mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-06-11 13:29:49 +00:00
Merge branch 'feature/UI-Containers' into v3
* feature/UI-Containers: Views tweaking and todos Should had been include with preceeding Fought with ms-layouts (and they won) Correct Bottom-Bar Buttons url Rows adjustments
This commit is contained in:
iRouge
@@ -6,9 +6,9 @@
|
||||
xmlns:rsrc="OGo:url"
|
||||
xmlns:label="OGo:label"
|
||||
xmlns:uix="OGo:uix">
|
||||
<md-content md-scroll-y="md-scroll-y" style="width: 250px" id="messagesList">
|
||||
<md-list data-n0-vs-repeat="56"
|
||||
data-n0-vs-scroll-parent="#messagesList">
|
||||
<md-content md-scroll-y="md-scroll-y" class="md-padding" flex="flex" id="messagesList">
|
||||
<md-list data-vs-repeat="56"
|
||||
data-vs-scroll-parent="#messagesList">
|
||||
<md-item ng-repeat="currentMessage in mailbox.$messages track by currentMessage.id"
|
||||
data-ng-class="{unread: !currentMessage.isread}">
|
||||
<a data-ui-sref="mail.account.mailbox.message({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: currentMessage.uid})"
|
||||
@@ -24,5 +24,7 @@
|
||||
</md-item>
|
||||
</md-list>
|
||||
</md-content>
|
||||
<md-content flex="flex" data-ui-view="message"><!-- message view --></md-content>
|
||||
|
||||
<md-content class="md-padding" flex="66" data-ui-view="message"><!-- message view --></md-content>
|
||||
|
||||
</container>
|
||||
|
||||
@@ -213,8 +213,8 @@
|
||||
</ul>
|
||||
</div>
|
||||
-->
|
||||
|
||||
<div ui-view="mailboxes" layout="row" layout-fill="layout-fill"><!-- mailboxes list --></div>
|
||||
<!--FIXME : repport in-line styling in style definitions -->
|
||||
<div ui-view="mailboxes" layout="row" style="max-height: 100%"><!-- mailboxes list --></div>
|
||||
|
||||
<script type="text/ng-template" id="mailboxes.html">
|
||||
|
||||
@@ -240,7 +240,6 @@
|
||||
</div>
|
||||
|
||||
<md-sidenav class="md-sidenav-left md-whiteframe-z1" md-component-id="left" md-is-locked-open="$media('gt-md')" layout="column">
|
||||
<div style="text-align: center; position: absolute; top: 0; width: 100%; z-index: 100;">[ZONE DE NAVIGATION]</div>
|
||||
<md-toolbar class="md-tall" layout-align="end start">
|
||||
<h2 class="md-toolbar-tools md-toolbar-tools-bottom">
|
||||
<span class="md-flex">user@domain</span>
|
||||
@@ -270,6 +269,7 @@
|
||||
|
||||
<main layout="column" layout-fill="layout-fill">
|
||||
<md-toolbar layout="row" layout-align="space-between start" class="md-tall md-warn">
|
||||
<!--fixme : md-toolbar-tools height is inconsistently defined, in former version it was 64px (basic toolbar height), here it's 100% -->
|
||||
<div class="md-toolbar-tools">
|
||||
<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>
|
||||
@@ -277,12 +277,12 @@
|
||||
[[Calendar]]
|
||||
</div>
|
||||
</span>
|
||||
<span class="sd-toolbar">
|
||||
<span class="sd-toolbar-tools">
|
||||
<span>search</span>
|
||||
</span>
|
||||
</div>
|
||||
</md-toolbar>
|
||||
<md-content layout="row" layout-md="column" layout-sm="column" layout-fill="layout-fill" flex="flex" class="md-padding" ui-view="mailbox"><!-- messages list --></md-content>
|
||||
<md-content layout="row" flex="flex" ui-view="mailbox"><!-- messages list --></md-content>
|
||||
</main>
|
||||
</script>
|
||||
|
||||
|
||||
@@ -38,8 +38,9 @@
|
||||
</var:if-ie>
|
||||
</head>
|
||||
|
||||
<body style="overflow: hidden" var:data-ng-app="angularModule" var:class="bodyClasses"
|
||||
><var:if condition="isCompatibleBrowser"
|
||||
<!--FIXME : repport in-line styling in style definitions -->
|
||||
<body style="overflow: hidden; padding-bottom:64px;" var:data-ng-app="angularModule" var:class="bodyClasses"
|
||||
><var:if condition="isCompatibleBrowser"
|
||||
><var:if condition="singleWindowModeEnabled"
|
||||
><div id="popupFrame" style="display: none;"><iframe width="100%" height="100%" src="/SOGo/loading"><!-- space --></iframe></div></var:if
|
||||
><var:if condition="shortUserNameForDisplay" const:value="anonymous"
|
||||
@@ -58,42 +59,43 @@
|
||||
><!-- space --></var:if>
|
||||
</var:if>
|
||||
|
||||
<div class="container" layout="row" layout-fill="layout-fill">
|
||||
|
||||
<var:component-content/>
|
||||
</div>
|
||||
<md-toolbar layout="row" layout-align="center center" style="background-color:#212121; position: fixed; bottom: 0px; left: 0px; width: 100%; z-index: 100">
|
||||
<var:if condition="userHasCalendarAccess">
|
||||
<var:if condition="isCalendar">
|
||||
<md-button class="active"><a href="#"><var:string label:value="Calendar" /></a></md-button>
|
||||
</var:if>
|
||||
<var:if condition="isCalendar" const:negate="YES">
|
||||
<md-button><a var:href="relativeCalendarPath"><var:string label:value="Calendar" /></a></md-button>
|
||||
</var:if>
|
||||
</var:if>
|
||||
<var:if condition="isContacts">
|
||||
<md-button class="active"><a href="#"><var:string label:value="Address Book"/></a></md-button>
|
||||
</var:if>
|
||||
<var:if condition="isContacts" const:negate="YES">
|
||||
<md-button><a var:href="relativeContactsPath"><var:string label:value="Address Book" /></a></md-button>
|
||||
</var:if>
|
||||
<var:if condition="userHasMailAccess">
|
||||
<var:if condition="isMail">
|
||||
<md-button class="active"><a href="#"><var:string label:value="Mail"/></a></md-button>
|
||||
</var:if>
|
||||
<var:if condition="isMail" const:negate="YES">
|
||||
<md-button><a var:href="relativeMailPath"><var:string label:value="Mail" /></a></md-button>
|
||||
</var:if>
|
||||
</var:if>
|
||||
<md-button><a var:href="relativePreferencesPath"><var:string label:value="Preferences" /></a></md-button>
|
||||
<var:if condition="isSuperUser">
|
||||
<var:if condition="isAdministration">
|
||||
<md-button class="active"><var:string label:value="Administration"/></md-button>
|
||||
</var:if>
|
||||
<var:if condition="isAdministration" const:negate="YES">
|
||||
<md-button><a var:href="relativeAdministrationPath"><var:string label:value="Administration" /></a></md-button>
|
||||
</var:if>
|
||||
</var:if>
|
||||
</md-toolbar>
|
||||
<!--FIXME : make sure the .md-button.md-default-theme[disabled] is "contrast aware" disabled labels are actualy almost invisible -->
|
||||
<!--FIXME : repport in-line styling in style definitions -->
|
||||
<md-toolbar layout="row" layout-align="center center" style="background-color:#212121; position: fixed; bottom: 0px; left: 0px; width: 100%; z-index: 100">
|
||||
<var:if condition="userHasCalendarAccess">
|
||||
<var:if condition="isCalendar">
|
||||
<md-button ng-disabled="true"><var:string label:value="Calendar" /></md-button>
|
||||
</var:if>
|
||||
<var:if condition="isCalendar" const:negate="YES">
|
||||
<md-button var:data-ng-href="relativeCalendarPath"><var:string label:value="Calendar" /></md-button>
|
||||
</var:if>
|
||||
</var:if>
|
||||
<var:if condition="isContacts">
|
||||
<md-button ng-disabled="true"><var:string label:value="Address Book"/></md-button>
|
||||
</var:if>
|
||||
<var:if condition="isContacts" const:negate="YES">
|
||||
<md-button var:data-ng-href="relativeContactsPath"><var:string label:value="Address Book" /></md-button>
|
||||
</var:if>
|
||||
<var:if condition="userHasMailAccess">
|
||||
<var:if condition="isMail">
|
||||
<md-button ng-disabled="true"><var:string label:value="Mail"/></md-button>
|
||||
</var:if>
|
||||
<var:if condition="isMail" const:negate="YES">
|
||||
<md-button var:data-ng-href="relativeMailPath"><var:string label:value="Mail" /></md-button>
|
||||
</var:if>
|
||||
</var:if>
|
||||
<md-button var:data-ng-href="relativePreferencesPath"><var:string label:value="Preferences" /></md-button>
|
||||
<var:if condition="isSuperUser">
|
||||
<var:if condition="isAdministration">
|
||||
<md-button ng-disabled="true"><var:string label:value="Administration"/></md-button>
|
||||
</var:if>
|
||||
<var:if condition="isAdministration" const:negate="YES">
|
||||
<md-button var:data-ng-href="relativeAdministrationPath"><var:string label:value="Administration" /></md-button>
|
||||
</var:if>
|
||||
</var:if>
|
||||
</md-toolbar>
|
||||
|
||||
<script type="text/javascript">
|
||||
var ApplicationBaseURL = '<var:string value="modulePath"/>';
|
||||
|
||||
Reference in New Issue
Block a user