Integrate UIxSidenavToolbarTemplate in all modules

This commit is contained in:
Francis Lachapelle
2015-04-03 11:34:05 -04:00
parent 171b5085ab
commit 91acb9d0c5
4 changed files with 62 additions and 126 deletions

View File

@@ -146,26 +146,7 @@
-->
<!-- Sidenav -->
<md-sidenav id="left-sidenav" class="md-sidenav-left md-whiteframe-z1" md-component-id="left" md-is-locked-open="isGtMedium" layout="column">
<md-toolbar class="md-tall" layout-align="start start">
<div class="md-toolbar-tools sg-padded" layout="row" layout-align="start start">
<md-button class="iconButton sg-button-navicon" ng-click="openBottomSheet()">
<i class="md-icon-apps"><!--icon--></i>
</md-button>
<span class="sg-logo"><!--logo.svg--></span>
</div>
<div class="md-toolbar-tools sg-padded" layout="row">
<div layout="column">
<p class="sg-md-title">{{activeUser.identification}}</p>
<!--fixme: implement this with the proper model and actions -->
<md-select class="sg-logout" ng-model="accounts.options" label:placeholder="sogo1@inverse.ca">
<md-option >sogo1@inverse.ca</md-option>
<md-option >connect an other account</md-option>
<md-option >logout</md-option>
</md-select>
</div>
</div>
</md-toolbar>
<var:component className="UIxSidenavToolbarTemplate" />
<md-content md-scroll-y="md-scroll-y" class="md-flex">
<md-list>
<md-item ng-repeat="folder in addressbooks track by folder.id"

View File

@@ -265,26 +265,7 @@
<!-- Sidenav -->
<md-sidenav id="left-sidenav" class="md-sidenav-left md-whiteframe-z1 md-layout-fill" md-component-id="left" md-is-locked-open="isGtMedium" layout="column">
<md-toolbar class="md-tall sg-padded" layout-align="start start">
<div class="md-toolbar-tools" layout="row" layout-align="start start">
<md-button class="iconButton sg-button-navicon" ng-click="openBottomSheet()">
<i class="md-icon-apps"><!--icon--></i>
</md-button>
<span class="sg-logo"><!--logo.svg--></span>
</div>
<div class="md-toolbar-tools" layout="row">
<div layout="column">
<p class="sg-md-title">{{activeUser.identification}}</p>
<!--fixme: implement this with the proper model and actions -->
<md-select class="sg-logout" ng-model="accounts.options" label:placeholder="sogo1@inverse.ca">
<md-option >sogo1@inverse.ca</md-option>
<md-option >connect an other account</md-option>
<md-option >logout</md-option>
</md-select>
</div>
</div>
</md-toolbar>
<var:component className="UIxSidenavToolbarTemplate" />
<md-content md-scroll-y="md-scroll-y" class="md-flex">
<md-list ng-repeat="account in accounts track by account.id">
<h2 class="sg-md-subheader--static sg-padded">{{account.name}}</h2>
@@ -309,7 +290,7 @@
<p class="sg-md-display-3 sg-date-today" ng-bind="currentDay.day"><!-- day --></p>
</div>
<div class="sg-toolbar-group-last">
<md-button class="iconButton" aria-label="More">
<md-button class="iconButton" label:aria-label="More">
<i class="md-icon-more-vert"><!--icon--></i>
</md-button>
</div>

View File

