<roundcube:object name="pagetitle" />

From 80b3c6200ee7788bef1bca0562aa53113ffea9bd Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Sun, 1 Sep 2013 16:35:58 +0200 Subject: Toolbar and list icons for responses + list header icon for prority column (#1489234) --- skins/larry/images/buttons.png | Bin 50162 -> 38670 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'skins/larry/images/buttons.png') diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png index 9f8f44536..3e28d128d 100644 Binary files a/skins/larry/images/buttons.png and b/skins/larry/images/buttons.png differ -- cgit v1.2.3 From 0933d66b591056358b5e645cbd563814308998d2 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 4 Sep 2013 10:08:42 +0200 Subject: Keep current selection on IE browsers by adding unselectable=on to link elements --- program/include/rcmail_output_html.php | 2 +- program/js/app.js | 7 ++++--- program/lib/Roundcube/html.php | 4 ++-- program/steps/mail/compose.inc | 1 + skins/larry/images/buttons.png | Bin 38670 -> 53350 bytes skins/larry/templates/compose.html | 6 +++--- 6 files changed, 11 insertions(+), 9 deletions(-) (limited to 'skins/larry/images/buttons.png') diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index a2ec29ca3..006b89c64 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -1171,7 +1171,7 @@ class rcmail_output_html extends rcmail_output // generate html code for button if ($btn_content) { - $attrib_str = html::attrib_string($attrib, $link_attrib); + $attrib_str = html::attrib_string($attrib, array_merge(html::$common_attrib, $link_attrib)); $out = sprintf('%s', $attrib_str, $btn_content); } diff --git a/program/js/app.js b/program/js/app.js index cef688204..5233d9c9a 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -258,12 +258,12 @@ function rcube_webmail() this.env.address_group_stack = []; this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', 'toggle-editor', 'list-adresses', 'pushgroup', 'search', 'reset-search', 'extwin', - 'insert-response', 'save-response', 'edit-responses']; + 'insert-response', 'save-response']; if (this.env.drafts_mailbox) this.env.compose_commands.push('savedraft') - this.enable_command(this.env.compose_commands, 'identities', true); + this.enable_command(this.env.compose_commands, 'identities', 'responses', true); // add more commands (not enabled) $.merge(this.env.compose_commands, ['add-recipient', 'firstpage', 'previouspage', 'nextpage', 'lastpage']); @@ -277,6 +277,7 @@ function rcube_webmail() // init canned response functions if (this.gui_objects.responseslist) { $('a.insertresponse', this.gui_objects.responseslist) + .attr('unselectable', 'on') .mousedown(function(e){ return rcube_event.cancel(e); }) .mouseup(function(e){ ref.command('insert-response', $(this).attr('rel')); @@ -3458,7 +3459,7 @@ function rcube_webmail() this.edit_responses = function() { - // TODO: decide what to do here... + // TODO: implement inline editing of responses }; this.delete_response = function(key) diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php index 2086aaa85..4295f26d6 100644 --- a/program/lib/Roundcube/html.php +++ b/program/lib/Roundcube/html.php @@ -3,7 +3,7 @@ /* +-----------------------------------------------------------------------+ | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2011, The Roundcube Dev Team | + | Copyright (C) 2005-2013, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -32,7 +32,7 @@ class html public static $doctype = 'xhtml'; public static $lc_tags = true; - public static $common_attrib = array('id','class','style','title','align'); + public static $common_attrib = array('id','class','style','title','align','unselectable'); public static $containers = array('iframe','div','span','p','h1','h2','h3','ul','form','textarea','table','thead','tbody','tr','th','td','style','script'); diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 282a2fd3e..bce4fd313 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -1713,6 +1713,7 @@ function rcmail_compose_responses_list($attrib) $item = html::a(array( 'href '=> '#'.urlencode($response['name']), 'class' => rtrim('insertresponse ' . $attrib['itemclass']), + 'unselectable' => 'on', 'rel' => $key, ), Q($response['name'])); diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png index 3e28d128d..03c61ed93 100644 Binary files a/skins/larry/images/buttons.png and b/skins/larry/images/buttons.png differ diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html index 0e4568bdd..863570cd1 100644 --- a/skins/larry/templates/compose.html +++ b/skins/larry/templates/compose.html @@ -30,7 +30,7 @@ - + @@ -200,8 +200,8 @@

-- cgit v1.2.3 From 0d9b63e9c022c48b98ec1542dccb50f1b28f80b8 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 4 Sep 2013 11:13:26 +0200 Subject: Add canned response UI elements to classic skin --- skins/classic/common.css | 29 ++++++++++++++++++- skins/classic/images/mail_toolbar.png | Bin 40806 -> 39276 bytes skins/classic/includes/settingstabs.html | 1 + skins/classic/mail.css | 4 +++ skins/classic/settings.css | 15 ++++++++++ skins/classic/templates/compose.html | 11 +++++++ skins/classic/templates/responseedit.html | 24 ++++++++++++++++ skins/classic/templates/responses.html | 46 ++++++++++++++++++++++++++++++ skins/larry/images/buttons.png | Bin 53350 -> 38715 bytes 9 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 skins/classic/templates/responseedit.html create mode 100644 skins/classic/templates/responses.html (limited to 'skins/larry/images/buttons.png') diff --git a/skins/classic/common.css b/skins/classic/common.css index 3c322f0ed..accdf7166 100644 --- a/skins/classic/common.css +++ b/skins/classic/common.css @@ -511,7 +511,8 @@ body.iframe .boxtitle margin: 3px -4px; } -.popupmenu li a +.popupmenu li a, +.popupmenu li label { display: block; color: #a0a0a0; @@ -521,6 +522,14 @@ body.iframe .boxtitle background: transparent; } +.popupmenu li label.comment +{ + color: #999; + font-style: italic; + padding-top: 4px; + padding-bottom: 3px; +} + .popupmenu li a.active, .popupmenu li a.active:active, .popupmenu li a.active:visited @@ -704,6 +713,24 @@ ul.treelist li div.expanded outline: none; } +.propform div.prop +{ + margin-bottom: 0.5em; +} + +.propform div.prop.block label +{ + display: block; + margin-bottom: 2px; +} + +.propform div.prop.block input, +.propform div.prop.block textarea +{ + width: 97%; +} + + /***** roundcube webmail pre-defined classes *****/ #rcmversion diff --git a/skins/classic/images/mail_toolbar.png b/skins/classic/images/mail_toolbar.png index 4a8431715..3ef003f23 100644 Binary files a/skins/classic/images/mail_toolbar.png and b/skins/classic/images/mail_toolbar.png differ diff --git a/skins/classic/includes/settingstabs.html b/skins/classic/includes/settingstabs.html index 0aea80b67..e44eb5b8b 100644 --- a/skins/classic/includes/settingstabs.html +++ b/skins/classic/includes/settingstabs.html @@ -2,6 +2,7 @@ + diff --git a/skins/classic/mail.css b/skins/classic/mail.css index b8cc9f351..d472d6d07 100644 --- a/skins/classic/mail.css +++ b/skins/classic/mail.css @@ -171,6 +171,10 @@ background-position: -480px -32px; } +#messagetoolbar a.responses { + background-position: -512px 0; +} + #messagetoolbar select.mboxlist { position: relative; diff --git a/skins/classic/settings.css b/skins/classic/settings.css index 2433f5040..0e4f796a4 100644 --- a/skins/classic/settings.css +++ b/skins/classic/settings.css @@ -81,6 +81,7 @@ } #identity-details table td.title, +#response-details table td.title, #folder-details table td.title { font-weight: bold; @@ -89,6 +90,14 @@ white-space: nowrap; } +#response-details table td.title +{ + text-align: left; + vertical-align: top; + width: 140px; + padding-top: 5px; +} + #bottomboxes { position: absolute; @@ -149,6 +158,12 @@ body.iframe, float: right; } +#formfooter .footerindent +{ + padding: 10px 0; + margin-left: 155px; +} + #quota { position: absolute; diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html index 5e259e11c..7ed9fac36 100644 --- a/skins/classic/templates/compose.html +++ b/skins/classic/templates/compose.html @@ -40,6 +40,7 @@ +