diff options
Diffstat (limited to 'skins/classic')
29 files changed, 58 insertions, 648 deletions
diff --git a/skins/classic/common.css b/skins/classic/common.css index 0de8a2f7f..4367d26cb 100644 --- a/skins/classic/common.css +++ b/skins/classic/common.css @@ -728,11 +728,6 @@ ul.treelist ul ul li a padding-left: 65px; } -ul.treelist ul ul ul li -{ - margin-left: 20px; -} - ul.treelist li ul li:last-child { border-bottom: 0; @@ -946,11 +941,6 @@ a.rcmContactAddress:hover font-weight: bold; } -#console -{ - opacity: 0.8; -} - .disabled, a.disabled { diff --git a/skins/classic/functions.js b/skins/classic/functions.js index 049e4d5d4..39dd96e3b 100644 --- a/skins/classic/functions.js +++ b/skins/classic/functions.js @@ -155,11 +155,6 @@ show_popupmenu: function(popup, show) } obj[show?'show':'hide'](); - - if (bw.ie6 && this.popups[popup].overlap) { - $('select').css('visibility', show?'hidden':'inherit'); - $('select', obj).css('visibility', 'inherit'); - } }, dragmenu: function(show) @@ -207,11 +202,13 @@ searchmenu: function(show) var n, all, list = $('input:checkbox[name="s_mods[]"]', obj), mbox = rcmail.env.mailbox, - mods = rcmail.env.search_mods; + mods = rcmail.env.search_mods, + scope = rcmail.env.search_scope || 'base'; if (rcmail.env.task == 'mail') { mods = mods[mbox] ? mods[mbox] : mods['*']; all = 'text'; + $('input:radio[name="s_scope"]').prop('checked', false).filter('#s_scope_'+scope).prop('checked', true); } else { all = '*'; @@ -236,7 +233,11 @@ set_searchmod: function(elem) { var all, m, task = rcmail.env.task, mods = rcmail.env.search_mods, - mbox = rcmail.env.mailbox; + mbox = rcmail.env.mailbox, + scope = $('input[name="s_scope"]:checked').val(); + + if (scope == 'all') + mbox = '*'; if (!mods) mods = {}; @@ -258,23 +259,24 @@ set_searchmod: function(elem) m[elem.value] = 1; // mark all fields - if (elem.value != all) - return; - - $('input:checkbox[name="s_mods[]"]').map(function() { - if (this == elem) - return; + if (elem.value == all) { + $('input:checkbox[name="s_mods[]"]').map(function() { + if (this == elem) + return; + + this.checked = true; + if (elem.checked) { + this.disabled = true; + delete m[this.value]; + } + else { + this.disabled = false; + m[this.value] = 1; + } + }); + } - this.checked = true; - if (elem.checked) { - this.disabled = true; - delete m[this.value]; - } - else { - this.disabled = false; - m[this.value] = 1; - } - }); + rcmail.set_searchmods(m); }, listmenu: function(show) @@ -319,9 +321,6 @@ listmenu: function(show) } }); $('#listmenu fieldset').css("min-height", maxheight+"px") - // IE6 complains if you set this attribute using either method: - //$('#listmenu fieldset').css({'height':'auto !important'}); - //$('#listmenu fieldset').css("height","auto !important"); .height(maxheight); }; }, @@ -417,6 +416,7 @@ body_mouseup: function(evt, p) for (i in this.popups) { if (this.popups[i].obj.is(':visible') && target != rcube_find_object(i+'link') && !this.popups[i].toggle + && target != this.popups[i].obj.get(0) // check if scroll bar was clicked (#1489832) && (!this.popups[i].editable || !this.target_overlaps(target, this.popups[i].id)) && (!this.popups[i].sticky || !rcube_mouse_is_over(evt, rcube_find_object(this.popups[i].id))) && !$(target).is('.folder-selector-link') && !$(target).children('.folder-selector-link').length @@ -470,7 +470,7 @@ switch_preview_pane: function(elem) } else { prev_frm.hide(); - if (bw.ie6 || bw.ie7) { + if (bw.ie7) { var fr = document.getElementById('mailcontframe'); fr.style.bottom = 0; fr.style.height = parseInt(fr.parentNode.offsetHeight)+'px'; diff --git a/skins/classic/ie6hacks.css b/skins/classic/ie6hacks.css deleted file mode 100644 index a431ee45e..000000000 --- a/skins/classic/ie6hacks.css +++ /dev/null @@ -1,184 +0,0 @@ -/* CSS hacks for IE versions 5,6 */ - -#taskbar -{ - background: url(images/taskbar.gif) top right no-repeat; - width: expression((parseInt(document.documentElement.clientWidth)-250)+'px'); -} - -img -{ - behavior: url(skins/classic/pngbehavior.htc); -} - -#logo -{ - width: 178px; - height: 47px; -} - -body > #message div.notice, -body > #message div.error, -body > #message div.warning, -body > #message div.confirmation, -#message-objects div.notice, -#message-objects div.error, -#message-objects div.warning, -#message-objects div.confirmation -{ - background-image: url(images/display/icons.gif); -} - -#messagemenu li a -{ - background-image: url(images/messageactions.gif); -} - -#mailboxlist li -{ - background-image: url(images/icons/folders.gif); -} - -#messagetoolbar a -{ - display: block; - float: left; - padding-right: 10px; -} - -.boxfooter a.button, -.boxfooter a.buttonPas -{ - background-image: url(images/icons/groupactions.gif); -} - -.pagenav -{ - width: 250px; -} - -.pagenav a.button, -.pagenav a.buttonPas -{ - background-image: url(images/pagenav.gif); -} - -#listcontrols a.button, -#listcontrols a.buttonPas { - background-image: url(images/mail_footer.gif); -} - -#messagetoolbar a.button, -#messagetoolbar a.buttonPas { - background-image: url(images/mail_toolbar.gif); -} - -#abooktoolbar a.button, -#abooktoolbar a.buttonPas, -#abooktoolbar span.separator { - background-image: url(images/abook_toolbar.gif); -} - -ul.toolbarmenu li a, -.popupmenu li a -{ - clear: left; - height: expression(Math.min(14, parseInt(document.documentElement.clientHeight))+'px'); - width: expression(Math.min(130, parseInt(document.documentElement.clientWidth))+'px'); -} - -ul.toolbarmenu li.separator_below -{ - padding-bottom: 3px; -} - -.boxfooter -{ - width: 100%; - bottom: -1px; -} - -.boxtitle, -#directorylist li a -{ - width: auto; -} - -#directorylist li -{ - background-image: url(images/icons/folders.gif); -} - -.boxlistcontent -{ - top: 21px; - height: expression((parseInt(this.parentNode.offsetHeight)-24-parseInt(this.style.top?this.style.top:21))+'px'); -} - -#compose-div .boxlistcontent -{ - height: expression((parseInt(this.parentNode.offsetHeight)-23-parseInt(this.style.top?this.style.top:21))+'px'); -} - -#compose-body-div -{ - height: expression(parseInt(this.parentNode.offsetHeight)+'px'); -} - -#folder-manager -{ - height: expression((parseInt(document.documentElement.clientHeight)-105)+'px'); -} - -#messagelist tr td div.collapsed, -#messagelist tr td div.expanded, -#messagelist tr td.threads div.listmenu, -#messagelist tr td.attachment span.attachment, -#messagelist tr td.attachment span.report, -#messagelist tr td.priority span.priority, -#messagelist tr td.priority span.prio1, -#messagelist tr td.priority span.prio2, -#messagelist tr td.priority span.prio3, -#messagelist tr td.priority span.prio4, -#messagelist tr td.priority span.prio5, -#messagelist tr td.flag span.flagged, -#messagelist tr td.flag span.unflagged:hover, -#messagelist tr td.status span.status, -#messagelist tr td.status span.msgicon, -#messagelist tr td.status span.deleted, -#messagelist tr td.status span.unread, -#messagelist tr td.status span.unreadchildren, -#messagelist tr td.subject span.msgicon, -#messagelist tr td.subject span.deleted, -#messagelist tr td.subject span.unread, -#messagelist tr td.subject span.replied, -#messagelist tr td.subject span.forwarded, -#messagelist tr td.subject span.unreadchildren -{ - background-image: url(images/messageicons.gif); -} - -#messagelist tr td div.collapsed, -#messagelist tr td div.expanded { - background-color: #fff; -} - -body.iframe .boxtitle -{ - position: absolute; -} - -#subscription-table -{ - width: auto; -} - -#sourcename -{ - zoom: 1; -} - -#abookactions a -{ - background-image: url("images/icons/groupactions.gif"); -} diff --git a/skins/classic/iehacks.css b/skins/classic/iehacks.css deleted file mode 100644 index fabf73db6..000000000 --- a/skins/classic/iehacks.css +++ /dev/null @@ -1,295 +0,0 @@ - -input, textarea -{ - border-style: expression(this.type=='checkbox' || this.type=='radio' || this.id=='quicksearchbox' ? 'none' : 'solid'); - border-width: expression(this.type=='checkbox' || this.type=='radio' ? '0' : '1px'); - border-color: expression(this.type=='checkbox' || this.type=='radio' ? '' : '#666666'); - background-color: expression(this.type=='checkbox' || this.type=='radio' ? 'transparent' : '#ffffff'); -} - -body.iframe -{ - margin-top: 0px; -} - -body.iframe div.boxcontent -{ - margin-top: 20px; - z-index: 2; -} - -body.iframe div.boxtitle -{ - z-index: 100; -} - -body.iframe #prefs-details -{ - padding-top: 1px; -} - -#login-form form -{ - margin-top: 0; -} - -.pagenav a.buttonPas -{ - filter: alpha(opacity=35); -} - -body > #message -{ - filter: alpha(opacity=85); -} - -.popupmenu -{ - background-color: #ffffff; -} - -#tabsbar, -#partheader -{ - width: expression((parseInt(document.documentElement.clientWidth)-240)+'px'); -} - -#mainscreen -{ - height: expression((parseInt(document.documentElement.clientHeight)-105)+'px'); -} - -#mainscreen, -#messagepartcontainer -{ - width: expression((parseInt(document.documentElement.clientWidth)-40)+'px'); -} - -#messagetoolbar -{ - width: expression((parseInt(document.documentElement.clientWidth)-215)+'px'); - z-index: 240; -} - -#messagetoolbar select.mboxlist -{ - margin: 0 8px; - top: 8px; -} - -div.messageheaderbox -{ - margin-top: 0px; -} - -body.iframe div.messageheaderbox -{ - margin-top: 6px; -} - -#abooktoolbar a.buttonPas -{ - filter: alpha(opacity=35); - background-image: url(images/abook_toolbar.gif); -} - -#messagetoolbar a.buttonPas -{ - filter: alpha(opacity=35); - background-image: url(images/mail_toolbar.gif); -} - -#listcontrols a.buttonPas -{ - filter: alpha(opacity=35); -} - -#quicksearchbar -{ - z-index: 240; -} - -#addresslist, -#sectionslist, -#identities-list, -#mailleftcontainer, -#mailrightcontainer, -#compose-container, -#compose-attachments, -#compose-contacts, -#mailcontframe, -#mailboxlist-container, -#mailrightcontent, -#messageframe, -#identity-details, -#contacts-box, -#prefs-box, -#folder-box, -#directorylistbox, -#addressscreen -{ - height: expression(parseInt(this.parentNode.offsetHeight)+'px'); -} - -#mailrightcontainer -{ - width: expression((parseInt(this.parentNode.offsetWidth)-170)+'px'); -} - -#messagepartcontainer -{ - height: expression((parseInt(document.documentElement.clientHeight)-90)+'px'); -} - -#mailrightcontent -{ - width: 100%; -} - -#compose-div -{ - height: expression((parseInt(this.parentNode.offsetHeight)-1-parseInt(document.getElementById('compose-headers').offsetHeight))+'px'); -} - -#compose-attachments ul li -{ - width: 1000px; /* for IE7 */ -} - -#compose-attachments li a -{ - float: left; /* for IE7 */ -} - -#messagelist -{ - width: inherit; - *width: auto; /* IE6/7 conditional hack */ - border-collapse: collapse; -} - -#messagelist thead tr td, -#messagelist tbody tr td -{ - height: 18px; -} - -#messagelist tbody tr.unroot td.subject -{ - text-decoration: underline; -} - -#messageframe -{ - width: expression((parseInt(this.parentNode.offsetWidth)-180)+'px'); - overflow: hidden; -} - -body.iframe -{ - width: expression((parseInt(document.documentElement.clientWidth))+'px'); -} - -div.message-part pre, -div.message-htmlpart pre, -div.message-part div.pre -{ - word-wrap: break-word; -} - -#addressscreen -{ - width: expression((parseInt(document.documentElement.clientWidth)-245)+'px'); -} - -#contacts-box, -#prefs-box, -#folder-box -{ - width: expression((parseInt(this.parentNode.offsetWidth)-555)+'px'); - overflow: hidden; -} - -#rcmdraglayer -{ - filter: alpha(opacity=82); - padding-left: 20px; -} - -div.draglayercopy -{ - border-color: #00cc00; - background: url(images/messageactions.png) 0 -125px no-repeat #fff; -} - -html.ie8 .draglayercopy:before -{ - content: ""; - display: none; -} - -ul.toolbarmenu -{ - margin: 0 0 -4px 0; -} - -.popupmenu ul li, -ul.toolbarmenu li -{ - min-width: auto; -} - -.popupmenu ul li a, -ul.toolbarmenu li a -{ - min-height: auto; -} - -.popupmenu li.block a -{ - clear: none; - display: inline-block; - padding-left: 2px; -} - -#console -{ - filter: alpha(opacity=80); -} - -table.records-table thead tr td -{ - height: 19px; -} - -#listmenu fieldset -{ - margin: 0 4px; - padding: 0.8em; -} - -#listcontrols input -{ - margin-top: 2px; -} - -#contact-details -{ - margin-top: 20px; -} - -#contact-details form { - margin-top: -1px; -} - -.contactfieldgroup legend -{ - padding: 0 0 0.5em 0; - margin-left: -4px; -} - -/* fix "jumping" login form in IE7 */ -#login-form div.boxcontent -{ - overflow: hidden; -} diff --git a/skins/classic/images/abook_toolbar.gif b/skins/classic/images/abook_toolbar.gif Binary files differdeleted file mode 100644 index 2e8f4e259..000000000 --- a/skins/classic/images/abook_toolbar.gif +++ /dev/null diff --git a/skins/classic/images/icons/folders.gif b/skins/classic/images/icons/folders.gif Binary files differdeleted file mode 100644 index 279519496..000000000 --- a/skins/classic/images/icons/folders.gif +++ /dev/null diff --git a/skins/classic/images/icons/glass.gif b/skins/classic/images/icons/glass.gif Binary files differdeleted file mode 100644 index d86aec5c0..000000000 --- a/skins/classic/images/icons/glass.gif +++ /dev/null diff --git a/skins/classic/images/icons/groupactions.gif b/skins/classic/images/icons/groupactions.gif Binary files differdeleted file mode 100644 index eba6a6caf..000000000 --- a/skins/classic/images/icons/groupactions.gif +++ /dev/null diff --git a/skins/classic/images/mail_footer.gif b/skins/classic/images/mail_footer.gif Binary files differdeleted file mode 100644 index 302b55870..000000000 --- a/skins/classic/images/mail_footer.gif +++ /dev/null diff --git a/skins/classic/images/mail_toolbar.gif b/skins/classic/images/mail_toolbar.gif Binary files differdeleted file mode 100644 index 4bddf5b45..000000000 --- a/skins/classic/images/mail_toolbar.gif +++ /dev/null diff --git a/skins/classic/images/messageactions.gif b/skins/classic/images/messageactions.gif Binary files differdeleted file mode 100644 index 3bdd0d735..000000000 --- a/skins/classic/images/messageactions.gif +++ /dev/null diff --git a/skins/classic/images/messageicons.gif b/skins/classic/images/messageicons.gif Binary files differdeleted file mode 100644 index 178e88597..000000000 --- a/skins/classic/images/messageicons.gif +++ /dev/null diff --git a/skins/classic/images/quota.gif b/skins/classic/images/quota.gif Binary files differdeleted file mode 100644 index b029e7d56..000000000 --- a/skins/classic/images/quota.gif +++ /dev/null diff --git a/skins/classic/images/taskbar.gif b/skins/classic/images/taskbar.gif Binary files differdeleted file mode 100644 index fe1adc325..000000000 --- a/skins/classic/images/taskbar.gif +++ /dev/null diff --git a/skins/classic/includes/links.html b/skins/classic/includes/links.html index 6d8d03c52..2f6ef0119 100644 --- a/skins/classic/includes/links.html +++ b/skins/classic/includes/links.html @@ -5,10 +5,6 @@ <roundcube:if condition="in_array(env:task, array('mail', 'addressbook', 'settings'))" /> <link rel="stylesheet" type="text/css" href="/<roundcube:var name="env:task" />.css" /> <roundcube:endif /> -<roundcube:if condition="browser:ie" /> -<!--[if lte IE 8]><link rel="stylesheet" type="text/css" href="/iehacks.css" /><![endif]--> -<!--[if lte IE 6]><link rel="stylesheet" type="text/css" href="/ie6hacks.css" /><![endif]--> -<roundcube:endif /> <roundcube:if condition="browser:safari" /> <link rel="stylesheet" type="text/css" href="/safari.css" /> <roundcube:endif />
\ No newline at end of file diff --git a/skins/classic/mail.css b/skins/classic/mail.css index b1c8a0ea9..fc066e023 100644 --- a/skins/classic/mail.css +++ b/skins/classic/mail.css @@ -1010,6 +1010,16 @@ table.messagelist.fixedcopy padding: 0 2px; } +.messagelist tr td.folder +{ + width: 135px; +} + +.messagelist tr td.hidden +{ + display: none; +} + .messagelist tr.message { background-color: #FFF; diff --git a/skins/classic/pngbehavior.htc b/skins/classic/pngbehavior.htc deleted file mode 100644 index 6f892df64..000000000 --- a/skins/classic/pngbehavior.htc +++ /dev/null @@ -1,84 +0,0 @@ -<public:component lightWeight="true"> -<public:attach event="onpropertychange" onevent="propertyChanged()" /> -<public:attach event="onbeforeprint" onevent="beforePrint()" for="window"/> -<public:attach event="onafterprint" onevent="afterPrint()" for="window"/> -<script> - -/* - * PNG Behavior - * - * This script was created by Erik Arvidsson (http://webfx.eae.net/contact.html#erik) - * for WebFX (http://webfx.eae.net) - * Copyright 2002-2004 - * - * For usage see license at http://webfx.eae.net/license.html - * - * Version: 1.02 - * Created: 2001-??-?? First working version - * Updated: 2002-03-28 Fixed issue when starting with a non png image and - * switching between non png images - * 2003-01-06 Fixed RegExp to correctly work with IE 5.0x - * 2004-05-09 When printing revert to original - * - */ - -var supported = /MSIE ((5\.5)|6)/.test(navigator.userAgent) && navigator.platform == "Win32", - realSrc, - blankSrc = "program/resources/blank.gif", - isPrinting = false; - -if (supported) fixImage(); - -function propertyChanged() { - if (!supported || isPrinting) return; - - var pName = event.propertyName; - if (pName != "src") return; - // if not set to blank - if (!new RegExp(blankSrc).test(src)) - fixImage(); -}; - -function fixImage() { - // get src - var src = element.src; - - // check for real change - if (src == realSrc && /\.png$/i.test(src)) { - element.src = blankSrc; - return; - } - - if ( ! new RegExp(blankSrc).test(src)) { - // backup old src - realSrc = src; - } - - // test for png - if (/\.png$/i.test(realSrc)) { - // set blank image - element.src = blankSrc; - // set filter - element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft." + - "AlphaImageLoader(src='" + src + "',sizingMethod='scale')"; - } - else { - // remove filter - element.runtimeStyle.filter = ""; - } -} - -function beforePrint() { - isPrinting = true; - element.src = realSrc; - element.runtimeStyle.filter = ""; - realSrc = null; -} - -function afterPrint() { - isPrinting = false; - fixImage(); -} - -</script> -</public:component> diff --git a/skins/classic/splitter.js b/skins/classic/splitter.js index cec6a4713..d90ea1d6f 100644 --- a/skins/classic/splitter.js +++ b/skins/classic/splitter.js @@ -11,7 +11,6 @@ function rcube_splitter(attrib) this.id = attrib.id ? attrib.id : this.p1id + '_' + this.p2id + '_splitter'; this.orientation = attrib.orientation; this.horizontal = (this.orientation == 'horizontal' || this.orientation == 'h'); - this.offset = bw.ie6 ? 2 : 0; this.pos = attrib.start ? attrib.start * 1 : 0; this.relative = attrib.relative ? true : false; this.drag_active = false; @@ -67,7 +66,7 @@ function rcube_splitter(attrib) this.resize = function() { if (this.horizontal) { - var lh = this.layer.height - this.offset * 2; + var lh = this.layer.height; this.p1.style.height = Math.floor(this.pos - this.p1pos.top - lh / 2) + 'px'; this.p2.style.top = Math.ceil(this.pos + lh / 2) + 'px'; this.layer.move(this.layer.x, Math.round(this.pos - lh / 2 + 1)); diff --git a/skins/classic/templates/addressbook.html b/skins/classic/templates/addressbook.html index 429b83438..98658f28b 100644 --- a/skins/classic/templates/addressbook.html +++ b/skins/classic/templates/addressbook.html @@ -7,13 +7,9 @@ <script type="text/javascript" src="/functions.js"></script> <style type="text/css"> #addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; } -#contacts-box { left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px; - <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255).')+\\'px\\');') : ''" /> -} +#contacts-box { left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px; } #directorylistbox { width: <roundcube:exp expression="!empty(cookie:addressviewsplitterd) ? cookie:addressviewsplitterd-5 : 195" />px; } -#addressscreen { left: <roundcube:exp expression="!empty(cookie:addressviewsplitterd) ? cookie:addressviewsplitterd+5 : 205" />px; - <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:addressviewsplitterd) ? cookie:addressviewsplitterd+5 : 205).')+\\'px\\');') : ''" /> -} +#addressscreen { left: <roundcube:exp expression="!empty(cookie:addressviewsplitterd) ? cookie:addressviewsplitterd+5 : 205" />px; } </style> </head> diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html index 74d25778b..c43adbc27 100644 --- a/skins/classic/templates/compose.html +++ b/skins/classic/templates/compose.html @@ -10,9 +10,7 @@ <script type="text/javascript" src="/splitter.js"></script> <style type="text/css"> #compose-contacts { width: <roundcube:exp expression="!empty(cookie:composesplitterv1) ? cookie:composesplitterv1-5 : 195" />px; } -#compose-container { left: <roundcube:exp expression="!empty(cookie:composesplitterv1) ? cookie:composesplitterv1+5 : 205" />px; -<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:composesplitterv1) ? cookie:composesplitterv1+5 : 200).')+\\'px\\');') : ''" /> -} +#compose-container { left: <roundcube:exp expression="!empty(cookie:composesplitterv1) ? cookie:composesplitterv1+5 : 205" />px; } </style> </head> <roundcube:if condition="env:extwin" /> diff --git a/skins/classic/templates/folders.html b/skins/classic/templates/folders.html index f86be092b..f00c23b22 100644 --- a/skins/classic/templates/folders.html +++ b/skins/classic/templates/folders.html @@ -7,9 +7,7 @@ <script type="text/javascript" src="/splitter.js"></script> <style type="text/css"> #folder-manager { width: <roundcube:exp expression="!empty(cookie:folderviewsplitter) ? cookie:folderviewsplitter-5 : 295" />px; } -#folder-box { left: <roundcube:exp expression="!empty(cookie:folderviewsplitter) ? cookie:folderviewsplitter+5 : 305" />px; - <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:folderviewsplitter) ? cookie:folderviewsplitter+5 : 305).')+\\'px\\');') : ''" /> -} +#folder-box { left: <roundcube:exp expression="!empty(cookie:folderviewsplitter) ? cookie:folderviewsplitter+5 : 305" />px; } </style> </head> <body> @@ -31,7 +29,7 @@ <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " /> <roundcube:if condition="env:quota" /> - <img id="quotaimg" src="/images/quota.<roundcube:exp expression="browser:ie && browser:ver < 7 ? 'gif' : 'png'" />" alt="" width="102" height="16" /> + <img id="quotaimg" src="/images/quota.png" alt="" width="102" height="16" /> <div id="quota"> <roundcube:object name="quotaDisplay" display="image" width="100" height="14" id="quotadisplay" /> </div> diff --git a/skins/classic/templates/identities.html b/skins/classic/templates/identities.html index 464afd545..89937ad51 100644 --- a/skins/classic/templates/identities.html +++ b/skins/classic/templates/identities.html @@ -7,9 +7,7 @@ <script type="text/javascript" src="/splitter.js"></script> <style type="text/css"> #identities-list { width: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter-5 : 295" />px; } -#identity-box { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px; - <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305).')+\\'px\\');') : ''" /> -} +#identity-box { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px; } </style> </head> diff --git a/skins/classic/templates/identityedit.html b/skins/classic/templates/identityedit.html index 3b33752ca..b0ecef9ac 100644 --- a/skins/classic/templates/identityedit.html +++ b/skins/classic/templates/identityedit.html @@ -7,9 +7,7 @@ <script type="text/javascript" src="/splitter.js"></script> <style type="text/css"> #identities-list { width: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter-5 : 295" />px; } -#identity-details { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px; - <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305).')+\\'px\\');') : ''" /> -} +#identity-details { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px; } </style> </head> diff --git a/skins/classic/templates/mail.html b/skins/classic/templates/mail.html index 10aebc96d..7a169c8ab 100644 --- a/skins/classic/templates/mail.html +++ b/skins/classic/templates/mail.html @@ -8,14 +8,10 @@ <style type="text/css"> <roundcube:if condition="config:preview_pane == true" /> #mailcontframe { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-5 : 195" />px; } -#mailpreviewframe { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />px; -<roundcube:exp expression="browser:ie ? ('height: expression((parseInt(this.parentNode.offsetHeight)-'.(!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+25 : 245).')+\\'px\\');') : ''" /> -} +#mailpreviewframe { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />px; } <roundcube:endif /> #mailleftcontainer { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 160" />px; } -#mailrightcontainer { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px; -<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 165).')+\\'px\\');') : ''" /> -} +#mailrightcontainer { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px; } </style> </head> <body> @@ -34,7 +30,7 @@ <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " /> <roundcube:if condition="env:quota" /> -<img id="quotaimg" src="/images/quota.<roundcube:exp expression="browser:ie && browser:ver < 7 ? 'gif' : 'png'" />" alt="" width="102" height="16" /> +<img id="quotaimg" src="/images/quota.png" alt="" width="102" height="16" /> <div id="quota"> <roundcube:object name="quotaDisplay" display="image" width="100" height="14" id="quotadisplay" /> </div> @@ -118,6 +114,10 @@ <li><label><input type="checkbox" name="s_mods[]" value="bcc" id="s_mod_bcc" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="bcc" /></span></label></li> <li><label><input type="checkbox" name="s_mods[]" value="body" id="s_mod_body" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="body" /></span></label></li> <li><label><input type="checkbox" name="s_mods[]" value="text" id="s_mod_text" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="msgtext" /></span></label></li> + <li><label class="comment"><roundcube:label name="searchscope" /></label></li> + <li><label><input type="radio" name="s_scope" value="base" id="s_scope_base" onclick="rcmail.set_searchscope(this.value)" /> <span><roundcube:label name="currentfolder" /></span></label></li> + <li><label><input type="radio" name="s_scope" value="sub" id="s_scope_sub" onclick="rcmail.set_searchscope(this.value)" /> <span><roundcube:label name="subfolders" /></span></label></li> + <li><label><input type="radio" name="s_scope" value="all" id="s_scope_all" onclick="rcmail.set_searchscope(this.value)" /> <span><roundcube:label name="allfolders" /></span></label></li> </ul> </div> @@ -142,7 +142,7 @@ <ul> <li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li> <li><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li> - <li class="separator_below"><roundcube:button name="messageimport" type="link" class="active" label="importmessages" id="uploadformlink" onclick="rcmail_ui.show_popup('uploadform', true); return false" /></li> + <li class="separator_below"><roundcube:button command="import-messages" name="messageimport" type="link" classAct="active" label="importmessages" id="uploadformlink" onclick="if(rcmail.command_enabled('import-messages'))rcmail_ui.show_popup('uploadform', true); return false" /></li> <li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li> <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" /> </ul> diff --git a/skins/classic/templates/message.html b/skins/classic/templates/message.html index 3ab0a2e5e..088b7018d 100644 --- a/skins/classic/templates/message.html +++ b/skins/classic/templates/message.html @@ -7,9 +7,7 @@ <script type="text/javascript" src="/functions.js"></script> <style type="text/css"> #mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 170" />px; } -#messageframe { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180" />px; -<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180).')+\\'px\\');') : ''" /> -} +#messageframe { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180" />px; } </style> </head> <roundcube:if condition="env:extwin" /> diff --git a/skins/classic/templates/messageerror.html b/skins/classic/templates/messageerror.html index eb8c7e058..590296c81 100644 --- a/skins/classic/templates/messageerror.html +++ b/skins/classic/templates/messageerror.html @@ -21,9 +21,7 @@ <script type="text/javascript" src="/functions.js"></script> <style type="text/css"> #mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 170" />px; } -#messageframe { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180" />px; -<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180).')+\\'px\\');') : ''" /> -} +#messageframe { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180" />px; } </style> </head> diff --git a/skins/classic/templates/messagepart.html b/skins/classic/templates/messagepart.html index 9f2215679..91dc13641 100644 --- a/skins/classic/templates/messagepart.html +++ b/skins/classic/templates/messagepart.html @@ -7,9 +7,7 @@ <script type="text/javascript" src="/functions.js"></script> <style type="text/css"> #messagepartheader { width: <roundcube:exp expression="!empty(cookie:mailpartsplitter) ? cookie:mailpartsplitter-5 : 170" />px; } -#messagepartcontainer { left: <roundcube:exp expression="!empty(cookie:mailpartsplitter) ? cookie:mailpartsplitter+5 : 180" />px; -<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailpartsplitter) ? cookie:mailpartsplitter+5 : 180).')+\\'px\\');') : ''" /> -} +#messagepartcontainer { left: <roundcube:exp expression="!empty(cookie:mailpartsplitter) ? cookie:mailpartsplitter+5 : 180" />px; } </style> </head> <body class="extwin"> diff --git a/skins/classic/templates/responses.html b/skins/classic/templates/responses.html index 2459827b0..b15053738 100644 --- a/skins/classic/templates/responses.html +++ b/skins/classic/templates/responses.html @@ -7,9 +7,7 @@ <script type="text/javascript" src="/splitter.js"></script> <style type="text/css"> #identities-list { width: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter-5 : 295" />px; } -#identity-box { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px; - <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305).')+\\'px\\');') : ''" /> -} +#identity-box { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px; } </style> </head> diff --git a/skins/classic/templates/settings.html b/skins/classic/templates/settings.html index 0cd623f75..0055722ba 100644 --- a/skins/classic/templates/settings.html +++ b/skins/classic/templates/settings.html @@ -8,9 +8,7 @@ <style type="text/css"> #sectionslist { width: <roundcube:exp expression="!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter-5 : 190" />px; } -#prefs-box { left: <roundcube:exp expression="!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter+5 : 200" />px; -<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter+5 : 200).')+\\'px\\');') : ''" /> -} +#prefs-box { left: <roundcube:exp expression="!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter+5 : 200" />px; } </style> </head> |
