diff --git a/src/views/page-admin.pug b/src/views/page-admin.pug index 6ae6973..a715eee 100644 --- a/src/views/page-admin.pug +++ b/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') diff --git a/src/views/partials/header.pug b/src/views/partials/header.pug index 5277980..7a57c4a 100644 --- a/src/views/partials/header.pug +++ b/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-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.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')