From 4be86f3a3779ef86be30e8451750130569d2cacd Mon Sep 17 00:00:00 2001 From: alecpl Date: Fri, 9 Mar 2012 13:23:24 +0000 Subject: - Unified (single) spellchecker button --- skins/larry/mail.css | 8 ++----- skins/larry/styles.css | 10 ++++++-- skins/larry/templates/compose.html | 12 ++++++++-- skins/larry/ui.js | 47 ++++++++++++++++++++++++++++++++++---- 4 files changed, 62 insertions(+), 15 deletions(-) (limited to 'skins/larry') diff --git a/skins/larry/mail.css b/skins/larry/mail.css index a9deea6e1..f96827b27 100644 --- a/skins/larry/mail.css +++ b/skins/larry/mail.css @@ -1166,11 +1166,12 @@ div.message-part blockquote blockquote blockquote { #composebody { position: absolute; - top: 24px; + top: 1px; left: 0; bottom: 0; width: 99%; border: 0; + border-radius: 0; padding: 8px 0 8px 8px; box-shadow: none; resize: none; @@ -1195,11 +1196,6 @@ div.message-part blockquote blockquote blockquote { overflow: auto; } -#spellcheck-control { - margin: 6px 8px; - text-align: right; -} - .defaultSkin table.mceLayout, .defaultSkin table.mceLayout tr.mceLast td { border: 0 !important; diff --git a/skins/larry/styles.css b/skins/larry/styles.css index 4c242f56b..c9a4b0f67 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -1390,7 +1390,8 @@ ul.proplist li { } .toolbar a.button.spellcheck { - background-position: center -930px; + min-width: 64px; + background-position: left -930px; } .toolbar a.button.insertsig { @@ -1574,10 +1575,15 @@ select.decorated option[selected='selected'] { background: linear-gradient(top, #00aad6 0%, #008fc9 100%); } -ul.toolbarmenu.iconized li a { +ul.toolbarmenu.iconized li a, +ul.toolbarmenu.selectable li a { padding-left: 30px; } +ul.toolbarmenu.selectable li a.selected { + background: url(images/messages.png) 4px -27px no-repeat; +} + ul.toolbarmenu li label { display: block; color: #fff; diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html index 20bead41c..0c1b81759 100644 --- a/skins/larry/templates/compose.html +++ b/skins/larry/templates/compose.html @@ -3,7 +3,9 @@ <roundcube:object name="pagetitle" /> + + @@ -38,7 +40,12 @@
- + + + + + + @@ -142,7 +149,6 @@
-
@@ -171,6 +177,8 @@
+
+ diff --git a/skins/larry/ui.js b/skins/larry/ui.js index d6f945a6c..7f14c5ea9 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -24,6 +24,7 @@ function rcube_mail_ui() groupmenu: { above:1 }, mailboxmenu: { above:1 }, composeoptionsmenu: { editable:1, overlap:1 }, + spellmenu: { callback: spellmenu }, // toggle: #1486823, #1486930 'attachment-form': { editable:1, above:1, toggle:!bw.ie&&!bw.linux }, 'upload-form': { editable:1, toggle:!bw.ie&&!bw.linux } @@ -338,13 +339,13 @@ function rcube_mail_ui() bottom.css('height', (form.height() - bottom.position().top) + 'px'); - w = body.parent().width() - 6; - h = body.parent().height() - 36; + w = body.parent().width() - 5; + h = body.parent().height() - 16; body.width(w).height(h); if (window.tinyMCE && tinyMCE.get('composebody')) { - $('#composebody_tbl').width((w+10)+'px').height('').css('margin-top', '1px'); - $('#composebody_ifr').width((w+10)+'px').height((h-22)+'px'); + $('#composebody_tbl').width((w+8)+'px').height('').css('margin-top', '1px'); + $('#composebody_ifr').width((w+8)+'px').height((h-40)+'px'); } else { $('#googie_edit_layer').height(h+'px'); @@ -425,7 +426,7 @@ function rcube_mail_ui() $('select').css('visibility', show?'hidden':'inherit'); $('select', obj).css('visibility', 'inherit'); } - + return show; } @@ -554,6 +555,42 @@ function rcube_mail_ui() } + function spellmenu(show) + { + var link, li, + lang = rcmail.spellcheck_lang(), + menu = popups.spellmenu, + ul = $('ul', menu); + + if (!ul.length) { + ul = $('