diff --git a/app/app/components/layout/button-home.js b/app/app/components/back-to-home.js similarity index 83% rename from app/app/components/layout/button-home.js rename to app/app/components/back-to-home.js index f62de890..b5ff0521 100644 --- a/app/app/components/layout/button-home.js +++ b/app/app/components/back-to-home.js @@ -10,5 +10,7 @@ // https://documize.com import Ember from 'ember'; +import stringUtil from '../utils/string'; -export default Ember.Component.extend({}); +export default Ember.Component.extend({ +}); diff --git a/app/app/components/back-to-space.js b/app/app/components/back-to-space.js new file mode 100644 index 00000000..b5ff0521 --- /dev/null +++ b/app/app/components/back-to-space.js @@ -0,0 +1,16 @@ +// 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'; +import stringUtil from '../utils/string'; + +export default Ember.Component.extend({ +}); diff --git a/app/app/components/document/document-sidebar.js b/app/app/components/document/document-sidebar.js index 87d3daab..e99ec637 100644 --- a/app/app/components/document/document-sidebar.js +++ b/app/app/components/document/document-sidebar.js @@ -41,6 +41,10 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, { }, positionTool() { + if (this.get('isDestroyed') || this.get('isDestroying')) { + return; + } + let s = $(".scroll-tool"); let windowpos = $(window).scrollTop(); diff --git a/app/app/components/folder/folders-list.js b/app/app/components/folder/folders-list.js index 6d75654c..349387d3 100644 --- a/app/app/components/folder/folders-list.js +++ b/app/app/components/folder/folders-list.js @@ -71,6 +71,10 @@ export default Ember.Component.extend(TooltipMixin, { }, positionTool() { + if (this.get('isDestroyed') || this.get('isDestroying')) { + return; + } + let s = $(".scroll-space-tool"); let windowpos = $(window).scrollTop(); diff --git a/app/app/pods/customize/template.hbs b/app/app/pods/customize/template.hbs index ae1e4594..b386b6ec 100644 --- a/app/app/pods/customize/template.hbs +++ b/app/app/pods/customize/template.hbs @@ -1,12 +1,8 @@ {{#layout/zone-container}} {{layout/zone-navigation}} - - {{#layout/zone-header title="Documize Settings" message="General options, space management, user management"}} - {{layout/button-home}} - {{/layout/zone-header}} - {{#layout/zone-sidebar}} + {{back-to-home}}
    {{#link-to 'customize.general' activeClass='selected' class="option" tagName="li"}}General{{/link-to}} diff --git a/app/app/pods/folders/settings/template.hbs b/app/app/pods/folders/settings/template.hbs index ec6f9db1..b4626bb4 100644 --- a/app/app/pods/folders/settings/template.hbs +++ b/app/app/pods/folders/settings/template.hbs @@ -3,13 +3,7 @@ {{layout/zone-navigation}} {{#layout/zone-sidebar}} - {{#link-to 'folders.folder' model.id model.slug}} -
    - arrow_back -
    space
    -
    - {{/link-to}} - + {{back-to-space document=model folder=model}}
    • General
      • diff --git a/app/app/pods/profile/template.hbs b/app/app/pods/profile/template.hbs index f01bedae..976577a9 100644 --- a/app/app/pods/profile/template.hbs +++ b/app/app/pods/profile/template.hbs @@ -2,11 +2,8 @@ {{layout/zone-navigation}} - {{#layout/zone-header title=session.user.fullname message="Your Documize profile"}} - {{layout/button-home}} - {{/layout/zone-header}} - {{#layout/zone-sidebar}} + {{back-to-home}}
      {{session.user.initials}}
      diff --git a/app/app/styles/app.scss b/app/app/styles/app.scss index b1cb6f64..98de9fe2 100644 --- a/app/app/styles/app.scss +++ b/app/app/styles/app.scss @@ -17,7 +17,6 @@ @import "view/layout.scss"; @import "view/page-search.scss"; @import "view/page-documents.scss"; -@import "view/page-folder-settings.scss"; @import "view/page-settings.scss"; @import "view/page-auth.scss"; @import "view/page-onboard.scss"; @@ -27,6 +26,7 @@ @import "view/document/wysiwyg.scss"; @import "view/document/editor.scss"; @import "view/document/wizard.scss"; +@import "view/common.scss"; @import "vendor.scss"; @import "responsive.scss"; @import "print.scss"; diff --git a/app/app/styles/view/common.scss b/app/app/styles/view/common.scss new file mode 100644 index 00000000..ef57b602 --- /dev/null +++ b/app/app/styles/view/common.scss @@ -0,0 +1,21 @@ +.space-button { + width: 100%; +} + +.space-name { + max-width: 90%; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} + +.back-to-home-button { + width: 100%; +} + +.back-to-home-name { + max-width: 90%; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} diff --git a/app/app/styles/view/document/sidebar.scss b/app/app/styles/view/document/sidebar.scss index d10fbae8..04de515e 100644 --- a/app/app/styles/view/document/sidebar.scss +++ b/app/app/styles/view/document/sidebar.scss @@ -1,19 +1,7 @@ .document-sidebar { @extend .no-select; - margin-top: 40px; width: 100%; - .space-button { - width: 100%; - } - - .space-name { - max-width: 90%; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - } - > .summary-line { color: $color-gray; margin: 30px 0; diff --git a/app/app/styles/view/layout.scss b/app/app/styles/view/layout.scss index e8bb5e85..80d93910 100644 --- a/app/app/styles/view/layout.scss +++ b/app/app/styles/view/layout.scss @@ -91,31 +91,31 @@ } } -// .zone-header { -// background-color: $color-header; -// padding: 0 40px 0 40px; -// > .info { -// padding: 20px 0 20px 0; -// > .title { -// color: $color-off-black; -// font-size: 1.2rem; -// } -// > .message { -// color: $color-gray; -// font-size: 1rem; -// margin: 10px 0 0 5px; -// } -// } -// > .actions { -// padding: 20px 0 20px 0; -// } -// } +.zone-header { + background-color: $color-header; + padding: 0 40px 0 40px; + > .info { + padding: 20px 0 20px 0; + > .title { + color: $color-off-black; + font-size: 1.2rem; + } + > .message { + color: $color-gray; + font-size: 1rem; + margin: 10px 0 0 5px; + } + } + > .actions { + padding: 20px 0 20px 0; + } +} .zone-sidebar { background-color: $color-header; height: 100%; min-height: 100%; - padding: 0 40px 0 40px; + padding: 40px 40px 0 40px; float: left; } diff --git a/app/app/styles/view/page-folder-settings.scss b/app/app/styles/view/page-folder-settings.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/app/app/styles/widget/widget-sidebar-menu.scss b/app/app/styles/widget/widget-sidebar-menu.scss index a309f1a0..c1240d8b 100644 --- a/app/app/styles/widget/widget-sidebar-menu.scss +++ b/app/app/styles/widget/widget-sidebar-menu.scss @@ -1,5 +1,5 @@ .sidebar-menu { - margin: 30px 0; + margin: 30px 0 0 0; > .options { padding: 0; @@ -11,7 +11,7 @@ list-style: none; cursor: pointer; @extend .no-select; - color: $color-gray; + color: $color-off-black; &:hover { color: $color-link; diff --git a/app/app/templates/components/back-to-home.hbs b/app/app/templates/components/back-to-home.hbs new file mode 100644 index 00000000..c46394f1 --- /dev/null +++ b/app/app/templates/components/back-to-home.hbs @@ -0,0 +1,6 @@ +{{#link-to 'application' }} +
      + arrow_back +
      home
      +
      +{{/link-to}} diff --git a/app/app/templates/components/back-to-space.hbs b/app/app/templates/components/back-to-space.hbs new file mode 100644 index 00000000..b6e10d5d --- /dev/null +++ b/app/app/templates/components/back-to-space.hbs @@ -0,0 +1,6 @@ +{{#link-to 'folders.folder' folder.id folder.slug}} +
      + arrow_back +
      {{folder.name}}
      +
      +{{/link-to}} diff --git a/app/app/templates/components/document/document-sidebar.hbs b/app/app/templates/components/document/document-sidebar.hbs index 6d1927ed..c35fc8e6 100644 --- a/app/app/templates/components/document/document-sidebar.hbs +++ b/app/app/templates/components/document/document-sidebar.hbs @@ -1,10 +1,5 @@
      - {{#link-to 'folders.folder' folder.id folder.slug}} -
      - arrow_back -
      {{folder.name}}
      -
      - {{/link-to}} + {{back-to-space document=model folder=folder}} {{#if session.authenticated}}