diff --git a/app/app/components/layout/zone-header.js b/app/app/components/layout/zone-header.js deleted file mode 100644 index 937dca3c..00000000 --- a/app/app/components/layout/zone-header.js +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2016 Documize Inc. . All rights reserved. -// -// This software (Documize Community Edition) is licensed under -// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html -// -// You can operate outside the AGPL restrictions by purchasing -// Documize Enterprise Edition and obtaining a commercial license -// by contacting . -// -// https://documize.com - -import Ember from 'ember'; - -export default Ember.Component.extend({ - title: "", - message: "", - - hasMessage: Ember.computed('message', function() { - return this.get('message').length !== 0; - }) -}); diff --git a/app/app/pods/customize/folders/template.hbs b/app/app/pods/customize/folders/template.hbs index 9ba8a6f5..44ec0bd9 100644 --- a/app/app/pods/customize/folders/template.hbs +++ b/app/app/pods/customize/folders/template.hbs @@ -1,43 +1,41 @@
-
-
-
{{folders.length}} shared {{label}}
-
View and change shared space ownership
-
-
- - +
+
{{folders.length}} shared {{label}}
+
View and change shared space ownership
+
+
+
+ + + + + + + + {{#each folders as |folder|}} - - - - - - {{#each folders as |folder|}} - - - + - - {{/each}} - -
SpaceParticipants
SpaceParticipants
- {{#link-to 'folder' folder.id folder.slug class="alt"}}{{folder.name}}{{/link-to}} - - {{#each folder.sharedWith as |person|}} - {{#if person.isEveryone}} - Everyone - {{else}} + + {{#link-to 'folder' folder.id folder.slug class="alt"}}{{folder.name}}{{/link-to}} + + {{#each folder.sharedWith as |person|}} + {{#if person.isEveryone}} + Everyone + {{else}} - {{#if person.isOwner}} - {{person.firstname}} {{person.lastname}} (owner) - {{else}} - {{person.firstname}} {{person.lastname}} - make owner - {{/if}} + {{#if person.isOwner}} + {{person.firstname}} {{person.lastname}} (owner) + {{else}} + {{person.firstname}} {{person.lastname}} + make owner {{/if}} -
- {{/each}} -
-
-
+ {{/if}} +
+ {{/each}} + + + {{/each}} + + +
diff --git a/app/app/pods/customize/template.hbs b/app/app/pods/customize/template.hbs index 462de47e..1e00c3f2 100644 --- a/app/app/pods/customize/template.hbs +++ b/app/app/pods/customize/template.hbs @@ -1,20 +1,28 @@ {{layout/zone-navigation}} - -{{#layout/zone-sidebar}} - {{layout/sidebar-intro title='Settings' message='Documize application settings'}} -
-
    - {{#link-to 'customize.general' activeClass='selected' class="option" tagName="li"}}General{{/link-to}} - {{#link-to 'customize.folders' activeClass='selected' class="option" tagName="li"}}Spaces{{/link-to}} - {{#link-to 'customize.users' activeClass='selected' class="option" tagName="li"}}Users{{/link-to}} - {{#if session.isGlobalAdmin}} - {{#link-to 'customize.global' activeClass='selected' class="option" tagName="li"}}Global{{/link-to}} - {{#link-to 'customize.auth' activeClass='selected' class="option" tagName="li"}}Authentication{{/link-to}} - {{/if}} -
-
-{{/layout/zone-sidebar}} - -{{#layout/zone-content}} - {{outlet}} -{{/layout/zone-content}} +{{#layout/zone-container}} + {{#layout/zone-sidebar}} +
+
+
+ {{layout/sidebar-intro title='Settings' message='Documize application settings'}} +
+
+
+
    + {{#link-to 'customize.general' activeClass='selected' class="option" tagName="li"}}General{{/link-to}} + {{#link-to 'customize.folders' activeClass='selected' class="option" tagName="li"}}Spaces{{/link-to}} + {{#link-to 'customize.users' activeClass='selected' class="option" tagName="li"}}Users{{/link-to}} + {{#if session.isGlobalAdmin}} + {{#link-to 'customize.global' activeClass='selected' class="option" tagName="li"}}Global{{/link-to}} + {{#link-to 'customize.auth' activeClass='selected' class="option" tagName="li"}}Authentication{{/link-to}} + {{/if}} +
+
+
+ {{/layout/zone-sidebar}} + {{#layout/zone-content}} +
+ {{outlet}} +
+ {{/layout/zone-content}} +{{/layout/zone-container}} diff --git a/app/app/pods/document/index/template.hbs b/app/app/pods/document/index/template.hbs index d1b6b62e..43785a2c 100644 --- a/app/app/pods/document/index/template.hbs +++ b/app/app/pods/document/index/template.hbs @@ -1,45 +1,23 @@ -
- - - -
-
-
-
- {{#if toggled}} - - {{else}} - - {{/if}} -
-
- {{#link-to 'folder' model.folder.id model.folder.slug}} - arrow_back {{model.folder.name}} - {{/link-to}} -
- {{document/document-heading document=model.document isEditor=model.isEditor onSaveDocument=(action 'onSaveDocument')}} - {{document/document-view document=model.document links=model.links pages=model.pages - folder=model.folder folders=model.folders sections=model.sections isEditor=model.isEditor pageId=pageId - onSavePage=(action 'onSavePage') onInsertSection=(action 'onInsertSection') - onSavePageAsBlock=(action 'onSavePageAsBlock') onDeleteBlock=(action 'onDeleteBlock') - onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onPageDeleted')}} -
-
+ {{/layout/zone-sidebar}} + {{#layout/zone-content}} +
+
+ {{#link-to 'folder' model.folder.id model.folder.slug}} + arrow_back {{model.folder.name}} + {{/link-to}}
+ {{document/document-heading document=model.document isEditor=model.isEditor onSaveDocument=(action 'onSaveDocument')}} + {{document/document-view document=model.document links=model.links pages=model.pages + folder=model.folder folders=model.folders sections=model.sections isEditor=model.isEditor pageId=pageId + onSavePage=(action 'onSavePage') onInsertSection=(action 'onInsertSection') + onSavePageAsBlock=(action 'onSavePageAsBlock') onDeleteBlock=(action 'onDeleteBlock') + onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onPageDeleted')}}
-
- -
+ {{/layout/zone-content}} +{{/layout/zone-container}} diff --git a/app/app/pods/folder/template.hbs b/app/app/pods/folder/template.hbs index c66f742f..f1d758fe 100644 --- a/app/app/pods/folder/template.hbs +++ b/app/app/pods/folder/template.hbs @@ -1,12 +1,12 @@ {{layout/zone-navigation}} - -{{#layout/zone-sidebar}} - {{folder/folders-list folders=model.folders folder=model.folder onImport=(action 'onImport') onFolderAdd=(action 'onFolderAdd') - showDocument=(action 'showDocument')}} -{{/layout/zone-sidebar}} - -{{#layout/zone-content}} - {{folder/folder-toolbar folders=model.folders folder=model.folder hasSelectedDocuments=hasSelectedDocuments onDeleteDocument=(action - 'onDeleteDocument') onMoveDocument=(action 'onMoveDocument')}} - {{folder/documents-list documents=model.documents folder=model.folder isFolderOwner=isFolderOwner onDocumentsChecked=(action 'onDocumentsChecked') }} -{{/layout/zone-content}} +{{#layout/zone-container}} + {{#layout/zone-sidebar}} + {{folder/folders-list folders=model.folders folder=model.folder onImport=(action 'onImport') onFolderAdd=(action 'onFolderAdd') + showDocument=(action 'showDocument')}} + {{/layout/zone-sidebar}} + {{#layout/zone-content}} + {{folder/folder-toolbar folders=model.folders folder=model.folder hasSelectedDocuments=hasSelectedDocuments onDeleteDocument=(action + 'onDeleteDocument') onMoveDocument=(action 'onMoveDocument')}} + {{folder/documents-list documents=model.documents folder=model.folder isFolderOwner=isFolderOwner onDocumentsChecked=(action 'onDocumentsChecked') }} + {{/layout/zone-content}} +{{/layout/zone-container}} \ No newline at end of file diff --git a/app/app/pods/folders/template.hbs b/app/app/pods/folders/template.hbs index eb81b23e..85acf0ed 100644 --- a/app/app/pods/folders/template.hbs +++ b/app/app/pods/folders/template.hbs @@ -1,8 +1,8 @@ {{layout/zone-navigation}} - -{{#layout/zone-sidebar}} - {{folder/folders-list folders=model noFolder=true onFolderAdd=(action 'onFolderAdd')}} -{{/layout/zone-sidebar}} - -{{#layout/zone-content}} -{{/layout/zone-content}} +{{#layout/zone-container}} + {{#layout/zone-sidebar}} + {{folder/folders-list folders=model noFolder=true onFolderAdd=(action 'onFolderAdd')}} + {{/layout/zone-sidebar}} + {{#layout/zone-content}} + {{/layout/zone-content}} +{{/layout/zone-container}} diff --git a/app/app/pods/profile/template.hbs b/app/app/pods/profile/template.hbs index 476f9eb5..230554d9 100644 --- a/app/app/pods/profile/template.hbs +++ b/app/app/pods/profile/template.hbs @@ -1,12 +1,18 @@ {{layout/zone-navigation}} - -{{#layout/zone-sidebar}} - {{layout/sidebar-intro title="Profile" message=session.user.fullname}} -
-
{{session.user.initials}}
-
-{{/layout/zone-sidebar}} - -{{#layout/zone-content}} - {{user-profile model=model save=(action 'save')}} -{{/layout/zone-content}} +{{#layout/zone-container}} + {{#layout/zone-sidebar}} +
+
+
+ {{layout/sidebar-intro title="Profile" message="Your user profile"}} +
+
+
+
{{session.user.initials}}
+
+
+ {{/layout/zone-sidebar}} + {{#layout/zone-content}} + {{user-profile model=model save=(action 'save')}} + {{/layout/zone-content}} +{{/layout/zone-container}} diff --git a/app/app/pods/search/template.hbs b/app/app/pods/search/template.hbs index d1dbae70..bf1e19cf 100644 --- a/app/app/pods/search/template.hbs +++ b/app/app/pods/search/template.hbs @@ -1,16 +1,22 @@ {{layout/zone-navigation}} - -{{#layout/zone-sidebar}} - {{layout/sidebar-intro title="Search" message='Search by: #tags, keywords, "some phrase", this AND that, this OR that'}} -
-
- {{focus-input type="text" value=filter placeholder='search'}} +{{#layout/zone-container}} + {{#layout/zone-sidebar}} +
-
-{{/layout/zone-sidebar}} - -{{#layout/zone-content}} -
- {{search/search-results results=results}} -
-{{/layout/zone-content}} +
+ {{layout/sidebar-intro title="Search" message='#tag, keyword, "some phrase", this AND that, this OR that'}} +
+
+
+
+ {{focus-input type="text" value=filter placeholder='search'}} +
+
+
+ {{/layout/zone-sidebar}} + {{#layout/zone-content}} +
+ {{search/search-results results=results}} +
+ {{/layout/zone-content}} +{{/layout/zone-container}} \ No newline at end of file diff --git a/app/app/styles/app.scss b/app/app/styles/app.scss index d3335e60..1434b597 100644 --- a/app/app/styles/app.scss +++ b/app/app/styles/app.scss @@ -10,16 +10,18 @@ // https://documize.com @import "color.scss"; @import "font.scss"; -@import "functions.scss"; +@import "mixins.scss"; @import "base.scss"; @import "widget/widget.scss"; -@import "view/layout.scss"; +@import "view/layout-right-nav.scss"; +@import "view/layout-left-sidebar.scss"; @import "view/page-search.scss"; -@import "view/page-documents.scss"; -@import "view/page-settings.scss"; +@import "view/page-profile.scss"; +@import "view/page-customize.scss"; @import "view/page-auth.scss"; @import "view/page-onboard.scss"; @import "view/page-exceptions.scss"; +@import "view/folder/all.scss"; @import "view/document/all.scss"; @import "view/common.scss"; @import "vendor.scss"; diff --git a/app/app/styles/base.scss b/app/app/styles/base.scss index 286f2cec..5311bf6b 100644 --- a/app/app/styles/base.scss +++ b/app/app/styles/base.scss @@ -107,7 +107,7 @@ video.responsive-video { html { overflow-y: scroll; font-family: $font-regular; - background-color: $color-white; + background-color: $color-off-white; font-size: 14px; height: 100%; -webkit-font-smoothing: antialiased; diff --git a/app/app/styles/functions.scss b/app/app/styles/mixins.scss similarity index 91% rename from app/app/styles/functions.scss rename to app/app/styles/mixins.scss index 809a1400..ca2dfd5f 100644 --- a/app/app/styles/functions.scss +++ b/app/app/styles/mixins.scss @@ -92,6 +92,13 @@ border-top: $size solid $color; } +@mixin content-container($pad-tb: 25px, $pad-lr: 50px) { + @include border-radius(2px); + padding: $pad-tb $pad-lr; + box-shadow: 0 0 0 0.75pt $color-stroke,0 0 3pt 0.75pt $color-stroke; + background-color: $color-white; +} + .dotted { border-bottom: 1px dotted $color-gray; @@ -147,9 +154,9 @@ } @mixin opacity($opacity) { - opacity: $opacity; - $opacity-ie: $opacity * 100; - filter: alpha(opacity=$opacity-ie); //IE8 + opacity: $opacity; + $opacity-ie: $opacity * 100; + filter: alpha(opacity=$opacity-ie); //IE8 } @keyframes fadein { diff --git a/app/app/styles/view/document/all.scss b/app/app/styles/view/document/all.scss index 8aa3d917..07c3c3a3 100644 --- a/app/app/styles/view/document/all.scss +++ b/app/app/styles/view/document/all.scss @@ -1,11 +1,9 @@ @import "content-linker.scss"; @import "history.scss"; @import "inline-editor.scss"; -@import "layout.scss"; @import "section-editor.scss"; @import "sidebar-view-activity.scss"; @import "sidebar-view-attachments.scss"; @import "sidebar-view-index.scss"; -@import "sidebar-zone.scss"; @import "view.scss"; @import "wysiwyg.scss"; diff --git a/app/app/styles/view/document/layout.scss b/app/app/styles/view/document/layout.scss deleted file mode 100644 index 48e2c8ce..00000000 --- a/app/app/styles/view/document/layout.scss +++ /dev/null @@ -1,80 +0,0 @@ -$document-sidebar-width: 400px; - -#wrapper { - padding-right: 0; - margin-left: 60px; - -webkit-transition: all 0.5s ease; - -moz-transition: all 0.5s ease; - -o-transition: all 0.5s ease; - transition: all 0.5s ease; - background-color: $color-off-white; -} - -// #wrapper.toggled { -// padding-right: $document-sidebar-width; -// } - -#sidebar-wrapper { - // z-index: 1000; - z-index: 888; - position: fixed; - right: $document-sidebar-width; - width: 0; - height: 100%; - margin-right: -$document-sidebar-width; - overflow-y: auto; - background: $color-off-white; - -webkit-transition: all 0.5s ease; - -moz-transition: all 0.5s ease; - -o-transition: all 0.5s ease; - transition: all 0.5s ease; - border-left: 1px solid $color-stroke; -} - -#wrapper.toggled #sidebar-wrapper { - width: $document-sidebar-width; -} - -#page-content-wrapper { - width: 100%; - position: absolute; - padding: 30px 70px; -} - -#wrapper.toggled #page-content-wrapper { - position: absolute; - margin-left: -$document-sidebar-width; -} - -@media(min-width:768px) { - #wrapper { - padding-right: $document-sidebar-width; - } - - #wrapper.toggled { - padding-left: 0; - padding-right: 0; - } - - #sidebar-wrapper { - width: $document-sidebar-width; - } - - #wrapper.toggled #sidebar-wrapper { - width: 0; - - .document-sidebar-toolbar { - position: relative; - } - } - - #page-content-wrapper { - padding: 20px 60px; - position: relative; - } - - #wrapper.toggled #page-content-wrapper { - position: relative; - margin-left: 0; - } -} diff --git a/app/app/styles/view/document/sidebar-zone.scss b/app/app/styles/view/document/sidebar-zone.scss deleted file mode 100644 index 8e8ddde6..00000000 --- a/app/app/styles/view/document/sidebar-zone.scss +++ /dev/null @@ -1,72 +0,0 @@ -.document-sidebar-common { - display: inline-block; - width: 340px; - padding: 40px 20px 40px 20px; - - > .pinner { - cursor: pointer; - - > .material-icons { - color: $color-primary; - } - } - - > .template-header { - color: $color-goldy; - font-size: 1.5em; - margin-bottom: 20px; - } -} - -.document-sidebar-toolbar { - display: inline-block; - width: 60px; - background-color: $color-toolbar; - text-align: center; - position: fixed; - right: 0; - top: 0; - height: 100%; - padding: 50px 0 0 0; - - > .selected { - background-color: $color-off-black !important; - border: none; - - > .material-icons { - color: $color-white !important; - } - } - - > .round-button-mono { - > .material-icons { - color: $color-gray; - } - } -} - -.document-sidebar-wrapper { - padding: 40px 20px 40px 20px; - margin-right: 60px; - - .document-sidebar-panel { - width: 300px; - // top: 0; - // bottom: 0; - // position: fixed; - // overflow-y: scroll; - // overflow-x: hidden; - - > .title { - color: $color-primary; - font-size: 1.1rem; - margin-bottom: 30px; - } - - .document-sidebar-form-wrapper { - padding: 20px; - border: 1px solid $color-stroke; - @include border-radius(3px); - } - } -} diff --git a/app/app/styles/view/document/view.scss b/app/app/styles/view/document/view.scss index ee7f8ec9..40141c30 100644 --- a/app/app/styles/view/document/view.scss +++ b/app/app/styles/view/document/view.scss @@ -1,11 +1,3 @@ -.zone-document { - min-height: 500px; //ensure dropdowns render in viewport - height: 100%; - margin-left: 60px; - padding: 30px 70px; - z-index: 777; -} - .zone-document-content { > .back-to-space { margin: 10px 0; @@ -58,12 +50,9 @@ margin: 0 0 50px 0; .is-a-page { - @extend .transition-all; - @include border-radius(2px); + @include content-container(); @include ease-in(); - padding: 25px 50px; - box-shadow: 0 0 0 0.75pt $color-stroke,0 0 3pt 0.75pt $color-stroke; - background-color: $color-white; + @extend .transition-all; overflow-x: scroll; &:hover { @@ -82,11 +71,8 @@ } .is-a-tab { - @include border-radius(2px); + @include content-container(); @include ease-in(); - padding: 25px 50px; - box-shadow: 0 0 0 0.75pt $color-stroke,0 0 3pt 0.75pt $color-stroke; - background-color: $color-white; .icon { text-align: center; diff --git a/app/app/styles/view/folder/all.scss b/app/app/styles/view/folder/all.scss new file mode 100644 index 00000000..a2f2d4d2 --- /dev/null +++ b/app/app/styles/view/folder/all.scss @@ -0,0 +1,3 @@ +@import "document.scss"; +@import "folder.scss"; +@import "wizard.scss"; diff --git a/app/app/styles/view/folder/document.scss b/app/app/styles/view/folder/document.scss new file mode 100644 index 00000000..e95fb470 --- /dev/null +++ b/app/app/styles/view/folder/document.scss @@ -0,0 +1,96 @@ +.documents-list { + > .document { + margin: 0; + padding: 20px 20px 25px; + width: 100%; + position: relative; + transition: 0.3s; + border-bottom: 1px solid $color-border; + + &:hover { + > .link { + > .title { + color: $color-link; + } + + > .snippet { + color: $color-gray; + } + } + + > .checkbox { + display: block; + } + } + + > .checkbox { + position: absolute; + display: none; + top: 8px; + right: 15px; + cursor: pointer; + + > .material-icons { + width: 10px; + margin: 0; + padding: 0; + color: $color-checkbox; + } + } + + .link { + text-decoration: none; + color: $color-off-black; + cursor: pointer; + + &:hover { + text-decoration: none; + color: $color-off-black; + } + + > .title { + font-size: 18px; + margin-bottom: 10px; + } + + > .snippet { + color: $color-gray; + font-size: 14px; + line-height: 24px; + } + } + } + + > .selected-card { + background-color: $color-card-active !important; + + > .checkbox { + display: block; + } + } +} + +.move-document-options, +.start-document-options { + height: 150px; + overflow-y: auto; + margin: 0; + padding: 0; + + > .option { + vertical-align: bottom; + cursor: pointer; + font-size: 0.9rem; + overflow: hidden; + white-space: nowrap; + + > .material-icons { + font-size: 0.9rem; + vertical-align: top; + } + } + + > .selected { + color: $color-link; + } +} diff --git a/app/app/styles/view/folder/folder.scss b/app/app/styles/view/folder/folder.scss new file mode 100644 index 00000000..1cad0848 --- /dev/null +++ b/app/app/styles/view/folder/folder.scss @@ -0,0 +1,45 @@ +.folders-list { + > .section { + margin: 30px 0 10px; + + > .heading { + font-size: 0.9rem; + font-weight: bold; + color: $color-gray; + padding-bottom: 5px; + } + + > .message { + font-size: 0.8rem; + color: $color-gray; + margin-top: 10px; + } + + > .list { + padding: 0; + margin: 5px 0 0 15px; + + > .link { + font-size: 1rem; + color: $color-off-black; + text-decoration: none; + + &:hover { + color: $color-link; + } + + > .item { + list-style-type: none; + list-style: none; + margin: 0 0 5px; + padding: 0; + } + } + + > .selected { + color: $color-link; + font-weight: bold; + } + } + } +} diff --git a/app/app/styles/view/folder/wizard.scss b/app/app/styles/view/folder/wizard.scss new file mode 100644 index 00000000..8a91a6f6 --- /dev/null +++ b/app/app/styles/view/folder/wizard.scss @@ -0,0 +1,105 @@ +.start-document { + > .import-document-button { + width: 100%; + padding: 20px; + margin: 30px 0; + text-align: center; + color: $color-gray; + border: 2px dotted $color-gray; + cursor: pointer; + font-size: 1rem; + line-height: 1.7rem; + @include border-radius(10px); + @include ease-in(); + + &:hover { + border-color: $color-link; + color: $color-link; + } + + > .dz-preview, + .dz-processing { + display: none !important; + } + } + + > .templates-list { + margin: 0; + + > .list { + margin: 0; + padding: 0; + + > .item { + cursor: pointer; + list-style: none; + padding: 10px 5px; + margin: 10px 0; + min-height: 90px; + @include ease-in(); + + &:hover { + > .icon { + > .edit-control { + display: block; + } + } + } + + .icon { + text-align: center; + display: inline-block; + width: 50px; + + > .img { + text-align: center; + display: inline-block; + height: 40px; + width: 40px; + } + + > .edit-control { + display: none; + vertical-align: top; + text-align: center; + margin-top: 5px; + opacity: 0.5; + cursor: pointer; + color: $color-gray; + + &:hover { + color: $color-link; + } + } + } + + > .details { + vertical-align: top; + display: inline-block; + width: 80%; + cursor: pointer; + + > .title { + font-size: 1rem; + font-weight: bold; + color: $color-off-black; + letter-spacing: 0.5px; + } + + > .desc { + color: $color-gray; + font-size: 0.9rem; + margin-top: 5px; + } + + &:hover { + > .title, + > .desc { + color: $color-link !important; + } + } + } + } + } + } +} diff --git a/app/app/styles/view/layout-left-sidebar.scss b/app/app/styles/view/layout-left-sidebar.scss new file mode 100644 index 00000000..8b90cbb8 --- /dev/null +++ b/app/app/styles/view/layout-left-sidebar.scss @@ -0,0 +1,169 @@ +$sidebar-width: 400px; + +#wrapper { + padding-left: 0; + margin-right: 60px; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + transition: all 0.5s ease; + background-color: $color-off-white; +} + +#sidebar-wrapper { + z-index: 888; + position: fixed; + left: $sidebar-width; + width: 0; + height: 100%; + margin-left: -$sidebar-width; + border-right: 1px solid $color-stroke; + background: $color-off-white; + overflow-y: auto; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + transition: all 0.5s ease; +} + +#wrapper.toggled #sidebar-wrapper { + width: $sidebar-width; +} + +#page-content-wrapper { + width: 100%; + position: absolute; + margin-top: 30px; + padding: 30px; +} + +#wrapper.toggled #page-content-wrapper { + position: absolute; + margin-right: -$sidebar-width; +} + +@media(min-width:768px) { + #wrapper { + padding-left: $sidebar-width; + } + + #wrapper.toggled { + padding-left: 0; + padding-right: 0; + } + + #sidebar-wrapper { + width: $sidebar-width; + } + + #wrapper.toggled #sidebar-wrapper { + width: 0; + + .sidebar-toolbar { + position: relative; + } + } + + #page-content-wrapper { + padding: 30px; + position: relative; + } + + #wrapper.toggled #page-content-wrapper { + position: relative; + margin-left: 0; + } +} + +.sidebar-toolbar { + display: inline-block; + width: 60px; + background-color: $color-primary; + text-align: center; + position: fixed; + left: 0; + top: 0; + height: 100%; + padding: 40px 0 0 0; + + > .selected { + background-color: $color-link !important; + border: 1px solid $color-link !important; + + > .material-icons { + color: $color-white !important; + } + } + + > .round-button-mono { + background-color: $color-off-white; + border: 1px solid $color-off-white; + + > .material-icons { + @include ease-in(); + color: $color-gray; + } + + &:hover { + > .material-icons { + color: $color-link; + } + } + } +} + +.sidebar-common { + display: inline-block; + width: 340px; + padding: 40px 20px 0px 20px; + margin-left: 60px; + + > .pinner { + cursor: pointer; + + > .material-icons { + color: $color-primary; + } + } + + > .template-header { + color: $color-goldy; + font-size: 1.5em; + margin-bottom: 20px; + } + + .zone-sidebar-page-title { + color: $color-primary; + font-size: 1.3rem; + font-weight: bold; + margin-bottom: 20px; + } + + .zone-sidebar-page-info { + color: $color-gray; + font-size: 1rem; + line-height: 1.5rem; + margin-bottom: 30px; + } +} + +.sidebar-wrapper { + padding: 40px 20px 40px 20px; + margin-left: 60px; + + .sidebar-panel { + width: 300px; + + > .title { + color: $color-primary; + font-size: 1.1rem; + margin-bottom: 30px; + } + + .document-sidebar-form-wrapper { + padding: 20px; + border: 1px solid $color-stroke; + @include border-radius(3px); + } + } +} diff --git a/app/app/styles/view/layout-right-nav.scss b/app/app/styles/view/layout-right-nav.scss new file mode 100644 index 00000000..afc9c4e4 --- /dev/null +++ b/app/app/styles/view/layout-right-nav.scss @@ -0,0 +1,121 @@ +.zone-navigation { + position: fixed; + top: 0; + right: 0; + width: 60px; + min-height: 100%; + height: 100%; + margin: 0; + padding: 0; + z-index: 999; + overflow-x: hidden; + background: $color-toolbar; + + > .bottom-zone, + > .top-zone { + position: absolute; + padding: 0; + width: 100%; + + > li { + cursor: pointer; + margin: 0; + padding: 10px 0; + width: 100%; + text-align: center; + } + + .round-button-mono { + > .material-icons { + color: $color-gray; + @include ease-in(); + } + + &:hover { + > .material-icons { + color: $color-link; + } + } + } + + .profile-link { + color: $color-primary; + text-align: center; + font-size: 1rem; + font-style: normal; + font-family: $font-regular; + vertical-align: top; + } + + .selected { + .round-button-mono { + background-color: $color-link !important; + border: 1px solid $color-link !important; + + > .material-icons { + color: $color-white !important; + } + + > a { + > .material-icons { + color: $color-white !important; + } + } + } + } + } + + > .top-zone { + top: 0; + padding-top: 30px; + } + + > .bottom-zone { + bottom: 0; + padding-bottom: 30px; + } + + .pinned-zone { + position: relative; + top: 200px; + padding: 0; + margin: 0; + width: 80px; + overflow-x: hidden; + overflow-y: scroll; + + > .pin { + cursor: pointer; + margin: 20px 0 20px 9px; + padding: 14px 3px; + height: 40px; + width: 40px; + text-align: center; + overflow: hidden; + @include ease-in(); + @include border-radius(3px); + font-family: $font-semibold; + font-size: 12px; + letter-spacing: -1px; + background-color: $color-gray; + color: $color-white; + + > .key { + width: 30px; + text-align: center; + display: inline-block; + overflow: hidden; + } + + &:hover { + background-color: $color-link; + color: $color-white; + } + } + + > .sortable-ghost { + background-color: $color-gray; + color: $color-off-white; + } + } +} diff --git a/app/app/styles/view/layout.scss b/app/app/styles/view/layout.scss deleted file mode 100644 index 667c5c83..00000000 --- a/app/app/styles/view/layout.scss +++ /dev/null @@ -1,182 +0,0 @@ -.zone-navigation { - position: fixed; - top: 0; - width: 60px; - min-height: 100%; - height: 100%; - margin: 0; - padding: 0; - z-index: 999; - overflow-x: hidden; - background-color: $color-primary; - - > .bottom-zone, - > .top-zone { - position: absolute; - padding: 0; - width: 100%; - - > li { - cursor: pointer; - margin: 0; - padding: 20px 0; - width: 100%; - text-align: center; - } - - .selected { - // background-color: $color-link; - - > a { - > .material-icons { - opacity: 1; - color: $color-white; - } - } - } - } - - > .top-zone { - top: 0; - // padding-top: 10px; - } - - > .bottom-zone { - bottom: 0; - padding-bottom: 10px; - } - - .filled-tool { - position: relative; - overflow: hidden; - width: 35px; - height: 35px; - line-height: 35px; - margin: 0 0 0 12px; - padding: 0; - border-radius: 50%; - transition: 0.3s; - cursor: pointer; - vertical-align: middle; - background-color: $color-white; - text-align: center; - - &:hover { - @extend .z-depth-1; - } - - &:before { - border-radius: 0; - } - - > .material-icons { - color: $color-primary; - text-align: center; - font-size: 1.4em; - } - - > .initials { - color: $color-primary; - text-align: center; - font-size: 1rem; - font-style: normal; - line-height: 2.6rem; - } - } - - .icon-tool { - position: relative; - vertical-align: middle; - text-align: center; - font-size: 2rem; - @include ease-in; - opacity: 0.5; - color: $color-white; - - &:hover { - opacity: 1; - color: $color-white; - } - } - - .pinned-zone { - position: relative; - top: 220px; - padding: 0; - margin: 0; - width: 80px; - overflow-x: hidden; - overflow-y: scroll; - - > .pin { - cursor: pointer; - margin: 20px 0 20px 9px; - padding: 14px 3px; - height: 40px; - width: 40px; - text-align: center; - overflow: hidden; - @include ease-in(); - @include border-radius(3px); - font-family: $font-semibold; - font-size: 12px; - letter-spacing: -1px; - background-color: $color-off-white; - color: $color-primary; - - > .key { - width: 30px; - text-align: center; - display: inline-block; - overflow: hidden; - } - - &:hover { - background-color: $color-link; - color: $color-off-white; - } - } - - > .sortable-ghost { - background-color: $color-gray; - color: $color-off-white; - } - } -} - -.zone-sidebar { - background-color: $color-sidebar; - height: 100%; - min-height: 100%; - padding: 30px 40px 0; - position: fixed; - margin: 0; - z-index: 888; - margin-left: 60px; - - .zone-sidebar-title { - color: $color-primary; - font-size: 1.3rem; - font-weight: bold; - margin-bottom: 10px; - - > .material-icons, - > a > .material-icons { - font-size: 1rem; - vertical-align: middle; - } - } - - .zone-sidebar-info { - color: $color-gray; - font-size: 1rem; - font-weight: bold; - margin-bottom: 30px; - } -} - -.zone-content { - min-height: 500px; //ensure dropdowns render in viewport - padding: 30px 40px 30px 110px; - z-index: 777; -} diff --git a/app/app/styles/view/page-customize.scss b/app/app/styles/view/page-customize.scss new file mode 100644 index 00000000..76803171 --- /dev/null +++ b/app/app/styles/view/page-customize.scss @@ -0,0 +1,35 @@ +.page-customize { + @include content-container(); + + .user-list { + margin: 30px 0; + + > .heading { + font-size: 1.2rem; + color: $color-off-black; + font-weight: bold; + margin: 0 0 20px 0; + } + + > .basic-table { + background-color: $color-white; + font-size: 0.9rem; + } + + .inactive + { + @extend .color-red; + font-weight: normal; + text-decoration: line-through; + } + + .checkbox { + color: $color-checkbox; + cursor: pointer; + } + } + + .edit-user-dialog, .delete-user-dialog { + display: none; + } +} diff --git a/app/app/styles/view/page-documents.scss b/app/app/styles/view/page-documents.scss deleted file mode 100644 index b767d82f..00000000 --- a/app/app/styles/view/page-documents.scss +++ /dev/null @@ -1,286 +0,0 @@ -.space-tools { - .doc-tool { - position: absolute; - top: 130px; - right: -18px; - z-index: 888; - } - - .scroll-space-tool { - position: absolute; - top: 130px; - right: -18px; - z-index: 999; - -webkit-animation: fadein 1s; - -moz-animation: fadein 1s; - -ms-animation: fadein 1s; - -o-animation: fadein 1s; - animation: fadein 1s; - } - - .stuck-space-tool { - position: fixed !important; - top: 130px !important; - right: 0; - left: 0; - -webkit-animation: fadein 1s; - -moz-animation: fadein 1s; - -ms-animation: fadein 1s; - -o-animation: fadein 1s; - animation: fadein 1s; - } -} - -.folders-list { - > .section { - margin: 30px 0 10px; - - > .heading { - font-size: 0.9rem; - font-weight: bold; - color: $color-gray; - padding-bottom: 5px; - } - - > .message { - font-size: 0.8rem; - color: $color-gray; - margin-top: 10px; - } - - > .list { - padding: 0; - margin: 5px 0 0 15px; - - > .link { - font-size: 1rem; - color: $color-off-black; - text-decoration: none; - - &:hover { - color: $color-link; - } - - > .item { - list-style-type: none; - list-style: none; - margin: 0 0 5px; - padding: 0; - } - } - - > .selected { - color: $color-link; - font-weight: bold; - } - } - } -} - -.documents-list { - > .document { - margin: 0; - padding: 20px 20px 25px; - width: 100%; - position: relative; - transition: 0.3s; - border-bottom: 1px solid $color-border; - - &:hover { - > .link { - > .title { - color: $color-link; - } - - > .snippet { - color: $color-gray; - } - } - - > .checkbox { - display: block; - } - } - - > .checkbox { - position: absolute; - display: none; - top: 8px; - right: 15px; - cursor: pointer; - - > .material-icons { - width: 10px; - margin: 0; - padding: 0; - color: $color-checkbox; - } - } - - .link { - text-decoration: none; - color: $color-off-black; - cursor: pointer; - - &:hover { - text-decoration: none; - color: $color-off-black; - } - - > .title { - font-size: 18px; - margin-bottom: 10px; - } - - > .snippet { - color: $color-gray; - font-size: 14px; - line-height: 24px; - } - } - } - - > .selected-card { - background-color: $color-card-active !important; - - > .checkbox { - display: block; - } - } -} - -.move-document-options, -.start-document-options { - height: 150px; - overflow-y: auto; - margin: 0; - padding: 0; - - > .option { - vertical-align: bottom; - cursor: pointer; - font-size: 0.9rem; - overflow: hidden; - white-space: nowrap; - - > .material-icons { - font-size: 0.9rem; - vertical-align: top; - } - } - - > .selected { - color: $color-link; - } -} - -.empty-state-space { - margin-top: 150px; - text-align: center; -} - -.start-document { - > .import-document-button { - width: 100%; - padding: 20px; - margin: 30px 0; - text-align: center; - color: $color-gray; - border: 2px dotted $color-gray; - cursor: pointer; - font-size: 1rem; - line-height: 1.7rem; - @include border-radius(10px); - @include ease-in(); - - &:hover { - border-color: $color-link; - color: $color-link; - } - - > .dz-preview, - .dz-processing { - display: none !important; - } - } - - > .templates-list { - margin: 0; - - > .list { - margin: 0; - padding: 0; - - > .item { - cursor: pointer; - list-style: none; - padding: 10px 5px; - margin: 10px 0; - min-height: 90px; - @include ease-in(); - - &:hover { - > .icon { - > .edit-control { - display: block; - } - } - } - - .icon { - text-align: center; - display: inline-block; - width: 50px; - - > .img { - text-align: center; - display: inline-block; - height: 40px; - width: 40px; - } - - > .edit-control { - display: none; - vertical-align: top; - text-align: center; - margin-top: 5px; - opacity: 0.5; - cursor: pointer; - color: $color-gray; - - &:hover { - color: $color-link; - } - } - } - - > .details { - vertical-align: top; - display: inline-block; - width: 80%; - cursor: pointer; - - > .title { - font-size: 1rem; - font-weight: bold; - color: $color-off-black; - letter-spacing: 0.5px; - } - - > .desc { - color: $color-gray; - font-size: 0.9rem; - margin-top: 5px; - } - - &:hover { - > .title, - > .desc { - color: $color-link !important; - } - } - } - } - } - } -} diff --git a/app/app/styles/view/page-profile.scss b/app/app/styles/view/page-profile.scss index e69de29b..06b1e965 100644 --- a/app/app/styles/view/page-profile.scss +++ b/app/app/styles/view/page-profile.scss @@ -0,0 +1,3 @@ +.page-profile { + @include content-container(); +} \ No newline at end of file diff --git a/app/app/styles/view/page-search.scss b/app/app/styles/view/page-search.scss index d45420d7..b9226ff2 100644 --- a/app/app/styles/view/page-search.scss +++ b/app/app/styles/view/page-search.scss @@ -6,9 +6,10 @@ } .search-results { - .heading { - font-size: 1.2rem; - color: $color-off-black; + > .heading { + font-size: 2rem; + margin-bottom: 10px; + font-weight: normal; } > .list { @@ -16,10 +17,9 @@ list-style: none; > .item { + @include content-container(); cursor: pointer; - margin: 0 30px 30px 0; - padding-bottom: 40px; - border-bottom: 1px solid #e1e1e1; + margin-bottom: 30px; > .link { text-decoration: none; @@ -35,10 +35,9 @@ } > .folder { - display: inline-block; font-size: 0.8rem; color: $color-gray; - margin-left: 15px; + margin-top: 5px; } > .excerpt { @@ -50,25 +49,6 @@ margin-top: 1rem; } } - - > .references { - margin-top: 1rem; - - > .label { - font-size: 0.9rem; - color: $color-gray; - } - - > .link { - font-size: 0.9rem; - color: $color-off-black; - - &:hover { - color: $color-link; - text-decoration: underline; - } - } - } } } } diff --git a/app/app/styles/view/page-settings.scss b/app/app/styles/view/page-settings.scss deleted file mode 100644 index 0d77863a..00000000 --- a/app/app/styles/view/page-settings.scss +++ /dev/null @@ -1,34 +0,0 @@ -.global-folder-settings { -} - -.user-list { - margin: 30px 0; - - > .heading { - font-size: 1.2rem; - color: $color-off-black; - font-weight: bold; - margin: 0 0 20px 0; - } - - > .basic-table { - background-color: $color-white; - font-size: 0.9rem; - } - - .inactive - { - @extend .color-red; - font-weight: normal; - text-decoration: line-through; - } - - .checkbox { - color: $color-checkbox; - cursor: pointer; - } -} - -.edit-user-dialog, .delete-user-dialog { - display: none; -} diff --git a/app/app/templates/components/customize/auth-settings.hbs b/app/app/templates/components/customize/auth-settings.hbs index a52dc437..5d007440 100644 --- a/app/app/templates/components/customize/auth-settings.hbs +++ b/app/app/templates/components/customize/auth-settings.hbs @@ -1,4 +1,4 @@ -
+
Authentication
Determine the method for user authentication
diff --git a/app/app/templates/components/customize/general-settings.hbs b/app/app/templates/components/customize/general-settings.hbs index 21706fa0..dae58578 100644 --- a/app/app/templates/components/customize/general-settings.hbs +++ b/app/app/templates/components/customize/general-settings.hbs @@ -1,27 +1,25 @@ -
-
-
Instance Settings
-
Settings applicable to your Documize instance
-
-
- -
Describe the title of this Documize instance
- {{focus-input id="siteTitle" type="text" value=model.general.title class=(if hasTitleInputError 'error')}} -
-
- -
Describe the purpose of this Documize instance
- {{textarea id="siteMessage" rows="3" value=model.general.message class=(if hasMessageInputError 'error')}} -
-
- -
Content within "Everyone" will be made available to anonymous users
-
- - -
-
-
save
+
+
Instance Settings
+
Settings applicable to your Documize instance
+
+ +
Describe the title of this Documize instance
+ {{focus-input id="siteTitle" type="text" value=model.general.title class=(if hasTitleInputError 'error')}} +
+
+ +
Describe the purpose of this Documize instance
+ {{textarea id="siteMessage" rows="3" value=model.general.message class=(if hasMessageInputError 'error')}} +
+
+ +
Content within "Everyone" will be made available to anonymous users
+
+ + +
+
+
save
diff --git a/app/app/templates/components/customize/global-settings.hbs b/app/app/templates/components/customize/global-settings.hbs index 26a42073..439c9e02 100644 --- a/app/app/templates/components/customize/global-settings.hbs +++ b/app/app/templates/components/customize/global-settings.hbs @@ -1,4 +1,4 @@ -
+
Mail Server Settings
Used for sending email notifications
diff --git a/app/app/templates/components/customize/user-list.hbs b/app/app/templates/components/customize/user-list.hbs index 3361fa59..c063e1c7 100644 --- a/app/app/templates/components/customize/user-list.hbs +++ b/app/app/templates/components/customize/user-list.hbs @@ -1,4 +1,4 @@ -
+
User Management
Set basic information, passwords and permissions for {{users.length}} users
diff --git a/app/app/templates/components/customize/user-settings.hbs b/app/app/templates/components/customize/user-settings.hbs index b2dcbc40..51ab5471 100644 --- a/app/app/templates/components/customize/user-settings.hbs +++ b/app/app/templates/components/customize/user-settings.hbs @@ -1,5 +1,5 @@ {{#if isAuthProviderDocumize}} - +
Add user
New users receive an invitation email with a random password
diff --git a/app/app/templates/components/document/sidebar-view-activity.hbs b/app/app/templates/components/document/sidebar-view-activity.hbs index 5e766f00..46c47293 100644 --- a/app/app/templates/components/document/sidebar-view-activity.hbs +++ b/app/app/templates/components/document/sidebar-view-activity.hbs @@ -1,4 +1,4 @@ -
+
Activity
    diff --git a/app/app/templates/components/document/sidebar-view-attachments.hbs b/app/app/templates/components/document/sidebar-view-attachments.hbs index ccf24f3c..b376babd 100644 --- a/app/app/templates/components/document/sidebar-view-attachments.hbs +++ b/app/app/templates/components/document/sidebar-view-attachments.hbs @@ -1,4 +1,4 @@ -
    +
    Attachments
    {{#if isEditor}} diff --git a/app/app/templates/components/document/sidebar-view-index.hbs b/app/app/templates/components/document/sidebar-view-index.hbs index b0a40b90..b3649184 100644 --- a/app/app/templates/components/document/sidebar-view-index.hbs +++ b/app/app/templates/components/document/sidebar-view-index.hbs @@ -1,4 +1,4 @@ -
    +
    Index
    diff --git a/app/app/templates/components/document/sidebar-zone.hbs b/app/app/templates/components/document/sidebar-zone.hbs index f129301a..51586f9f 100644 --- a/app/app/templates/components/document/sidebar-zone.hbs +++ b/app/app/templates/components/document/sidebar-zone.hbs @@ -1,6 +1,6 @@ -
    +
    @@ -18,14 +18,14 @@ {{/if}}
    -
    +
    {{#if document.template}}
    Template
    {{/if}} {{document/tag-editor documentTags=document.tags isEditor=isEditor onChange=(action 'onTagChange')}}
    -
    +
    {{#if (is-equal tab 'index')}} {{document/sidebar-view-index document=document folder=folder pages=pages page=page isEditor=isEditor onPageSequenceChange=(action 'onPageSequenceChange') onPageLevelChange=(action 'onPageLevelChange') onGotoPage=(action 'onGotoPage')}} @@ -40,7 +40,7 @@ {{/if}}
    -{{#dropdown-menu target="sidebar-zone-more-button" position="bottom right" open="click" onOpenCallback=(action 'onMenuOpen') onCloseCallback=(action 'onMenuOpen')}} +{{#dropdown-menu target="sidebar-zone-more-button" position="bottom left" open="click" onOpenCallback=(action 'onMenuOpen') onCloseCallback=(action 'onMenuOpen')}}
      {{#if session.authenticated}} {{#if pinState.isPinned}} @@ -71,7 +71,7 @@ {{#if session.authenticated}} {{#if menuOpen}} {{#unless pinState.isPinned}} - {{#dropdown-dialog target="pin-document-button" position="bottom right" button="Pin" color="flat-green" onAction=(action 'onPin') focusOn="pin-document-name" }} + {{#dropdown-dialog target="pin-document-button" position="bottom left" button="Pin" color="flat-green" onAction=(action 'onPin') focusOn="pin-document-name" }}
      A 3 or 4 character name
      @@ -83,12 +83,12 @@ {{#if isEditor}} {{#if menuOpen}} - {{#dropdown-dialog target="delete-document-button" position="bottom right" button="Delete" color="flat-red" onAction=(action 'onDeleteDocument')}} + {{#dropdown-dialog target="delete-document-button" position="bottom left" button="Delete" color="flat-red" onAction=(action 'onDeleteDocument')}}

      Are you sure you want to delete this document?

      There is no undo, so be careful.

      {{/dropdown-dialog}} - {{#dropdown-dialog target="save-template-button" position="bottom right" button="Save as Template" color="flat-green" onAction=(action 'onSaveTemplate') focusOn="new-template-name" }} + {{#dropdown-dialog target="save-template-button" position="bottom left" button="Save as Template" color="flat-green" onAction=(action 'onSaveTemplate') focusOn="new-template-name" }}
      Short name for this type of document
      diff --git a/app/app/templates/components/folder/folders-list.hbs b/app/app/templates/components/folder/folders-list.hbs index 874ee044..53de7d93 100644 --- a/app/app/templates/components/folder/folders-list.hbs +++ b/app/app/templates/components/folder/folders-list.hbs @@ -1,94 +1,84 @@ -{{#unless noFolder}} -
      - {{#if showingDocument}} - {{layout/sidebar-intro title=folder.name message='Import files or start with a template'}} -
      - close -
      +
      +
      - {{folder/start-document savedTemplates=savedTemplates folder=folder editor=folderService.canEditCurrentFolder - onImport=(action 'onImport') - onEditTemplate=(action 'onEditTemplate') - onDocumentTemplate=(action 'onDocumentTemplate')}} - {{/if}} +
      + {{layout/sidebar-intro title=appMeta.title message=appMeta.message}} +
      - {{#if showScrollTool}} -
      - vertical_align_top -
      - {{/if}} +
      + {{#unless noFolder}} +
      + {{#if showingDocument}} + {{folder/start-document savedTemplates=savedTemplates folder=folder editor=folderService.canEditCurrentFolder + onImport=(action 'onImport') + onEditTemplate=(action 'onEditTemplate') + onDocumentTemplate=(action 'onDocumentTemplate')}} + {{/if}} +
      + {{/unless}} +
      {{#if showingList}} - {{#if folderService.canEditCurrentFolder}} -
      + {{#if session.isEditor}} +
      add +
      Space
      +
      + {{#dropdown-dialog target="add-space-button" position="bottom left" button="Add" color="flat-green" onAction=(action 'addFolder') focusOn="new-folder-name" }} +
      +
      + +
      A repository for related documentation
      + {{input type='text' id="new-folder-name" class="mousetrap" value=newFolder}} +
      +
      + {{/dropdown-dialog}} + {{/if}} + +
      +
      EVERYONE
      + {{#unless hasPublicFolders}} +
      No global spaces
      + {{/unless}} +
        + {{#each publicFolders as |folder|}} + {{#link-to 'folder' folder.id folder.slug class="link" activeClass='selected' }} +
      • {{ folder.name }}
        • + {{/link-to}} + {{/each}} +
      +
      + + {{#if session.authenticated}} +
      +
      TEAM
      + {{#unless hasProtectedFolders}} +
      No protected spaces
      + {{/unless}} +
        + {{#each protectedFolders as |folder|}} + {{#link-to 'folder' folder.id folder.slug class="link" activeClass='selected' }} +
      • {{ folder.name }}
        • + {{/link-to}} + {{/each}} +
      +
      + +
      +
      PERSONAL
      + {{#unless hasPrivateFolders}} +
      No private spaces
      + {{/unless}} +
        + {{#each privateFolders as |folder|}} + {{#link-to 'folder' folder.id folder.slug class="link" activeClass='selected' }} +
      • {{ folder.name }}
        • + {{/link-to}} + {{/each}} +
      {{/if}} {{/if}}
      -{{/unless}} - -
      - {{#if showingList}} - {{layout/sidebar-intro title=appMeta.title message=appMeta.message}} - {{#if session.isEditor}} -
      - add -
      Space
      -
      - {{#dropdown-dialog target="add-space-button" position="bottom left" button="Add" color="flat-green" onAction=(action 'addFolder') focusOn="new-folder-name" }} -
      -
      - -
      A repository for related documentation
      - {{input type='text' id="new-folder-name" class="mousetrap" value=newFolder}} -
      -
      - {{/dropdown-dialog}} - {{/if}} - -
      -
      EVERYONE
      - {{#unless hasPublicFolders}} -
      No global spaces
      - {{/unless}} -
        - {{#each publicFolders as |folder|}} - {{#link-to 'folder' folder.id folder.slug class="link" activeClass='selected' }} -
      • {{ folder.name }}
        • - {{/link-to}} - {{/each}} -
      -
      - - {{#if session.authenticated}} -
      -
      TEAM
      - {{#unless hasProtectedFolders}} -
      No protected spaces
      - {{/unless}} -
        - {{#each protectedFolders as |folder|}} - {{#link-to 'folder' folder.id folder.slug class="link" activeClass='selected' }} -
      • {{ folder.name }}
        • - {{/link-to}} - {{/each}} -
      -
      - -
      -
      PERSONAL
      - {{#unless hasPrivateFolders}} -
      No private spaces
      - {{/unless}} -
        - {{#each privateFolders as |folder|}} - {{#link-to 'folder' folder.id folder.slug class="link" activeClass='selected' }} -
      • {{ folder.name }}
        • - {{/link-to}} - {{/each}} -
      -
      - {{/if}} - {{/if}}
      + diff --git a/app/app/templates/components/layout/sidebar-intro.hbs b/app/app/templates/components/layout/sidebar-intro.hbs index 6f33c404..aba05a18 100644 --- a/app/app/templates/components/layout/sidebar-intro.hbs +++ b/app/app/templates/components/layout/sidebar-intro.hbs @@ -1,7 +1,7 @@ -
      +
      {{title}} {{yield}}
      -
      +
      {{message}}
      diff --git a/app/app/templates/components/layout/zone-container.hbs b/app/app/templates/components/layout/zone-container.hbs new file mode 100644 index 00000000..4d6dd0e7 --- /dev/null +++ b/app/app/templates/components/layout/zone-container.hbs @@ -0,0 +1,3 @@ +
      + {{yield}} +
      diff --git a/app/app/templates/components/layout/zone-content.hbs b/app/app/templates/components/layout/zone-content.hbs index 01ae479f..ca007cf1 100644 --- a/app/app/templates/components/layout/zone-content.hbs +++ b/app/app/templates/components/layout/zone-content.hbs @@ -1,3 +1,9 @@ -
      - {{yield}} +
      +
      +
      +
      + {{yield}} +
      +
      +
      diff --git a/app/app/templates/components/layout/zone-header.hbs b/app/app/templates/components/layout/zone-header.hbs deleted file mode 100644 index 612d89a0..00000000 --- a/app/app/templates/components/layout/zone-header.hbs +++ /dev/null @@ -1,14 +0,0 @@ -
      -
      -
      -  {{title}} -
      -
      - {{message}} -
      -
      - -
      -
      diff --git a/app/app/templates/components/layout/zone-navigation.hbs b/app/app/templates/components/layout/zone-navigation.hbs index dd1de60a..6b761676 100644 --- a/app/app/templates/components/layout/zone-navigation.hbs +++ b/app/app/templates/components/layout/zone-navigation.hbs @@ -2,26 +2,26 @@
        {{#if session.authenticated}}
      • -
        +
        apps
        • {{else}}
      • {{#link-to 'folders' class='title'}} -
        +
        apps
        {{/link-to}}
        • {{/if}}
      • - {{#link-to 'folders'}} - home + {{#link-to 'folders' tagName="div" class="round-button-mono button-white"}} + home {{/link-to}}
      • - {{#link-to 'search'}} + {{#link-to 'search' tagName="div" class="round-button-mono button-white"}} search {{/link-to}}
        • @@ -37,34 +37,40 @@ {{#if session.session.content.authenticated.user.admin}}
      • {{#link-to 'customize.general'}} - tune +
        + tune +
        {{/link-to}}
        • {{/if}} {{#if session.authenticated}} -
      • - {{#link-to 'auth.logout'}} - exit_to_app - {{/link-to}} -
      • {{#link-to 'profile'}} -
        - {{session.user.initials}} +
        + {{session.user.initials}} +
        + {{/link-to}} +
        • +
      • + {{#link-to 'auth.logout'}} +
        + exit_to_app
        {{/link-to}}
        • {{else}}
      • {{#link-to 'auth.login'}} - lock_open +
        + lock_open +
        {{/link-to}}
        • {{/if}}
      {{#if session.authenticated}} - {{#dropdown-menu target="accounts-button" position="bottom left" open="click" }} + {{#dropdown-menu target="accounts-button" position="bottom right" open="click" }}
        {{#each session.user.accounts as |account|}}
      • {{account.title}}
        • diff --git a/app/app/templates/components/layout/zone-sidebar.hbs b/app/app/templates/components/layout/zone-sidebar.hbs index a25b0f19..e7ea4f38 100644 --- a/app/app/templates/components/layout/zone-sidebar.hbs +++ b/app/app/templates/components/layout/zone-sidebar.hbs @@ -1,3 +1,3 @@ -
        + diff --git a/app/app/templates/components/search/search-results.hbs b/app/app/templates/components/search/search-results.hbs index 87c16def..b9146df2 100644 --- a/app/app/templates/components/search/search-results.hbs +++ b/app/app/templates/components/search/search-results.hbs @@ -1,23 +1,14 @@
        -

        {{resultPhrase}}

        +
        {{resultPhrase}}
        diff --git a/app/app/templates/components/user-profile.hbs b/app/app/templates/components/user-profile.hbs index 28241270..79bddbcf 100644 --- a/app/app/templates/components/user-profile.hbs +++ b/app/app/templates/components/user-profile.hbs @@ -1,7 +1,7 @@ -
        +
        About You
        -
        The basics...
        +
        @@ -18,7 +18,7 @@ {{#if isAuthProviderDocumize}}
        -
        Optional change your password
        +
        New password
        {{input id="password" type="password" value=password.password class=hasPasswordError}}