Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-28 09:39:42 +02:00
Code Releases Activity

Migrate views to new master layout

Browse source
This commit is contained in:
Harvey Kandola 2019-05-20 17:40:57 +01:00
parent 14f313a836
commit 08794f8d5f
17 changed files with 419 additions and 414 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gui/app/components/folder/space-sidebar.js
View file

@ -17,6 +17,9 @@ import AuthMixin from '../../mixins/auth';
import Component from '@ember/component'; import Component from '@ember/component';
export default Component.extend(AuthMixin, { export default Component.extend(AuthMixin, {
tagName: 'div',
classNames: ['master-sidebar'],
router: service(), router: service(),
documentService: service('document'), documentService: service('document'),
folderService: service('folder'), folderService: service('folder'),

235
gui/app/pods/document/index/template.hbs
View file

@ -1,7 +1,78 @@
{{#layout/master-sidebar}} <Layout::MasterNavigation />
<Ui::UiSpacer @size=100 /> <Layout::MasterToolbar>
<div class="zone-1">
{{#link-to "folder.index" folder.id folder.slug class="no-print"}}
{{ui/ui-button color=constants.Color.Gray outline=true uppercase=false icon=constants.Icon.ArrowLeft label=folder.name}}
{{/link-to}}
</div>
<div class="zone-2" />
<div class="zone-3">
{{document/document-toolbar
tab=tab
roles=roles
space=folder
spaces=folders
document=document
versions=versions
permissions=permissions
refresh=(action "refresh")
onSaveTemplate=(action "onSaveTemplate")
onSaveDocument=(action "onSaveDocument")
onDocumentDelete=(action "onDocumentDelete")}}
</div>
</Layout::MasterToolbar>
<Layout::Grid::Container>
<Layout::Grid::Sidebar>
<div class="sidebar-content">
<div class="section">
<div class="text-center">
{{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}}
{{ui/ui-toolbar-icon icon=constants.Icon.Index color=constants.Color.Gray tooltip="Table of contents"
selected=(eq sidebarTab "toc") onClick=(action "onSidebarChange" "toc")}}
{{ui/ui-toolbar-icon icon=constants.Icon.Attachment color=constants.Color.Gray tooltip="Attachments"
selected=(eq sidebarTab "files") onClick=(action "onSidebarChange" "files")}}
{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
{{ui/ui-toolbar-icon icon=constants.Icon.Chat color=constants.Color.Gray tooltip="Comments & Feedback"
selected=(eq sidebarTab "feedback") onClick=(action "onSidebarChange" "feedback")}}
{{/if}}
{{/ui/ui-toolbar}}
</div>
</div>
<Ui::UiSpacer @size=200 />
{{#if (eq sidebarTab "toc")}}
{{document/sidebar-toc
page=page
roles=roles
pages=pages
folder=folder
document=document
permissions=permissions
currentPageId=currentPageId
onShowPage=(action "onShowPage")
onPageLevelChange=(action "onPageLevelChange")
onPageSequenceChange=(action "onPageSequenceChange")}}
{{/if}}
{{#if (eq sidebarTab "files")}}
{{document/sidebar-attachment
document=document
permissions=permissions}}
{{/if}}
{{#if (eq sidebarTab "feedback")}}
{{enterprise/sidebar-feedback
document=document
permissions=permissions}}
{{/if}}
</div>
</Layout::Grid::Sidebar>
<Layout::Grid::Content>
<div class="section">
{{document/sidebar-meta {{document/sidebar-meta
roles=roles roles=roles
pages=pages pages=pages
@ -13,125 +84,69 @@
contributionStatus=contributionStatus contributionStatus=contributionStatus
approvalStatus=approvalStatus}} approvalStatus=approvalStatus}}
<Ui::UiSpacer @size=300 /> {{document/document-meta
tab=tab
<div class="text-center">
{{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}}
{{ui/ui-toolbar-icon icon=constants.Icon.Index color=constants.Color.Gray tooltip="Table of contents"
selected=(eq sidebarTab "toc") onClick=(action "onSidebarChange" "toc")}}
{{ui/ui-toolbar-icon icon=constants.Icon.Attachment color=constants.Color.Gray tooltip="Attachments"
selected=(eq sidebarTab "files") onClick=(action "onSidebarChange" "files")}}
{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
{{ui/ui-toolbar-icon icon=constants.Icon.Chat color=constants.Color.Gray tooltip="Comments & Feedback"
selected=(eq sidebarTab "feedback") onClick=(action "onSidebarChange" "feedback")}}
{{/if}}
{{/ui/ui-toolbar}}
</div>
</div>
<Ui::UiSpacer @size=200 />
{{#if (eq sidebarTab "toc")}}
{{document/sidebar-toc
page=page
roles=roles roles=roles
pages=pages pages=pages
folder=folder space=folder
spaces=folders
document=document document=document
versions=versions
permissions=permissions permissions=permissions
currentPageId=currentPageId contributionStatus=contributionStatus
onShowPage=(action "onShowPage") approvalStatus=approvalStatus}}
onPageLevelChange=(action "onPageLevelChange")
onPageSequenceChange=(action "onPageSequenceChange")}}
{{/if}}
{{#if (eq sidebarTab "files")}} {{#if contributionStatus}}
{{document/sidebar-attachment
document=document
permissions=permissions}}
{{/if}}
{{#if (eq sidebarTab "feedback")}}
{{enterprise/sidebar-feedback
document=document
permissions=permissions}}
{{/if}}
{{/layout/master-sidebar}}
{{#layout/master-content}}
{{document/document-toolbar
tab=tab
roles=roles
space=folder
spaces=folders
document=document
versions=versions
permissions=permissions
refresh=(action "refresh")
onSaveTemplate=(action "onSaveTemplate")
onSaveDocument=(action "onSaveDocument")
onDocumentDelete=(action "onDocumentDelete")}}
{{document/document-meta
tab=tab
roles=roles
pages=pages
space=folder
spaces=folders
document=document
versions=versions
permissions=permissions
contributionStatus=contributionStatus
approvalStatus=approvalStatus}}
{{#if contributionStatus}}
<Ui::UiSpacer @size=200 />
<div class="document-meta">
<div class="label-workflow-status">
{{contributionStatus}}
</div>
</div>
{{else}}
{{#if approvalStatus}}
<Ui::UiSpacer @size=200 /> <Ui::UiSpacer @size=200 />
<div class="document-meta"> <div class="document-meta">
<div class="label-workflow-status"> <div class="label-workflow-status">
{{approvalStatus}} {{contributionStatus}}
</div> </div>
</div> </div>
{{else}}
{{#if approvalStatus}}
<Ui::UiSpacer @size=200 />
<div class="document-meta">
<div class="label-workflow-status">
{{approvalStatus}}
</div>
</div>
{{/if}}
{{/if}} {{/if}}
{{/if}}
<Ui::UiSpacer @size=300 /> <Ui::UiSpacer @size=300 />
<div class="document-meta {{if permissions.documentEdit "cursor-pointer"}}" {{action "onEditMeta"}}> <div class="document-meta {{if permissions.documentEdit "cursor-pointer"}}" {{action "onEditMeta"}}>
<div class="document-heading"> <div class="document-heading">
<h1 class="name">{{document.name}}</h1> <h1 class="name">{{document.name}}</h1>
<h2 class="desc">{{document.excerpt}}</h2> <h2 class="desc">{{document.excerpt}}</h2>
</div>
</div> </div>
</div>
{{document/view-content {{document/view-content
roles=roles roles=roles
links=links links=links
pages=pages pages=pages
blocks=blocks blocks=blocks
folder=folder folder=folder
folders=folders folders=folders
sections=sections sections=sections
document=document document=document
permissions=permissions permissions=permissions
attachments=attachments attachments=attachments
currentPageId=currentPageId currentPageId=currentPageId
refresh=(action "refresh") refresh=(action "refresh")
onSavePage=(action "onSavePage") onSavePage=(action "onSavePage")
onCopyPage=(action "onCopyPage") onCopyPage=(action "onCopyPage")
onMovePage=(action "onMovePage") onMovePage=(action "onMovePage")
onDeletePage=(action "onPageDeleted") onDeletePage=(action "onPageDeleted")
onInsertSection=(action "onInsertSection") onInsertSection=(action "onInsertSection")
onSavePageAsBlock=(action "onSavePageAsBlock") onSavePageAsBlock=(action "onSavePageAsBlock")
onPageLevelChange=(action "onPageLevelChange") onPageLevelChange=(action "onPageLevelChange")
onPageSequenceChange=(action "onPageSequenceChange") onPageSequenceChange=(action "onPageSequenceChange")
onAttachmentUpload=(action "onAttachmentUpload") onAttachmentUpload=(action "onAttachmentUpload")
onAttachmentDelete=(action "onAttachmentDelete")}} onAttachmentDelete=(action "onAttachmentDelete")}}
{{/layout/master-content}} </Layout::Grid::Content>
</Layout::Grid::Container>

72
gui/app/pods/document/revisions/template.hbs
View file

@ -1,38 +1,46 @@
{{#layout/master-sidebar}} <Layout::MasterNavigation />
<Ui::UiSpacer @size=300 /> <Layout::MasterToolbar>
<div class="zone-1">
<div class="section">
{{#link-to "document.index"}} {{#link-to "document.index"}}
{{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Document"}} {{ui/ui-button color=constants.Color.Gray outline=true uppercase=false icon=constants.Icon.ArrowLeft label=document.name}}
{{/link-to}} {{/link-to}}
<Ui::UiSpacer @size=400 />
<div class="title">REVISIONS</div>
<div class="list">
{{#each revisions as |revision|}}
<div class="item {{if (eq selectedRevision revision) "selected"}}" {{action "onRevision" revision}}>
<i class={{concat "dicon " constants.Icon.TriangleSmallRight}} />
<div class="name">{{formatted-date revision.created}}</div>
</div>
{{/each}}
</div>
</div> </div>
{{/layout/master-sidebar}} <div class="zone-2" />
<div class="zone-3" />
</Layout::MasterToolbar>
{{#layout/master-content}} <Layout::Grid::Container>
{{layout/logo-heading <Layout::Grid::Sidebar>
title="Content Revisions" <div class="sidebar-content">
desc="Review previous content changes and roll back edits" <div class="section">
icon=constants.Icon.TimeBack}} <div class="title">REVISIONS</div>
<div class="list">
{{#each revisions as |revision|}}
<div class="item {{if (eq selectedRevision revision) "selected"}}" {{action "onRevision" revision}}>
<i class={{concat "dicon " constants.Icon.TriangleSmallRight}} />
<div class="name">{{formatted-date revision.created}}</div>
</div>
{{/each}}
</div>
</div>
</div>
</Layout::Grid::Sidebar>
<Layout::Grid::Content>
{{layout/logo-heading
title="Content Revisions"
desc="Review previous content changes and roll back edits"
icon=constants.Icon.TimeBack}}
{{document/view-revision
pages=pages
folder=folder
document=document
permissions=permissions
revisions=revisions
revision=selectedRevision
onRollback=(action "onRollback")}}
</Layout::Grid::Content>
</Layout::Grid::Container>
{{document/view-revision
pages=pages
folder=folder
document=document
permissions=permissions
revisions=revisions
revision=selectedRevision
onRollback=(action "onRollback")}}
{{/layout/master-content}}

17
gui/app/pods/document/section/template.hbs
View file

@ -1,14 +1,15 @@
{{#layout/master-sidebar}} <Layout::MasterNavigation />
<Ui::UiSpacer @size=300 /> <Layout::MasterToolbar>
<div class="zone-1">
<div class="section">
{{#link-to "document.index" model.folder.id model.folder.slug model.document.id model.document.slug}} {{#link-to "document.index" model.folder.id model.folder.slug model.document.id model.document.slug}}
{{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Document"}} {{ui/ui-button color=constants.Color.Gray outline=true uppercase=false icon=constants.Icon.ArrowLeft label=model.document.name}}
{{/link-to}} {{/link-to}}
</div> </div>
{{/layout/master-sidebar}} <div class="zone-2" />
<div class="zone-3" />
</Layout::MasterToolbar>
{{#layout/master-content}} <Layout::Container>
{{document/document-editor {{document/document-editor
document=model.document document=model.document
folder=model.folder folder=model.folder
@ -22,4 +23,4 @@
files=model.attachments files=model.attachments
onAttachmentUpload=(action "onAttachmentUpload") onAttachmentUpload=(action "onAttachmentUpload")
onAttachmentDelete=(action "onAttachmentDelete")}} onAttachmentDelete=(action "onAttachmentDelete")}}
{{/layout/master-content}} </Layout::Container>

166
gui/app/pods/document/settings/template.hbs
View file

@ -1,87 +1,95 @@
{{#layout/master-sidebar}} <Layout::MasterNavigation />
<Ui::UiSpacer @size=300 /> <Layout::MasterToolbar>
<div class="section"> <div class="zone-1">
{{#link-to "document.index"}} {{#link-to "document.index"}}
{{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Document"}} {{ui/ui-button color=constants.Color.Gray outline=true uppercase=false icon=constants.Icon.ArrowLeft label=model.document.name}}
{{/link-to}} {{/link-to}}
<Ui::UiSpacer @size=400 />
<div class="title">Document Options</div>
<div class="list">
<div class="item {{if (eq tab "general") "selected"}}" {{action "onTab" "general"}}>
<i class={{concat "dicon " constants.Icon.Settings}} />
<div class="name">Content Settings</div>
</div>
<div class="item {{if (eq tab "category") "selected"}}" {{action "onTab" "category"}}>
<i class={{concat "dicon " constants.Icon.Category}} />
<div class="name">Categories</div>
</div>
<div class="item {{if (eq tab "tag") "selected"}}" {{action "onTab" "tag"}}>
<i class={{concat "dicon " constants.Icon.Tag}} />
<div class="name">Tags</div>
</div>
{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
{{#if model.permissions.documentApprove}}
<div class="item {{if (eq tab "protection") "selected"}}" {{action "onTab" "protection"}}>
<i class={{concat "dicon " constants.Icon.Locked}} />
<div class="name">Change Control</div>
</div>
{{/if}}
{{#if model.permissions.documentVersion}}
<div class="item {{if (eq tab "versions") "selected"}}" {{action "onTab" "versions"}}>
<i class={{concat "dicon " constants.Icon.Copy}} />
<div class="name">Versions</div>
</div>
{{/if}}
{{/if}}
</div>
</div> </div>
{{/layout/master-sidebar}} <div class="zone-2" />
<div class="zone-3" />
</Layout::MasterToolbar>
{{#layout/master-content}} <Layout::Grid::Container>
{{#if (eq tab "general")}} <Layout::Grid::Sidebar>
{{document/settings-general <div class="sidebar-content">
space=model.folder <div class="section">
document=model.document <div class="title">Options</div>
permissions=model.permissions <div class="list">
onSaveDocument=(action "onSaveDocument")}} <div class="item {{if (eq tab "general") "selected"}}" {{action "onTab" "general"}}>
{{/if}} <i class={{concat "dicon " constants.Icon.Settings}} />
<div class="name">Content Settings</div>
</div>
<div class="item {{if (eq tab "category") "selected"}}" {{action "onTab" "category"}}>
<i class={{concat "dicon " constants.Icon.Category}} />
<div class="name">Categories</div>
</div>
<div class="item {{if (eq tab "tag") "selected"}}" {{action "onTab" "tag"}}>
<i class={{concat "dicon " constants.Icon.Tag}} />
<div class="name">Tags</div>
</div>
{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
{{#if model.permissions.documentApprove}}
<div class="item {{if (eq tab "protection") "selected"}}" {{action "onTab" "protection"}}>
<i class={{concat "dicon " constants.Icon.Locked}} />
<div class="name">Change Control</div>
</div>
{{/if}}
{{#if model.permissions.documentVersion}}
<div class="item {{if (eq tab "versions") "selected"}}" {{action "onTab" "versions"}}>
<i class={{concat "dicon " constants.Icon.Copy}} />
<div class="name">Versions</div>
</div>
{{/if}}
{{/if}}
</div>
</div>
</div>
</Layout::Grid::Sidebar>
{{#if (eq tab "category")}} <Layout::Grid::Content>
{{document/settings-category {{#if (eq tab "general")}}
space=model.folder {{document/settings-general
document=model.document space=model.folder
permissions=model.permissions document=model.document
onSaveDocument=(action "onSaveDocument")}} permissions=model.permissions
{{/if}} onSaveDocument=(action "onSaveDocument")}}
{{/if}}
{{#if (eq tab "tag")}} {{#if (eq tab "category")}}
{{document/settings-tag {{document/settings-category
space=model.folder space=model.folder
document=model.document document=model.document
permissions=model.permissions permissions=model.permissions
onSaveDocument=(action "onSaveDocument")}} onSaveDocument=(action "onSaveDocument")}}
{{/if}} {{/if}}
{{#if (eq tab "protection")}} {{#if (eq tab "tag")}}
{{document/settings-protection {{document/settings-tag
space=model.folder space=model.folder
spaces=model.folders document=model.document
document=model.document permissions=model.permissions
permissions=model.permissions onSaveDocument=(action "onSaveDocument")}}
onRefresh=(action "onRefresh") {{/if}}
onSaveDocument=(action "onSaveDocument")}}
{{/if}}
{{#if (eq tab "versions")}} {{#if (eq tab "protection")}}
{{enterprise/settings-version {{document/settings-protection
space=model.folder space=model.folder
spaces=model.folders spaces=model.folders
document=model.document document=model.document
permissions=model.permissions permissions=model.permissions
versions=model.versions onRefresh=(action "onRefresh")
onRefresh=(action "onRefresh") onSaveDocument=(action "onSaveDocument")}}
onSaveDocument=(action "onSaveDocument")}} {{/if}}
{{/if}}
{{/layout/master-content}} {{#if (eq tab "versions")}}
{{enterprise/settings-version
space=model.folder
spaces=model.folders
document=model.document
permissions=model.permissions
versions=model.versions
onRefresh=(action "onRefresh")
onSaveDocument=(action "onSaveDocument")}}
{{/if}}
</Layout::Grid::Content>
</Layout::Grid::Container>

37
gui/app/pods/folder/block/template.hbs
View file

@ -1,18 +1,29 @@
{{#layout/master-sidebar}} <Layout::MasterNavigation />
<Ui::UiSpacer @size=300 /> <Layout::MasterToolbar>
<div class="section"> <div class="zone-1">
{{#link-to "folder.settings"}} {{#link-to "folder.settings"}}
{{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Space Settings"}} {{ui/ui-button color=constants.Color.Gray outline=true uppercase=false icon=constants.Icon.ArrowLeft label=model.folder.name}}
{{/link-to}} {{/link-to}}
</div> </div>
{{/layout/master-sidebar}} </Layout::MasterToolbar>
{{#layout/master-content}} <Layout::Grid::Container>
{{layout/logo-heading <Layout::Grid::Sidebar>
title="Content Blocks" <div class="sidebar-content">
desc="Content blocks provide re-usable content that can be inserted into any document" <div class="section">
icon=constants.Icon.Integrations}} <div class="title">about</div>
<div class="text"></div>
</div>
</div>
</Layout::Grid::Sidebar>
{{document/block-editor document=model.document folder=model.folder block=model.block <Layout::Grid::Content>
onCancel=(action "onCancel") onAction=(action "onAction")}} {{layout/logo-heading
{{/layout/master-content}} title="Content Blocks"
desc="Content blocks provide re-usable content that can be inserted into any document"
icon=constants.Icon.Integrations}}
{{document/block-editor document=model.document folder=model.folder block=model.block
onCancel=(action "onCancel") onAction=(action "onAction")}}
</Layout::Grid::Content>
</Layout::Grid::Container>

99
gui/app/pods/folder/index/template.hbs
View file

@ -3,6 +3,15 @@
<div class="zone-1" /> <div class="zone-1" />
<div class="zone-2" /> <div class="zone-2" />
<div class="zone-3"> <div class="zone-3">
{{folder/space-toolbar
spaces=model.folders
space=model.folder
permissions=model.permissions
templates=model.templates
category=category
categories=model.categories
documents=filteredDocs
onRefresh=(action "onRefresh")}}
</div> </div>
</Layout::MasterToolbar> </Layout::MasterToolbar>
@ -26,76 +35,28 @@
onFiltered=(action "onFiltered") onFiltered=(action "onFiltered")
onRefresh=(action "onRefresh")}} onRefresh=(action "onRefresh")}}
<Layout::Grid::Sidebar>
<div class="sidebar-content">
<div class="section">
<div class="title">ABOUT</div>
<div class="text">
Documize product updates are released frequently for both
cloud and self-hosted customers.
</div>
<div class="text">
Have an idea, suggestion or some feedback? <a href="mailto:support@documize.com">Get in touch.</a>
</div>
</div>
</div>
</Layout::Grid::Sidebar>
<Layout::Grid::Content> <Layout::Grid::Content>
{{layout/logo-heading {{#if (eq model.folder.labelId "")}}
title="Product News" <div class="space-label">Unclassified</div>
desc="Latest product news and updates" {{else}}
icon=constants.Icon.Announce}} <div class="space-label" style={{{model.label.bgColor}}}>{{model.label.name}}</div>
{{/if}}
<div class="product-news"> {{layout/logo-heading
{{{newsContent}}} title=model.folder.name
<div class="action"> desc=model.folder.desc
Have an idea? Suggestion or feedback? <a href="mailto:support@documize.com">Get in touch!</a> meta=model.folder.icon}}
</div>
</div> {{folder/documents-list
documents=filteredDocs
spaces=model.folders
space=model.folder
templates=model.templates
permissions=model.permissions
sortBy=sortBy
onFiltered=(action "onFiltered")
onExportDocument=(action "onExportDocument")
onDeleteDocument=(action "onDeleteDocument")
onMoveDocument=(action "onMoveDocument")}}
</Layout::Grid::Content> </Layout::Grid::Content>
</Layout::Grid::Container> </Layout::Grid::Container>
{{#layout/master-content}}
<div class="grid-container-6-4">
<div class="grid-cell-1">
{{#if (eq model.folder.labelId "")}}
<div class="space-label">Unclassified</div>
{{else}}
<div class="space-label" style={{{model.label.bgColor}}}>{{model.label.name}}</div>
{{/if}}
{{layout/logo-heading
title=model.folder.name
desc=model.folder.desc
meta=model.folder.icon}}
</div>
<div class="grid-cell-2 grid-cell-right">
{{folder/space-toolbar
spaces=model.folders
space=model.folder
permissions=model.permissions
templates=model.templates
category=category
categories=model.categories
documents=filteredDocs
onRefresh=(action "onRefresh")}}
</div>
</div>
{{folder/documents-list
documents=filteredDocs
spaces=model.folders
space=model.folder
templates=model.templates
permissions=model.permissions
sortBy=sortBy
onFiltered=(action "onFiltered")
onExportDocument=(action "onExportDocument")
onDeleteDocument=(action "onDeleteDocument")
onMoveDocument=(action "onMoveDocument")}}
{{/layout/master-content}}

139
gui/app/pods/folder/settings/template.hbs
View file

@ -1,75 +1,80 @@
{{#layout/master-sidebar}} <Layout::MasterNavigation />
<Ui::UiSpacer @size=300 /> <Layout::MasterToolbar>
<div class="zone-1">
<div class="section">
{{#link-to "folder.index"}} {{#link-to "folder.index"}}
{{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Space"}} {{ui/ui-button color=constants.Color.Gray outline=true uppercase=false icon=constants.Icon.ArrowLeft label=model.folder.name}}
{{/link-to}} {{/link-to}}
<Ui::UiSpacer @size=400 />
<div class="title">space management</div>
<div class="list">
<div class="item {{if (eq tab "general") "selected"}}" {{action "onTab" "general"}}>
<i class={{concat "dicon " constants.Icon.Settings}} />
<div class="name">Meta</div>
</div>
<div class="item {{if (eq tab "categories") "selected"}}" {{action "onTab" "categories"}}>
<i class={{concat "dicon " constants.Icon.Category}} />
<div class="name">Categories</div>
</div>
<div class="item {{if (eq tab "permissions") "selected"}}" {{action "onTab" "permissions"}}>
<i class={{concat "dicon " constants.Icon.Locked}} />
<div class="name">Permissions</div>
</div>
<div class="item {{if (eq tab "blocks") "selected"}}" {{action "onTab" "blocks"}}>
<i class={{concat "dicon " constants.Icon.Blocks}} />
<div class="name">Content Blocks</div>
</div>
{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
<div class="item {{if (eq tab "archived") "selected"}}" {{action "onTab" "archived"}}>
<i class={{concat "dicon " constants.Icon.Archive}} />
<div class="name">Archived Content</div>
</div>
{{/if}}
{{#if model.permissions.spaceOwner}}
<div class="item {{if (eq tab "deletion") "selected"}}" {{action "onTab" "deletion"}}>
<i class={{concat "dicon " constants.Icon.Delete}} />
<div class="name">Deletion</div>
</div>
{{/if}}
</div>
</div> </div>
{{/layout/master-sidebar}} </Layout::MasterToolbar>
{{#layout/master-content}} <Layout::Grid::Container>
{{#if (eq tab "general")}} <Layout::Grid::Sidebar>
{{folder/settings-general permissions=model.permissions space=model.folder labels=model.labels}} <div class="sidebar-content">
{{/if}} <div class="section">
<div class="title">space management</div>
<div class="list">
<div class="item {{if (eq tab "general") "selected"}}" {{action "onTab" "general"}}>
<i class={{concat "dicon " constants.Icon.Settings}} />
<div class="name">Meta</div>
</div>
<div class="item {{if (eq tab "categories") "selected"}}" {{action "onTab" "categories"}}>
<i class={{concat "dicon " constants.Icon.Category}} />
<div class="name">Categories</div>
</div>
<div class="item {{if (eq tab "permissions") "selected"}}" {{action "onTab" "permissions"}}>
<i class={{concat "dicon " constants.Icon.Locked}} />
<div class="name">Permissions</div>
</div>
<div class="item {{if (eq tab "blocks") "selected"}}" {{action "onTab" "blocks"}}>
<i class={{concat "dicon " constants.Icon.Blocks}} />
<div class="name">Content Blocks</div>
</div>
{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
<div class="item {{if (eq tab "archived") "selected"}}" {{action "onTab" "archived"}}>
<i class={{concat "dicon " constants.Icon.Archive}} />
<div class="name">Archived Content</div>
</div>
{{/if}}
{{#if model.permissions.spaceOwner}}
<div class="item {{if (eq tab "deletion") "selected"}}" {{action "onTab" "deletion"}}>
<i class={{concat "dicon " constants.Icon.Delete}} />
<div class="name">Deletion</div>
</div>
{{/if}}
</div>
</div>
</div>
</Layout::Grid::Sidebar>
{{#if (eq tab "permissions")}} <Layout::Grid::Content>
{{folder/settings-permissions permissions=model.permissions folders=model.folders folder=model.folder onRefresh=(action "onRefresh")}} {{#if (eq tab "general")}}
{{/if}} {{folder/settings-general permissions=model.permissions space=model.folder labels=model.labels}}
{{#if (eq tab "templates")}}
{{folder/settings-templates permissions=model.permissions space=model.folder templates=model.templates}}
{{/if}}
{{#if (eq tab "blocks")}}
{{folder/settings-blocks permissions=model.permissions space=model.folder}}
{{/if}}
{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
{{#if (eq tab "archived")}}
{{enterprise/space-archived permissions=model.permissions spaces=model.folder space=model.folder}}
{{/if}} {{/if}}
{{/if}}
{{#if (eq tab "categories")}} {{#if (eq tab "permissions")}}
{{folder/settings-category permissions=model.permissions spaces=model.folder space=model.folder}} {{folder/settings-permissions permissions=model.permissions folders=model.folders folder=model.folder onRefresh=(action "onRefresh")}}
{{/if}} {{/if}}
{{#if (eq tab "deletion")}} {{#if (eq tab "templates")}}
{{folder/settings-delete permissions=model.permissions spaces=model.folder space=model.folder}} {{folder/settings-templates permissions=model.permissions space=model.folder templates=model.templates}}
{{/if}} {{/if}}
{{/layout/master-content}}
{{#if (eq tab "blocks")}}
{{folder/settings-blocks permissions=model.permissions space=model.folder}}
{{/if}}
{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
{{#if (eq tab "archived")}}
{{enterprise/space-archived permissions=model.permissions spaces=model.folder space=model.folder}}
{{/if}}
{{/if}}
{{#if (eq tab "categories")}}
{{folder/settings-category permissions=model.permissions spaces=model.folder space=model.folder}}
{{/if}}
{{#if (eq tab "deletion")}}
{{folder/settings-delete permissions=model.permissions spaces=model.folder space=model.folder}}
{{/if}}
</Layout::Grid::Content>
</Layout::Grid::Container>

4
gui/app/styles/colors.scss
View file

@ -17,7 +17,7 @@
**************************************************************/ **************************************************************/
/************************************************************** /**************************************************************
* Gray, Grey shades * Gray shades
**************************************************************/ **************************************************************/
$gray-shades: ( $gray-shades: (
900: #1F2833, 900: #1F2833,
@ -155,7 +155,7 @@ $color-white-dark-1: #f5f5f5;
// Documents and spaces card background color // Documents and spaces card background color
$color-card: #F6F4EE; $color-card: #F6F4EE;
$color-sidebar: #F6F4EE; $color-sidebar: #f2f8fd;
// $color-card: #F6F4EE; // $color-card: #F6F4EE;
// $color-sidebar: #f2f8fd; // $color-sidebar: #f2f8fd;

12
gui/app/styles/core/layout/layout.scss
View file

@ -162,7 +162,7 @@ $sidebar-height: auto;
height: $sidebar-height; height: $sidebar-height;
// overflow-x: hidden; // overflow-x: hidden;
// overflow-y: auto; // overflow-y: auto;
padding: 20px 15px; padding: 20px 10px 20px 20px;
} }
.master-content { .master-content {
@ -199,7 +199,7 @@ $sidebar-height: auto;
.master-sidebar { .master-sidebar {
width: 300px; width: 300px;
padding: 40px 20px; padding: 40px 10px 40px 20px;
} }
.master-content { .master-content {
@ -214,11 +214,11 @@ $sidebar-height: auto;
@media (min-width: $display-break-4) and (min-height: 650px) { @media (min-width: $display-break-4) and (min-height: 650px) {
.master-grid-container { .master-grid-container {
display: grid; display: grid;
grid-template-columns: 350px minmax(auto, 1200px); grid-template-columns: 400px minmax(auto, 1200px);
.master-sidebar { .master-sidebar {
width: 350px; width: 400px;
padding: 40px 20px; padding: 40px 10px 40px 20px;
} }
.master-content { .master-content {
@ -264,6 +264,6 @@ $sidebar-height: auto;
@media (min-width: $display-break-4) and (min-height: 650px) { @media (min-width: $display-break-4) and (min-height: 650px) {
.master-container { .master-container {
padding: 40px; padding: 40px;
max-width: 1200px; // max-width: 1200px;
} }
} }

7
gui/app/styles/core/layout/sidebar.scss
View file

@ -1,10 +1,11 @@
.sidebar-content { .sidebar-content {
display: block; display: block;
position: relative; position: relative;
padding: 20px 10px 10px 10px; padding: 20px 5px 20px 10px;
// background-color: $theme-100;
background-color: $color-sidebar; background-color: $color-sidebar;
@include border-radius(4px); // background-color: map-get($gray-shades, 100);
border: 1px solid map-get($gray-shades, 100); @include border-radius(6px);
> .section { > .section {
margin: 0; margin: 0;

6
gui/app/styles/core/view/document/sidebar-attachment.scss
View file

@ -10,7 +10,6 @@
padding: 0; padding: 0;
> .file { > .file {
@include card();
list-style-type: none; list-style-type: none;
margin: 10px 0 0 0; margin: 10px 0 0 0;
padding: 5px; padding: 5px;
@ -25,11 +24,6 @@
margin-right: 10px; margin-right: 10px;
width: 90%; width: 90%;
@extend .text-truncate; @extend .text-truncate;
color: map-get($gray-shades, 800);
&:hover {
color: map-get($gray-shades, 900);
}
} }
> .menu { > .menu {

17
gui/app/styles/core/view/document/sidebar-toc.scss
View file

@ -26,21 +26,24 @@
padding: 0; padding: 0;
list-style: none; list-style: none;
font-size: 1rem; font-size: 1rem;
overflow-x: hidden;
list-style-type: none; list-style-type: none;
margin: 0 0 0 0; margin: 0 0 0 0;
.item { .item {
@extend .no-select; @extend .no-select;
padding: 5px 0; padding: 5px 0;
text-overflow: ellipsis; // text-overflow: ellipsis;
word-wrap: break-word; // word-wrap: break-word;
white-space: nowrap; // white-space: nowrap;
overflow: hidden; // overflow: hidden;
> .link { > .link {
color: map-get($gray-shades, 800); color: map-get($gray-shades, 800);
font-weight: 500; // font-weight: 300;
// text-overflow: ellipsis;
// word-wrap: break-word;
// white-space: nowrap;
overflow: hidden;
&:hover { &:hover {
color: map-get($yellow-shades, 600); color: map-get($yellow-shades, 600);
@ -48,7 +51,7 @@
> .numbering { > .numbering {
color: map-get($gray-shades, 600); color: map-get($gray-shades, 600);
font-weight: 500; font-weight: 300;
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
font-size: 0.9rem; font-size: 0.9rem;

1
gui/app/styles/core/view/space.scss
View file

@ -17,7 +17,6 @@
> .document { > .document {
@include card(); @include card();
box-shadow: none;
list-style-type: none; list-style-type: none;
margin: 0 0 2rem 0; margin: 0 0 2rem 0;
padding: 15px 20px; padding: 15px 20px;

6
gui/app/templates/components/document/sidebar-meta.hbs
View file

@ -1,10 +1,4 @@
<div class="document-meta"> <div class="document-meta">
{{#link-to "folder.index" space.id space.slug class="no-print"}}
{{ui/ui-button light=true color=constants.Color.Yellow uppercase=false
icon=constants.Icon.ArrowLeft label=space.name stretch=true truncate=true}}
{{/link-to}}
<Ui::UiSpacer @size=200 />
{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
<div class="title">VERSION</div> <div class="title">VERSION</div>
{{#if (gt versions.length 0)}} {{#if (gt versions.length 0)}}

10
gui/app/templates/components/folder/space-sidebar.hbs
View file

@ -1,5 +1,5 @@
<Layout::Grid::Sidebar> <div class="sidebar-content">
<div class="sidebar-content"> <div class="section">
<div class="title">filter</div> <div class="title">filter</div>
<div class="list"> <div class="list">
<div class="item {{if (eq selectedFilter "space") "selected"}}" {{action "onDocumentFilter" "space" space.id}}> <div class="item {{if (eq selectedFilter "space") "selected"}}" {{action "onDocumentFilter" "space" space.id}}>
@ -39,9 +39,11 @@
<div class="name">Updated recently ({{recentUpdate.length}})</div> <div class="name">Updated recently ({{recentUpdate.length}})</div>
</div> </div>
</div> </div>
</div>
<Ui::UiSpacer @size=200 /> <Ui::UiSpacer @size=200 />
<div class="section">
<div class="title">category</div> <div class="title">category</div>
<div class="list"> <div class="list">
{{#if categories}} {{#if categories}}
@ -55,4 +57,4 @@
{{/if}} {{/if}}
</div> </div>
</div> </div>
</Layout::Grid::Sidebar> </div>

2
gui/app/templates/components/folder/space-toolbar.hbs
View file

@ -18,7 +18,7 @@
{{/ui/ui-toolbar}} {{/ui/ui-toolbar}}
{{#if permissions.documentAdd}} {{#if permissions.documentAdd}}
{{#ui/ui-toolbar dark=false light=true raised=true large=true bordered=true}} {{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}}
{{ui/ui-toolbar-icon icon=constants.Icon.Plus color=constants.Color.Green}} {{ui/ui-toolbar-icon icon=constants.Icon.Plus color=constants.Color.Green}}
{{ui/ui-toolbar-label label="CONTENT" color=constants.Color.Green}} {{ui/ui-toolbar-label label="CONTENT" color=constants.Color.Green}}
{{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}} {{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}