Merge branch 'master' into feature/community-directory

src/views/page-admin.pug

@@ -1,60 +1,61 @@
 .with-sidebar.whitespace-normal.bg-color-white.only-on-admin(hidden)
   .scrollbar-content.views-container.sidebar-is-closed
     for component of components
-      if component.type == "circles"
-        div(
-          id=`admin-${component.route}`
-          hidden
-          data-view=`admin-${component.route}`
-          no-render
-        )
-          - var page = 'join';
-          include partials/admin/page-admin-circles-join.pug
-        div.text-disable-selection(
-          id=`admin-${component.route}-leave`
-          hidden
-          data-view=`admin-${component.route}-leave`
-          no-render
-        )
-          - var page = 'leave';
-          include partials/admin/page-admin-circles-leave.pug
-        div.text-disable-selection(
-          id=`admin-${component.route}-create`
-          hidden
-          data-view=`admin-${component.route}-create`
-          no-render
-        )
-          include partials/admin/page-admin-circles-create.pug
-      if component.type == "projects"
-        div(
-          id=`admin-${component.route}`
-          hidden
-          data-view=`admin-${component.route}`
-          no-render
-        )
-          include partials/admin/page-admin-projects.pug
-        div(
-          id=`admin-${component.route}-create`
-          hidden
-          data-view=`admin-${component.route}-create`
-          no-render
-        )
-          include partials/admin/page-admin-projects-create.pug
-      if component.type == "chat" && componentSet.has('communities')
-        div(
-          id=`admin-${component.route}`
-          hidden
-          data-view=`admin-${component.route}`
-          no-render
-        )
-          include partials/admin/page-admin-chat.pug
-        div(
-          id=`admin-${component.route}-create`
-          hidden
-          data-view=`admin-${component.route}-create`
-          no-render
-        )
-          include partials/admin/page-admin-chat-create.pug
+      if component.route
+        if component.type == "circles"
+          div(
+            id=`admin-${component.route}`
+            hidden
+            data-view=`admin-${component.route}`
+            no-render
+          )
+            - var page = 'join';
+            include partials/admin/page-admin-circles-join.pug
+          div.text-disable-selection(
+            id=`admin-${component.route}-leave`
+            hidden
+            data-view=`admin-${component.route}-leave`
+            no-render
+          )
+            - var page = 'leave';
+            include partials/admin/page-admin-circles-leave.pug
+          div.text-disable-selection(
+            id=`admin-${component.route}-create`
+            hidden
+            data-view=`admin-${component.route}-create`
+            no-render
+          )
+            include partials/admin/page-admin-circles-create.pug
+        if component.type == "projects"
+          div(
+            id=`admin-${component.route}`
+            hidden
+            data-view=`admin-${component.route}`
+            no-render
+          )
+            include partials/admin/page-admin-projects.pug
+          div(
+            id=`admin-${component.route}-create`
+            hidden
+            data-view=`admin-${component.route}-create`
+            no-render
+          )
+            include partials/admin/page-admin-projects-create.pug
+        if component.type == "chat" && componentSet.has('communities')
+          div(
+            id=`admin-${component.route}`
+            hidden
+            data-view=`admin-${component.route}`
+            no-render
+          )
+            include partials/admin/page-admin-chat.pug
+          div(
+            id=`admin-${component.route}-create`
+            hidden
+            data-view=`admin-${component.route}-create`
+            no-render
+          )
+            include partials/admin/page-admin-chat-create.pug
 
   nav.jsRightMenu.text-disable-selection.sidebar.whitespace-normal(role='navigation')
     .segment.whitespace-normal.text-color-heading.text-bold
@@ -65,18 +66,19 @@
             span.icon.icon-arrow-right.icon-xsmall.margin-right-xxsmall
             a(data-trans='admin.menuRight.fold')
         for component of components
-          if component.type == "circles"
-            solid-link.segment.full(next=`admin-${component.route}`)
-              li.segment.full.padding-medium
-                span.icon.ci-bubble-add.icon-xlarge.margin-right-medium
-                a(data-trans='admin.menuRight.circles')
-          if component.type == "projects"
-            solid-link.segment.full(next=`admin-${component.route}`)
-              li.segment.full.padding-medium
-                span.icon.ci-add.icon-xlarge.margin-right-medium
-                a(data-trans='admin.menuRight.projects')
-          if component.type == "chat"
-            solid-link.segment.full(next=`admin-${component.route}`)
-              li.segment.full.padding-medium
-                span.icon.ci-networking.icon-xlarge.margin-right-medium
-                a(data-trans='admin.menuRight.community')
+          if component.route
+            if component.type == "circles"
+              solid-link.segment.full(next=`admin-${component.route}`)
+                li.segment.full.padding-medium
+                  span.icon.ci-bubble-add.icon-xlarge.margin-right-medium
+                  a(data-trans='admin.menuRight.circles')
+            if component.type == "projects"
+              solid-link.segment.full(next=`admin-${component.route}`)
+                li.segment.full.padding-medium
+                  span.icon.ci-add.icon-xlarge.margin-right-medium
+                  a(data-trans='admin.menuRight.projects')
+            if component.type == "chat"
+              solid-link.segment.full(next=`admin-${component.route}`)
+                li.segment.full.padding-medium
+                  span.icon.ci-networking.icon-xlarge.margin-right-medium
+                  a(data-trans='admin.menuRight.community')

src/views/page-resources.pug

@@ -1,7 +1,10 @@
 div.whitespace-normal