@@ -14,96 +14,70 @@
<main class="view md-layout-fill" ui-view="preferences" layout="row"
ng-controller="navController"><!-- preferences --> </main>
<script type="text/javascript">
var mailCustomFromEnabled = <var:string value="mailCustomFromEnabled" const:escapeHTML="NO"/>;
</script>
<script type="text/javascript">
var mailCustomFromEnabled = <var:string value="mailCustomFromEnabled" const:escapeHTML="NO"/>;
</script>
<script type="text/ng-template" id="preferences.html">
<script type="text/ng-template" id="preferences.html">
<md-sidenav id="left-sidenav" class="md-sidenav-left md-whiteframe-z1" md-component-id="left" md-is-locked-open="$mdMedia('gt-md')" layout="column">
<md-sidenav id="left-sidenav" class="md-sidenav-left md-whiteframe-z1" md-component-id="left" md-is-locked-open="$mdMedia('gt-md')" layout="column">
<var:component className="UIxSidenavToolbarTemplate" />
<md-content md-scroll-y="md-scroll-y" class="md-padding md-flex">
<md-list>
<md-item>
<md-item-content>
<a ui-sref="preferences.general">General</a>
</md-item-content>
</md-item>
<md-item>
<md-item-content>
<a ui-sref="preferences.calendars">Calendar</a>
</md-item-content>
</md-item>
<md-item>
<md-item-content>
<a ui-sref="preferences.addressbooks">Contacts</a>
</md-item-content>
</md-item>
<md-item>
<md-item-content>
<a ui-sref="preferences.mailer">Mail</a>
</md-item-content>
</md-item>
</md-list>
</md-content>
</md-sidenav>
<md-toolbar class="md-tall" layout-align="end start">
<div class="md-toolbar-tools">
<md-button class="iconButton sg-button-navicon" ng-click="openBottomSheet()">
<i class="md-icon-apps"><!--icon--></i>
</md-button>
<span class="sg-logo"><!--logo.svg--></span>
<section layout="column" class="md-layout-fill">
<!-- TOP RIGHT TOOLBAR -->
<md-toolbar layout="row" layout-align="space-between start" class="md-tall">
<div class="md-toolbar-tools" ng-controller="navController">
<span flex="flex">
<md-button ng-click="toggleLeft()" class="md-primary" hide-gt-md="hide-gt-md">
<span class="icon-ic_menu_24px"></span>
</md-button>
<div class="display-1" style="font-size: 2em; font-weight: 300">
[[Preferences]]
</div>
</span>
<span class="sd-toolbar-tools">
<span>search</span>
</span>
</div>
</md-toolbar>
<div class="md-toolbar-tools" layout="row">
<div layout="column">
<p class="sg-md-title">{{activeUser.identification}}</p>
<!--fixme: implement this with the proper model and actions -->
<md-select class="sg-logout" ng-model="accounts.options" label:placeholder="sogo1@inverse.ca">
<md-option >sogo1@inverse.ca</md-option>
<md-option >connect an other account</md-option>
<md-option >logout</md-option>
</md-select>
</div>
</div>
</md-toolbar>
<form name="preferencesForm"
ng-submit="save()">
<div ui-view="module"><!-- view --></div>
<md-button class="" type="submit">
<var:string label:value="Save" />
</md-button>
</form>
<md-content md-scroll-y="md-scroll-y" class="md-padding md-flex">
<md-list>
</section>
<md-item>
<md-item-content>
<a ui-sref="preferences.general">General</a>
</md-item-content>
</md-item>
<md-item>
<md-item-content>
<a ui-sref="preferences.calendars">Calendar</a>
</md-item-content>
</md-item>
<md-item>
<md-item-content>
<a ui-sref="preferences.addressbooks">Contacts</a>
</md-item-content>
</md-item>
<md-item>
<md-item-content>
<a ui-sref="preferences.mailer">Mail</a>
</md-item-content>
</md-item>
</md-list>
</md-content>
</md-sidenav>
<section layout="column" class="md-layout-fill">
<!-- TOP RIGHT TOOLBAR -->
<md-toolbar layout="row" layout-align="space-between start" class="md-tall">
<div class="md-toolbar-tools" ng-controller="navController">
<span flex="flex">
<md-button ng-click="toggleLeft()" class="md-primary" hide-gt-md="hide-gt-md">
<span class="icon-ic_menu_24px"></span>
</md-button>
<div class="display-1" style="font-size: 2em; font-weight: 300">
[[Preferences]]
</div>
</span>
<span class="sd-toolbar-tools">
<span>search</span>
</span>
</div>
</md-toolbar>
<form name="preferencesForm"
ng-submit="save()">
<div ui-view="module"><!-- view --></div>
<md-button class="" type="submit">
<var:string label:value="Save" />
</md-button>
</form>
</section>
</script>
</script>
<!--
GENERAL PREFERENCE PANEL

View File

@@ -6,7 +6,7 @@
xmlns:label="OGo:label"
>
<md-toolbar class="md-tall" layout-align="start start">
<div class="md-toolbar-tools" layout="row">
<div class="md-toolbar-tools sg-padded" layout="row" layout-align="start start">
<md-button
class="iconButton sg-button-navicon"
label:aria-label="Apps"
@@ -16,7 +16,7 @@
<span class="sg-logo"><!-- logo.svg --></span>
</div>
<div class="md-toolbar-tools" layout="row">
<div class="md-toolbar-tools sg-padded" layout="row">
<div layout="column">
<p class="sg-md-title">{{activeUser.identification}}</p>
<!--fixme: implement this with the proper model and actions -->