diff --git a/app/app/components/document/document-sidebar.js b/app/app/components/document/document-sidebar.js index 350e9482..3c7f5a0a 100644 --- a/app/app/components/document/document-sidebar.js +++ b/app/app/components/document/document-sidebar.js @@ -51,7 +51,7 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, { if (windowpos >= 300) { this.set('showScrollTool', true); s.addClass("stuck-tool"); - s.css('left', parseInt($(".zone-sidebar").css('width')) - 18 + 'px'); + s.css('left', parseInt($(".zone-navigation").css('width')) + parseInt($(".zone-sidebar").css('width')) - 18 + 'px'); } else { this.set('showScrollTool', false); s.removeClass("stuck-tool"); diff --git a/app/app/components/folder/folders-list.js b/app/app/components/folder/folders-list.js index a1685d1b..b2eef93f 100644 --- a/app/app/components/folder/folders-list.js +++ b/app/app/components/folder/folders-list.js @@ -14,9 +14,14 @@ import constants from '../../utils/constants'; import TooltipMixin from '../../mixins/tooltip'; import NotifierMixin from '../../mixins/notifier'; +const { + inject: { service } +} = Ember; + export default Ember.Component.extend(TooltipMixin, NotifierMixin, { folderService: Ember.inject.service('folder'), templateService: Ember.inject.service('template'), + appMeta: service(), publicFolders: [], protectedFolders: [], privateFolders: [], @@ -108,7 +113,7 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, { if (windowpos >= 300) { this.set('showScrollTool', true); s.addClass("stuck-space-tool"); - s.css('left', parseInt($(".zone-sidebar").css('width')) - 18 + 'px'); + s.css('left', parseInt($(".zone-navigation").css('width')) + parseInt($(".zone-sidebar").css('width')) - 17 + 'px'); } else { this.set('showScrollTool', false); s.removeClass("stuck-space-tool"); @@ -123,7 +128,7 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, { onImport() { this.attrs.onImport(); }, - + scrollTop() { this.set('showScrollTool', false); diff --git a/app/app/components/layout/zone-navigation.js b/app/app/components/layout/zone-navigation.js index 59b34f07..d9b1e8b3 100644 --- a/app/app/components/layout/zone-navigation.js +++ b/app/app/components/layout/zone-navigation.js @@ -21,10 +21,15 @@ export default Ember.Component.extend({ folder: null, appMeta: service(), session: service(), + view: { + search: false, + settings: false, + profile: false + }, init() { this._super(...arguments); - + if (this.get("session.authenticated")) { this.get("session.session.content.authenticated.user.accounts").forEach((account) => { // TODO: do not mutate account.active here @@ -37,6 +42,12 @@ export default Ember.Component.extend({ if (this.get('folder') === null) { this.set("folder", this.get('folderService.currentFolder')); } + + let route = this.get('router.currentRouteName'); + console.log(route); + this.set('view.settings', (route === 'customize.general') ? true : false); + this.set('view.profile', (route === 'profile') ? true : false); + this.set('view.search', (route === 'search') ? true : false); }, actions: { diff --git a/app/app/components/search/search-results.js b/app/app/components/search/search-results.js index 453e27dc..c83c6482 100644 --- a/app/app/components/search/search-results.js +++ b/app/app/components/search/search-results.js @@ -43,11 +43,10 @@ export default Ember.Component.extend({ let phrase = 'Nothing found'; if (results.length > 0) { - let places = documents.length === 1 ? "place" : "places"; - let references = results.length === 1 ? "secton" : "sections"; + let references = results.length === 1 ? "reference" : "references"; let i = results.length; let j = documents.length; - phrase = `${i} ${references} in ${j} ${places}`; + phrase = `${i} ${references}`; } this.set('resultPhrase', phrase); diff --git a/app/app/pods/customize/template.hbs b/app/app/pods/customize/template.hbs index eab4db88..23ef3e49 100644 --- a/app/app/pods/customize/template.hbs +++ b/app/app/pods/customize/template.hbs @@ -1,22 +1,18 @@ -{{#layout/zone-container}} +{{layout/zone-navigation}} - {{layout/zone-navigation}} - {{#layout/zone-sidebar}} - {{back-to-home}} -
- {{/layout/zone-sidebar}} +{{#layout/zone-sidebar}} + +{{/layout/zone-sidebar}} - {{#layout/zone-content}} - {{outlet}} - {{/layout/zone-content}} - -{{/layout/zone-container}} +{{#layout/zone-content}} + {{outlet}} +{{/layout/zone-content}} diff --git a/app/app/pods/customize/users/template.hbs b/app/app/pods/customize/users/template.hbs index 555cf597..b8b79a11 100644 --- a/app/app/pods/customize/users/template.hbs +++ b/app/app/pods/customize/users/template.hbs @@ -2,4 +2,6 @@ {{user-settings add=(action 'add')}} - {{settings/user-list users=model onDelete=(action "onDelete") onSave=(action "onSave") onPassword=(action "onPassword")}} + + +{{settings/user-list users=model onDelete=(action "onDelete") onSave=(action "onSave") onPassword=(action "onPassword")}} diff --git a/app/app/pods/document/index/template.hbs b/app/app/pods/document/index/template.hbs index b808c5d4..2b55d35a 100644 --- a/app/app/pods/document/index/template.hbs +++ b/app/app/pods/document/index/template.hbs @@ -1,28 +1,17 @@ -{{#layout/zone-container}} +{{layout/zone-navigation}} - {{layout/zone-navigation}} +{{#layout/zone-sidebar}} + {{document/document-sidebar document=model meta=meta folder=folder pages=pages page=page owner=owner isEditor=isEditor onAddSection=(action + 'onAddSection') changePageSequence=(action 'onPageSequenceChange') changePageLevel=(action 'onPageLevelChange') gotoPage=(action + 'gotoPage')}} +{{/layout/zone-sidebar}} - {{#layout/zone-sidebar}} - {{document/document-sidebar document=model meta=meta folder=folder pages=pages page=page owner=owner isEditor=isEditor - onAddSection=(action 'onAddSection') - changePageSequence=(action 'onPageSequenceChange') - changePageLevel=(action 'onPageLevelChange') - gotoPage=(action 'gotoPage')}} - {{/layout/zone-sidebar}} +{{#layout/zone-content}} + {{document/document-toolbar document=model pages=pages folder=folder owner=owner isEditor=isEditor users=users onSaveTemplate=(action + 'onSaveTemplate') onDocumentChange=(action 'onDocumentChange') onAttachmentUpload=(action 'onAttachmentUpload') onDocumentDelete=(action + 'onDocumentDelete')}} - {{#layout/zone-content}} - {{document/document-toolbar document=model pages=pages folder=folder owner=owner - isEditor=isEditor users=users - onSaveTemplate=(action 'onSaveTemplate') - onDocumentChange=(action 'onDocumentChange') - onAttachmentUpload=(action 'onAttachmentUpload') - onDocumentDelete=(action 'onDocumentDelete')}} - - {{document/document-view document=model meta=meta pages=pages attachments=attachments folder=folder folders=folders - isEditor=isEditor - gotoPage=(action 'gotoPage') - onAttachmentDeleted=(action 'onAttachmentDeleted') - onDeletePage=(action 'onPageDeleted')}} - {{/layout/zone-content}} - -{{/layout/zone-container}} + {{document/document-view document=model meta=meta pages=pages attachments=attachments folder=folder + folders=folders isEditor=isEditor gotoPage=(action 'gotoPage') onAttachmentDeleted=(action 'onAttachmentDeleted') onDeletePage=(action + 'onPageDeleted')}} +{{/layout/zone-content}} diff --git a/app/app/pods/folders/folder/template.hbs b/app/app/pods/folders/folder/template.hbs index c3472f0d..30922f40 100644 --- a/app/app/pods/folders/folder/template.hbs +++ b/app/app/pods/folders/folder/template.hbs @@ -1,23 +1,12 @@ -{{#layout/zone-container}} +{{layout/zone-navigation}} - {{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-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-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}} diff --git a/app/app/pods/folders/settings/template.hbs b/app/app/pods/folders/settings/template.hbs index 2104aafd..4c812b7e 100644 --- a/app/app/pods/folders/settings/template.hbs +++ b/app/app/pods/folders/settings/template.hbs @@ -1,34 +1,30 @@ -{{#layout/zone-container}} +{{layout/zone-navigation}} - {{layout/zone-navigation}} +{{#layout/zone-sidebar}} + {{back-to-space folder=model}} + +{{/layout/zone-sidebar}} - {{#layout/zone-sidebar}} - {{back-to-space folder=model}} - - {{/layout/zone-sidebar}} - - {{#layout/zone-content}} - {{#folder/folder-settings - tabGeneral=tabGeneral - tabShare=tabShare - tabPermissions=tabPermissions - tabDelete=tabDelete - folder=model - folders=folders - permissions=permissions - users=users - onRemove="onRemove" - onRename="onRename" - onShare="onShare" - onPermission="onPermission" }} - {{/folder/folder-settings}} - {{/layout/zone-content}} - -{{/layout/zone-container}} +{{#layout/zone-content}} + {{#folder/folder-settings + tabGeneral=tabGeneral + tabShare=tabShare + tabPermissions=tabPermissions + tabDelete=tabDelete + folder=model + folders=folders + permissions=permissions + users=users + onRemove="onRemove" + onRename="onRename" + onShare="onShare" + onPermission="onPermission" }} + {{/folder/folder-settings}} +{{/layout/zone-content}} diff --git a/app/app/pods/profile/template.hbs b/app/app/pods/profile/template.hbs index 976577a9..5f627bbd 100644 --- a/app/app/pods/profile/template.hbs +++ b/app/app/pods/profile/template.hbs @@ -1,16 +1,11 @@ -{{#layout/zone-container}} +{{layout/zone-navigation}} - {{layout/zone-navigation}} +{{#layout/zone-sidebar}} + +{{/layout/zone-sidebar}} - {{#layout/zone-sidebar}} - {{back-to-home}} - - {{/layout/zone-sidebar}} - - {{#layout/zone-content}} - {{user-profile model=model save=(action 'save')}} - {{/layout/zone-content}} - -{{/layout/zone-container}} +{{#layout/zone-content}} + {{user-profile model=model save=(action 'save')}} +{{/layout/zone-content}} diff --git a/app/app/pods/search/template.hbs b/app/app/pods/search/template.hbs index 58011475..ca3f8dc9 100644 --- a/app/app/pods/search/template.hbs +++ b/app/app/pods/search/template.hbs @@ -1,22 +1,18 @@ -{{#layout/zone-container}} - - {{layout/zone-navigation}} +{{layout/zone-navigation}} +{{#layout/zone-sidebar}}#tags, keywords, "some phrase"
+keyword AND keyword
+keyword OR keyword