From db1a87cd6c506f2afbd1a37c64cb56ae11120b49 Mon Sep 17 00:00:00 2001 From: thomascube Date: Fri, 17 Dec 2010 15:07:04 +0000 Subject: Update branch for 0.5-rc release --- skins/default/common.css | 19 +++++ skins/default/functions.js | 2 +- skins/default/iehacks.css | 8 +- skins/default/mail.css | 22 +----- skins/default/settings.css | 118 ++++++++++------------------- skins/default/splitter.js | 6 +- skins/default/templates/compose.html | 18 ++--- skins/default/templates/folderedit.html | 24 ++++++ skins/default/templates/folders.html | 62 +++++++++++++++ skins/default/templates/identityedit.html | 2 +- skins/default/templates/managefolders.html | 41 ---------- 11 files changed, 157 insertions(+), 165 deletions(-) create mode 100644 skins/default/templates/folderedit.html create mode 100644 skins/default/templates/folders.html delete mode 100644 skins/default/templates/managefolders.html (limited to 'skins') diff --git a/skins/default/common.css b/skins/default/common.css index 938c68a5e..622fba949 100644 --- a/skins/default/common.css +++ b/skins/default/common.css @@ -249,6 +249,11 @@ img background: url(images/listheader.gif) top left repeat-x #CCC; } +.boxtitle .rightalign +{ + float: right; +} + .boxcontent { padding: 15px 10px 10px 10px; @@ -861,3 +866,17 @@ fieldset.tabbed padding-top: 12px; } +.quota_text { + text-align: center; + font-size: 10px; + color: #666; + border: 1px solid #999; + cursor: default; +} +.quota_bg { background-color: white; } +.quota_high { background-color: #F33131; } +.quota_mid { background-color: #F5AD3C; } +.quota_low { background-color: #91E164; } +.quota_text_high { color: white; } +.quota_text_mid { color: #666; } +.quota_text_low { color: #666; } diff --git a/skins/default/functions.js b/skins/default/functions.js index 3197c9847..77cdeb8d2 100644 --- a/skins/default/functions.js +++ b/skins/default/functions.js @@ -353,7 +353,7 @@ switch_preview_pane: function(elem) /* Message composing */ init_compose_form: function() { - var f, field, fields = ['cc', 'bcc', 'replyto', 'mailreplyto', 'mailfollowupto'], + var f, field, fields = ['cc', 'bcc', 'replyto', 'followupto'], div = document.getElementById('compose-div'), headers_div = document.getElementById('compose-headers-div'); diff --git a/skins/default/iehacks.css b/skins/default/iehacks.css index 2b2180fb9..29ab8cb75 100644 --- a/skins/default/iehacks.css +++ b/skins/default/iehacks.css @@ -38,11 +38,6 @@ input, textarea height: expression((parseInt(document.documentElement.clientHeight)-105)+'px'); } -#folder-manager -{ - height: expression((parseInt(this.parentNode.offsetHeight)-105)+'px'); -} - #messagetoolbar { width: expression((parseInt(document.documentElement.clientWidth)-215)+'px'); @@ -90,7 +85,8 @@ input, textarea #messageframe, #identity-details, #contacts-box, -#prefs-box +#prefs-box, +#folder-box { height: expression(parseInt(this.parentNode.offsetHeight)+'px'); } diff --git a/skins/default/mail.css b/skins/default/mail.css index ead0aa610..7bb308c06 100644 --- a/skins/default/mail.css +++ b/skins/default/mail.css @@ -1337,8 +1337,7 @@ input.from_address #compose-cc, #compose-bcc, #compose-replyto, -#compose-mailreplyto, -#compose-mailfollowupto +#compose-followupto { display: none; } @@ -1435,9 +1434,6 @@ input.from_address margin-top: 4px; } - -/** quota indicator */ - #quota { position: absolute; @@ -1453,19 +1449,3 @@ input.from_address right: 6px; z-index: 101; } - -.quota_text { - text-align: center; - font-size: 10px; - color: #666; - border: 1px solid #999; - cursor: default; -} -.quota_bg { background-color: white; } -.quota_high { background-color: #F33131; } -.quota_mid { background-color: #F5AD3C; } -.quota_low { background-color: #91E164; } -.quota_text_high { color: white; } -.quota_text_mid { color: #666; } -.quota_text_low { color: #666; } - diff --git a/skins/default/settings.css b/skins/default/settings.css index c902740a6..5624f80e3 100644 --- a/skins/default/settings.css +++ b/skins/default/settings.css @@ -5,41 +5,20 @@ width: 300px; } -#folder-manager -{ - position: absolute; - width: 600px; - top: 0; - left: 0; - bottom: 105px; - overflow: auto; - border: 1px solid #999999; -} - #folder-manager.droptarget { border: 1px solid #CC3333; background-color: #FFFFA6; } -#listbuttons -{ - position: absolute; - left: 20px; - bottom: 18px; -} - -#identities-table +#identities-table, +#subscription-table, +#sections-table { width: 100%; table-layout: fixed; } -#subscription-table -{ - width: 100%; -} - #subscription-table input { font: inherit; @@ -50,14 +29,8 @@ #sections-table tbody td { cursor: default; - overflow: hidden; text-overflow: ellipsis; -o-text-overflow: ellipsis; -} - -#subscription-table tbody td -{ - height: 22px !important; height: 18px; } @@ -66,49 +39,26 @@ color: #666; } -#subscription-table tr.selected td, -#subscription-table tr.selected td a +#subscription-table tr.selected td { color: #FFFFFF; background-color: #CC3333; } -#subscription-table tr.droptarget td, -#subscription-table tr.droptarget td a +#subscription-table tr.droptarget td { background-color: #FFFFA6; } -#subscription-table thead td.name -{ - width: 95%; -} - -#subscription-table thead td.msgcount, -#subscription-table thead td.subscribed, -#subscription-table thead td.threaded -{ - white-space: nowrap; - min-width: 50px; -} - -#subscription-table tbody td.subscribed, -#subscription-table tbody td.rename, -#subscription-table tbody td.delete -{ - padding: 1px 4px; -} - -#subscription-table thead td.rename, -#subscription-table thead td.delete +#subscription-table td.name { - width: 30px; + width: auto; } -#subscription-table td.name input +#subscription-table td.subscribed { - font: inherit; - width: 90%; + text-align: right; + padding-right: 12px; } #identity-frame @@ -118,7 +68,9 @@ border: 1px solid #999999; } -#identity-details +#identity-details, +#folder-box, +#prefs-box { position: absolute; top: 0; @@ -129,7 +81,8 @@ background-color: #F2F2F2; } -#identity-details table td.title +#identity-details table td.title, +#folder-details table td.title { font-weight: bold; text-align: right; @@ -150,6 +103,7 @@ input.disabled } #identities-list, +#folder-manager, #sectionslist { position: absolute; @@ -161,24 +115,9 @@ input.disabled overflow: hidden; } -#sections-table -{ - width: 100%; - table-layout: fixed; -} - -#prefs-box -{ - position: absolute; - top: 0; - right: 0; - bottom: 0; - border: 1px solid #999999; - overflow: hidden; -} - body.iframe, -#prefs-frame +#prefs-frame, +#folder-frame { background-color: #F2F2F2; border: none; @@ -203,3 +142,24 @@ body.iframe, text-align: right; float: right; } + +#quota +{ + position: absolute; + top: 3px; + right: 8px; + width: 100px; +} + +#quotaimg +{ + position: absolute; + top: 3px; + right: 6px; + z-index: 101; +} + +#rcmfd_signature +{ + font-family: monospace; +} diff --git a/skins/default/splitter.js b/skins/default/splitter.js index de228c58a..e11f9fea5 100644 --- a/skins/default/splitter.js +++ b/skins/default/splitter.js @@ -24,7 +24,7 @@ function rcube_splitter(attrib) // create and position the handle for this splitter this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset(); this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset(); - + if (this.horizontal) { var top = this.p1pos.top + this.p1.offsetHeight; this.layer = new rcube_layer(this.id, {x: 0, y: top, height: 10, @@ -92,7 +92,7 @@ function rcube_splitter(attrib) this.onDragStart = function(e) { // disable text selection while dragging the splitter - if (window.webkit || bw.safari) + if (bw.konq || bw.chrome || bw.safari) document.body.style.webkitUserSelect = 'none'; this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset(); @@ -155,7 +155,7 @@ function rcube_splitter(attrib) this.onDragStop = function(e) { // resume the ability to highlight text - if (window.webkit || bw.safari) + if (bw.konq || bw.chrome || bw.safari) document.body.style.webkitUserSelect = 'auto'; // cancel the listening for drag events diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html index 99015abee..2dcf8b0c1 100644 --- a/skins/default/templates/compose.html +++ b/skins/default/templates/compose.html @@ -78,18 +78,12 @@ - + - - + + - - - - - - - + @@ -99,9 +93,7 @@ | | - - | - + diff --git a/skins/default/templates/folderedit.html b/skins/default/templates/folderedit.html new file mode 100644 index 000000000..78ddd335e --- /dev/null +++ b/skins/default/templates/folderedit.html @@ -0,0 +1,24 @@ + + + +<roundcube:object name="pagetitle" /> + + + + + +
+ +
+ +

+ + " class="button" onclick="history.back()" />  + + +

+
+ + + + diff --git a/skins/default/templates/folders.html b/skins/default/templates/folders.html new file mode 100644 index 000000000..1710b8ca0 --- /dev/null +++ b/skins/default/templates/folders.html @@ -0,0 +1,62 @@ + + + +<roundcube:object name="pagetitle" /> + + + + + + + + + + + +
+ +
+
+
+ +
+
+ + + + + +
+ +
+ +
+
+ + + +
+ +
+ +
+ +
+
    +
    • +
    • + +
+
+ + + diff --git a/skins/default/templates/identityedit.html b/skins/default/templates/identityedit.html index 24c37a629..45c68f1ad 100644 --- a/skins/default/templates/identityedit.html +++ b/skins/default/templates/identityedit.html @@ -40,7 +40,7 @@
- +

diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html deleted file mode 100644 index 164d56f54..000000000 --- a/skins/default/templates/managefolders.html +++ /dev/null @@ -1,41 +0,0 @@ - - - -<roundcube:object name="pagetitle" /> - - - - - - - - - -

- -
- -
- -
- -
-
- -
-:  - - -
-
-
- -
- -
- - - -- cgit v1.2.3