-  solid-resource(data-src=`${component.endpoints.resources}`
-      range-resource-type=`${component.endpoints.resourcestypes}`
-      range-resource-keyword=`${component.endpoints.resourceskeywords}`
+  solid-resource(data-src=`${component.endpoints.get}`
+      post-data-src=`${component.endpoints.post}`
+      range-resource-type=`${component.endpoints.types}`
+      post-data-type-src=`${component.endpoints.postTypes}`
+      range-resource-keyword=`${component.endpoints.keywords}`
+      post-data-keyword-src=`${component.endpoints.postKeywords}`
       range-resource-circle=`${getComponent('circles').endpoints.get}/`
       associated-circle-label=""
       data-trans=`associated-circle-label=${component.parameters && component.parameters.associatedName ? component.parameters.associatedName : 'circle.extensions.associated'}`

src/views/partials/admin/page-admin-circles-create.pug

@@ -38,7 +38,8 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
     range-community='store://user.communities'
     option-label-community="community.name"
 
-    widget-status='hubl-status'
+    widget-status='solid-form-dropdown-autocompletion-label'
+    enum-status=""
     widget-community='solid-form-dropdown-autocompletion-label'
     widget-linebreak='solid-form-hidden'
 
@@ -50,5 +51,5 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
     submit-button=''
     submit-widget="button"
 
-    data-trans='label-status=circle.create.labelStatus;label-community=circle.create.labelCommunity;label-name=circle.create.labelName;label-description=circle.create.labelDescription;submit-button=circle.create.buttonSubmit;label-subtitle=circle.create.labelSubtitle;label-help=circle.create.descriptionHelp'
+    data-trans='enum-status=hublStatus;label-status=circle.create.labelStatus;label-community=circle.create.labelCommunity;label-name=circle.create.labelName;label-description=circle.create.labelDescription;submit-button=circle.create.buttonSubmit;label-subtitle=circle.create.labelSubtitle;label-help=circle.create.descriptionHelp'
   )

src/views/partials/circle/page-circle-edit.pug

@@ -49,7 +49,8 @@ div.segment.full.padding-large.whitespace-normal
       class-owner='hidden'
       class-help='segment full text-small margin-bottom-medium padding-left-small'
 
-      widget-status='hubl-status'
+      widget-status='solid-form-dropdown-autocompletion-label'
+      enum-status=""
       widget-description='solid-form-richtext-label'
       widget-help='solid-form-hidden-label'
       widget-community='solid-form-dropdown-autocompletion-label'
@@ -64,7 +65,7 @@ div.segment.full.padding-large.whitespace-normal
       submit-widget="button"
       next=`${component.route}-information`
 
-      data-trans='label-status=circle.edit.labelStatus;label-community=circle.edit.labelCommunity;label-name=circle.edit.labelName;label-owner=circle.edit.labelOwner;label-description=circle.edit.labelDescription;submit-button=circle.edit.buttonSubmit;label-subtitle=circle.edit.labelSubtitle;label-help=circle.edit.descriptionHelp'
+      data-trans='enum-status=hublStatus;label-status=circle.edit.labelStatus;label-community=circle.edit.labelCommunity;label-name=circle.edit.labelName;label-owner=circle.edit.labelOwner;label-description=circle.edit.labelDescription;submit-button=circle.edit.buttonSubmit;label-subtitle=circle.edit.labelSubtitle;label-help=circle.edit.descriptionHelp'
     )
 
   h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='circle.edit.subTitle')

src/views/partials/header.pug

@@ -45,15 +45,15 @@ div
                 li.segment.padding-small.border-bottom.border-color-grey
                   div(data-trans='header.admin')
                   ul.text-normal
-                    if componentSet.has("communities")
+                    if componentSet.has("communities") && getComponent("chat").route
                       solid-link.text-hover(next=`admin-${getRoute("chat", true)}`)
                         li.segment.padding-top-small
                           a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
-                    if componentSet.has("circles")
+                    if componentSet.has("circles") && getComponent("circles").route
                       solid-link.text-hover(next=`admin-${getRoute("circles", true)}`)
                         li.segment.padding-top-small
                           a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles')
-                    if componentSet.has("projects")
+                    if componentSet.has("projects") && getComponent("projects").route
                       solid-link.text-hover(next=`admin-${getRoute("projects", true)}`)
                         li.segment.padding-top-small
                           a.icon.icon-folder-alt.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.projects')
@@ -96,15 +96,15 @@ div
                 li.segment.padding-small.sm-padding-medium.sm-padding-left-xlarge.border-bottom.border-color-grey
                   div(data-trans='header.admin')
                   ul.text-normal
-                    if componentSet.has("communities")
+                    if componentSet.has("communities") && getComponent("chat").route
                       solid-link.text-hover(next=`admin-${getRoute("chat", true)}`)
                         li.segment.padding-top-small.sm-padding-top-medium
                           a.icon.icon-grid.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
-                    if componentSet.has("circles")
+                    if componentSet.has("circles") && getComponent("circles").route
                       solid-link.text-hover(next=`admin-${getRoute("circles", true)}`)
                         li.segment.padding-top-small.sm-padding-top-medium
                           a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles')
-                    if componentSet.has("projects")
+                    if componentSet.has("projects") && getComponent("projects").route
                       solid-link.text-hover(next=`admin-${getRoute("projects", true)}`)
                         li.segment.padding-top-small.sm-padding-top-medium
                           a.icon.icon-folder-alt.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.projects')

src/views/partials/menu-left.pug

@@ -2,10 +2,11 @@ solid-form-search.icon.children-icon-magnifier(
   id='general-search'
   class='segment block form menu-search'
   fields='name'
-  search-name='circle.name, project.customer.name, project.name, contact.username'
+  search-name='circle.name, project.customer.name, project.name, contact.username, contact.name'
   order-asc-names='name'
 
-  label-name='Rechercher'
+  placeholder-name=''
+  data-trans='placeholder-name=menuLeft.search'
   widget-name="solid-form-placeholder-text"
 
   submit-button=""