diff --git a/src/styles/admin-circles/_index.scss b/src/styles/admin-circles/_index.scss
index 3644506b1bb2caf1cb94df7430c7cece127420fb..f152015facd6fbd4f3d5c49cbd47105cce9adfcd 100644
--- a/src/styles/admin-circles/_index.scss
+++ b/src/styles/admin-circles/_index.scss
@@ -187,10 +187,31 @@
}
.communities-profile-map .leaflet-pane.leaflet-popup-pane {
- /*display: none;*/
+ display: none;
+ }
+
+ .communities-map {
.leaflet-popup-content-wrapper {
- white-space: normal;
+ border-radius: 5px;
+
+ .leaflet-popup-content {
+ width: 340px !important;
+ margin: 0;
+
+ .description {
+ height: 32px;
+ }
+
+ .title:hover {
+ cursor: pointer;
+ text-decoration: underline;
+ }
+ }
+ }
+
+ .leaflet-popup-close-button {
+ display: none;
}
}
@@ -239,6 +260,16 @@
top: 70px;
z-index: 1000;
width: 97%;
+
+ button[type='submit'] {
+ background: var(--color-secondary) !important;
+ color: white !important;
+
+ &:hover {
+ background: white !important;
+ color: var(--color-secondary) !important;
+ }
+ }
}
.communities-map {
diff --git a/src/views/partials/communities/page-community-directory.pug b/src/views/partials/communities/page-community-directory.pug
index bc323e636b1826edef3df53f5245a081cfe4296f..79549f0b378f38ef1b69168e168f8138edc2bb3e 100644
--- a/src/views/partials/communities/page-community-directory.pug
+++ b/src/views/partials/communities/page-community-directory.pug
@@ -2,7 +2,7 @@
h2.margin-top-xxsmall.margin-left-xsmall.margin-bottom-medium.sm-margin-none.sm-margin-right-xsmall.sm-margin-bottom-small.sm-margin-left-xsmall.text-xlarge.text-bold.text-color-heading.text-uppercase(data-trans='communities.list.title')
div.padding-top-xxsmall.margin-left-xsmall.margin-right-xsmall.sm-padding-none.sm-margin-none.sm-margin-right-xsmall.sm-margin-left-xsmall
- div.segment.half.sm-full
+ div.segment.three-quarter.sm-full
solid-form-search.form.search-form.search-button(
id=`communities-filter`
fields='name'
@@ -13,7 +13,7 @@
submit-widget="button"
data-trans='placeholder-name=communities.list.searchBy;submit-button=communities.list.searchButton'
)
- div.segment.half.sm-full.text-right
+ div.segment.quarter.sm-full.text-right
solid-link.segment.children-link-rounded.children-icon-map.children-link-reversed.color-secondary.bordered(next=`${component.route}-map`)
span
diff --git a/src/views/partials/communities/page-community-map.pug b/src/views/partials/communities/page-community-map.pug
index da0ccb0ebd1f921e4bc41d2e0d399a118dac717b..36d9f62f32e707a66f31b1f9d66d62e497f8eafb 100644
--- a/src/views/partials/communities/page-community-map.pug
+++ b/src/views/partials/communities/page-community-map.pug
@@ -2,7 +2,7 @@
h2.segment.sm-hidden.margin-top-xxsmall.margin-left-xsmall.margin-bottom-medium.sm-margin-none.sm-margin-right-xsmall.sm-margin-bottom-large.sm-margin-left-xsmall.text-xlarge.text-bold.text-color-heading.text-uppercase(data-trans='communities.list.title')
div.mobile-map-search-field.padding-top-xxsmall.margin-left-xsmall.margin-right-xsmall.sm-padding-none.sm-margin-none.sm-margin-right-xsmall.sm-margin-left-xsmall
- div.segment.half.sm-full
+ div.segment.three-quarter.sm-full
solid-form-search.form.search-form.search-button(
id=`communities-filter-map`
fields='filter'
@@ -15,15 +15,25 @@
submit-widget="button"
data-trans='placeholder-name=communities.list.searchBy;submit-button=communities.list.searchButton'
)
- div.segment.half.sm-full.text-right
+ div.segment.quarter.sm-full.text-right
solid-link.segment.children-link-rounded.children-icon-grid.children-link-reversed.color-secondary.bordered(next=`${component.route}-directory`)
span
solid-map.communities-map.margin-right-xsmall.margin-left-xsmall.sm-margin-none.shadow(
data-src=`${component.endpoints.addresses}`
loader-id=`loader-${component.route}-map`
- fields="position(community.name, community.profile.shortDescription, address_line1, address_line2)"
- class-position="segment"
+ fields="position(segment1(community.logo), segment2(community.name, community.profile.shortDescription, community.members))"
+
+ class-segment1="segment block margin-medium"
+ class-segment2="segment full padding-top-xlarge padding-right-large padding-left-large sm-padding-medium border-top border-color-grey text-center whitespace-normal"
+ class-community.name="title segment block margin-bottom-xsmall text-color-heading text-xlarge text-bold"
+ class-community.profile.shortDescription="segment block description text-medium whitespace-normal two-lines-ellipsis"
+
+ action-circle.name=`${getRoute(`community`, true)}-profile`
+ widget-circle.name='hubl-communities-map-fix-url-name'
+ widget-community.logo='hubl-admin-community-logo'
+ widget-community.members="hubl-communities-profile-members-counter"
+
clustering=""
filtered-by=`communities-filter-map`
style="display:block;height:698px;"
diff --git a/src/views/partials/widgets.pug b/src/views/partials/widgets.pug
index e1d488ba8cf336d94644340f26fa5f6593e758fb..12059875e16f6b7fde4362f1174d498a449eeeaa 100644
--- a/src/views/partials/widgets.pug
+++ b/src/views/partials/widgets.pug
@@ -25,6 +25,7 @@ include widgets/hubl-communities-edit-button.pug
include widgets/hubl-communities-edit-email.pug
include widgets/hubl-communities-edit-website.pug
include widgets/hubl-communities-logo.pug
+include widgets/hubl-communities-map-fix-url-name.pug
include widgets/hubl-communities-profile-address.pug
include widgets/hubl-communities-profile-email.pug
include widgets/hubl-communities-profile-facebook.pug
diff --git a/src/views/partials/widgets/hubl-communities-map-fix-url-name.pug b/src/views/partials/widgets/hubl-communities-map-fix-url-name.pug
new file mode 100644
index 0000000000000000000000000000000000000000..d5a41abd07aad4980745836477a95c31e3006784
--- /dev/null
+++ b/src/views/partials/widgets/hubl-communities-map-fix-url-name.pug
@@ -0,0 +1,19 @@
+if componentSet.has('communities')
+ solid-widget(name='hubl-communities-name')
+ template
+ solid-link(
+ data-src="${src || value}"
+ next=`${getRoute(`communities`, true)}-profile`
+ )
+ solid-display(
+ data-src="${src || value}"
+ fields="name"
+ )
+
+ solid-widget(name='hubl-communities-map-fix-url-name')
+ template
+ solid-display(
+ data-src="${src}"
+ fields="community"
+ widget-community='hubl-communities-name'
+ )
\ No newline at end of file