From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Apr 2015 06:28:40 -0400
Subject: [PATCH] Allow preference sections to define CSS class names
---
skins/larry/ui.js | 70 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 7b08aea..a1c00eb 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -1,5 +1,3 @@
-// @license http://creativecommons.org/publicdomain/zero/1.0/legalcode CC0
-
/**
* Roundcube functions for default skin interface
*
@@ -9,6 +7,8 @@
* License. It is allowed to copy, distribute, transmit and to adapt the work
* by keeping credits to the original autors in the README file.
* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
+ *
+ * @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0-1.0
*/
function rcube_mail_ui()
@@ -149,7 +149,12 @@
rcmail.addEventListener('enable-command', enable_command)
.addEventListener('aftershow-headers', function() { layout_messageview(); })
.addEventListener('afterhide-headers', function() { layout_messageview(); });
- $('#previewheaderstoggle').click(function(e){ toggle_preview_headers(); return false });
+ $('#previewheaderstoggle').click(function(e) {
+ toggle_preview_headers();
+ if (this.blur && !rcube_event.is_keyboard(e))
+ this.blur();
+ return false;
+ });
// add menu link for each attachment
$('#attachment-list > li').each(function() {
@@ -272,19 +277,22 @@
orientation:'v', relative:true, start:266, min:180, size:12 }).init();
}
else if (rcmail.env.action == 'edit-prefs') {
- $('<a href="#toggle"></a>')
+ var legend = $('#preferences-details fieldset.advanced legend'),
+ toggle = $('<a href="#toggle"></a>')
.text(env.toggleoptions)
.attr('title', env.toggleoptions)
- .addClass('advanced-toggle')
- .appendTo('#preferences-details fieldset.advanced legend');
+ .addClass('advanced-toggle');
- $('#preferences-details fieldset.advanced legend').click(function(e){
- var collapsed = $(this).hasClass('collapsed'),
- toggle = $('.advanced-toggle', this).html(collapsed ? '▲' : '▼');
- $(this)
- .toggleClass('collapsed')
- .closest('fieldset').children('.propform').toggle()
- }).addClass('collapsed')
+ legend.click(function(e) {
+ toggle.html($(this).hasClass('collapsed') ? '▲' : '▼');
+
+ $(this).toggleClass('collapsed')
+ .closest('fieldset').children('.propform').toggle()
+ }).append(toggle).addClass('collapsed')
+
+ // this magically fixes incorrect position of toggle link created above in Firefox 3.6
+ if (bw.mz)
+ legend.parents('form').css('display', 'inline');
}
}
/*** addressbook task ***/
@@ -411,6 +419,7 @@
if (me.message_timer) {
window.clearTimeout(me.message_timer);
}
+
if (!me.messagedialog) {
me.messagedialog = $('<div>').addClass('popupdialog').hide();
}
@@ -421,7 +430,7 @@
me.messagedialog.is(':visible') && me.messagedialog.dialog('destroy').hide();
};
- if (me.messagedialog.is(':visible'))
+ if (me.messagedialog.is(':visible') && me.messagedialog.text() != msg)
msg = me.messagedialog.html() + '<p>' + p.message + '</p>';
me.messagedialog.html(msg)
@@ -502,12 +511,13 @@
$('#composebodycontainer > div').width(w+8);
$('#composebody_ifr').height(h + 4 - $('div.mce-toolbar').height());
- $('#googie_edit_layer').height(h - 8);
+ $('#googie_edit_layer').width(w).height(h);
// $('#composebodycontainer')[(btns ? 'addClass' : 'removeClass')]('buttons');
// $('#composeformbuttons')[(btns ? 'show' : 'hide')]();
var abooks = $('#directorylist');
- $('#compose-contacts .scroller').css('top', abooks.position().top + abooks.outerHeight());
+ if (abooks.length)
+ $('#compose-contacts .scroller').css('top', abooks.position().top + abooks.outerHeight());
}
@@ -522,6 +532,7 @@
y -= step;
element.css('background-position', '0 -' + y + 'px');
+ element.attr('class', 'countdisplay p' + (Math.round(p.percent / 10) * 10));
if (p.table) {
if (!menu.length)
@@ -541,7 +552,7 @@
var title = $('.boxtitle', container),
box = $('.listsearchbox', container),
dir = box.is(':visible') ? -1 : 1,
- height = 34 + ($('select', box).length ? 24 : 0);
+ height = 34 + ($('select', box).length ? 22 : 0);
box.slideToggle({
duration: 160,
@@ -553,6 +564,8 @@
box.toggleClass('expanded');
if (box.is(':visible')) {
box.find('input[type=text]').focus();
+ height = 34 + ($('select', box).length ? $('select', box).outerHeight() + 4 : 0);
+ $('.scroller', container).css('top', (title.outerHeight() + height) + 'px');
}
else {
$('a.reset', box).click();
@@ -1135,14 +1148,11 @@
*/
function show_about(elem)
{
- var frame = $('<iframe>').attr('id', 'aboutframe')
- .attr('src', rcmail.url('settings/about'))
- .attr('frameborder', '0')
- .appendTo(document.body);
+ var frame = $('<iframe>').attr({id: 'aboutframe', src: rcmail.url('settings/about'), frameborder: '0'});
+ h = Math.floor($(window).height() * 0.75),
+ buttons = {},
+ supportln = $('#supportlink');
- var h = Math.floor($(window).height() * 0.75);
- var buttons = {};
- var supportln = $('#supportlink');
if (supportln.length && (env.supporturl = supportln.attr('href')))
buttons[supportln.html()] = function(e){ env.supporturl.indexOf('mailto:') < 0 ? window.open(env.supporturl) : location.href = env.supporturl };
@@ -1277,8 +1287,8 @@
this.resize = function()
{
if (this.horizontal) {
- this.p1.css('height', Math.floor(this.pos - this.p1pos.top - this.halfsize) + 'px');
- this.p2.css('top', Math.ceil(this.pos + this.halfsize + 2) + 'px');
+ this.p1.css('height', Math.floor(this.pos - this.p1pos.top - Math.floor(this.halfsize)) + 'px');
+ this.p2.css('top', Math.ceil(this.pos + Math.ceil(this.halfsize) + 2) + 'px');
this.handle.css('top', Math.round(this.pos - this.halfsize + this.offset)+'px');
if (bw.ie) {
var new_height = parseInt(this.parent.outerHeight(), 10) - parseInt(this.p2.css('top'), 10) - (bw.ie8 ? 2 : 0);
@@ -1286,8 +1296,8 @@
}
}
else {
- this.p1.css('width', Math.floor(this.pos - this.p1pos.left - this.halfsize) + 'px');
- this.p2.css('left', Math.ceil(this.pos + this.halfsize) + 'px');
+ this.p1.css('width', Math.floor(this.pos - this.p1pos.left - Math.floor(this.halfsize)) + 'px');
+ this.p2.css('left', Math.ceil(this.pos + Math.ceil(this.halfsize)) + 'px');
this.handle.css('left', Math.round(this.pos - this.halfsize + this.offset + 3)+'px');
if (bw.ie) {
var new_width = parseInt(this.parent.outerWidth(), 10) - parseInt(this.p2.css('left'), 10) ;
@@ -1370,7 +1380,7 @@
if (me.horizontal) {
if (((pos.y - me.halfsize) > me.p1pos.top) && ((pos.y + me.halfsize) < (me.p2pos.top + me.p2.outerHeight()))) {
- me.pos = Math.max(me.min, pos.y - me.offset);
+ me.pos = Math.max(me.min, pos.y - Math.max(0, me.offset));
if (me.pos > me.min)
me.pos = Math.min(me.pos, me.parent.height() - me.min);
@@ -1379,7 +1389,7 @@
}
else {
if (((pos.x - me.halfsize) > me.p1pos.left) && ((pos.x + me.halfsize) < (me.p2pos.left + me.p2.outerWidth()))) {
- me.pos = Math.max(me.min, pos.x - me.offset);
+ me.pos = Math.max(me.min, pos.x - Math.max(0, me.offset));
if (me.pos > me.min)
me.pos = Math.min(me.pos, me.parent.width() - me.min);
--
Gitblit v1.9.1