From e14414ed56f50f161af275ad128a6ba403643abd Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 4 Dec 2015 15:00:58 -0500 Subject: [PATCH] Various Web interface changes - more contrasted primary palette; - white toolbars for list and detail views; - modules navigation always visible; - wrapped detail views into a md-card; - moved preferences button to the sidenav; - moved the sidenav toggle button to the top toolbar; - new "flip" visual effect when looking at the raw source of cards and messages. --- .../ContactsUI/UIxContactEditorTemplate.wox | 19 +- .../ContactsUI/UIxContactFoldersView.wox | 18 +- .../ContactsUI/UIxContactViewTemplate.wox | 346 +++++++-------- .../ContactsUI/UIxContactsUserFolders.wox | 3 +- .../MailerUI/UIxMailFolderTemplate.wox | 11 +- UI/Templates/MailerUI/UIxMailMainFrame.wox | 47 +-- UI/Templates/MailerUI/UIxMailViewTemplate.wox | 399 +++++++++--------- UI/Templates/PreferencesUI/UIxPreferences.wox | 8 +- .../UIxAppointmentEditorTemplate.wox | 2 +- .../UIxAppointmentViewTemplate.wox | 4 +- UI/Templates/SchedulerUI/UIxCalDayTable.wox | 2 +- UI/Templates/SchedulerUI/UIxCalDayView.wox | 20 +- UI/Templates/SchedulerUI/UIxCalMainView.wox | 14 +- UI/Templates/SchedulerUI/UIxCalMonthView.wox | 123 +++--- .../SchedulerUI/UIxCalMulticolumnDayView.wox | 20 +- UI/Templates/SchedulerUI/UIxCalWeekView.wox | 9 +- .../SchedulerUI/UIxTaskEditorTemplate.wox | 4 +- .../SchedulerUI/UIxTaskViewTemplate.wox | 4 +- UI/Templates/UIxSidenavToolbarTemplate.wox | 22 +- UI/Templates/UIxTopnavToolbarTemplate.wox | 101 ++--- UI/WebServerResources/js/Common/Common.app.js | 19 +- .../js/Common/mdColors.app.js | 26 +- .../js/Common/navController.js | 2 +- .../js/Contacts/CardController.js | 43 +- .../js/Mailer/MessageController.js | 45 +- .../js/Scheduler/ComponentController.js | 7 +- .../scss/components/button/button.scss | 20 +- .../scss/components/card/card.scss | 12 + .../scss/components/dialog/dialog.scss | 10 +- .../scss/components/list/list.scss | 4 +- .../scss/components/menu/menu.scss | 8 + .../scss/components/toolbar/toolbar.scss | 6 + UI/WebServerResources/scss/views/LoginUI.scss | 1 + .../scss/views/MailerUI.scss | 27 +- .../scss/views/SchedulerUI.scss | 9 + UI/WebServerResources/scss/views/_view.scss | 32 +- 36 files changed, 755 insertions(+), 692 deletions(-) diff --git a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox index 928e1e92e..55931a85b 100644 --- a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox +++ b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox @@ -5,9 +5,9 @@ xmlns:const="http://www.skyrix.com/od/constant" xmlns:label="OGo:label"> -
- -
+
+ + @@ -24,10 +24,8 @@ ng-click="editor.save(editor.card.$isCard()?cardForm:listForm)"> save -
- - -
+ +

{{editor.card.$description()}}
@@ -42,7 +40,6 @@ -
- + +
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox index 9e8e320de..7cdd3fa54 100644 --- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox +++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox @@ -24,7 +24,6 @@ md-component-id="left" md-is-locked-open="isGtMedium" ng-class="{ 'sg-closed': leftIsClose }"> -
@@ -113,8 +112,8 @@ + sg-subscribe="contact" + sg-subscribe-on-select="app.subscribeToFolder(folderData)"> add_circle_outline
@@ -182,7 +181,6 @@ -
@@ -198,7 +196,7 @@
-
@@ -352,20 +350,16 @@
+ + - - keyboard_arrow_left - {{addressbook.selectedFolder.cards.length}} - - keyboard_arrow_left - @@ -434,7 +428,6 @@ layout="column" layout-align="start center" ng-class="{ 'sg-close': !addressbook.selectedFolder.selectedCard }" ui-view="card"> -
@@ -477,7 +470,6 @@ - diff --git a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox index fdacd004a..6b3a5273d 100644 --- a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox +++ b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox @@ -5,185 +5,199 @@ xmlns:const="http://www.skyrix.com/od/constant" xmlns:label="OGo:label"> -
- -
- - close - -
- - - mode_edit - - - - delete - - - - more_vert +
+
+ + + + close - - - - - - - - - - - - - -
- - -
-
-
- -
-
- -
-
-

-
{{editor.card.$description()}}
- - - {{$chip.value}} - - -
-
-
- -
-
- +
+ + + mode_edit + + + + delete + + + + more_vert + + + + + + + + + + + + + + + + +
+
+
-
- {{editor.card.$birthday()}} +
+
-
+
+

