Merge branch 'release/contacts-implementation' into feature/hubl-2
This commit is contained in:
@ -12,6 +12,15 @@ solid-widget(name='hubl-menu-publicprivate')
|
||||
template
|
||||
div ${value == 'Public' ? '#' : ''}
|
||||
|
||||
solid-widget(name='hubl-create-contact')
|
||||
template
|
||||
p.create
|
||||
span(data-trans="menuLeft.contact.create")
|
||||
span
|
||||
solid-link(next="members" data-trans="menuLeft.contact.profileDir")
|
||||
span
|
||||
span(data-trans="menuLeft.contact.create2")
|
||||
|
||||
solid-widget(name='hubl-create')
|
||||
template
|
||||
p.create
|
||||
@ -22,6 +31,19 @@ solid-widget(name='hubl-create')
|
||||
span
|
||||
solid-link(next="${value == 'projet' ? 'admin-projects' : 'admin-circles'}", data-trans="menuLeft.emptyCircleProject.adminPanel")
|
||||
|
||||
solid-widget(name='hubl-menu-fix-url-contact')
|
||||
template
|
||||
solid-link(data-src="${value}" next="messages")
|
||||
solid-display(
|
||||
data-src='${value}'
|
||||
fields='name, chatProfile.jabberID, badge'
|
||||
value-badge='${value}'
|
||||
widget-badge='hubl-counter'
|
||||
widget-chatProfile.jabberID='hubl-menu-jabberid'
|
||||
widget-name='solid-display-div'
|
||||
order-asc='username'
|
||||
)
|
||||
|
||||
solid-widget(name='hubl-menu-fix-url-circle')
|
||||
template
|
||||
solid-link(data-src="${value}" next="circle")
|
||||
@ -33,7 +55,7 @@ solid-widget(name='hubl-menu-fix-url-circle')
|
||||
widget-badge='hubl-counter'
|
||||
widget-jabberID='hubl-menu-jabberid'
|
||||
widget-name='solid-display-div'
|
||||
order-by="name"
|
||||
order-asc="name"
|
||||
)
|
||||
|
||||
solid-widget(name='hubl-menu-fix-url-project')
|
||||
@ -49,7 +71,7 @@ solid-widget(name='hubl-menu-fix-url-project')
|
||||
widget-jabberID='hubl-menu-jabberid'
|
||||
widget-badge='hubl-counter'
|
||||
widget-name='solid-display-div'
|
||||
order-by="customer.name"
|
||||
order-asc="customer.name"
|
||||
)
|
||||
|
||||
|
||||
@ -110,7 +132,7 @@ solid-router#navbar-router(default-route='dashboard')
|
||||
empty-value=''
|
||||
data-trans="empty-value=menuLeft.emptyCircleProject.project"
|
||||
widget-project='hubl-menu-fix-url-project'
|
||||
order-by="project.customer.name"
|
||||
order-asc="project.customer.name"
|
||||
)
|
||||
div.divider
|
||||
if endpoints.circles || (endpoints.get && endpoints.get.circles)
|
||||
@ -139,40 +161,37 @@ solid-router#navbar-router(default-route='dashboard')
|
||||
empty-value=''
|
||||
data-trans="empty-value=menuLeft.emptyCircleProject.circle"
|
||||
widget-circle='hubl-menu-fix-url-circle'
|
||||
order-by="circle.name"
|
||||
)
|
||||
div.divider
|
||||
if endpoints.users || (endpoints.get && endpoints.get.users)
|
||||
div.menu-wrapper
|
||||
div.menu
|
||||
div.menu-chevron
|
||||
div.menu-icon.icon-arrow-up
|
||||
div.menu-label(data-trans="menuLeft.messages")
|
||||
div.menu-icon.icon-envelope-letter
|
||||
solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden)
|
||||
div.sub-menu.menu-notification
|
||||
div#loader-messages.loader.loader-menu
|
||||
div
|
||||
div
|
||||
div
|
||||
div
|
||||
solid-display.nosub.message-tab(
|
||||
data-src=`${endpoints.users || (endpoints.get && endpoints.get.users)}`
|
||||
fields='name, chatProfile.jabberID, badge'
|
||||
loader-id='loader-messages'
|
||||
search-fields="name"
|
||||
search-label-name=""
|
||||
data-trans="search-label-name=menuLeft.search"
|
||||
search-widget-name="hubl-search-users"
|
||||
widget-name='solid-display-div'
|
||||
widget-badge='hubl-counter'
|
||||
widget-chatProfile.jabberID='hubl-menu-jabberid'
|
||||
action-badge='badge'
|
||||
order-by='username'
|
||||
next='messages'
|
||||
paginate-by='10'
|
||||
order-asc="circle.name"
|
||||
)
|
||||
div.divider
|
||||
div.menu-wrapper
|
||||
div.menu
|
||||
div.menu-chevron
|
||||
div.menu-icon.icon-arrow-up
|
||||
div.menu-label(data-trans="menuLeft.messages")
|
||||
div.menu-icon.icon-envelope-letter
|
||||
solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden)
|
||||
div.sub-menu.menu-notification
|
||||
div#loader-messages.loader.loader-menu
|
||||
div
|
||||
div
|
||||
div
|
||||
div
|
||||
solid-display.message-tab(
|
||||
bind-user
|
||||
nested-field='contacts'
|
||||
fields='contact'
|
||||
search-fields="contact.name"
|
||||
search-label-contact.name=""
|
||||
data-trans="search-label-contact.name=menuLeft.search"
|
||||
search-widget-contact.name="hubl-search-users"
|
||||
loader-id='loader-messages'
|
||||
empty-widget='hubl-create-contact'
|
||||
empty-value=''
|
||||
widget-contact='hubl-menu-fix-url-contact'
|
||||
order-asc="contact.username"
|
||||
)
|
||||
div.divider
|
||||
|
||||
solid-route(name='admin', hidden)
|
||||
solid-route.menu(name='profile', hidden)
|
||||
|
Reference in New Issue
Block a user