diff --git a/NEWS b/NEWS index 56b010c3c..f238aa9b6 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ New features - [core] support repetitive email alarms on tasks and events (#1053) + - [web] allow to hide center column on large screens Enhancements - [core] updated time zones to version 2016i diff --git a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox index aa8094a64..3cbb693b2 100644 --- a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox +++ b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox @@ -8,12 +8,18 @@
+ +
close -
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox index 065c86a6e..fed259a41 100644 --- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox +++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox @@ -235,7 +235,7 @@
-
+
+ diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox index 143b717e3..1ad7f9816 100644 --- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox +++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox @@ -3,7 +3,7 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:var="http://www.skyrix.com/od/binding" xmlns:label="OGo:label"> -
+
+ +
- + arrow_downward + + diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox index 4c286be6f..4b6ebdcf9 100644 --- a/UI/Templates/SchedulerUI/UIxCalMainView.wox +++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox @@ -353,7 +353,7 @@
-
+
diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox index a58798e7c..8c21e619f 100644 --- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox +++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox @@ -9,6 +9,12 @@ +
- + arrow_downward + + diff --git a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox index 11103ef5c..a5c32607b 100644 --- a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox +++ b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox @@ -9,6 +9,12 @@ +
- + arrow_downward + + diff --git a/UI/Templates/SchedulerUI/UIxCalWeekView.wox b/UI/Templates/SchedulerUI/UIxCalWeekView.wox index abe17ef25..9b4be8426 100644 --- a/UI/Templates/SchedulerUI/UIxCalWeekView.wox +++ b/UI/Templates/SchedulerUI/UIxCalWeekView.wox @@ -9,6 +9,12 @@ +
- + arrow_downward + + diff --git a/UI/WebServerResources/js/Common/navController.js b/UI/WebServerResources/js/Common/navController.js index 8d7c12758..4ebdeb298 100644 --- a/UI/WebServerResources/js/Common/navController.js +++ b/UI/WebServerResources/js/Common/navController.js @@ -16,6 +16,7 @@ $scope.activeUser = sgSettings.activeUser(); $scope.baseURL = sgSettings.baseURL(); $scope.leftIsClose = !$mdMedia(sgConstant['gt-md']); + $scope.centerIsClose = false; // Show current day in top bar $scope.currentDay = window.currentDay; @@ -52,6 +53,9 @@ $log.debug("toggle right is done"); }); }; + $scope.toggleCenter = function() { + $scope.centerIsClose = !$scope.centerIsClose; + }; // $scope.openBottomSheet = function() { // $mdBottomSheet.show({ // parent: angular.element(document.getElementById('left-sidenav')), diff --git a/UI/WebServerResources/scss/components/icon/icon.scss b/UI/WebServerResources/scss/components/icon/icon.scss index a5da45358..d4b5896e7 100644 --- a/UI/WebServerResources/scss/components/icon/icon.scss +++ b/UI/WebServerResources/scss/components/icon/icon.scss @@ -109,6 +109,12 @@ md-icon { &.icon-expand-more:before { content: "\e5cf"; } + &.icon-fullscreen:before { + content: "\e5d0"; + } + &.icon-fullscreen-exit:before { + content: "\e5d1"; + } &.icon-needs-action:before, &.icon-help:before { content: "\e887"; diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss index da484f965..e4f62dc1d 100644 --- a/UI/WebServerResources/scss/views/SchedulerUI.scss +++ b/UI/WebServerResources/scss/views/SchedulerUI.scss @@ -37,13 +37,11 @@ $quarter_height: 10px; } } - .view-detail { - @include at(sm) { - @include flex-col($breakpoint: sm, $nb: 10); - } + .view-list--close { @include from(md) { - flex: 1 1 auto; - margin: 0; + $cols: map-get($base-grid-total-columns, md); + $colWidth: ((100 / $cols) * -5vw); + margin-right: $colWidth; } } diff --git a/UI/WebServerResources/scss/views/_view.scss b/UI/WebServerResources/scss/views/_view.scss index 2c5c09f3d..d4d37168f 100644 --- a/UI/WebServerResources/scss/views/_view.scss +++ b/UI/WebServerResources/scss/views/_view.scss @@ -50,8 +50,9 @@ $listView-width: grid-step(6) !global; } .view-list { - z-index: ($z-index-view - 1); min-width: ($listView-width - ($pitch * 2)); + transition: $swift-ease-out; + z-index: ($z-index-view - 1); // With Material, when a button inside a md-list uses the class md-secondary, it is moved inside a container // on the right side of the list item. Since we define the avatar as the secondary button, we must move it to @@ -84,9 +85,26 @@ $listView-width: grid-step(6) !global; } } +.view-list--close { + transform: translateX(-100%); + + @include at(sm) { + $cols: map-get($base-grid-total-columns, sm); + $colWidth: ((100 / $cols) * -6vw); + margin-right: $colWidth; + } + @include from(md) { + $cols: map-get($base-grid-total-columns, md); + $colWidth: ((100 / $cols) * -6vw); + margin-right: $colWidth; + } +} + .view-detail { - z-index: $z-index-view; + flex: 1 1 auto; + margin: 0; overflow: hidden; + z-index: $z-index-view; .sg-face, .sg-back { > md-card { @@ -155,11 +173,6 @@ $listView-width: grid-step(6) !global; } } - @include at(sm) { - @include flex-col(sm, 10); - margin: 0; - } - // No animation on medium to large screens @include from(sm) { .md-static { @@ -195,11 +208,6 @@ $listView-width: grid-step(6) !global; } } - @include from(md) { - flex: 1 1 auto; - margin: 0; - } - // Flippable view card, used to show raw source of cards and messages perspective: 1000px; .sg-reversible { @@ -225,4 +233,4 @@ $listView-width: grid-step(6) !global; transform: rotateY( 180deg ); } } -} \ No newline at end of file +}