From e173bccf52eb912486662acb2841076d20419039 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Thu, 30 Jun 2016 16:02:45 -0700 Subject: [PATCH] global settings UX --- app/app/pods/customize/folders/template.hbs | 86 ++++++++++--------- app/app/pods/customize/general/template.hbs | 4 +- app/app/pods/customize/template.hbs | 46 ++++++---- app/app/pods/customize/users/template.hbs | 4 +- app/app/styles/base.scss | 11 +++ app/app/styles/color.scss | 1 + app/app/styles/view/layout.scss | 22 ++--- app/app/styles/view/page-documents.scss | 2 +- app/app/styles/view/page-settings.scss | 6 +- .../components/layout/zone-container.hbs | 2 +- .../components/settings/user-list.hbs | 4 +- 11 files changed, 109 insertions(+), 79 deletions(-) diff --git a/app/app/pods/customize/folders/template.hbs b/app/app/pods/customize/folders/template.hbs index f19f6e52..09bbcf09 100644 --- a/app/app/pods/customize/folders/template.hbs +++ b/app/app/pods/customize/folders/template.hbs @@ -1,43 +1,45 @@ -
-
-
-
{{folders.length}} shared {{label}}
-
View and change shared space ownership
-
-
- - - - - - - - - {{#each folders as |folder|}} - - - + + {{/each}} + +
SpaceParticipants
- {{#link-to 'folders.folder' folder.id folder.slug}}{{folder.name}}{{/link-to}} - - {{#each folder.sharedWith as |person|}} - {{#if person.isEveryone}} - Everyone - {{else}} +
+
+ +
+
{{folders.length}} shared {{label}}
+
View and change shared space ownership
+
+
+ + + + + + + + + {{#each folders as |folder|}} + + + - - {{/each}} - -
SpaceParticipants
+ {{#link-to 'folders.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}} -
- {{/each}} -
-
- -
\ No newline at end of file + {{#if person.isOwner}} + {{person.firstname}} {{person.lastname}} (owner) + {{else}} + {{person.firstname}} {{person.lastname}} + make owner + {{/if}} + {{/if}} +
+ {{/each}} +
+
+ +
+ diff --git a/app/app/pods/customize/general/template.hbs b/app/app/pods/customize/general/template.hbs index c7b26e69..c161a5c8 100644 --- a/app/app/pods/customize/general/template.hbs +++ b/app/app/pods/customize/general/template.hbs @@ -1,4 +1,4 @@ -
+
General Settings
@@ -26,4 +26,4 @@
save
-
\ No newline at end of file +
diff --git a/app/app/pods/customize/template.hbs b/app/app/pods/customize/template.hbs index 22a00a02..97e2e6e1 100644 --- a/app/app/pods/customize/template.hbs +++ b/app/app/pods/customize/template.hbs @@ -1,18 +1,30 @@ -{{#header/page-navigation settingsMode=true}} - {{header/message-box message="Manage this Documize instance"}} -{{/header/page-navigation}} +{{#layout/zone-container}} -{{#layout/page-container}} - {{#layout/page-sidebar}} -
- -
- {{/layout/page-sidebar}} - {{#layout/page-content}} - {{outlet}} - {{/layout/page-content}} -{{/layout/page-container}} + {{layout/zone-navigation}} + + {{#layout/zone-header title="Documize Settings" message="General options, space management, user management"}} +
+ {{#link-to 'folders.folder' folder.id folder.slug}} +
+ arrow_back +
space
+
+ {{/link-to}} +
+ {{/layout/zone-header}} + + {{#layout/zone-sidebar}} +
+ +
+ {{/layout/zone-sidebar}} + + {{#layout/zone-content}} + {{outlet}} + {{/layout/zone-content}} + +{{/layout/zone-container}} diff --git a/app/app/pods/customize/users/template.hbs b/app/app/pods/customize/users/template.hbs index 2e196261..e858f5a8 100644 --- a/app/app/pods/customize/users/template.hbs +++ b/app/app/pods/customize/users/template.hbs @@ -1,4 +1,4 @@ -
+
Add User
@@ -20,4 +20,4 @@
-
{{settings/user-list users=model onDelete=(action "onDelete") onSave=(action "onSave") onPassword=(action "onPassword")}} \ No newline at end of file +
{{settings/user-list users=model onDelete=(action "onDelete") onSave=(action "onSave") onPassword=(action "onPassword")}} diff --git a/app/app/styles/base.scss b/app/app/styles/base.scss index b1946208..2caa40fa 100644 --- a/app/app/styles/base.scss +++ b/app/app/styles/base.scss @@ -52,6 +52,17 @@ a { } } +a.alt { + color: $color-blue; + text-decoration: none; + cursor: pointer; + + a:hover, a:focus { + text-decoration: underline; + } +} + + $i: 150; @while $i > 0 { .margin-#{$i} { margin: #{$i}px; } diff --git a/app/app/styles/color.scss b/app/app/styles/color.scss index f4a5b0fd..4c4cba74 100644 --- a/app/app/styles/color.scss +++ b/app/app/styles/color.scss @@ -28,6 +28,7 @@ $color-stroke: #e1e1e1; $color-tooltip: #a1a1a1; $color-toast: #4c4c4c; +$color-checkbox: #115a97; $color-chip: #98A2AB; $color-chip: #dff0f9; diff --git a/app/app/styles/view/layout.scss b/app/app/styles/view/layout.scss index fdd91163..1c15e8f7 100644 --- a/app/app/styles/view/layout.scss +++ b/app/app/styles/view/layout.scss @@ -1,17 +1,7 @@ -.page-container { +.zone-container { min-height: 500px; //ensure dropdowns render in viewport } -.copyright { - margin-top: 50px; - text-align: center; - - > a { - font-size: 0.8rem; - color: $color-gray; - } -} - .zone-navigation { background-color: $color-primary; color: $color-white; @@ -144,3 +134,13 @@ padding: 30px 40px 30px 40px; float: left; } + +.copyright { + margin-top: 50px; + text-align: center; + + > a { + font-size: 0.8rem; + color: $color-gray; + } +} diff --git a/app/app/styles/view/page-documents.scss b/app/app/styles/view/page-documents.scss index 1c6f4248..6a541785 100644 --- a/app/app/styles/view/page-documents.scss +++ b/app/app/styles/view/page-documents.scss @@ -85,7 +85,7 @@ width: 10px; margin: 0; padding: 0; - color: $color-blue; + color: $color-checkbox; } } diff --git a/app/app/styles/view/page-settings.scss b/app/app/styles/view/page-settings.scss index 99959170..d40f5863 100644 --- a/app/app/styles/view/page-settings.scss +++ b/app/app/styles/view/page-settings.scss @@ -1,3 +1,7 @@ +.global-folder-settings { + +} + .user-list { margin: 30px 0; @@ -21,7 +25,7 @@ } .checkbox { - color: $color-link; + color: $color-checkbox; cursor: pointer; } } diff --git a/app/app/templates/components/layout/zone-container.hbs b/app/app/templates/components/layout/zone-container.hbs index 252fff94..0e828778 100644 --- a/app/app/templates/components/layout/zone-container.hbs +++ b/app/app/templates/components/layout/zone-container.hbs @@ -1,4 +1,4 @@ -
+
{{yield}} diff --git a/app/app/templates/components/settings/user-list.hbs b/app/app/templates/components/settings/user-list.hbs index fea8b2eb..7c87a021 100644 --- a/app/app/templates/components/settings/user-list.hbs +++ b/app/app/templates/components/settings/user-list.hbs @@ -1,6 +1,6 @@
{{users.length}} users
- +
@@ -130,4 +130,4 @@
- \ No newline at end of file +
Firstname