From e2fcacf951ec0925a38f91b0618f4e8e8769b977 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 24 Aug 2020 13:13:48 +0200 Subject: [PATCH 1/3] update: replace channel/channels with circle/circles --- src/menu-left.pug | 4 ++-- src/page-admin.pug | 2 +- src/views/admin/page-admin-circles-create.pug | 8 ++++---- src/views/admin/page-admin-circles.pug | 4 ++-- src/views/admin/page-admin-projects-create.pug | 2 +- src/views/circle/page-circle-edit.pug | 8 ++++---- src/views/circle/page-circle-left.pug | 2 +- src/views/circle/page-circle-profile.pug | 6 +++--- src/views/project/page-project-edit.pug | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/menu-left.pug b/src/menu-left.pug index b7e91cb..771db32 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -96,7 +96,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 @@ -105,7 +105,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 54e08f9..87697f8 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/views/admin/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug index 2e94345..ee876f5 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 c0f1833..3e6c2ef 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 57c9748..de5e6d6 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 979ec1c..0b30466 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 0a6b700..5ecf22c 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 administration ou contacte un administrateur. diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug index df4f59e..5d37887 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 cce893a..01a350a 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' From acb6d0726deb7246fbd91f95410cdf8893519567 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 24 Aug 2020 13:40:35 +0200 Subject: [PATCH 2/3] feature: add keyboard shortcut hubl#524 --- src/components/hubl-search-users.js | 2 +- src/scripts/keyboard-shortcuts.js | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/scripts/keyboard-shortcuts.js diff --git a/src/components/hubl-search-users.js b/src/components/hubl-search-users.js index ab4300e..c65e58e 100644 --- a/src/components/hubl-search-users.js +++ b/src/components/hubl-search-users.js @@ -5,7 +5,7 @@ const HublSearchUsers = widgetFactory( ` input').focus(); + e.preventDefault(); + } +}); \ No newline at end of file From c44c2d6f5322eece0cf754cb802ae0519a91f327 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 24 Aug 2020 13:45:01 +0200 Subject: [PATCH 3/3] update: color of the left menu font --- src/styles/base/menu-left.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss index 47b207d..a018b5d 100644 --- a/src/styles/base/menu-left.scss +++ b/src/styles/base/menu-left.scss @@ -162,7 +162,7 @@ width: calc(80vw - 71px); display: block; background-color: var(--color-secondary); - color: var(--color-grey-6); + color: var(--color-white); border: 1px solid var(--color-grey-4); border-radius: 3px; padding: 4px; @@ -182,7 +182,7 @@ grid-template-areas: "left middle right"; >* { - color: var(--color-grey-6); + color: var(--color-white); } >[data-id="prev"] { @@ -227,7 +227,7 @@ } >div { - color: var(--color-grey-6); + color: var(--color-white); cursor: pointer; >hubl-menu-fix-url-circle>solid-display>div,