Adapt to latest md changes

See https://github.com/angular/material/commit/17797f0
This commit is contained in:
Francis Lachapelle
2015-12-11 15:11:53 -05:00
parent 0b10e20d37
commit 4b5abdb5ce
24 changed files with 496 additions and 622 deletions
@@ -24,19 +24,21 @@
</div>
</md-toolbar>
<md-dialog-content class="md-dialog-content">
<!-- location -->
<md-input-container>
<label><var:string label:value="Location"/></label>
<input type="text" ng-model="editor.component.location"/>
</md-input-container>
<!-- calendar -->
<md-input-container>
<label><var:string label:value="Calendar"/></label>
<md-select ng-model="editor.component.destinationCalendar">
<md-option ng-repeat="calendar in editor.service.$findAll(null, true)"
ng-value="calendar.id">{{calendar.name}}</md-option>
</md-select>
</md-input-container>
<div layout="row" layout-wrap="layout-wrap">
<!-- location -->
<md-input-container flex="50" flex-xs="100">
<label><var:string label:value="Location"/></label>
<input type="text" ng-model="editor.component.location"/>
</md-input-container>
<!-- calendar -->
<md-input-container flex="50" flex-xs="100">
<label><var:string label:value="Calendar"/></label>
<md-select ng-model="editor.component.destinationCalendar">
<md-option ng-repeat="calendar in editor.service.$findAll(null, true)"
ng-value="calendar.id">{{calendar.name}}</md-option>
</md-select>
</md-input-container>
</div>
<!-- categories -->
<md-chips ng-model="editor.component.categories">
<md-autocomplete
@@ -73,6 +75,7 @@
label:aria-label="Priority"><!-- slider --></md-slider>
</div>
<!-- is all day -->
<div layout="row">
<md-checkbox
ng-model="editor.component.isAllDay"
ng-true-value="1"
@@ -80,7 +83,9 @@
label:aria-label="All day Event">
<var:string label:value="All day Event"/>
</md-checkbox>
</div>
<!-- is transparent -->
<div layout="row">
<md-checkbox
ng-model="editor.component.isTransparent"
ng-true-value="1"
@@ -88,7 +93,9 @@
label:aria-label="Show Time as Free">
<var:string label:value="Show Time as Free"/>
</md-checkbox>
</div>
<!-- send appointment notifications -->
<div layout="row">
<md-checkbox
ng-model="editor.component.sendAppointmentNotifications"
ng-true-value="1"
@@ -96,6 +103,7 @@
label:aria-label="Send Appointment Notifications">
<var:string label:value="Send Appointment Notifications"/>
</md-checkbox>
</div>
<!-- start + end -->
<div layout="row">
<div flex="50">
@@ -127,8 +135,8 @@
</div>
<!-- attach urls -->
<div class="attr" ng-repeat="attach in editor.component.attachUrls">
<div layout="row" layout-align="center end">
<md-input-container>
<div layout="row">
<md-input-container class="md-block md-flex">
<label>
<var:string label:value="URL"/>
</label>
@@ -149,14 +157,14 @@
</label>
</div>
<!-- comment -->
<md-input-container>
<md-input-container class="md-block md-flex">
<label><var:string label:value="Description"/></label>
<textarea ng-model="editor.component.comment"><!-- comment --></textarea>
</md-input-container>
<!-- repeat -->
<div layout="row" layout-align="start end">
<div class="md-flex">
<md-input-container>
<md-input-container class="md-block md-flex">
<label><var:string label:value="Repeat"/></label>
<md-select ng-model="editor.component.repeat.frequency" ng-disabled="editor.component.occurrenceId">
<var:foreach list="repeatList" item="item">
@@ -177,28 +185,25 @@
<var:component className="UIxRecurrenceEditor" />
</div>
<!-- end repeat -->
<div layout="row" layout-align="start end">
<div flex="50" flex-xs="100"
ng-show="editor.component.repeat.frequency != 'never'">
<md-input-container>
<label><var:string label:value="End Repeat"/></label>
<md-select ng-model="editor.component.repeat.end"
ng-disabled="editor.component.occurrenceId">
<md-option value="never"><var:string label:value="Never"/></md-option>
<md-option value="count"><var:string label:value="After"/></md-option>
<md-option value="until"><var:string label:value="On Date"/></md-option>
</md-select>
</md-input-container>
</div>
<div layout="row" layout-align="start center" ng-show="editor.component.repeat.end == 'count'">
<md-input-container class="md-input-number">
<input type="number" label:aria-label="times" ng-model="editor.component.repeat.count"/>
</md-input-container>
<var:string label:value="times"/>
</div>
<md-input-container ng-show="editor.component.repeat.end == 'until'">
<input type="date" label:aria-label="Repeat until" ng-model="editor.component.repeat.until"/>
<div layout="row">
<md-input-container class="md-block" flex="50" flex-xs="100"
ng-show="editor.component.repeat.frequency != 'never'">
<label><var:string label:value="End Repeat"/></label>
<md-select ng-model="editor.component.repeat.end"
ng-disabled="editor.component.occurrenceId">
<md-option value="never"><var:string label:value="Never"/></md-option>
<md-option value="count"><var:string label:value="After"/></md-option>
<md-option value="until"><var:string label:value="On Date"/></md-option>
</md-select>
</md-input-container>
<md-input-container class="md-block md-input-number"
ng-show="editor.component.repeat.end == 'count'">
<label><var:string label:value="times"/></label>
<input type="number" label:aria-label="times" ng-model="editor.component.repeat.count"/>
</md-input-container>
<md-datepicker ng-show="editor.component.repeat.end == 'until'"
ng-model="editor.component.repeat.until"
label:md-placeholder="On Date"><!-- date picker --></md-datepicker>
</div>
<!-- attendees -->
<div layout="row" layout-align="start start">
@@ -255,7 +260,7 @@
label:aria-label="Reminder">
<var:string label:value="Reminder"/>
</md-checkbox>
<div class="sg-subcontent"
<div flex-offset="5"
ng-show="editor.component.$hasAlarm">
<var:component className="UIxReminderEditor" />
</div>
+4 -3
View File
@@ -539,15 +539,16 @@
</div>
<!-- search mode -->
<div class="md-toolbar-tools sg-toolbar-secondary"
layout="row"
ng-show="list.mode.search"
sg-search="list.component.$filter(list.componentType, { value: searchText, search: searchField })">
<md-button class="sg-icon-button"
<md-button class="md-icon-button"
sg-search-cancel="list.cancelSearch()"
label:aria-label="Back">
<md-icon>arrow_back</md-icon>
</md-button>
<md-input-container>
<input name="folderSearch" type="search" />
<md-input-container class="md-flex" md-no-float="md-no-float">
<input name="folderSearch" type="search" label:placeholder="Search"/>
</md-input-container>
<md-input-container flex="25">
<md-select>
@@ -9,9 +9,9 @@
xmlns:uix="OGo:uix">
<div layout="column">
<md-input-container>
<md-input-container class="md-block md-flex">
<label><var:string label:value="label_Public"/></label>
<md-select flex="50" label:aria-label="Public"
<md-select label:aria-label="Public"
ng-model="acl.selectedUser.rights.Public"
ng-change="acl.confirmChange(acl.selectedUser)">
<var:foreach list="objectRights" item="currentRight">
@@ -22,9 +22,9 @@
</md-select>
</md-input-container>
<md-input-container>
<md-input-container class="md-block md-flex">
<label><var:string label:value="label_Confidential"/></label>
<md-select flex="50" label:aria-label="Confidential"
<md-select label:aria-label="Confidential"
ng-model="acl.selectedUser.rights.Confidential"
ng-change="acl.confirmChange(acl.selectedUser)">
<var:foreach list="objectRights" item="currentRight">
@@ -35,9 +35,9 @@
</md-select>
</md-input-container>
<md-input-container>
<md-input-container class="md-block md-flex">
<label><var:string label:value="label_Private"/></label>
<md-select flex="50" label:aria-label="Private"
<md-select label:aria-label="Private"
ng-model="acl.selectedUser.rights.Private"
ng-change="acl.confirmChange(acl.selectedUser)">
<var:foreach list="objectRights" item="currentRight">
@@ -24,46 +24,44 @@
<md-dialog-content class="md-padding">
<div layout="column">
<div layout="column" layout-padding="layout-padding">
<md-input-container ng-show="links.calendar.isWebCalendar">
<label><var:string label:value="URL"/></label>
<input type="text" ng-model="links.calendar.urls.webCalendarURL" ng-readonly="true"/>
</md-input-container>
<md-input-container class="md-block" ng-show="links.calendar.isWebCalendar">
<label><var:string label:value="URL"/></label>
<input type="text" ng-model="links.calendar.urls.webCalendarURL" ng-readonly="true"/>
</md-input-container>
<div ng-hide="links.calendar.isWebCalendar">
<div class="sg-md-title"><var:string label:value="Authenticated User Access"/></div>
<md-input-container>
<label><var:string label:value="CalDAV URL"/></label>
<input type="text" ng-model="links.calendar.urls.calDavURL" ng-readonly="true"/>
</md-input-container>
<md-input-container>
<label><var:string label:value="WebDAV ICS URL"/></label>
<input type="text" ng-model="links.calendar.urls.webDavICSURL" ng-readonly="true"/>
</md-input-container>
<md-input-container>
<label><var:string label:value="WebDAV XML URL"/></label>
<input type="text" ng-model="links.calendar.urls.webDavXMLURL" ng-readonly="true"/>
</md-input-container>
</div>
<div layout="column" ng-hide="links.calendar.isWebCalendar">
<div class="sg-md-title"><var:string label:value="Authenticated User Access"/></div>
<md-input-container class="md-block">
<label><var:string label:value="CalDAV URL"/></label>
<input type="text" ng-model="links.calendar.urls.calDavURL" ng-readonly="true"/>
</md-input-container>
<md-input-container class="md-block">
<label><var:string label:value="WebDAV ICS URL"/></label>
<input type="text" ng-model="links.calendar.urls.webDavICSURL" ng-readonly="true"/>
</md-input-container>
<md-input-container class="md-block">
<label><var:string label:value="WebDAV XML URL"/></label>
<input type="text" ng-model="links.calendar.urls.webDavXMLURL" ng-readonly="true"/>
</md-input-container>
</div>
<var:if condition="isPublicAccessEnabled">
<div layout="column" layout-padding="layout-padding" ng-hide="links.calendar.isWebCalendar">
<div class="sg-md-title"><var:string label:value="Public Access"/></div>
<md-input-container>
<label><var:string label:value="CalDAV URL"/></label>
<input type="text" ng-model="links.calendar.urls.publicCalDavURL" ng-readonly="true"/>
</md-input-container>
<md-input-container>
<label><var:string label:value="WebDAV ICS URL"/></label>
<input type="text" ng-model="links.calendar.urls.publicWebDavICSURL" ng-readonly="true"/>
</md-input-container>
<md-input-container>
<label><var:string label:value="WebDAV XML URL"/></label>
<input type="text" ng-model="links.calendar.urls.publicWebDavXMLURL" ng-readonly="true"/>
</md-input-container>
</div>
</var:if>
<div layout="column" ng-hide="links.calendar.isWebCalendar">
<div class="sg-md-title"><var:string label:value="Public Access"/></div>
<md-input-container class="md-block">
<label><var:string label:value="CalDAV URL"/></label>
<input type="text" ng-model="links.calendar.urls.publicCalDavURL" ng-readonly="true"/>
</md-input-container>
<md-input-container class="md-block">
<label><var:string label:value="WebDAV ICS URL"/></label>
<input type="text" ng-model="links.calendar.urls.publicWebDavICSURL" ng-readonly="true"/>
</md-input-container>
<md-input-container class="md-block">
<label><var:string label:value="WebDAV XML URL"/></label>
<input type="text" ng-model="links.calendar.urls.publicWebDavXMLURL" ng-readonly="true"/>
</md-input-container>
</div>
</var:if>
</div>
</md-dialog-content>
@@ -13,7 +13,7 @@
<!-- color -->
<sg-color-picker ng-model="properties.calendar.color"><!-- color picker --></sg-color-picker>
<!-- name -->
<md-input-container>
<md-input-container class="md-block md-flex">
<label><var:string label:value="Name"/></label>
<input type="text"
class="md-title"
@@ -60,7 +60,7 @@
<var:string label:value="Reload on login"/>
</md-checkbox>
<div ng-hide="properties.calendar.isWebCalendar || !properties.calendar.isOwned" layout="column">
<md-divider><!-- divider --></md-divider>
<md-divider class="md-padding"><!-- divider --></md-divider>
<md-checkbox
ng-model="properties.calendar.notifications.notifyOnPersonalModifications"
ng-true-value="1"
@@ -79,7 +79,7 @@
ng-false-value="0">
<var:string label:value="When I modify my calendar, send a mail to"/>
</md-checkbox>
<md-input-container md-no-float="md-no-float">
<md-input-container flex-offset="5" md-no-float="md-no-float">
<input type="text"
label:placeholder="Email Address"
ng-value="properties.calendar.notifications.notifiedUserOnPersonalModifications"
+11 -13
View File
@@ -4,7 +4,7 @@
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:label="OGo:label">
<div layout="row" layout-align="start center" layout-wrap="layout-wrap">
<div layout="row" layout-wrap="layout-wrap">
<md-input-container class="md-input-number">
<input type="number" label:aria-label="quantity" ng-model="editor.component.alarm.quantity"/>
</md-input-container>
@@ -32,18 +32,16 @@
</div>
<var:if condition="emailAlarmsEnabled">
<div layout="row" layout-align="space-around center">
<md-radio-group layout="row" layout-align="space-around center"
ng-model="editor.component.alarm.action">
<md-radio-button value="display">
<var:string label:value="Show an Alert"/>
</md-radio-button>
<md-radio-button value="email">
<var:string label:value="Send an E-mail"/>
</md-radio-button>
</md-radio-group>
</div>
<div layout="row" layout-align="space-around center"
<md-radio-group layout="column"
ng-model="editor.component.alarm.action">
<md-radio-button value="display">
<var:string label:value="Show an Alert"/>
</md-radio-button>
<md-radio-button value="email">
<var:string label:value="Send an E-mail"/>
</md-radio-button>
</md-radio-group>
<div layout="row" flex-offset="5"
ng-show="editor.component.canRemindAttendeesByEmail()">
<md-checkbox ng-model="editor.component.alarm.organizer"
ng-true-value="1"
@@ -11,7 +11,7 @@
<!-- summary -->
<md-icon ng-if="editor.component.classification == 'confidential'">visibility_off</md-icon>
<md-icon ng-if="editor.component.classification == 'private'">vpn_key</md-icon>
<md-input-container>
<md-input-container class="md-block md-flex">
<label><var:string label:value="Title"/></label>
<input type="text"
class="md-title"
@@ -24,11 +24,21 @@
</div>
</md-toolbar>
<md-dialog-content class="md-dialog-content">
<!-- location -->
<md-input-container>
<label><var:string label:value="Location"/></label>
<input type="text" ng-model="editor.component.location"/>
</md-input-container>
<div layout="row" layout-wrap="layout-wrap">
<!-- location -->
<md-input-container flex="50" flex-xs="100">
<label><var:string label:value="Location"/></label>
<input type="text" ng-model="editor.component.location"/>
</md-input-container>
<!-- calendar -->
<md-input-container flex="50" flex-xs="100">
<label><var:string label:value="Calendar"/></label>
<md-select ng-model="editor.component.destinationCalendar">
<md-option ng-repeat="calendar in editor.service.$findAll(null, true)"
ng-value="calendar.id">{{calendar.name}}</md-option>
</md-select>
</md-input-container>
</div>
<!-- categories -->
<md-chips ng-model="editor.component.categories">
<md-autocomplete
@@ -40,16 +50,8 @@
<span md-highlight-text="editor.categories.searchText">{{category}}</span>
</md-autocomplete>
</md-chips>
<!-- calendar -->
<md-input-container>
<label><var:string label:value="Calendar"/></label>
<md-select ng-model="editor.component.destinationCalendar">
<md-option ng-repeat="calendar in editor.service.$findAll(null, true)"
ng-value="calendar.id">{{calendar.name}}</md-option>
</md-select>
</md-input-container>
<!-- classification -->
<md-radio-group layout="row" layout-align="space-around center"
<md-radio-group class="md-padding" layout="row" layout-align="space-around center"
ng-model="editor.component.classification">
<md-radio-button value="public">
<var:string label:value="label_Public"/>
@@ -145,7 +147,7 @@
<!-- attach urls -->
<div class="attr" ng-repeat="attach in editor.component.attachUrls">
<div layout="row" layout-align="center end">
<md-input-container>
<md-input-container class="md-block md-flex">
<label>
<var:string label:value="URL"/>
</label>
@@ -166,13 +168,13 @@
</label>
</div>
<!-- comment -->
<md-input-container>
<md-input-container class="md-block md-flex">
<label><var:string label:value="Description"/></label>
<textarea ng-model="editor.component.comment"><!-- comment --></textarea>
</md-input-container>
<!-- repeat -->
<div layout="row" layout-align="start end">
<md-input-container>
<md-input-container class="md-block md-flex">
<label><var:string label:value="Repeat"/></label>
<md-select class="pseudo-input-field" ng-model="editor.component.repeat.frequency">
<var:foreach list="repeatList" item="item">
@@ -192,33 +194,32 @@
<var:component className="UIxRecurrenceEditor" />
</div>
<!-- end repeat -->
<div layout="row" layout-align="start end">
<div ng-show="editor.component.repeat.frequency != 'never'">
<md-input-container>
<label><var:string label:value="End Repeat"/></label>
<md-select class="pseudo-input-field" ng-model="editor.component.repeat.end">
<md-option value="never"><var:string label:value="Never"/></md-option>
<md-option value="count"><var:string label:value="After"/></md-option>
<md-option value="until"><var:string label:value="On Date"/></md-option>
</md-select>
</md-input-container>
</div>
<div layout="row" layout-align="start center" ng-show="editor.component.repeat.end == 'count'">
<md-input-container class="md-input-number">
<input type="number" label:aria-label="times" ng-model="editor.component.repeat.count"/>
</md-input-container>
<var:string label:value="times"/>
</div>
<md-input-container ng-show="editor.component.repeat.end == 'until'">
<input type="date" label:aria-label="Repeat until" ng-model="editor.component.repeat.until"/>
<div layout="row">
<md-input-container class="md-block" flex="50" flex-xs="100"
ng-show="editor.component.repeat.frequency != 'never'">
<label><var:string label:value="End Repeat"/></label>
<md-select ng-model="editor.component.repeat.end"
ng-disabled="editor.component.occurrenceId">
<md-option value="never"><var:string label:value="Never"/></md-option>
<md-option value="count"><var:string label:value="After"/></md-option>
<md-option value="until"><var:string label:value="On Date"/></md-option>
</md-select>
</md-input-container>
<md-input-container class="md-block md-input-number"
ng-show="editor.component.repeat.end == 'count'">
<label><var:string label:value="times"/></label>
<input type="number" label:aria-label="times" ng-model="editor.component.repeat.count"/>
</md-input-container>
<md-datepicker ng-show="editor.component.repeat.end == 'until'"
ng-model="editor.component.repeat.until"
label:md-placeholder="On Date"><!-- date picker --></md-datepicker>
</div>
<!-- reminder -->
<md-checkbox ng-model="editor.component.$hasAlarm"
label:aria-label="Reminder">
<var:string label:value="Reminder"/>
</md-checkbox>
<div class="sg-subcontent"
<div flex-offset="5"
ng-show="editor.component.$hasAlarm">
<var:component className="UIxReminderEditor" />
</div>