From 7a32e9c7e82a884d58ec2774d0148e5075a4791c Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 29 Feb 2012 03:44:16 -0500
Subject: [PATCH] Decorate search filter drop-down with a more Larry like style
---
skins/larry/ui.js | 185 +++++++++++++++++++++++++++++++++------------
1 files changed, 134 insertions(+), 51 deletions(-)
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 9e9e6b7..5e12186 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -54,15 +54,18 @@
}
/**
- *
+ * Initialize UI
+ * Called on document.ready
*/
function init()
{
rcmail.addEventListener('message', message_displayed);
-
+
+ /*** mail task ***/
if (rcmail.env.task == 'mail') {
rcmail.addEventListener('menu-open', show_listoptions);
rcmail.addEventListener('menu-save', save_listoptions);
+ rcmail.addEventListener('responseafterlist', function(e){ switch_view_mode(rcmail.env.threading ? 'thread' : 'list') });
var dragmenu = $('#dragmessagemenu');
if (dragmenu.length) {
@@ -70,20 +73,23 @@
popups.dragmessagemenu = dragmenu;
}
- var previewframe = $('#mailpreviewframe').is(':visible');
- $('#mailpreviewtoggle').addClass(previewframe ? 'enabled' : 'closed').click(function(e){ toggle_preview_pane(e); return false });
- $('#maillistmode').addClass(rcmail.env.threading ? '' : 'selected').click(function(e){ switch_view_mode('list'); return false });
- $('#mailthreadmode').addClass(rcmail.env.threading ? 'selected' : '').click(function(e){ switch_view_mode('thread'); return false });
-
if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
layout_messageview();
$("#all-headers").resizable({ handles: 's', minHeight: 50 });
+ $('#previewheaderstoggle').click(function(e){ toggle_preview_headers(this); return false });
}
else if (rcmail.env.action == 'compose') {
- rcmail.addEventListener('aftertoggle-editor', function(){ window.setTimeout(function(){ layout_composeview() }, 100); });
+ rcmail.addEventListener('aftertoggle-editor', function(){ window.setTimeout(function(){ layout_composeview() }, 200); });
rcmail.addEventListener('aftersend-attachment', show_uploadform);
rcmail.addEventListener('add-recipient', function(p){ show_header_row(p.field, true); });
layout_composeview();
+
+ // Show input elements with non-empty value
+ var field, fields = ['cc', 'bcc', 'replyto', 'followupto'];
+ for (var f=0; f < fields.length; f++) {
+ if ((field = $('#_'+fields[f])) && field.length && field.val() != '')
+ show_header_row(fields[f], true);
+ }
$('#composeoptionstoggle').parent().click(function(){
$('#composeoptionstoggle').toggleClass('enabled');
@@ -93,15 +99,20 @@
}).css('cursor', 'pointer');
new rcube_splitter({ id:'composesplitterv', p1:'#composeview-left', p2:'#composeview-right',
- orientation:'v', relative:true, start:248, min:170, size:12 }).init();
+ orientation:'v', relative:true, start:248, min:170, size:12, render:layout_composeview }).init();
}
else if (rcmail.env.action == 'list' || !rcmail.env.action) {
- mailviewsplit = new rcube_splitter({ id:'mailviewsplitter', p1:'#mailview-top', p2:'#mailview-bottom',
- orientation:'h', relative:true, start:310, min:150, size:0, offset:-22 });
- if (previewframe)
- mailviewsplit.init();
+ var previewframe = $('#mailpreviewframe').is(':visible');
+ $('#mailpreviewtoggle').addClass(previewframe ? 'enabled' : 'closed').click(function(e){ toggle_preview_pane(e); return false });
+ $('#maillistmode').addClass(rcmail.env.threading ? '' : 'selected').click(function(e){ switch_view_mode('list'); return false });
+ $('#mailthreadmode').addClass(rcmail.env.threading ? 'selected' : '').click(function(e){ switch_view_mode('thread'); return false });
- rcmail.addEventListener('setquota', update_quota);
+ mailviewsplit = new rcube_splitter({ id:'mailviewsplitter', p1:'#mailview-top', p2:'#mailview-bottom',
+ orientation:'h', relative:true, start:310, min:150, size:0, offset:-22 });
+ if (previewframe)
+ mailviewsplit.init();
+
+ rcmail.addEventListener('setquota', update_quota);
}
if ($('#mailview-left').length) {
@@ -109,6 +120,7 @@
orientation:'v', relative:true, start:248, min:150, size:12, callback:render_mailboxlist, render:resize_leftcol }).init();
}
}
+ /*** settings task ***/
else if (rcmail.env.task == 'settings') {
rcmail.addEventListener('init', function(){
var tab = '#settingstabpreferences';
@@ -128,6 +140,7 @@
orientation:'v', relative:true, start:305, min:150, size:12 }).init();
}
}
+ /*** addressbook task ***/
else if (rcmail.env.task == 'addressbook') {
rcmail.addEventListener('afterupload-photo', show_uploadform);
@@ -138,8 +151,9 @@
orientation:'v', relative:true, start:296, min:220, size:12 }).init();
}
}
+ /*** login page ***/
else if (rcmail.env.task == 'login') {
- if (bw.ie && bw.vendver < 9) {
+ if (bw.ie && bw.vendver < 8) {
var popup = $('<div>')
.addClass('readtext')
.html("Roundcube will not work well with the crappy browser ya' using. Get yourself a new internet browsing software and don't come back without!<p>Sincerly,<br/>the Roundcube Dev Team</p>")
@@ -159,30 +173,44 @@
// turn a group of fieldsets into tabs
$('.tabbed').each(function(idx, elem){ init_tabs(elem); })
- $(document.body).bind('mouseup', function(e){
- var config, obj, target = e.target;
- for (var id in popups) {
- obj = popups[id];
- config = popupconfig[id];
- if (obj.is(':visible')
- && target.id != id+'link'
- && !config.toggle
- && (!config.editable || !target_overlaps(target, obj.get(0)))
- && (!config.sticky || !rcube_mouse_is_over(e, obj.get(0)))
- ) {
- var myid = id+'';
- window.setTimeout(function(){ show_popupmenu(myid, false) }, 10);
+ // decorate select elements
+ if (!bw.opera) {
+ $('select.decorated').each(function(){
+ var title = $('option', this).first().text();
+ if ($('option:selected', this).val() != '')
+ title = $('option:selected', this).text();
+ var select = $(this)
+ .change(function(){
+ var val = $('option:selected', this).text();
+ $(this).next().children().html(val);
+ });
+
+ $('<a class="menuselector dropdownselector"><span class="handle">' + title + '</span></a>')
+ .offset(select.position())
+ .insertAfter(select)
+ .children().width(select.width() - 5);
+
+ select.parent().css('position', 'relative');
+ });
+ }
+
+ $(document.body)
+ .bind('mouseup', body_mouseup)
+ .bind('keyup', function(e){
+ if (e.keyCode == 27) {
+ for (var id in popups) {
+ if (popups[id].is(':visible'))
+ show_popup(id, false);
+ }
}
- }
+ });
+
+ $('iframe').load(function(e){
+ // this = iframe
+ var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
+ $(doc).mouseup(body_mouseup);
})
- .bind('keyup', function(e){
- if (e.keyCode == 27) {
- for (var id in popups) {
- if (popups[id].is(':visible'))
- show_popup(id, false);
- }
- }
- });
+ .contents().mouseup(body_mouseup);
$(window).resize(function(e) {
// check target due to bugs in jquery
@@ -190,6 +218,28 @@
// http://bugs.jquery.com/ticket/9841
if (e.target == window) resize();
});
+ }
+
+ /**
+ * Handler for mouse-up events on the document body.
+ * This will close all open popup menus
+ */
+ function body_mouseup(e)
+ {
+ var config, obj, target = e.target;
+ for (var id in popups) {
+ obj = popups[id];
+ config = popupconfig[id];
+ if (obj.is(':visible')
+ && target.id != id+'link'
+ && !config.toggle
+ && (!config.editable || !target_overlaps(target, obj.get(0)))
+ && (!config.sticky || !rcube_mouse_is_over(e, obj.get(0)))
+ ) {
+ var myid = id+'';
+ window.setTimeout(function(){ show_popupmenu(myid, false) }, 10);
+ }
+ }
}
/**
@@ -223,7 +273,7 @@
resizable: false,
closeOnEscape: true,
dialogClass: 'popupmessage ' + p.type,
- title: null,
+ title: env.errortitle,
close: function() {
me.messagedialog.dialog('destroy').hide();
},
@@ -232,8 +282,8 @@
width: 420,
minHeight: 90
}).show();
-
- window.setTimeout(function(){ me.messagedialog.dialog('close'); }, p.timeout / 2);
+
+ window.setTimeout(function(){ me.messagedialog.dialog('close'); }, Math.max(2000, p.timeout / 2));
}
}
@@ -269,22 +319,26 @@
function layout_composeview()
{
var body = $('#composebody'),
+ form = $('#compose-content'),
bottom = $('#composeview-bottom'),
w, h;
- bottom.css('height', (bottom.parent().height() - bottom.position().top) + 'px');
+ bottom.css('height', (form.height() - bottom.position().top) + 'px');
- w = body.parent().width() - 8;
+ w = body.parent().width() - 6;
h = body.parent().height() - 36;
body.width(w).height(h);
if (window.tinyMCE && tinyMCE.get('composebody')) {
- $('#composebody_tbl').width((w+12)+'px').height('').css('margin-top', '1px');
- $('#composebody_ifr').width((w+12)+'px').height((h-22)+'px');
+ $('#composebody_tbl').width((w+10)+'px').height('').css('margin-top', '1px');
+ $('#composebody_ifr').width((w+10)+'px').height((h-22)+'px');
}
else {
$('#googie_edit_layer').height(h+'px');
}
+
+ var abooks = $('#directorylist');
+ $('#compose-contacts .scroller').css('top', abooks.position().top + abooks.outerHeight());
}
@@ -421,6 +475,23 @@
rcmail.message_list.scrollto(uid);
rcmail.command('save-pref', { name:'preview_pane', value:(visible?1:0) });
+ }
+
+
+ /**
+ * Switch between short and full headers display in message preview
+ */
+ function toggle_preview_headers(button)
+ {
+ $('#preview-shortheaders').toggle();
+ var full = $('#preview-allheaders').toggle(),
+ button = $('a#previewheaderstoggle');
+
+ // add toggle button to full headers table
+ if (full.is(':visible'))
+ button.attr('href', '#hide').removeClass('add').addClass('remove')
+ else
+ button.attr('href', '#details').removeClass('remove').addClass('add')
}
@@ -674,8 +745,8 @@
*/
function init_tabs(elem, current)
{
- var id = elem.id,
- content = $(elem),
+ var content = $(elem),
+ id = content.get(0).id,
fs = content.children('fieldset');
if (!fs.length)
@@ -683,7 +754,7 @@
if (!id) {
id = 'rcmtabcontainer';
- elem.attr('id', id);
+ content.attr('id', id);
}
// first hide not selected tabs
@@ -734,6 +805,7 @@
{
var frame = $('<iframe>').attr('id', 'aboutframe')
.attr('src', rcmail.url('settings/about'))
+ .attr('frameborder', '0')
.appendTo(document.body);
var h = Math.floor($(window).height() * 0.75);
@@ -760,7 +832,7 @@
/**
- * Roundcube splitter GUI class
+ * Roundcube UI splitter class
*
* @constructor
*/
@@ -779,11 +851,16 @@
this.callback = p.callback;
var me = this;
+ rcube_splitter._instances[this.id] = me;
this.init = function()
{
this.p1 = $(this.p.p1);
this.p2 = $(this.p.p2);
+
+ // check if referenced elements exist, otherwise abort
+ if (!this.p1.length || !this.p2.length)
+ return;
// create and position the handle for this splitter
this.p1pos = this.relative ? this.p1.position() : this.p1.offset();
@@ -804,11 +881,9 @@
this.handle.css({ left:left+'px', top:'0px' });
}
- this.elm = this.handle.get(0);
-
// listen to window resize on IE
if (bw.ie)
- $(window).resize(function(e){ onResize(e) });
+ $(window).resize(onResize);
// read saved position from cookie
var cookie = bw.get_cookie(this.id);
@@ -978,3 +1053,11 @@
} // end class rcube_splitter
+// static getter for splitter instances
+rcube_splitter._instances = {};
+
+rcube_splitter.get_instance = function(id)
+{
+ return rcube_splitter._instances[id];
+};
+
--
Gitblit v1.9.1