From b0fe7aff26302b7d96e5cfde36c6c39f16eea6ba Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Wed, 22 Mar 2017 19:51:51 +0000 Subject: [PATCH 1/7] only show active users for selection in space-scoped lists --- core/api/endpoint/user_endpoint.go | 2 +- core/api/request/user.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/api/endpoint/user_endpoint.go b/core/api/endpoint/user_endpoint.go index 6020c226..a870d0ae 100644 --- a/core/api/endpoint/user_endpoint.go +++ b/core/api/endpoint/user_endpoint.go @@ -279,7 +279,7 @@ func GetFolderUsers(w http.ResponseWriter, r *http.Request) { switch folder.Type { case entity.FolderTypePublic: // return all users for team - users, err = p.GetUsersForOrganization() + users, err = p.GetActiveUsersForOrganization() break case entity.FolderTypePrivate: // just me diff --git a/core/api/request/user.go b/core/api/request/user.go index 54e46280..f34f8fff 100644 --- a/core/api/request/user.go +++ b/core/api/request/user.go @@ -189,7 +189,12 @@ func (p *Persister) GetUsersForOrganization() (users []entity.User, err error) { // GetFolderUsers returns a slice containing all user records for given folder. func (p *Persister) GetFolderUsers(folderID string) (users []entity.User, err error) { err = Db.Select(&users, - "SELECT id, refid, firstname, lastname, email, initials, password, salt, reset, created, revised FROM user WHERE refid IN (SELECT userid from labelrole WHERE orgid=? AND labelid=?) ORDER BY firstname,lastname", p.Context.OrgID, folderID) + `SELECT u.id, u.refid, u.firstname, u.lastname, u.email, u.initials, u.password, u.salt, u.reset, u.created, u.revised + FROM user u, account a + WHERE u.refid IN (SELECT userid from labelrole WHERE orgid=? AND labelid=?) + AND a.orgid=? AND u.refid = a.userid AND a.active=1 + ORDER BY u.firstname, u.lastname`, + p.Context.OrgID, folderID, p.Context.OrgID) if err != nil { log.Error(fmt.Sprintf("Unable to get all users for org %s", p.Context.OrgID), err) From 27ce8507d5fc54ec55313fcd383e34d849b413ec Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Thu, 23 Mar 2017 18:28:42 +0000 Subject: [PATCH 2/7] dual sidebar UX --- app/app/components/layout/zone-header.js | 21 -- app/app/pods/customize/folders/template.hbs | 74 +++-- app/app/pods/customize/template.hbs | 46 +-- app/app/pods/document/index/template.hbs | 56 ++-- app/app/pods/folder/template.hbs | 22 +- app/app/pods/folders/template.hbs | 14 +- app/app/pods/profile/template.hbs | 28 +- app/app/pods/search/template.hbs | 34 ++- app/app/styles/app.scss | 10 +- app/app/styles/base.scss | 2 +- .../styles/{functions.scss => mixins.scss} | 13 +- app/app/styles/view/document/all.scss | 2 - app/app/styles/view/document/layout.scss | 80 ----- .../styles/view/document/sidebar-zone.scss | 72 ----- app/app/styles/view/document/view.scss | 20 +- app/app/styles/view/folder/all.scss | 3 + app/app/styles/view/folder/document.scss | 96 ++++++ app/app/styles/view/folder/folder.scss | 45 +++ app/app/styles/view/folder/wizard.scss | 105 +++++++ app/app/styles/view/layout-left-sidebar.scss | 169 +++++++++++ app/app/styles/view/layout-right-nav.scss | 121 ++++++++ app/app/styles/view/layout.scss | 182 ----------- app/app/styles/view/page-customize.scss | 35 +++ app/app/styles/view/page-documents.scss | 286 ------------------ app/app/styles/view/page-profile.scss | 3 + app/app/styles/view/page-search.scss | 34 +-- app/app/styles/view/page-settings.scss | 34 --- .../components/customize/auth-settings.hbs | 2 +- .../components/customize/general-settings.hbs | 46 ++- .../components/customize/global-settings.hbs | 2 +- .../components/customize/user-list.hbs | 2 +- .../components/customize/user-settings.hbs | 2 +- .../document/sidebar-view-activity.hbs | 2 +- .../document/sidebar-view-attachments.hbs | 2 +- .../document/sidebar-view-index.hbs | 2 +- .../components/document/sidebar-zone.hbs | 16 +- .../components/folder/folders-list.hbs | 158 +++++----- .../components/layout/sidebar-intro.hbs | 4 +- .../components/layout/zone-container.hbs | 3 + .../components/layout/zone-content.hbs | 10 +- .../components/layout/zone-header.hbs | 14 - .../components/layout/zone-navigation.hbs | 36 ++- .../components/layout/zone-sidebar.hbs | 2 +- .../components/search/search-results.hbs | 15 +- app/app/templates/components/user-profile.hbs | 6 +- 45 files changed, 891 insertions(+), 1040 deletions(-) delete mode 100644 app/app/components/layout/zone-header.js rename app/app/styles/{functions.scss => mixins.scss} (91%) delete mode 100644 app/app/styles/view/document/layout.scss delete mode 100644 app/app/styles/view/document/sidebar-zone.scss create mode 100644 app/app/styles/view/folder/all.scss create mode 100644 app/app/styles/view/folder/document.scss create mode 100644 app/app/styles/view/folder/folder.scss create mode 100644 app/app/styles/view/folder/wizard.scss create mode 100644 app/app/styles/view/layout-left-sidebar.scss create mode 100644 app/app/styles/view/layout-right-nav.scss delete mode 100644 app/app/styles/view/layout.scss create mode 100644 app/app/styles/view/page-customize.scss delete mode 100644 app/app/styles/view/page-documents.scss delete mode 100644 app/app/styles/view/page-settings.scss create mode 100644 app/app/templates/components/layout/zone-container.hbs delete mode 100644 app/app/templates/components/layout/zone-header.hbs 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'}} - -{{/layout/zone-sidebar}} - -{{#layout/zone-content}} - {{outlet}} -{{/layout/zone-content}} +{{#layout/zone-container}} + {{#layout/zone-sidebar}} + + + + {{/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}} - -{{/layout/zone-sidebar}} - -{{#layout/zone-content}} - {{user-profile model=model save=(action 'save')}} -{{/layout/zone-content}} +{{#layout/zone-container}} + {{#layout/zone-sidebar}} + + + + {{/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'}} -