diff options
author | Aleksander Machniak <alec@alec.pl> | 2016-11-20 21:04:09 +0300 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2016-11-20 21:04:09 +0300 |
commit | a844db6a27aedc5dfdf5b382a94c9ffc7f369e31 (patch) | |
tree | 9f7b47bebf789399d7013c3be21818bfeecc590e /skins/larry/templates/mail.html | |
parent | ad9a55f8cb85b467de5617aedd811c1799e98955 (diff) | |
parent | 793a8aad7a98f23dde46e0da461b24f47f43fa8f (diff) |
Merge branch 'dev-layouts'
Diffstat (limited to 'skins/larry/templates/mail.html')
-rw-r--r-- | skins/larry/templates/mail.html | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html index ce51fd2c2..6ab25c469 100644 --- a/skins/larry/templates/mail.html +++ b/skins/larry/templates/mail.html @@ -4,7 +4,7 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> <style type="text/css"> -<roundcube:if condition="config:preview_pane == true" /> +<roundcube:if condition="env:layout != 'list'" /> #mailview-top { height: 270px; } #mailview-bottom { top: 284px; height: auto; display: block; } #mailpreviewframe { display: block; } @@ -66,7 +66,7 @@ </div> -<div id="mainscreencontent"> +<div id="mainscreencontent" class="<roundcube:var name="env:layout" />"> <div id="mailview-left"> <!-- folders list --> @@ -88,14 +88,15 @@ <div id="mailview-right" role="main"> -<roundcube:if condition="config:preview_pane == true" /> +<roundcube:if condition="env:layout == 'desktop'" /> <div id="mailview-top" class="uibox"> <roundcube:else /> <div id="mailview-top" class="uibox fullheight"> <roundcube:endif /> <!-- messagelist --> -<div id="messagelistcontainer" class="boxlistcontent"> +<div id="messagelistheader"><roundcube:object name="listmenulink" optionsmenuIcon="true" /></div> +<div id="messagelistcontainer" class="boxlistcontent" tabindex="-1"> <h2 id="aria-label-messagelist" class="voice"><roundcube:label name="arialabelmessagelist" /></h2> <roundcube:object name="messages" id="messagelist" @@ -138,8 +139,6 @@ </div> <roundcube:container name="listcontrols" id="listcontrols" /> - - <a href="#preview" id="mailpreviewtoggle" class="iconbutton" title="<roundcube:label name='previewpane' />" role="button" tabindex="0"><roundcube:label name="previewpane" /></a> </div> </div><!-- end mailview-top --> @@ -201,8 +200,18 @@ <div id="listoptions" class="propform popupdialog" role="dialog" aria-labelledby="aria-label-listoptions" aria-hidden="true"> <h2 id="aria-label-listoptions" class="voice"><roundcube:label name="arialabelmessagelistoptions" /></h2> -<roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" /> - <fieldset class="floating"> + <roundcube:if condition="!in_array('layout', (array)config:dont_override)" /> + <fieldset id="listoptions-layout" class="floating"> + <legend><roundcube:label name="layout" /></legend> + <ul class="proplist"> + <li><label><input type="radio" name="layout" value="widescreen" /> <span><roundcube:label name="layoutwidescreen" /></span></label></li> + <li><label><input type="radio" name="layout" value="desktop" /> <span><roundcube:label name="layoutdesktop" /></span></label></li> + <li><label><input type="radio" name="layout" value="list" /> <span><roundcube:label name="layoutlist" /></span></label></li> + </ul> + </fieldset> + <roundcube:endif /> + <roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" /> + <fieldset id="listoptions-columns" class="floating"> <legend><roundcube:label name="listcolumns" /></legend> <ul class="proplist"> <li><label class="disabled"><input type="checkbox" name="list_col[]" value="threads" checked disabled /> <span><roundcube:label name="threads" /></span></label></li> @@ -222,7 +231,7 @@ </fieldset> <roundcube:endif /> <roundcube:if condition="!in_array('message_sort_col', (array)config:dont_override)" /> - <fieldset class="floating"> + <fieldset id="listoptions-sortcol" class="floating"> <legend><roundcube:label name="listsorting" /></legend> <ul class="proplist"> <li><label><input type="radio" name="sort_col" value="" /> <span><roundcube:label name="nonesort" /></span></label></li> @@ -238,7 +247,7 @@ </fieldset> <roundcube:endif /> <roundcube:if condition="!in_array('message_sort_order', (array)config:dont_override)" /> - <fieldset class="floating"> + <fieldset id="listoptions-sortord" class="floating"> <legend><roundcube:label name="listorder" /></legend> <ul class="proplist"> <li><label><input type="radio" name="sort_ord" value="ASC" /> <span><roundcube:label name="asc" /></span></label></li> |