patch: conflict resolved

src/views/partials/widgets/hubl-admin-circle-counter-alternate-fix.pug

@@ -0,0 +1,8 @@
+if componentSet.has('admin') && componentSet.has('circles')
+  solid-widget(name='hubl-admin-circle-counter-alternate-fix')
+    template
+      solid-display(
+        fields='circle'
+        data-src="${src}"
+        widget-circle="hubl-admin-circle-counter-alternate"
+      )

src/views/partials/widgets/hubl-admin-circle-counter-alternate.pug

@@ -1,11 +1,12 @@
 if componentSet.has('admin') && componentSet.has('circles')
   solid-widget(name='hubl-admin-circle-counter-alternate')
     template
-      div(style='float:right')
+      div
+        span.icon.icon-people.icon-third.icon-large.margin-right-xsmall
         solid-display(
           fields=''
-          data-src="${src}"
-          nested-field="circle.members"
+          data-src="${src || value}"
+          nested-field="members"
           counter-template="\\\${counter}"
         )
-        span.icon.icon-people.icon-xsmall.margin-right-xxsmall
+        span members

src/views/partials/widgets/hubl-admin-circle-name.pug

@@ -0,0 +1,26 @@
+if componentSet.has('admin') && componentSet.has('circles')
+  solid-widget(name='hubl-admin-circle-name-title')
+    template
+      div.segment.block.one-line-ellipsis(
+        title="\${value}"
+      ) ${value}
+
+  solid-widget(name='hubl-admin-circle-name')
+    template
+      solid-link(
+        data-src="${src || value}"
+        next=`${getRoute(`circles`, true)}-information`
+      )
+        solid-display(
+          data-src="${src || value}"
+          fields="name"
+          widget-name="hubl-admin-circle-name-title"
+        )
+
+  solid-widget(name='hubl-admin-circle-fix-url-name')
+    template
+      solid-display(
+        data-src="${src}"
+        fields="circle"
+        widget-circle='hubl-admin-circle-name'
+      )

src/views/partials/widgets/hubl-admin-community-logo.pug

@@ -0,0 +1,3 @@
+if componentSet.has('admin') && componentSet.has('circles')
+  solid-widget(name='hubl-admin-community-logo')
+    template ${value != "" ? `<div \style="background-image:url(${value});" />` : `<div></div>`}

src/views/partials/widgets/hubl-menu-contact-removed.pug

@@ -0,0 +1,4 @@
+if componentSet.has('chat')
+  solid-widget(name='hubl-menu-contact-removed')
+    template ${value != "" ? `
+      <solid-delete class="icon icon-small icon-white icon-close" data-src='${value}' data-label="" confirmation-type="confirm" confirmation-message="Contact retiré"></solid-delete>` : ""}