program/include/rcube_template.php
@@ -770,7 +770,6 @@ */ public function button($attrib) { static $sa_buttons = array(); static $s_button_count = 100; // these commands can be called directly via url @@ -787,26 +786,11 @@ else { $attrib['type'] = ($attrib['image'] || $attrib['imagepas'] || $attrib['imageact']) ? 'image' : 'link'; } $command = $attrib['command']; // take the button from the stack if ($attrib['name'] && $sa_buttons[$attrib['name']]) { $attrib = $sa_buttons[$attrib['name']]; } else if($attrib['image'] || $attrib['imageact'] || $attrib['imagepas'] || $attrib['class']) { // add button to button stack if (!$attrib['name']) { $attrib['name'] = $command; } if (!$attrib['image']) { $attrib['image'] = $attrib['imagepas'] ? $attrib['imagepas'] : $attrib['imageact']; } $sa_buttons[$attrib['name']] = $attrib; } else if ($command && $sa_buttons[$command]) { // get saved button for this command/name $attrib = $sa_buttons[$command]; } if ($attrib['task']) $command = $attrib['task'] . '.' . $command; if (!$attrib['id']) { $attrib['id'] = sprintf('rcmbtn%d', $s_button_count++); @@ -849,6 +833,9 @@ if (in_array($attrib['command'], rcmail::$main_tasks)) { $attrib['href'] = rcmail_url(null, null, $attrib['command']); } else if ($attrib['task'] && in_array($attrib['task'], rcmail::$main_tasks)) { $attrib['href'] = rcmail_url($attrib['command'], null, $attrib['task']); } else if (in_array($attrib['command'], $a_static_commands)) { $attrib['href'] = rcmail_url($attrib['command']); } @@ -861,7 +848,11 @@ if (!$attrib['href']) { $attrib['href'] = '#'; } if ($command && !$attrib['onclick']) { if ($attrib['task']) { if ($attrib['classact']) $attrib['class'] = $attrib['classact']; } else if ($command && !$attrib['onclick']) { $attrib['onclick'] = sprintf( "return %s.command('%s','%s',this)", JS_OBJECT_NAME, program/localization/de_CH/labels.inc
@@ -148,6 +148,7 @@ $labels['listsorting'] = 'Sortierung'; $labels['listorder'] = 'Ordnung'; $labels['listmode'] = 'Anzeigemodus'; $labels['folderactions'] = 'Ordneraktionen...'; $labels['compact'] = 'Packen'; $labels['empty'] = 'Leeren'; $labels['purge'] = 'Aufräumen'; program/localization/de_DE/labels.inc
@@ -148,6 +148,7 @@ $labels['listsorting'] = 'Sortierung'; $labels['listorder'] = 'Ordnung'; $labels['listmode'] = 'Anzeigemodus'; $labels['folderactions'] = 'Ordneraktionen...'; $labels['compact'] = 'Packen'; $labels['empty'] = 'Leeren'; $labels['purge'] = 'Bereinigen'; program/localization/en_US/labels.inc
@@ -177,6 +177,7 @@ $labels['listorder'] = 'Sorting order'; $labels['listmode'] = 'List view mode'; $labels['folderctions'] = 'Folder actions...'; $labels['compact'] = 'Compact'; $labels['empty'] = 'Empty'; $labels['purge'] = 'Purge'; skins/default/addressbook.css
@@ -110,63 +110,10 @@ overflow: hidden; } #directorylistwarp { position: absolute; top: 20px; bottom: 22px; left: 0; right: 0; overflow-y: auto; overflow-x: hidden; } #groups-title { position: absolute; top: 0; left: 0; right: 0; } #directorylistbox input { display: absolute; margin: 2px; } #directorylistbuttons { display: block; position: absolute; bottom: 0px; left: 0px; right: 0px; height: 22px; border-top: 1px solid #999; background: url('images/listheader.gif') top left repeat-x #CCC; } #directorylistbuttons a.button, #directorylistbuttons a.buttonPas { display: block; float: left; width: 34px; height: 22px; padding: 0px; margin: 0; overflow: hidden; background: url('images/icons/groupactions.png') 0 0 no-repeat transparent; opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */ } #directorylistbuttons a.groupactions { background-position: 0 -26px; } #directorylistbuttons a.buttonPas { opacity: 0.35; } #addresslist skins/default/common.css
@@ -389,7 +389,59 @@ background-color: #c00; } #directorylist-title { position: absolute; top: 0; left: 0; right: 0; } #directorylistwarp { position: absolute; top: 20px; bottom: 22px; left: 0; right: 0; overflow-y: auto; overflow-x: hidden; } #directorylistbuttons { display: block; position: absolute; bottom: 0px; left: 0px; right: 0px; height: 22px; border-top: 1px solid #999; background: url('images/listheader.gif') top left repeat-x #CCC; } #directorylistbuttons a.button, #directorylistbuttons a.buttonPas { display: block; float: left; width: 34px; height: 22px; padding: 0px; margin: 0; overflow: hidden; background: url('images/icons/groupactions.png') 0 0 no-repeat transparent; opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */ } #directorylistbuttons a.groupactions { background-position: 0 -26px; } #directorylistbuttons a.buttonPas { opacity: 0.35; } /***** common table settings ******/ @@ -655,6 +707,7 @@ margin: 0 2px; } div.popupmenu ul li.separator_below, ul.toolbarmenu li.separator_below { border-bottom: 1px solid #ccc; @@ -662,6 +715,7 @@ padding-bottom: 2px; } div.popupmenu ul li.separator_above, ul.toolbarmenu li.separator_above { border-top: 1px solid #ccc; skins/default/functions.js
@@ -131,7 +131,8 @@ messagemenu:'messagemenu', listmenu:'listmenu', dragmessagemenu:'dragmessagemenu', groupmenu:'groupoptionsmenu' groupmenu:'groupoptionsmenu', mailboxmenu:'mailboxoptionsmenu' }; var obj; @@ -171,6 +172,11 @@ show_groupmenu: function(show) { this.show_popupmenu(this.groupmenu, 'groupactionslink', show, true); }, show_mailboxmenu: function(show) { this.show_popupmenu(this.mailboxmenu, 'mboxactionslink', show, true); }, show_searchmenu: function(show) @@ -289,6 +295,8 @@ this.dragmessagemenu.hide(); else if (this.groupmenu && this.groupmenu.is(':visible') && target != rcube_find_object('groupactionslink')) this.show_groupmenu(false); else if (this.mailboxmenu && this.mailboxmenu.is(':visible') && target != rcube_find_object('mboxactionslink')) this.show_mailboxmenu(false); else if (this.listmenu && this.listmenu.is(':visible') && target != rcube_find_object('listmenulink')) { var menu = rcube_find_object('listmenu'); while (target.parentNode) { skins/default/settings.css
@@ -75,9 +75,20 @@ #identities-list { bottom: 60px; bottom: 30px; width: 420px; border: 1px solid #999999; } #identitieslistwarp { position: absolute; top: 0px; bottom: 22px; left: 0; right: 0; overflow-y: auto; overflow-x: hidden; } #listbuttons @@ -192,7 +203,7 @@ top: 95px; left: 450px; right: 20px; bottom: 60px; bottom: 30px; border: 1px solid #999999; overflow: auto; background-color: #F2F2F2; skins/default/templates/addressbook.html
@@ -35,7 +35,7 @@ </div> <div id="directorylistbox"> <div id="groups-title" class="boxtitle"><roundcube:label name="groups" /></div> <div id="directorylist-title" class="boxtitle"><roundcube:label name="groups" /></div> <div id="directorylistwarp"> <roundcube:object name="directorylist" id="directorylist" /> <roundcube:object name="groupslist" id="contactgroupslist" /> skins/default/templates/editidentity.html
@@ -12,12 +12,13 @@ <roundcube:include file="/includes/settingstabs.html" /> <div id="identities-list"> <div id="identitieslistwarp"> <roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" editIcon="" /> </div> <p id="listbuttons"> <roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:identities_level:0<2" /> </p> <div id="directorylistbuttons"> <roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" /> </div> </div> <div id="identity-details"> <div id="identity-title" class="boxtitle"><roundcube:object name="steptitle" /></div> skins/default/templates/identities.html
@@ -12,12 +12,13 @@ <roundcube:include file="/includes/settingstabs.html" /> <div id="identities-list"> <div id="identitieslistwarp"> <roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" editIcon="" /> </div> <p id="listbuttons"> <roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:identities_level:0<2" /> </p> <div id="directorylistbuttons"> <roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" /> </div> </div> <div id="identity-details"> <div style="margin:10px auto; text-align:center"> skins/default/templates/mail.html
@@ -26,8 +26,14 @@ <div id="mainscreen"> <div id="mailleftcontainer"> <div id="mailboxlist-container"> <div class="boxtitle"><roundcube:label name="mailboxlist" /></div> <div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div> <div id="directorylistwarp"> <roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" /> </div> <div id="directorylistbuttons"> <!--><roundcube:button name="togglequota" type="link" title="showquota" class="buttonPas showinfo" classAct="button showinfo" onclick="rcmail_ui.toggle_quotadisplay();return false" content=" " />--> <roundcube:button name="mboxactions" id="mboxactionslink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_mailboxmenu();return false" content=" " /> </div> </div> <script type="text/javascript"> @@ -35,12 +41,6 @@ rcmail.add_onload('mailviewsplitv.init()'); </script> <div id="mailboxcontrols"> <span><roundcube:label name="folder" />: </span> <roundcube:button command="expunge" type="link" title="compact" class="buttonPas expunge" classAct="button expunge" classSel="button expungesel" content=" " /> <roundcube:button command="purge" type="link" title="empty" class="buttonPas purge" classAct="button purge" classSel="button purgesel" content=" " /> <roundcube:container name="mailboxcontrols" id="mailboxcontrols" /> </div> </div> <div id="mailrightcontainer"> @@ -161,6 +161,15 @@ </ul> </div> <div id="mailboxoptionsmenu" class="popupmenu"> <ul> <li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li> <li class="separator_below"><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li> <li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li> <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" /> </ul> </div> <div id="listmenu" class="popupmenu"> <roundcube:if condition="env:threads" /> <fieldset class="thinbordered"><legend><roundcube:label name="listmode" /></legend> skins/default/templates/message.html
@@ -34,10 +34,12 @@ <div id="mainscreen"> <div id="mailleftcontainer"> <div id="mailboxlist-container"> <div class="boxtitle"><roundcube:label name="mailboxlist" /></div> <div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div> <div id="directorylistwarp" style="bottom:0px"> <roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" /> </div> </div> </div> <div id="messageframe"> <div id="messagecanvas">