+
{{editor.card.$description()}}
+ + + {{$chip.value}} + + +
+
+
- -
- - - - - - -
-

- - {{ ref.$fullname() }} - -

-

- - {{ ref.email }} - -

-
- - -
- -
-
+
- -
- -
- -
- -
-
- -
-
-
- -
- -
{{editor.card.c_screenname}}
-
-
- -
-
-
- -
- -
- {{phone.value}} -
- -
-
-
-
-
-
-
- {{url.value}} -
- -
-
-
-
-
- -
-
-
+ {{editor.card.$birthday()}}
-
-
-
+ + +
+ + + + + +
+

+ + {{ ref.$fullname() }} + +

+

+ + {{ ref.email }} + +

+
+ +
-
-
+ +
+
+
+ +
+ +
+ +
+ +
-
-
-
- + +
+
+
+ +
+ +
{{editor.card.c_screenname}}
+
+
+ +
+
+
+ +
+ +
+ {{phone.value}} +
+ +
+
+
+
+
+ +
+ +
+ {{url.value}} +
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ + +
+
+ + + + arrow_forward + + + + 
{{editor.rawSource}}
+ + +
diff --git a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox index a3e08485f..e5ca911ca 100644 --- a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox +++ b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox @@ -25,7 +25,8 @@ ng-change="subscribe.onChange()"/> + ng-class="{ 'sg-collapsed': user.uid != subscribe.selectedUser.uid, + 'sg-expanded': user.uid == subscribe.selectedUser.uid }">
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox index 3db998892..f28b3cd9a 100644 --- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox +++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox @@ -60,7 +60,7 @@
-
@@ -200,12 +200,10 @@
+ + - - - keyboard_arrow_left - @@ -272,8 +270,7 @@ layout="column" layout-align="start center" ng-class="{ 'sg-close': !mailbox.service.selectedFolder.selectedMessage }" ui-view="message"> - -
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox index 1d85c6f46..0e68f50c0 100644 --- a/UI/Templates/MailerUI/UIxMailMainFrame.wox +++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox @@ -251,7 +251,6 @@ @@ -264,6 +263,7 @@ ng-change="account.$flattenMailboxes({ reload: true, saveState: true })">

{{app.metadataForFolder(folder).name}} {{folder.unseenCount}} @@ -278,14 +278,13 @@ sg-enter="app.saveFolder(folder)" sg-escape="app.revertEditing(folder)"/> - + more_vert - + @@ -368,25 +367,7 @@

- - - - (match - (does not match - {{$chip.searchBy}}) - {{$chip.searchInput}} - - - - close - -
-
-
+
@@ -408,6 +389,24 @@
+ + close + +
+
+ + + + (match + (does not match + {{$chip.searchBy}}) + {{$chip.searchInput}} + +
diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox index f23e8776c..09e1f472b 100644 --- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox +++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox @@ -7,210 +7,229 @@ xmlns:label="OGo:label" xmlns:uix="OGo:uix"> -
- -
- - close - - - arrow_back - -
- - - -
- - - reply - - - - reply_all - - - - forward - - - create - - - - delete - - - - open_in_new - - - - more_vert +
+
+ + + + close - - - - - - - - - - - - - - - - - - -
- - -
- -

{{viewer.message.subject}}

- - - + + arrow_back + +
+ + + +
+ + + reply + + + + reply_all + + + + forward + + + create + + + + delete + + + + open_in_new + + + + more_vert + + + + + + + + + + + + + + + + + + + + + +
+
{{viewer.message.subject}}
+ +
+
-
- -
- - - -
- {{ viewer.message.from[0].name }}
- +
+
+ +
+ + + +
+ {{ viewer.message.from[0].name }}
+ +
+
+
+
+
+ +
+ {{viewer.message.$shortRecipients()}} +
+
+ + + +
+
+
+ +
+ + + +
+
-
-
- -
- {{viewer.message.$shortRecipients()}} -
-
- - - -
-
-
- -
- - - -
-
- - {{viewer.service.$tags[$chip][0]}} - - - {{tag.description}} - - - - - + {{viewer.service.$tags[$chip][0]}} + + + {{tag.description}} + + + +
+ +
- - -
-
- collections + + +
+
+ collections +
+

+
+ + +
-

-
- - - -
- + - - -
-
- message + + +
+
+ message +
+

-

-
-
- - -
- +
+ + +
+ -
-
-
-
-
+
+
+
+
+
+
- -
- + + +
+
+ + + + arrow_forward + + + + 
{{viewer.rawSource}}
+ + +
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox index 24ae11631..b431b05b6 100644 --- a/UI/Templates/PreferencesUI/UIxPreferences.wox +++ b/UI/Templates/PreferencesUI/UIxPreferences.wox @@ -22,7 +22,9 @@