From 9f32a4dc9b95067748f408417ddbe8aa583967af Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 19 May 2020 18:22:00 +0200 Subject: [PATCH 1/6] feature: private circles --- package.json | 2 ++ src/components/hubl-status.js | 29 +++++++++++++++++++ src/dependencies.pug | 2 ++ src/styles/base/form.scss | 6 +++- src/views/admin/page-admin-circles-create.pug | 6 +++- src/views/circle/page-circle-edit.pug | 6 +++- src/views/circle/page-circle-profile.pug | 20 ++++++------- 7 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 src/components/hubl-status.js diff --git a/package.json b/package.json index 76a9d72..3792914 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "build": "run-p copy:* build:*", "build:css": "node-sass src/styles/index.scss -o dist/styles/", "build:js": "babel 'src/scripts/*.js' -o dist/scripts/index.js", + "build:jscomponents": "babel 'src/components/*.js' --out-dir dist/components/", "build:html": "pug src/index.pug -o dist/ --obj config.json", "copy:font": "copyfiles -f src/fonts/* dist/fonts", "copy:image": "copyfiles -f src/images/* dist/images", @@ -17,6 +18,7 @@ "watch": "run-p copy:* watch:* serve", "watch:css": "npm run build:css && npm run build:css -- -w", "watch:js": "babel --watch \"src/scripts/*.js\" -o dist/scripts/index.js", + "watch:jscomponents": "babel --watch \"src/components/*.js\" --out-dir dist/components/", "watch:pug": "pug --watch src/index.pug -o dist/ --obj config.json", "cypress:open": "cypress open", "cypress:verify": "cypress verify", diff --git a/src/components/hubl-status.js b/src/components/hubl-status.js new file mode 100644 index 0000000..1a3f02b --- /dev/null +++ b/src/components/hubl-status.js @@ -0,0 +1,29 @@ +import { widgetFactory } from 'https://unpkg.com/@startinblox/core@0.9/dist/widgets/widget-factory.js'; +import SlimSelect from 'https://dev.jspm.io/slim-select@1.23'; + +const HublStatus = widgetFactory( + 'hubl-status', + ``, + '', + formWidget => { + let select = formWidget.querySelector('select'); + if (!select) return; + const slimSelect = new SlimSelect({select: select}); + importCSS('https://dev.jspm.io/slim-select/dist/slimselect.min.css'); + select.addEventListener('change', () => slimSelect.render()); + }, +); + +export { HublStatus } \ No newline at end of file diff --git a/src/dependencies.pug b/src/dependencies.pug index 60b0441..c9ae0be 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -1,3 +1,5 @@ +script(type="module" src="/components/hubl-status.js" defer) + script(type="module" src="https://unpkg.com/@startinblox/core@0.9" defer) //- script(type="module" src="/lib/sib-core/dist/index.js" defer) diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss index e8b99dd..8941017 100644 --- a/src/styles/base/form.scss +++ b/src/styles/base/form.scss @@ -227,7 +227,7 @@ /* WIDGETS SIB */ - sib-form-auto-completion.member-select { + sib-form-auto-completion.member-select, hubl-status { align-self: flex-end; >label:first-of-type>div { @@ -263,6 +263,10 @@ } } + hubl-status { + align-self: auto; + } + sib-form-date { input[type="date"] { background-image: url("/images/calendar.svg"); diff --git a/src/views/admin/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug index e7c7770..70f19bf 100644 --- a/src/views/admin/page-admin-circles-create.pug +++ b/src/views/admin/page-admin-circles-create.pug @@ -6,10 +6,14 @@ div.content-box__info sib-form( data-src=`${endpoints.circles || endpoints.post.circles}` - fields='name, description' + fields='status, name, description' + + label-status='Statut du canal' + widget-status='hubl-status' class-name='form-label is-light is-full-width' class-description='form-label is-light is-full-width' + class-status='form-label is-light is-full-width member-select color' label-name='Nom du canal *' label-description='Sous-titre du canal *' diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug index d670e33..76d64b5 100644 --- a/src/views/circle/page-circle-edit.pug +++ b/src/views/circle/page-circle-edit.pug @@ -49,9 +49,12 @@ div.content-box__info sib-form.form-edit( bind-resources - fields='block-circle__info(name, owner), description' + fields='status, block-circle__info(name, owner), description' range-owner=`${endpoints.users || endpoints.get.users}` + label-status='Statut du canal' + widget-status='hubl-status' + label-name='Nom du canal' label-owner='Administrateur ou administratrice' label-description='Sous-titre du canal *' @@ -59,6 +62,7 @@ div.content-box__info class-name='form-label is-light is-half-width' class-owner='form-label is-light is-half-width member-select color' class-description='form-label is-light is-full-width' + class-status='form-label is-light is-full-width member-select color' widget-owner='sib-form-auto-completion' diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug index 71bdda5..2c583fb 100644 --- a/src/views/circle/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -21,16 +21,6 @@ sib-router(default-route='circle-profile', hidden) sib-link(class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources) Modifier et ajouter un membre - h2 Membres : - - sib-display.block( - bind-resources - fields='members' - - multiple-members='' - widget-members='hubl-circle-team-template' - ) - div.box-button sib-ac-checker(permission='acl:Delete', bind-resources) sib-delete( @@ -78,6 +68,16 @@ sib-router(default-route='circle-profile', hidden) hubl-inherit-user-id="search-value-user" ) + h2 Membres : + + sib-display.block( + bind-resources + fields='members' + + multiple-members='' + widget-members='hubl-circle-team-template' + ) + #circle-edit(hidden) From 120af5b3224527b88c027f6ddaabb66a41e66423 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 19 May 2020 19:09:59 +0200 Subject: [PATCH 2/6] feature: add search bar --- src/menu-left.pug | 4 ++++ src/styles/base/menu-left.scss | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/src/menu-left.pug b/src/menu-left.pug index 2d261c0..24165f3 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -115,12 +115,16 @@ nav#main__menu.jsLeftMenu sib-display.nosub( data-src=`${endpoints.users || (endpoints.get && endpoints.get.users)}` fields='name, chatProfile.jabberID, badge' + search-fields="name" + search-label-name="Rechercher..." + search-widget-name="sib-form-placeholder-text" widget-name='sib-display-div' widget-badge='hubl-counter' widget-chatProfile.jabberID='hubl-menu-jabberid' action-badge='badge' order-by='username' next='messages' + paginate-by='10' ) div.divider diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss index e4699d6..282bc13 100644 --- a/src/styles/base/menu-left.scss +++ b/src/styles/base/menu-left.scss @@ -125,6 +125,35 @@ } /* End of specific styles of "Projects" tab */ + sib-display.nosub>sib-form[fields="name"]>sib-form-placeholder-text>input { + margin: auto; + display: block; + background-color: var(--color-secondary); + color: var(--color-grey-6); + border: 1px solid var(--color-grey-4); + border-radius: 3px; + padding: 4px; + } + + sib-display.nosub>nav { + text-align: center; + display: grid; + grid-template-columns: auto 50% auto; + grid-template-areas: "left middle right"; + >* { + color: var(--color-grey-6); + } + >[data-id="prev"] { + grid-area: left; + } + >[data-id="next"] { + grid-area: right; + } + >span { + grid-area: middle; + } + } + >sib-display.nosub>div>sib-display>div { padding: 1rem 1rem 1rem 3rem; } From 7c00d2391a59262e8b462acadc294764bfb04a25 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 19 May 2020 19:42:32 +0200 Subject: [PATCH 3/6] feature: status icon on left menu --- src/components/hubl-status.js | 1 + src/menu-left.pug | 10 ++++++++-- src/styles/base/menu-left.scss | 11 +++++++++++ src/styles/base/table.scss | 1 - 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/components/hubl-status.js b/src/components/hubl-status.js index 1a3f02b..f3d256d 100644 --- a/src/components/hubl-status.js +++ b/src/components/hubl-status.js @@ -1,4 +1,5 @@ import { widgetFactory } from 'https://unpkg.com/@startinblox/core@0.9/dist/widgets/widget-factory.js'; +import { importCSS } from 'https://unpkg.com/@startinblox/core@0.9/dist/libs/helpers.js'; import SlimSelect from 'https://dev.jspm.io/slim-select@1.23'; const HublStatus = widgetFactory( diff --git a/src/menu-left.pug b/src/menu-left.pug index 24165f3..14b3687 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -8,6 +8,10 @@ sib-widget(name='hubl-menu-jabberid') data-jabberID="${value}" ) +sib-widget(name='hubl-menu-publicprivate') + template + div ${value == 'Public' ? '#' : ''} + sib-widget(name='hubl-create') template p.create Tu ne fais partie d'aucun ${value}. @@ -19,8 +23,9 @@ sib-widget(name='hubl-menu-fix-url-circle') template sib-display( data-src='${value}' - fields='name, jabberID, badge' + fields='status, name, jabberID, badge' value-badge='${value}' + widget-status='hubl-menu-publicprivate' widget-badge='hubl-counter' widget-jabberID='hubl-menu-jabberid' widget-name='sib-display-div' @@ -30,10 +35,11 @@ sib-widget(name='hubl-menu-fix-url-project') template sib-display( data-src='${value}' - fields='project(customer.name, name, jabberID), badge' + fields='status, project(customer.name, name, jabberID), badge' class-name='project-name' class-customer.name='project-customer' value-badge='${value}' + widget-status='hubl-menu-publicprivate' widget-jabberID='hubl-menu-jabberid' widget-badge='hubl-counter' widget-name='sib-display-div' diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss index 282bc13..2c00959 100644 --- a/src/styles/base/menu-left.scss +++ b/src/styles/base/menu-left.scss @@ -154,6 +154,17 @@ } } + 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; + } + } + >sib-display.nosub>div>sib-display>div { padding: 1rem 1rem 1rem 3rem; } diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index eb4078a..e8a8513 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -28,7 +28,6 @@ >* { border-right: 1px solid var(--color-table-border); - flex: 1; padding: 2.1rem 0; text-align: center; } From 4a24181026d561d9fdd4161567b2eb48fda88661 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 19 May 2020 18:12:41 +0000 Subject: [PATCH 4/6] cicd: fix devdeps installation --- .gitlab-ci.yml | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94caa36..803c471 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,10 +58,11 @@ test1: environment: name: test1 url: https://test1.startinblox.com + before_script: + - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TEST1" > config.json + - echo "$APP_CONFIG_TEST2" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - - npm install - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* test1@astral.startinblox.com:~/front/ only: @@ -75,10 +76,11 @@ test2: environment: name: test2 url: https://test2.startinblox.com + before_script: + - npm ci --cache .npm --prefer-offline --only=production script: - echo "$APP_CONFIG_TEST2" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - - npm install - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* test2@astral.startinblox.com:~/front/ only: @@ -92,10 +94,11 @@ test3: environment: name: test3 url: https://test3.startinblox.com + before_script: + - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TEST3" > config.json + - echo "$APP_CONFIG_TEST2" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - - npm install - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* test3@astral.startinblox.com:~/front/ only: @@ -109,10 +112,11 @@ stg1: environment: name: stg1 url: https://stg1.startinblox.com + before_script: + - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_STG1" > config.json + - echo "$APP_CONFIG_TEST2" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - - npm install - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* stg1@astral.startinblox.com:~/front/ only: @@ -126,10 +130,11 @@ stg2: environment: name: stg2 url: https://stg2.startinblox.com + before_script: + - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_STG2" > config.json + - echo "$APP_CONFIG_TEST2" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - - npm install - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* stg2@astral.startinblox.com:~/front/ only: @@ -157,10 +162,11 @@ community: environment: name: community url: https://community.startinblox.com + before_script: + - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_COMMUNITY" > config.json + - echo "$APP_CONFIG_TEST2" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - - npm install - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* community@astral.startinblox.com:~/front/ only: @@ -174,10 +180,11 @@ etuc: environment: name: etuc url: https://app.digitalplatformobservatory.org + before_script: + - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_DIGITALPLATFORMOBSERVATORY" > config.json + - echo "$APP_CONFIG_TEST2" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - - npm install - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* etuc@ssh-etuc.happy-dev.fr:~/sib/www/ only: @@ -191,10 +198,11 @@ nantes: environment: name: nantes url: https://app.nantes.happy-dev.fr + before_script: + - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_NANTESHD" > config.json + - echo "$APP_CONFIG_TEST2" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - - npm install - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* nantes@ssh-nantes.happy-dev.fr:~/sib/www/ only: @@ -208,10 +216,11 @@ paris: environment: name: paris url: https://app.paris.happy-dev.fr + before_script: + - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_PARIS" > config.json + - echo "$APP_CONFIG_TEST2" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - - npm install - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* paris@ssh-paris.happy-dev.fr:~/sib/www/ only: @@ -225,10 +234,11 @@ toulouse: environment: name: toulouse url: https://smart-toulouse.happy-dev.fr + before_script: + - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TOULOUSE" > config.json + - echo "$APP_CONFIG_TEST2" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - - npm install - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* smart-toulouse@ssh-smart-toulouse.happy-dev.fr:~/www/ only: From 8381cfb5a3d704fffb3a9cbf9b5fdfbb17a61d67 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 19 May 2020 18:15:30 +0000 Subject: [PATCH 5/6] cicd: deployment variables --- .gitlab-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 803c471..c40bb5b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,7 @@ test1: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TEST2" > config.json + - echo "$APP_CONFIG_TEST1" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* test1@astral.startinblox.com:~/front/ @@ -97,7 +97,7 @@ test3: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TEST2" > config.json + - echo "$APP_CONFIG_TEST3" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* test3@astral.startinblox.com:~/front/ @@ -115,7 +115,7 @@ stg1: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TEST2" > config.json + - echo "$APP_CONFIG_STG1" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* stg1@astral.startinblox.com:~/front/ @@ -133,7 +133,7 @@ stg2: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TEST2" > config.json + - echo "$APP_CONFIG_STG2" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* stg2@astral.startinblox.com:~/front/ @@ -165,7 +165,7 @@ community: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TEST2" > config.json + - echo "$APP_CONFIG_COMMUNITY" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* community@astral.startinblox.com:~/front/ @@ -183,7 +183,7 @@ etuc: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TEST2" > config.json + - echo "$APP_CONFIG_DIGITALPLATFORMOBSERVATORY" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* etuc@ssh-etuc.happy-dev.fr:~/sib/www/ @@ -201,7 +201,7 @@ nantes: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TEST2" > config.json + - echo "$APP_CONFIG_NANTESHD" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* nantes@ssh-nantes.happy-dev.fr:~/sib/www/ @@ -219,7 +219,7 @@ paris: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TEST2" > config.json + - echo "$APP_CONFIG_PARIS" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* paris@ssh-paris.happy-dev.fr:~/sib/www/ @@ -237,7 +237,7 @@ toulouse: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TEST2" > config.json + - echo "$APP_CONFIG_TOULOUSE" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* smart-toulouse@ssh-smart-toulouse.happy-dev.fr:~/www/ From f9653163ed4e480cbf635bae588b39ffcbc87424 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 20 May 2020 16:42:11 +0200 Subject: [PATCH 6/6] 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', + `` +); + +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