diff --git a/NEWS b/NEWS index cc0cfd68e..cb7d3f1fc 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ New features - [core] new database structure options to make SOGo use a total of nine tables - [core] new user-based rate-limiting support for all SOGo requests (#3188) + - [web] toolbar of all-day events can be expanded to display all events Enhancements - [web] updated Angular Material to version 1.0.6 diff --git a/UI/Templates/SchedulerUI/UIxCalDayTable.wox b/UI/Templates/SchedulerUI/UIxCalDayTable.wox index 9ea41fe6c..d79ec8f74 100644 --- a/UI/Templates/SchedulerUI/UIxCalDayTable.wox +++ b/UI/Templates/SchedulerUI/UIxCalDayTable.wox @@ -6,73 +6,82 @@ xmlns:const="http://www.skyrix.com/od/constant" xmlns:rsrc="OGo:url" xmlns:label="OGo:label"> - - - -
- -
- - -
- -
-
- -
-
-
-
- - - - -
-
- -
-
-
-
-
-
+ +
+ + keyboard_arrow_down +
- - +
+
-
- {{view.calendar.name}} -
-
- - - -
-
- - - - +
+ + +
+ +
+
+ +
+
+
+
+ + + + +
+
+ +
+
+
+
+
+ + + +
+
+ {{view.calendar.name}} +
+
+
+ + +
+
+ + + + + + +
+
+ @@ -92,12 +101,12 @@
+ var:id="currentDayId" + var:sg-day-number="currentDayNumber" + var:sg-day="currentTableDay.shortDateString" + var:sg-day-string="currentTableDay.iso8601DateString" + sg-calendar="{{view.id}}" + ng-repeat="view in calendar.views">
div { + overflow-y: scroll; + } + } &[sg-view$=dayview] { // Toolbar of day view only .dayLabels { @@ -91,17 +98,12 @@ $quarter_height: 10px; } } } - &.monthView { - // Toolbar of month view - > div { - overflow-y: scroll; - } - } } // The all-day events appear in the shrinkable toolbar, bellow the days labels .allDaysView { border-bottom: 1px solid sg-color($sogoPaper, 300); + flex-shrink: 0; max-height: $sg-font-size-4 * 6; min-height: 0; overflow: hidden; @@ -147,6 +149,23 @@ $quarter_height: 10px; } } + // Toolbar of all-day events when expanded to display all events + .allDaysView__expanded { + max-height: none; + min-height: 0; + } + + // Side column on the left of the days labels and all-day events; + // Contains the toggle button to collapse/expand the toolbar + .allDaysView--sidenav { + border-bottom: 1px solid sg-color($sogoPaper, 300); + width: $hours_margin; + .md-icon-button { + position: absolute; + bottom: 0; + } + } + md-card { // All views wrap a md-card position: absolute;