From f9653163ed4e480cbf635bae588b39ffcbc87424 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Wed, 20 May 2020 16:42:11 +0200
Subject: [PATCH] fix: MR155

---
 src/components/hubl-search-users.js    | 15 +++++++++++++++
 src/dependencies.pug                   |  1 +
 src/menu-left.pug                      |  4 +++-
 src/styles/base/menu-left.scss         |  2 +-
 src/views/admin/page-admin-circles.pug |  4 ++++
 src/views/circle/page-circle-edit.pug  |  2 +-
 6 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 src/components/hubl-search-users.js

diff --git a/src/components/hubl-search-users.js b/src/components/hubl-search-users.js
new file mode 100644
index 0000000..1916860
--- /dev/null
+++ b/src/components/hubl-search-users.js
@@ -0,0 +1,15 @@
+import { widgetFactory } from 'https://unpkg.com/@startinblox/core@0.9/dist/widgets/widget-factory.js';
+
+const HublSearchUsers = widgetFactory(
+  'hubl-search-users',
+  `<input
+    data-holder
+    autocomplete="off"
+    placeholder="\${label}"
+    type="text"
+    name="\${name}"
+    value="\${escapedValue}"
+  >`
+);
+
+export { HublSearchUsers }
\ No newline at end of file
diff --git a/src/dependencies.pug b/src/dependencies.pug
index c9ae0be..46c0ab6 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -1,3 +1,4 @@
+script(type="module" src="/components/hubl-search-users.js" defer)
 script(type="module" src="/components/hubl-status.js" defer)
 
 script(type="module" src="https://unpkg.com/@startinblox/core@0.9" defer)
diff --git a/src/menu-left.pug b/src/menu-left.pug
index 14b3687..3c82383 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -29,6 +29,7 @@ sib-widget(name='hubl-menu-fix-url-circle')
       widget-badge='hubl-counter'
       widget-jabberID='hubl-menu-jabberid'
       widget-name='sib-display-div'
+      order-by="name"
     )
 
 sib-widget(name='hubl-menu-fix-url-project')
@@ -43,6 +44,7 @@ sib-widget(name='hubl-menu-fix-url-project')
       widget-jabberID='hubl-menu-jabberid'
       widget-badge='hubl-counter'
       widget-name='sib-display-div'
+      order-by="customer.name"
     )
 
 nav#main__menu.jsLeftMenu
@@ -123,7 +125,7 @@ nav#main__menu.jsLeftMenu
             fields='name, chatProfile.jabberID, badge'
             search-fields="name"
             search-label-name="Rechercher..."
-            search-widget-name="sib-form-placeholder-text"
+            search-widget-name="hubl-search-users"
             widget-name='sib-display-div'
             widget-badge='hubl-counter'
             widget-chatProfile.jabberID='hubl-menu-jabberid'
diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss
index 2c00959..3470d71 100644
--- a/src/styles/base/menu-left.scss
+++ b/src/styles/base/menu-left.scss
@@ -125,7 +125,7 @@
       }
       /* End of specific styles of "Projects" tab */
 
-      sib-display.nosub>sib-form[fields="name"]>sib-form-placeholder-text>input {
+      sib-display.nosub>sib-form[fields="name"]>hubl-search-users>input {
         margin: auto;
         display: block;
         background-color: var(--color-secondary);
diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug
index 35d1016..1079379 100644
--- a/src/views/admin/page-admin-circles.pug
+++ b/src/views/admin/page-admin-circles.pug
@@ -66,6 +66,8 @@
           action-leaveButton="joinButton"
           widget-leaveButton="hubl-admin-circle-leave-button"
           widget-circle.owner='hubl-circle-owner'
+
+          order-by="circle.name"
         )
 
         sib-widget(name='hubl-admin-circle-join-button')
@@ -92,6 +94,8 @@
 
           class-members='w33 cell border cell-with-buttons'
           widget-members="hubl-admin-circle-join-button"
+
+          order-by="name"
         )
 
 
diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug
index 76d64b5..6663158 100644
--- a/src/views/circle/page-circle-edit.pug
+++ b/src/views/circle/page-circle-edit.pug
@@ -31,7 +31,7 @@ div.content-box__info
         sib-delete(
           class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
           data-src="${value['@id']}"
-          data-label='Quitter le canal'
+          data-label='Retirer'
         )
 
       //- Only to show the table grid