Merge branch 'master' of https://git.startinblox.com/applications/hubl into...

Merge branch 'master' of https://git.startinblox.com/applications/hubl into feature/resource-component

src/components/hubl-search-users.js

@@ -5,7 +5,7 @@ const HublSearchUsers = widgetFactory(
   `<input
     data-holder
     autocomplete="off"
-    placeholder="\${label}"
+    placeholder="\${label} (^ + K)"
     type="text"
     name="\${name}"
     value="\${escapedValue}"

src/menu-left.pug

@@ -106,7 +106,7 @@ solid-router#navbar-router(default-route='dashboard')
         div.menu
           div.menu-chevron
             div.menu-icon.icon-arrow-right-circle
-          div.menu-label  Canaux
+          div.menu-label  Cercles
           div.menu-icon.icon-folder-alt
       solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden)
       div.sub-menu.menu-notification
@@ -115,7 +115,7 @@ solid-router#navbar-router(default-route='dashboard')
           nested-field='circles'
           fields='circle'
           empty-widget='hubl-create'
-          empty-value='canal'
+          empty-value='cercle'
           widget-circle='hubl-menu-fix-url-circle'
           order-by='circle.name'
           next='circle'

src/page-admin.pug

@@ -20,7 +20,7 @@ nav.jsRightMenu(role='navigation')
       if endpoints.circles || (endpoints.get && endpoints.get.circles)
         solid-route(name='admin-circles')
           li
-            a Canaux
+            a Cercles
       if endpoints.projects || (endpoints.get && endpoints.get.projects)
         solid-route(name='admin-projects')
           li

src/scripts/keyboard-shortcuts.js

+document.addEventListener("keydown", function (e) {
+  /*
+      CTRL + K : Focus on the user search
+      Keycode 75
+  */
+  if(e.ctrlKey && e.which == 75) {
+    document.querySelector('hubl-search-users > input').focus();
+    e.preventDefault();
+  }
+});
\ No newline at end of file

src/styles/base/menu-left.scss

@@ -87,6 +87,96 @@
                 }
             }
         }
+      }
+
+      /* Ellipsis for message tab */
+
+      .message-tab>div>solid-display>div>solid-display-div>div {
+        box-sizing: border-box;
+        width: calc(80vw - 96px); /*96px = padding of the element + width and margin of counter */
+        
+        @include breakpoint(lg) {
+          width: 150px;
+        }
+      }
+
+      solid-display.nosub>solid-form[fields="name"]>hubl-search-users>input {
+        margin-left: 30px;
+        margin-bottom: 10px;
+        width: calc(80vw - 71px);
+        display: block;
+        background-color: var(--color-secondary);
+        color: var(--color-white);
+        border: 1px solid var(--color-grey-4);
+        border-radius: 3px;
+        padding: 4px;
+
+        @include breakpoint(lg) {
+          margin: auto;
+          margin-bottom: 10px;
+          width: auto;
+        }
+      }
+
+      solid-display.nosub>nav {
+        text-align: center;
+        overflow: hidden;
+        display: grid;
+        grid-template-columns: auto 50% auto;
+        grid-template-areas: "left middle right";
+
+        >* {
+          color: var(--color-white);
+        }
+
+        >[data-id="prev"] {
+          grid-area: left;
+        }
+
+        >[data-id="next"] {
+          grid-area: right;
+        }
+
+        >span {
+          grid-area: middle;
+        }
+      }
+
+      hubl-menu-publicprivate {
+        display: inline-block;
+        text-align: center;
+
+        div {
+          font-family: simple-line-icons;
+          width: 20px;
+          font-size: 0.8em;
+          padding-top: 0.1em;
+        }
+      }
+
+      >solid-display.nosub>div>solid-display>div {
+        padding: 1rem 1rem 1rem 3rem;
+      }
+
+      solid-display>div {
+
+        .create {
+          color: var(--color-white);
+          margin: 1rem 1rem 2.2rem 3.2rem;
+        }
+
+        &>solid-display {
+          &:last-child>div {
+            margin-bottom: 2.2rem;
+          }
+
+          >div {
+            color: var(--color-white);
+            cursor: pointer;
+
+            >hubl-menu-fix-url-circle>solid-display>div,
+            >hubl-menu-fix-url-project>solid-display>div {
+              padding: 1rem 1rem 1rem 3rem;
         .sub-menu {
             /* Ellipsis for project tab */
             .project-tab>div>solid-display>div:nth-child(1) {

src/views/admin/page-admin-circles-create.pug

 div.content-box__info.flex
   solid-link(class="backlink right", next='admin-circle-list') Retour
 
-  h1.centered Créer un canal
+  h1.centered Créer un cercle
 
   solid-form.form.button-register(
     data-src=`${endpoints.circles || endpoints.post.circles}`
@@ -12,9 +12,9 @@ div.content-box__info.flex
     class-name='form-label is-light is-full-width input-text-like'
     class-description='form-label is-light is-full-width input-text-like'
 
-    label-status='Statut du canal'
-    label-name='Nom du canal *'
-    label-description='Sous-titre du canal *'
+    label-status='Statut du cercle'
+    label-name='Nom du cercle *'
+    label-description='Sous-titre du cercle *'
 
     widget-status='hubl-status'
     

src/views/admin/page-admin-circles.pug

@@ -31,12 +31,12 @@
 
       div.admin-header.flex
 
-        h3 Canaux
+        h3 Cercles
 
         solid-link(
           class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus'
           next='admin-circle-create'
-        ) Créer un canal
+        ) Créer un cercle
 
       .table-wrapper
         .table

src/views/admin/page-admin-projects-create.pug

@@ -19,7 +19,7 @@ div.content-box__info.flex
     
     fields='status, line-1(customer.name, name), description, line-2(captain), logo'
 
-    label-status='Statut du canal*'
+    label-status='Statut du cercle*'
     widget-status='hubl-status'
     class-status='form-label is-light is-full-width'
 

src/views/circle/page-circle-edit.pug

@@ -44,7 +44,7 @@ div.content-box__info
   solid-link(class="backlink right", bind-resources, next='circle-profile') Retour
 
   solid-ac-checker(permission='acl:Write', bind-resources)
-    h1 Modifie ton canal
+    h1 Modifie ton cercle
 
     solid-form.form.button-register(
       bind-resources
@@ -52,12 +52,12 @@ div.content-box__info
       fields='status, line-1(name, owner), description'
       range-owner=`${endpoints.users || endpoints.get.users}`
 
-      label-status='Statut du canal'
+      label-status='Statut du cercle'
       widget-status='hubl-status'
 
-      label-name='Nom du canal'
+      label-name='Nom du cercle'
       label-owner='Administrateur ou administratrice'
-      label-description='Sous-titre du canal *'
+      label-description='Sous-titre du cercle *'
 
       class-name='form-label is-light is-half-width input-text-like'
       class-owner='form-label is-light is-half-width member-select color'

src/views/circle/page-circle-left.pug

 #circle-left(hidden)
   div.content-box__info.flex(style="padding: 15px")
 
-    p Tu as quitté ce canal.
+    p Tu as quitté ce cercle.
     p Pour le rejoindre à nouveau, rends-toi dans le panneau <solid-link next="admin-circle-list">administration</solid-link> ou contacte un administrateur.

src/views/circle/page-circle-profile.pug

@@ -27,7 +27,7 @@ solid-router(default-route='circle-profile', hidden)
         solid-delete(
           class='button mobile-full-width text-bold text-uppercase button-primary bordered with-icon icon-trash'
           bind-resources
-          data-label='Supprimer le canal'
+          data-label='Supprimer le cercle'
         )
 
       solid-widget(name='hubl-circle-leave-button')
@@ -35,7 +35,7 @@ solid-router(default-route='circle-profile', hidden)
           solid-delete(
             class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
             data-src="${src}"
-            data-label='Quitter le canal'
+            data-label='Quitter le cercle'
           )
 
       solid-widget(name='hubl-circle-join-button')
@@ -52,7 +52,7 @@ solid-router(default-route='circle-profile', hidden)
 
               hubl-inherit-bind-user2input="input[name='user.@id']"
 
-              submit-button='Rejoindre le canal'
+              submit-button='Rejoindre le cercle'
             )
 
       solid-display(

src/views/project/page-project-edit.pug

@@ -11,7 +11,7 @@ div.content-box__info
 	
 	  fields='status, line-1(customer.name, name), description'
 
-    label-status='Statut du canal*'
+    label-status='Statut du cercle*'
     widget-status='hubl-status'
     class-status='form-label is-light is-full-width member-select color'