mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-10-19 02:08:11 +00:00
(fix) calendar views now honor "breakpoints"
We also now use again the default top nav toolbar and we hide the fab button on sm devices. This of course needs a bit more work but we are getting there!
This commit is contained in:
Ludovic Marcotte committed
1 parent
456649a38a
commit
2e3057c2ce
4 files changed
+73
-66
No files matched your search
@@ -18,28 +18,30 @@
|
|||||||
<li><var:string label:value="Copy event to my calendar"/></li>
|
<li><var:string label:value="Copy event to my calendar"/></li>
|
||||||
<li><var:string label:value="View Raw Source"/></li>
|
<li><var:string label:value="View Raw Source"/></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>-->
|
</div>-->
|
||||||
<div layout="row" layout-align="center">
|
<md-content>
|
||||||
<h5>
|
<div layout="row" layout-align="center">
|
||||||
<md-button
|
<h5>
|
||||||
class="sg-icon-button"
|
<md-button
|
||||||
label:aria-label="Previous Day"
|
class="sg-icon-button"
|
||||||
var:date="prevDayQueryParameters.day"
|
label:aria-label="Previous Day"
|
||||||
ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
|
var:date="prevDayQueryParameters.day"
|
||||||
<var:string value="currentDayName" />
|
ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
|
||||||
<md-button
|
<var:string value="currentDayName" />
|
||||||
class="sg-icon-button"
|
<md-button
|
||||||
label:aria-label="Next Day"
|
class="sg-icon-button"
|
||||||
var:date="nextDayQueryParameters.day"
|
label:aria-label="Next Day"
|
||||||
ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
|
var:date="nextDayQueryParameters.day"
|
||||||
</h5>
|
ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
|
||||||
</div>
|
</h5>
|
||||||
<div id="calendarContent">
|
</div>
|
||||||
<var:component
|
<div id="calendarContent">
|
||||||
className="UIxCalDayTable"
|
<var:component
|
||||||
startDate="startDate"
|
className="UIxCalDayTable"
|
||||||
const:CSSClass="dayOverview"
|
startDate="startDate"
|
||||||
const:numberOfDays="1"
|
const:CSSClass="dayOverview"
|
||||||
const:currentView="dayview"/>
|
const:numberOfDays="1"
|
||||||
</div>
|
const:currentView="dayview"/>
|
||||||
|
</div>
|
||||||
|
</md-content>
|
||||||
</container>
|
</container>
|
||||||
@@ -312,12 +312,12 @@
|
|||||||
ng-controller="CalendarListController as list">
|
ng-controller="CalendarListController as list">
|
||||||
<md-toolbar layout="column" layout-align="space-between start" class="md-tall toolbar-main">
|
<md-toolbar layout="column" layout-align="space-between start" class="md-tall toolbar-main">
|
||||||
<div class="md-toolbar-tools md-toolbar-tools-top sg-padded" layout="row" layout-align="space-between start">
|
<div class="md-toolbar-tools md-toolbar-tools-top sg-padded" layout="row" layout-align="space-between start">
|
||||||
<!-- <var:component className="UIxTopnavToolbarTemplate" /> -->
|
<var:component className="UIxTopnavToolbarTemplate" />
|
||||||
<div class="sg-toolbar-group-2">
|
<!-- <div class="sg-toolbar-group-2">
|
||||||
<md-button class="sg-icon-button" label:aria-label="Search">
|
<md-button class="sg-icon-button" label:aria-label="Search">
|
||||||
<md-icon>search</md-icon>
|
<md-icon>search</md-icon>
|
||||||
</md-button>
|
</md-button>
|
||||||
</div>
|
</div> -->
|
||||||
</div><!-- .md-toolbar-tools -->
|
</div><!-- .md-toolbar-tools -->
|
||||||
<div class="md-toolbar-tools" layout="row" layout-align="space-between center">
|
<div class="md-toolbar-tools" layout="row" layout-align="space-between center">
|
||||||
<!-- sort/filter mode -->
|
<!-- sort/filter mode -->
|
||||||
@@ -582,12 +582,13 @@
|
|||||||
</md-tab>
|
</md-tab>
|
||||||
</md-tabs>
|
</md-tabs>
|
||||||
<md-button class="md-fab md-fab-bottom-right"
|
<md-button class="md-fab md-fab-bottom-right"
|
||||||
|
hide-sm="hide-sm"
|
||||||
label:aria-label="New Appointment"
|
label:aria-label="New Appointment"
|
||||||
ng-click="list.newComponent($event)">
|
ng-click="list.newComponent($event)">
|
||||||
<md-icon>add</md-icon>
|
<md-icon>add</md-icon>
|
||||||
</md-button>
|
</md-button>
|
||||||
</md-content>
|
</md-content>
|
||||||
<md-content class="view-detail sg-padded" ui-view="calendarView"><!-- calendar view --></md-content>
|
<div id="detailView" class="view-detail" layout="column" ui-view="calendarView"><!-- calendar view --></div>
|
||||||
</md-content>
|
</md-content>
|
||||||
</section>
|
</section>
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -21,21 +21,22 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div layout="row" layout-align="center">
|
<md-content>
|
||||||
<h5>
|
<div layout="row" layout-align="center">
|
||||||
<md-button
|
<h5>
|
||||||
class="sg-icon-button"
|
<md-button
|
||||||
label:aria-label="Previous Month"
|
class="sg-icon-button"
|
||||||
var:date="prevMonthQueryParameters.day"
|
label:aria-label="Previous Month"
|
||||||
ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
|
var:date="prevMonthQueryParameters.day"
|
||||||
<var:string value="monthNameOfThisMonth" />
|
ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
|
||||||
<md-button
|
<var:string value="monthNameOfThisMonth" />
|
||||||
class="sg-icon-button"
|
<md-button
|
||||||
label:aria-label="Next Month"
|
class="sg-icon-button"
|
||||||
var:date="nextMonthQueryParameters.day"
|
label:aria-label="Next Month"
|
||||||
ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
|
var:date="nextMonthQueryParameters.day"
|
||||||
</h5>
|
ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
|
||||||
</div>
|
</h5>
|
||||||
|
</div>
|
||||||
<div class="monthView">
|
<div class="monthView">
|
||||||
<div layout="row" layout-align="center center">
|
<div layout="row" layout-align="center center">
|
||||||
<var:foreach list="headerDaysToDisplay" item="currentTableDay">
|
<var:foreach list="headerDaysToDisplay" item="currentTableDay">
|
||||||
@@ -66,4 +67,5 @@
|
|||||||
</var:foreach>
|
</var:foreach>
|
||||||
</md-grid-list>
|
</md-grid-list>
|
||||||
</div>
|
</div>
|
||||||
|
</md-content>
|
||||||
</container>
|
</container>
|
||||||
@@ -6,27 +6,29 @@
|
|||||||
xmlns:rsrc="OGo:url"
|
xmlns:rsrc="OGo:url"
|
||||||
xmlns:label="OGo:label">
|
xmlns:label="OGo:label">
|
||||||
|
|
||||||
<div layout="row" layout-align="center">
|
<md-content>
|
||||||
<h5>
|
<div layout="row" layout-align="center">
|
||||||
<md-button
|
<h5>
|
||||||
class="sg-icon-button"
|
<md-button
|
||||||
label:aria-label="Previous Week"
|
class="sg-icon-button"
|
||||||
var:date="prevWeekQueryParameters.day"
|
label:aria-label="Previous Week"
|
||||||
ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
|
var:date="prevWeekQueryParameters.day"
|
||||||
<var:string value="currentWeekName" />
|
ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
|
||||||
<md-button
|
<var:string value="currentWeekName" />
|
||||||
class="sg-icon-button"
|
<md-button
|
||||||
label:aria-label="Next Week"
|
class="sg-icon-button"
|
||||||
var:date="nextWeekQueryParameters.day"
|
label:aria-label="Next Week"
|
||||||
ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
|
var:date="nextWeekQueryParameters.day"
|
||||||
</h5>
|
ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
|
||||||
</div>
|
</h5>
|
||||||
<div id="calendarContent">
|
</div>
|
||||||
<var:component
|
<div id="calendarContent">
|
||||||
className="UIxCalDayTable"
|
<var:component
|
||||||
startDate="startDate"
|
className="UIxCalDayTable"
|
||||||
const:CSSClass="weekOverview"
|
startDate="startDate"
|
||||||
const:numberOfDays="7"
|
const:CSSClass="weekOverview"
|
||||||
const:currentView="weekview"/>
|
const:numberOfDays="7"
|
||||||
</div>
|
const:currentView="weekview"/>
|
||||||
|
</div>
|
||||||
|
</md-content>
|
||||||
</container>
|
</container>
|
||||||
Reference in new issue
Block a user