diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-07-11 15:34:49 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-07-11 15:34:49 +0200 |
| commit | 1c079c1ace959266ab6b2f6c5df5f397a5ccdee0 (patch) | |
| tree | edb85238d192589e784dcf8a3b17c4465c9055b2 /skins/larry/templates | |
| parent | 840b4dbeb81603ed44c30dc77be8eff98d7667c3 (diff) | |
Put separated toolbars back together again; add min. width to mail view
Diffstat (limited to 'skins/larry/templates')
| -rw-r--r-- | skins/larry/templates/compose.html | 5 | ||||
| -rw-r--r-- | skins/larry/templates/mail.html | 14 | ||||
| -rw-r--r-- | skins/larry/templates/message.html | 16 |
3 files changed, 23 insertions, 12 deletions
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html index 93e9703a4..ff0c833c6 100644 --- a/skins/larry/templates/compose.html +++ b/skins/larry/templates/compose.html @@ -7,8 +7,9 @@ <link rel="stylesheet" type="text/css" href="/googiespell.css" /> <roundcube:endif /> </head> -<body class="noscroll"> +<body> +<div class="minwidth"> <roundcube:include file="/includes/header.html" /> <div id="mainscreen"> @@ -170,6 +171,8 @@ </div><!-- end mainscreen --> +</div><!-- end minwidth --> + <div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='addattachment' />"> <roundcube:object name="composeAttachmentForm" id="uploadform" attachmentFieldSize="40" buttons="no" /> <div class="formbuttons"> diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html index 01a59861c..f6b53f2f8 100644 --- a/skins/larry/templates/mail.html +++ b/skins/larry/templates/mail.html @@ -11,20 +11,23 @@ <roundcube:endif /> </style> </head> -<body class="noscroll"> +<body> +<div class="minwidth"> <roundcube:include file="/includes/header.html" /> <div id="mainscreen"> -<div id="mailview-left"> - <!-- toolbar --> -<div id="mailboxtoolbar" class="toolbar"> +<div id="messagetoolbar" class="toolbar"> <roundcube:button command="checkmail" type="link" class="button checkmail disabled" classAct="button checkmail" classSel="button checkmail pressed" label="refresh" title="checkmail" /> <roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" /> + <span class="spacer"></span> + <roundcube:include file="/includes/mailtoolbar.html" /> </div> +<div id="mailview-left"> + <!-- folders list --> <div id="folderlist-header"></div> <div id="mailboxcontainer" class="uibox listbox"> @@ -45,7 +48,6 @@ <!-- toolbar --> <div id="messagetoolbar"> -<roundcube:include file="/includes/mailtoolbar.html" /> </div> <div id="messagesearchtools"> @@ -128,6 +130,8 @@ </div><!-- end mainscreen --> +<div><!-- end minwidth --> + <div id="searchmenu" class="popupmenu"> <ul class="toolbarmenu"> <li><label><input type="checkbox" name="s_mods[]" value="subject" id="s_mod_subject" onclick="UI.set_searchmod(this)" /> <roundcube:label name="subject" /></label></li> diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html index 2509662fe..b66d82140 100644 --- a/skins/larry/templates/message.html +++ b/skins/larry/templates/message.html @@ -10,8 +10,17 @@ <div id="mainscreen"> +<!-- toolbar --> +<div id="messagetoolbar" class="toolbar fullwidth"> + <roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" /> + <span class="spacer"></span> + <roundcube:include file="/includes/mailtoolbar.html" /> + <div class="toolbarselect"> + <roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mailboxlist decorated" folder_filter="mail" /> + </div> +</div> + <div id="mailview-left"> -<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mailboxlist" folder_filter="mail" /> <!-- folders list --> <div id="mailboxcontainer" class="uibox listbox"> @@ -24,11 +33,6 @@ <div id="mailview-right"> -<!-- toolbar --> -<div id="messagetoolbar" class="fullwidth"> -<roundcube:include file="/includes/mailtoolbar.html" /> -</div> - <div id="mailview-top"> <div id="messageheader" class="uibox"> <h2 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h2> |