diff --git a/src/components/hubl-search-users.js b/src/components/hubl-search-users.js
index ab4300ed0a3c9f378e315c29c51e50902755ec85..c65e58e8c7d8b4365bfecc7162ed6d1148b26952 100644
--- a/src/components/hubl-search-users.js
+++ b/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}"
diff --git a/src/menu-left.pug b/src/menu-left.pug
index c4d0cb8db8fc7d5eb9a3273490a773d8cf91e4d1..a30027e90c3c28e4491a5b592e20c84373ffa786 100644
--- a/src/menu-left.pug
+++ b/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'
diff --git a/src/page-admin.pug b/src/page-admin.pug
index 54e08f92b8467059075f1f7abb41a17049841295..87697f843beefc15b0d0ffa11e63bfd353473049 100644
--- a/src/page-admin.pug
+++ b/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
diff --git a/src/scripts/keyboard-shortcuts.js b/src/scripts/keyboard-shortcuts.js
new file mode 100644
index 0000000000000000000000000000000000000000..5cc12395736671e4809f4c67351ef80e7531a1b6
--- /dev/null
+++ b/src/scripts/keyboard-shortcuts.js
@@ -0,0 +1,10 @@
+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
diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss
index 5e1fcd398a6517a42afa4fe5745548a53fee5565..cea32b5573e6c6f9ba7eaa765dfcbabbab2d7594 100644
--- a/src/styles/base/menu-left.scss
+++ b/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) {
diff --git a/src/views/admin/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug
index 2e94345d2dc9a06f31d5c79f5ef5bc9082a4398b..ee876f5b904a9e8422eb31fe942d52e35646a985 100644
--- a/src/views/admin/page-admin-circles-create.pug
+++ b/src/views/admin/page-admin-circles-create.pug
@@ -1,7 +1,7 @@
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'
diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug
index c0f1833765ac119a0090243f02f1efd7e053f994..3e6c2efb44528272f9c0437f832301f31d0696f8 100644
--- a/src/views/admin/page-admin-circles.pug
+++ b/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
diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug
index 57c9748747640a0f1e87bc0eaa6fca1c6f33c48f..de5e6d6d5c07cb93ed0956868c8255eb1e341b5c 100644
--- a/src/views/admin/page-admin-projects-create.pug
+++ b/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'
diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug
index 979ec1cc044cc37ce39144c29ccb333da09cd0c4..0b30466ca5a0aef88f4802bdb275f166436a1e08 100644
--- a/src/views/circle/page-circle-edit.pug
+++ b/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'
diff --git a/src/views/circle/page-circle-left.pug b/src/views/circle/page-circle-left.pug
index 0a6b7003694d02d3e1ef520d99414c1e6ebed6f9..5ecf22c6532f6d006cee2309b5c2aad9143942a0 100644
--- a/src/views/circle/page-circle-left.pug
+++ b/src/views/circle/page-circle-left.pug
@@ -1,5 +1,5 @@
#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.
diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug
index df4f59e7b2662c12008818ba82bea0b9e09b34b5..5d37887d9f0bafe6acbee54c1c1c2cb3b122a35e 100644
--- a/src/views/circle/page-circle-profile.pug
+++ b/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(
diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug
index cce893a145d36c98e46a44321899cc9304097320..01a350a3877b066abc0e07c571b5043a32684fd6 100644
--- a/src/views/project/page-project-edit.pug
+++ b/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'