Merge branch 'master' into release/hubl-524
This commit is contained in:
commit
b2b16c6552
@ -96,7 +96,7 @@ solid-router#navbar-router(default-route='dashboard')
|
|||||||
div.menu
|
div.menu
|
||||||
div.menu-chevron
|
div.menu-chevron
|
||||||
div.menu-icon.icon-arrow-right-circle
|
div.menu-icon.icon-arrow-right-circle
|
||||||
div.menu-label Canaux
|
div.menu-label Cercles
|
||||||
div.menu-icon.icon-folder-alt
|
div.menu-icon.icon-folder-alt
|
||||||
solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden)
|
solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden)
|
||||||
div.sub-menu.menu-notification
|
div.sub-menu.menu-notification
|
||||||
@ -105,7 +105,7 @@ solid-router#navbar-router(default-route='dashboard')
|
|||||||
nested-field='circles'
|
nested-field='circles'
|
||||||
fields='circle'
|
fields='circle'
|
||||||
empty-widget='hubl-create'
|
empty-widget='hubl-create'
|
||||||
empty-value='canal'
|
empty-value='cercle'
|
||||||
widget-circle='hubl-menu-fix-url-circle'
|
widget-circle='hubl-menu-fix-url-circle'
|
||||||
order-by='circle.name'
|
order-by='circle.name'
|
||||||
next='circle'
|
next='circle'
|
||||||
|
@ -20,7 +20,7 @@ nav.jsRightMenu(role='navigation')
|
|||||||
if endpoints.circles || (endpoints.get && endpoints.get.circles)
|
if endpoints.circles || (endpoints.get && endpoints.get.circles)
|
||||||
solid-route(name='admin-circles')
|
solid-route(name='admin-circles')
|
||||||
li
|
li
|
||||||
a Canaux
|
a Cercles
|
||||||
if endpoints.projects || (endpoints.get && endpoints.get.projects)
|
if endpoints.projects || (endpoints.get && endpoints.get.projects)
|
||||||
solid-route(name='admin-projects')
|
solid-route(name='admin-projects')
|
||||||
li
|
li
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
div.content-box__info.flex
|
div.content-box__info.flex
|
||||||
solid-link(class="backlink right", next='admin-circle-list') Retour
|
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(
|
solid-form.form.button-register(
|
||||||
data-src=`${endpoints.circles || endpoints.post.circles}`
|
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-name='form-label is-light is-full-width input-text-like'
|
||||||
class-description='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-status='Statut du cercle'
|
||||||
label-name='Nom du canal *'
|
label-name='Nom du cercle *'
|
||||||
label-description='Sous-titre du canal *'
|
label-description='Sous-titre du cercle *'
|
||||||
|
|
||||||
widget-status='hubl-status'
|
widget-status='hubl-status'
|
||||||
|
|
||||||
|
@ -31,12 +31,12 @@
|
|||||||
|
|
||||||
div.admin-header.flex
|
div.admin-header.flex
|
||||||
|
|
||||||
h3 Canaux
|
h3 Cercles
|
||||||
|
|
||||||
solid-link(
|
solid-link(
|
||||||
class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus'
|
class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus'
|
||||||
next='admin-circle-create'
|
next='admin-circle-create'
|
||||||
) Créer un canal
|
) Créer un cercle
|
||||||
|
|
||||||
.table-wrapper
|
.table-wrapper
|
||||||
.table
|
.table
|
||||||
|
@ -19,7 +19,7 @@ div.content-box__info.flex
|
|||||||
|
|
||||||
fields='status, line-1(customer.name, name), description, line-2(captain), logo'
|
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'
|
widget-status='hubl-status'
|
||||||
class-status='form-label is-light is-full-width'
|
class-status='form-label is-light is-full-width'
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ div.content-box__info
|
|||||||
solid-link(class="backlink right", bind-resources, next='circle-profile') Retour
|
solid-link(class="backlink right", bind-resources, next='circle-profile') Retour
|
||||||
|
|
||||||
solid-ac-checker(permission='acl:Write', bind-resources)
|
solid-ac-checker(permission='acl:Write', bind-resources)
|
||||||
h1 Modifie ton canal
|
h1 Modifie ton cercle
|
||||||
|
|
||||||
solid-form.form.button-register(
|
solid-form.form.button-register(
|
||||||
bind-resources
|
bind-resources
|
||||||
@ -52,12 +52,12 @@ div.content-box__info
|
|||||||
fields='status, line-1(name, owner), description'
|
fields='status, line-1(name, owner), description'
|
||||||
range-owner=`${endpoints.users || endpoints.get.users}`
|
range-owner=`${endpoints.users || endpoints.get.users}`
|
||||||
|
|
||||||
label-status='Statut du canal'
|
label-status='Statut du cercle'
|
||||||
widget-status='hubl-status'
|
widget-status='hubl-status'
|
||||||
|
|
||||||
label-name='Nom du canal'
|
label-name='Nom du cercle'
|
||||||
label-owner='Administrateur ou administratrice'
|
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-name='form-label is-light is-half-width input-text-like'
|
||||||
class-owner='form-label is-light is-half-width member-select color'
|
class-owner='form-label is-light is-half-width member-select color'
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#circle-left(hidden)
|
#circle-left(hidden)
|
||||||
div.content-box__info.flex(style="padding: 15px")
|
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.
|
p Pour le rejoindre à nouveau, rends-toi dans le panneau <solid-link next="admin-circle-list">administration</solid-link> ou contacte un administrateur.
|
||||||
|
@ -27,7 +27,7 @@ solid-router(default-route='circle-profile', hidden)
|
|||||||
solid-delete(
|
solid-delete(
|
||||||
class='button mobile-full-width text-bold text-uppercase button-primary bordered with-icon icon-trash'
|
class='button mobile-full-width text-bold text-uppercase button-primary bordered with-icon icon-trash'
|
||||||
bind-resources
|
bind-resources
|
||||||
data-label='Supprimer le canal'
|
data-label='Supprimer le cercle'
|
||||||
)
|
)
|
||||||
|
|
||||||
solid-widget(name='hubl-circle-leave-button')
|
solid-widget(name='hubl-circle-leave-button')
|
||||||
@ -35,7 +35,7 @@ solid-router(default-route='circle-profile', hidden)
|
|||||||
solid-delete(
|
solid-delete(
|
||||||
class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
|
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-src="${src}"
|
||||||
data-label='Quitter le canal'
|
data-label='Quitter le cercle'
|
||||||
)
|
)
|
||||||
|
|
||||||
solid-widget(name='hubl-circle-join-button')
|
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']"
|
hubl-inherit-bind-user2input="input[name='user.@id']"
|
||||||
|
|
||||||
submit-button='Rejoindre le canal'
|
submit-button='Rejoindre le cercle'
|
||||||
)
|
)
|
||||||
|
|
||||||
solid-display(
|
solid-display(
|
||||||
|
@ -11,7 +11,7 @@ div.content-box__info
|
|||||||
|
|
||||||
fields='status, line-1(customer.name, name), description'
|
fields='status, line-1(customer.name, name), description'
|
||||||
|
|
||||||
label-status='Statut du canal*'
|
label-status='Statut du cercle*'
|
||||||
widget-status='hubl-status'
|
widget-status='hubl-status'
|
||||||
class-status='form-label is-light is-full-width member-select color'
|
class-status='form-label is-light is-full-width member-select color'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user