Adapt to latest md changes

See https://github.com/angular/material/commit/17797f0
This commit is contained in:
Francis Lachapelle
2015-12-11 15:12:43 -05:00
parent 0b10e20d37
commit 4b5abdb5ce
24 changed files with 496 additions and 622 deletions
+90 -99
View File
@@ -97,71 +97,62 @@
</md-input-container>
<div layout="row">
<div flex="50">
<md-input-container>
<label><var:string label:value="Language"/></label>
<md-select ng-model="app.preferences.defaults.SOGoLanguage"
ng-change="app.onLanguageChange()">
<var:foreach list="languages" item="item">
<md-option var:value="item">
<var:string value="languageText"/>
</md-option>
</var:foreach>
</md-select>
</md-input-container>
</div>
<div flex="50">
<md-autocomplete
style="padding-bottom: 0"
md-search-text="app.timeZonesSearchText"
md-selected-item="app.preferences.defaults.SOGoTimeZone"
md-items="timezone in app.timeZonesListFilter(app.timeZonesSearchText)"
md-item-text="timezone"
md-min-length="3"
md-select-on-match="true"
label:md-floating-label="Current Time Zone">
<span md-highlight-text="app.timeZonesSearchText">{{timezone}}</span>
</md-autocomplete>
</div>
<md-input-container class="md-block" flex="50">
<label><var:string label:value="Language"/></label>
<md-select ng-model="app.preferences.defaults.SOGoLanguage"
ng-change="app.onLanguageChange()">
<var:foreach list="languages" item="item">
<md-option var:value="item">
<var:string value="languageText"/>
</md-option>
</var:foreach>
</md-select>
</md-input-container>
<md-autocomplete
class="md-block" flex="50"
style="padding-bottom: 0"
md-search-text="app.timeZonesSearchText"
md-selected-item="app.preferences.defaults.SOGoTimeZone"
md-items="timezone in app.timeZonesListFilter(app.timeZonesSearchText)"
md-item-text="timezone"
md-min-length="3"
md-select-on-match="true"
label:md-floating-label="Current Time Zone">
<span md-highlight-text="app.timeZonesSearchText">{{timezone}}</span>
</md-autocomplete>
</div>
<div layout="row">
<div flex="30">
<md-input-container>
<label><var:string label:value="Short Date Format"/></label>
<md-select ng-model="app.preferences.defaults.SOGoShortDateFormat">
<var:foreach list="shortDateFormatsList" item="item">
<md-option var:value="item">
<var:string value="itemShortDateFormatText"/>
</md-option>
</var:foreach>
</md-select>
</md-input-container>
</div>
<div flex="40">
<md-input-container>
<label><var:string label:value="Long Date Format"/></label>
<md-select ng-model="app.preferences.defaults.SOGoLongDateFormat">
<var:foreach list="longDateFormatsList" item="item">
<md-option var:value="item">
<var:string value="itemLongDateFormatText"/>
</md-option>
</var:foreach>
</md-select>
</md-input-container>
</div>
<div flex="30">
<md-input-container>
<label><var:string label:value="Time Format"/></label>
<md-select ng-model="app.preferences.defaults.SOGoTimeFormat">
<var:foreach list="timeFormatsList" item="item">
<md-option var:value="item">
<var:string value="itemTimeFormatText"/>
</md-option>
</var:foreach>
</md-select>
</md-input-container>
</div>
<md-input-container class="md-block" flex="30">
<label><var:string label:value="Short Date Format"/></label>
<md-select ng-model="app.preferences.defaults.SOGoShortDateFormat">
<var:foreach list="shortDateFormatsList" item="item">
<md-option var:value="item">
<var:string value="itemShortDateFormatText"/>
</md-option>
</var:foreach>
</md-select>
</md-input-container>
<md-input-container class="md-block" flex="40">
<label><var:string label:value="Long Date Format"/></label>
<md-select ng-model="app.preferences.defaults.SOGoLongDateFormat">
<var:foreach list="longDateFormatsList" item="item">
<md-option var:value="item">
<var:string value="itemLongDateFormatText"/>
</md-option>
</var:foreach>
</md-select>
</md-input-container>
<md-input-container class="md-block" flex="30">
<label><var:string label:value="Time Format"/></label>
<md-select ng-model="app.preferences.defaults.SOGoTimeFormat">
<var:foreach list="timeFormatsList" item="item">
<md-option var:value="item">
<var:string value="itemTimeFormatText"/>
</md-option>
</var:foreach>
</md-select>
</md-input-container>
</div>
<md-input-container>
@@ -207,13 +198,13 @@
label:label="Password">
<md-content id="passwordView" class="md-padding">
<div layout="row">
<md-input-container>
<md-input-container class="md-block" flex="50">
<label><var:string label:value="New password"/>
</label>
<input type="password" ng-model="app.passwords.newPassword"/>
</md-input-container>
<md-input-container>
<md-input-container class="md-block" flex="50">
<label><var:string label:value="Confirmation"/>
</label>
<input type="password" ng-model="app.passwords.newPasswordConfirmation"/>
@@ -248,7 +239,7 @@
id="calendarOptionsView-content">
<div layout="column" flex="100">
<div layout="row">
<md-input-container>
<md-input-container class="md-block" flex="33">
<label><var:string label:value="Week begins on" /></label>
<md-select ng-model="app.preferences.defaults.SOGoFirstDayOfWeek">
<var:foreach list="daysList" item="item">
@@ -259,7 +250,7 @@
</md-select>
</md-input-container>
<md-input-container>
<md-input-container class="md-block" flex="33">
<label><var:string label:value="Day start time" /></label>
<md-select ng-model="app.preferences.defaults.SOGoDayStartTime">
<var:foreach list="hoursList" item="item">
@@ -270,7 +261,7 @@
</md-select>
</md-input-container>
<md-input-container>
<md-input-container class="md-block" flex="33">
<label><var:string label:value="Day end time" /></label>
<md-select ng-model="app.preferences.defaults.SOGoDayEndTime">
<var:foreach list="hoursList" item="item">
@@ -313,7 +304,7 @@
</md-input-container>
<div layout="row">
<md-input-container>
<md-input-container class="md-block" flex="50">
<label><var:string label:value="Default events classification" /></label>
<md-select ng-model="app.preferences.defaults.SOGoCalendarEventsDefaultClassification">
<var:foreach list="calendarClassificationsList" item="item">
@@ -324,7 +315,7 @@
</md-select>
</md-input-container>
<md-input-container>
<md-input-container class="md-block" flex="50">
<label><var:string label:value="Default tasks classification"/></label>
<md-select ng-model="app.preferences.defaults.SOGoCalendarTasksDefaultClassification">
<var:foreach list="calendarClassificationsList" item="item">
@@ -362,7 +353,7 @@
app.preferences.defaults.SOGoCalendarCategories
track by $index">
<sg-color-picker ng-model="app.preferences.defaults.SOGoCalendarCategoriesColors[item]"><!-- color picker--></sg-color-picker>
<md-input-container>
<md-input-container class="md-block md-flex">
<input type="text" label:aria-label="Calendar Category"
ng-model="app.preferences.defaults.SOGoCalendarCategories[$index]"
sg-focus-on="calendarCategory_{{$index}}"/>
@@ -445,7 +436,7 @@
ng-repeat="item in
app.preferences.defaults.SOGoContactsCategories
track by $index">
<md-input-container>
<md-input-container class="md-block md-flex">
<input type="text"
label:aria-label="Contact Category"
ng-model="app.preferences.defaults.SOGoContactsCategories[$index]"
@@ -508,7 +499,7 @@
</md-checkbox>
</div>
<div layout="row" layout-align="space-around end">
<div>
<md-checkbox
class="md-align-top-left" ng-model="app.preferences.defaults.SOGoMailAddOutgoingAddresses"
ng-true-value="1"
@@ -531,7 +522,7 @@
</md-input-container>
</div>
<md-input-container>
<md-input-container class="md-block">
<label><var:string label:value="Forward messages"/></label>
<md-select ng-model="app.preferences.defaults.SOGoMailMessageForwarding">
<var:foreach list="messageForwardingList" item="item">
@@ -542,8 +533,8 @@
</md-select>
</md-input-container>
<div layout="row">
<md-input-container>
<div layout="row" layout-wrap="layout-wrap">
<md-input-container class="md-block" flex="50" flex-xs="100">
<label><var:string label:value="When replying to a message"/></label>
<md-select ng-model="app.preferences.defaults.SOGoMailReplyPlacement">
<var:foreach list="replyPlacementList" item="item">
@@ -554,7 +545,7 @@
</md-select>
</md-input-container>
<md-input-container>
<md-input-container class="md-block" flex="50" flex-xs="100">
<label><var:string label:value="And place my signature"/></label>
<md-select ng-model="app.preferences.defaults.SOGoMailSignaturePlacement">
<var:foreach list="signaturePlacementList" item="item">
@@ -566,7 +557,7 @@
</md-input-container>
</div>
<md-input-container>
<md-input-container class="md-block">
<label><var:string label:value="Compose messages in"/></label>
<md-select ng-model="app.preferences.defaults.SOGoMailComposeMessageType">
<var:foreach list="composeMessagesType" item="item">
@@ -577,7 +568,7 @@
</md-select>
</md-input-container>
<md-input-container>
<md-input-container class="md-block">
<label><var:string label:value="Display remote inline images"/></label>
<md-select ng-model="app.preferences.defaults.SOGoMailDisplayRemoteInlineImages">
<var:foreach list="displayRemoteInlineImages" item="item">
@@ -589,8 +580,8 @@
</md-input-container>
<div layout="row" layout-align="start center">
<var:string label:value="Auto save every"/>
<md-input-container class="md-input-number">
<p><var:string label:value="Auto save every"/></p>
<md-input-container class="md-input-number" md-no-float="md-no-float">
<input type="number" min="0" label:aria-label="minutes" ng-model="preferences.defaults.SOGoMailAutoSave"/>
</md-input-container>
<var:string label:value="minutes"/>
@@ -619,7 +610,7 @@
ng-false-value="0">
<!-- active or not-->
</md-checkbox>
<md-input-container>
<md-input-container class="md-flex">
<input type="text" ng-model="app.preferences.defaults.SOGoSieveFilters[$index].name"/>
</md-input-container>
<md-button class="sg-icon-button" type="button"
@@ -656,17 +647,17 @@
<md-content role="tabpanel" aria-labelledby="mailLabelsView"
id="mailLabelsView-content" class="md-padding">
<md-list layout="row" layout-wrap="layout-wrap">
<md-list-item flex="50"
<md-list layout="row" layout-xs="column" layout-wrap="layout-wrap">
<md-list-item flex="50" flex-xs="100"
ng-repeat="(key, value) in
app.preferences.defaults.SOGoMailLabelsColors">
<sg-color-picker ng-model="value[1]"><!-- color picker--></sg-color-picker>
<md-input-container>
<md-input-container class="md-block md-flex">
<input type="text"
label:aria-label="Label"
ng-model="value[0]"/>
</md-input-container>
<md-button class="sg-icon-button" type="button"
<md-button class="md-icon-button" type="button"
layout="row" layout-align="end center"
label:aria-label="Delete Label"
ng-click="app.removeMailLabel(key)">
@@ -695,7 +686,7 @@
<md-list-item ng-repeat="item in
app.preferences.defaults.AuxiliaryMailAccounts
track by $index">
<md-input-container>
<md-input-container class="md-block md-flex">
<input type="text"
label:aria-label="Mail Account"
ng-model="app.preferences.defaults.AuxiliaryMailAccounts[$index].name"
@@ -747,28 +738,28 @@
<var:string label:value="Enable vacation auto reply"/>
</md-checkbox>
<div flex-offset="5" ng-show="app.preferences.defaults.Vacation.enabled == 1">
<md-input-container>
<div layout="column" flex-offset="5" ng-show="app.preferences.defaults.Vacation.enabled == 1">
<md-input-container class="md-block md-flex">
<label><var:string label:value="Auto reply message"/></label>
<textarea const:name="autoReplyText"
const:id="autoReplyText"
ng-model="app.preferences.defaults.Vacation.autoReplyText"/>
</md-input-container>
<md-input-container>
<label><var:string label:value="Email addresses (separated by commas)"/></label>
<textarea const:name="autoReplyEmailAddresses"
required="required"
const:id="autoReplyEmailAddresses"
ng-model="app.preferences.defaults.Vacation.autoReplyEmailAddresses"/>
</md-input-container>
<div layout="row" layout-align="end center">
<div layout="row" layout-align="start center">
<md-input-container class="md-block md-flex">
<label><var:string label:value="Email addresses (separated by commas)"/></label>
<textarea const:name="autoReplyEmailAddresses"
required="required"
const:id="autoReplyEmailAddresses"
ng-model="app.preferences.defaults.Vacation.autoReplyEmailAddresses"/>
</md-input-container>
<md-button ng-click="app.addDefaultEmailAddresses()">
<var:string label:value="Add default email addresses" type="button"/>
</md-button>
</div>
<md-input-container>
<md-input-container class="md-block md-flex">
<label><var:string label:value="Days between responses"/></label>
<md-select label:aria-label="Days between responses"
ng-model="app.preferences.defaults.Vacation.daysBetweenResponse">
@@ -789,7 +780,7 @@
</md-checkbox>
</div>
<div layout="row" layout-align="start center">
<div layout="row">
<md-checkbox
ng-model="app.preferences.defaults.Vacation.endDateEnabled"
ng-true-value="1"
@@ -830,7 +821,7 @@
</md-checkbox>
<div flex-offset="5" ng-show="app.preferences.defaults.Forward.enabled == 1">
<md-input-container>
<md-input-container class="md-block md-flex">
<label><var:string label:value="Email addresses (separated by commas)"/></label>
<textarea const:name="forwardAddress"
const:id="forwardAddress"