From 170984bacf86662fe4390ba4648544b0861a18e3 Mon Sep 17 00:00:00 2001 From: Mariusz Krzaczkowski Date: Tue, 11 Oct 2016 08:40:33 +0200 Subject: [PATCH 01/27] Fixed mail client configuration --- config/config.inc.php | 4 +--- version.php | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/config.inc.php b/config/config.inc.php index f2c1dae5..50c909fb 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -5,8 +5,6 @@ */ $currentPath = getcwd(); chdir(dirname(__FILE__) . '/../../../../'); -if (!$no_include_config) { - include_once('include/ConfigUtils.php'); -} +include_once('include/ConfigUtils.php'); include_once('config/modules/OSSMail.php'); chdir($currentPath); diff --git a/version.php b/version.php index f49fdf68..0c799ca0 100644 --- a/version.php +++ b/version.php @@ -1,5 +1,5 @@ '2016.10.10', - 'version' => '0.0.2' + 'patch' => '2016.10.11', + 'version' => '0.0.3' ]; From bcad421fd3a175b3a5e9f7a881eabb2f387f319e Mon Sep 17 00:00:00 2001 From: Mariusz Krzaczkowski Date: Wed, 12 Oct 2016 13:17:54 +0200 Subject: [PATCH 02/27] Rebuilt previewing mail in the list --- plugins/yetiforce/list.js | 50 +- plugins/yetiforce/list.min.js | 2 +- plugins/yetiforce/yetiforce.php | 67 +- skins/yetiforce/templates/mail.html | 512 ++--- skins/yetiforce/ui.js | 2797 +++++++++++++-------------- skins/yetiforce/ui.min.js | 2 +- skins/yetiforce/yetiforce.css | 52 +- skins/yetiforce/yetiforce.min.css | 3 +- 8 files changed, 1751 insertions(+), 1734 deletions(-) diff --git a/plugins/yetiforce/list.js b/plugins/yetiforce/list.js index 67f998b6..9733ae80 100644 --- a/plugins/yetiforce/list.js +++ b/plugins/yetiforce/list.js @@ -1,28 +1,31 @@ /* {[The file is published on the basis of YetiForce Public License that can be found in the following directory: licenses/License.html]} */ window.rcmail && rcmail.addEventListener('listupdate', function (evt) { - window.crm = getCrmWindow(); + //window.crm = getCrmWindow(); rcmail.register_command('yetiforce.importICS', function (ics, element, e) { }, true); var container = $('#messagelistcontainer'); var headerFixed = container.find('.records-table.messagelist.sortheader.fixedheader.fixedcopy'); var messageList = container.find('#messagelist'); - var columnsWidth = window.crm.app.moduleCacheGet('widthColumns'); - if (columnsWidth != null) { - messageList.find('th,td').each(function (index) { - $(this).width(columnsWidth[index]); - }); - headerFixed.find('th,td').each(function (index) { - $(this).width(columnsWidth[index]); - }); - } - - headerFixed.colResizable({ - onResize: function (e) { - resizeContentTable(headerFixed, messageList, e); - }, - resizeMode:'fit' - }); + /* + var columnsWidth = window.crm.app.moduleCacheGet('widthColumns'); + if (columnsWidth != null) { + messageList.find('th,td').each(function (index) { + $(this).width(columnsWidth[index]); + }); + headerFixed.find('th,td').each(function (index) { + $(this).width(columnsWidth[index]); + }); + } + */ + /* + headerFixed.colResizable({ + onResize: function (e) { + resizeContentTable(headerFixed, messageList, e); + }, + resizeMode:'fit' + }); + */ }); function resizeContentTable(headerFixed, messageList, e) @@ -36,17 +39,4 @@ function resizeContentTable(headerFixed, messageList, e) }); window.crm.app.moduleCacheSet('widthColumns', column_widths); $(window).scroll(); - - -} - -function getCrmWindow() { - if (opener !== null) { - return opener.parent; - } else if (typeof parent.app == "object") { - return parent; - } else if (typeof parent.parent.app == "object") { - return parent.parent; - } - return false; } diff --git a/plugins/yetiforce/list.min.js b/plugins/yetiforce/list.min.js index a1a27f77..e774fa8c 100644 --- a/plugins/yetiforce/list.min.js +++ b/plugins/yetiforce/list.min.js @@ -1,2 +1,2 @@ -window.rcmail&&rcmail.addEventListener("listupdate",function(b){window.crm=getCrmWindow();rcmail.register_command("yetiforce.importICS",function(f,g,h){},true);var a=$("#messagelistcontainer");var c=a.find(".records-table.messagelist.sortheader.fixedheader.fixedcopy");var d=a.find("#messagelist");var e=window.crm.app.moduleCacheGet("widthColumns");if(e!=null){d.find("th,td").each(function(f){$(this).width(e[f])});c.find("th,td").each(function(f){$(this).width(e[f])})}c.colResizable({onResize:function(f){resizeContentTable(c,d,f)},resizeMode:"fit"})});function resizeContentTable(a,b,c){var d=[];a.find("thead th,thead td").each(function(e){d[e]=$(this).width()});b.find("th,td").each(function(e){$(this).width(d[e])});window.crm.app.moduleCacheSet("widthColumns",d);$(window).scroll()}function getCrmWindow(){if(opener!==null){return opener.parent}else{if(typeof parent.app=="object"){return parent}else{if(typeof parent.parent.app=="object"){return parent.parent}}}return false}; \ No newline at end of file +window.rcmail&&rcmail.addEventListener("listupdate",function(b){rcmail.register_command("yetiforce.importICS",function(f,g,h){},true);var a=$("#messagelistcontainer");var c=a.find(".records-table.messagelist.sortheader.fixedheader.fixedcopy");var d=a.find("#messagelist")});function resizeContentTable(a,b,c){var d=[];a.find("thead th,thead td").each(function(e){d[e]=$(this).width()});b.find("th,td").each(function(e){$(this).width(d[e])});window.crm.app.moduleCacheSet("widthColumns",d);$(window).scroll()}; \ No newline at end of file diff --git a/plugins/yetiforce/yetiforce.php b/plugins/yetiforce/yetiforce.php index 8a4a2cd8..f4972f0a 100644 --- a/plugins/yetiforce/yetiforce.php +++ b/plugins/yetiforce/yetiforce.php @@ -64,13 +64,15 @@ public function init() $this->include_stylesheet('preview.css'); $this->add_hook('message_load', [$this, 'messageLoad']); } - if(empty($this->rc->action)){ + if (empty($this->rc->action)) { + $this->add_hook('preferences_save', array($this, 'prefsSave')); + $this->rc->output->set_env('orientationPanelView', AppConfig::module('Email', 'ORIENTATION_PANEL_VIEW')); $this->include_script('colResizable.js'); $this->include_script('list.js'); } - - + + //var_dump($this->rc->config->get('preview_pane')); chdir($currentPath); } } @@ -140,19 +142,19 @@ public function loginAfter($args) if ($row = $this->getAutoLogin()) { $_SESSION['crm']['id'] = $row['cuid']; if (isset($row['params']['language'])) { - $languages = $this->rc->list_languages(); - $lang = explode('_', $row['params']['language']); - $lang[1] = strtoupper($lang[1]); - $lang = implode('_', $lang); - if (!isset($languages[$lang])) { - $lang = substr($lang, 0, 2); - } - if (isset($languages[$lang])) { - $this->rc->config->set('language', $lang); - $this->rc->load_language($lang); - $this->rc->user->save_prefs(['language' => $lang]); - } - } + $languages = $this->rc->list_languages(); + $lang = explode('_', $row['params']['language']); + $lang[1] = strtoupper($lang[1]); + $lang = implode('_', $lang); + if (!isset($languages[$lang])) { + $lang = substr($lang, 0, 2); + } + if (isset($languages[$lang])) { + $this->rc->config->set('language', $lang); + $this->rc->load_language($lang); + $this->rc->user->save_prefs(['language' => $lang]); + } + } } return $args; } @@ -611,4 +613,37 @@ public function ytAdressButton($p) $p['content'] = $content; return $p; } + + // save prefs after modified in UI + public function prefsSave($args) + { + if ($args['section'] != 'thunderbird_labels') + return $args; + + + $this->load_config(); + $dont_override = (array) $this->rc->config->get('dont_override', array()); + + if (!in_array('tb_label_enable', $dont_override)) + $args['prefs']['tb_label_enable'] = get_input_value('tb_label_enable', RCUBE_INPUT_POST) ? true : false; + + if (!in_array('tb_label_enable_shortcuts', $dont_override)) + $args['prefs']['tb_label_enable_shortcuts'] = get_input_value('tb_label_enable_shortcuts', RCUBE_INPUT_POST) ? true : false; + + if (!in_array('tb_label_style', $dont_override)) + $args['prefs']['tb_label_style'] = get_input_value('tb_label_style', RCUBE_INPUT_POST); + + if (!in_array('tb_label_custom_labels', $dont_override) && $this->rc->config->get('tb_label_modify_labels')) { + $args['prefs']['tb_label_custom_labels'] = array( + 0 => $this->gettext('label0'), + 1 => get_input_value('tb_label_custom_labels1', RCUBE_INPUT_POST), + 2 => get_input_value('tb_label_custom_labels2', RCUBE_INPUT_POST), + 3 => get_input_value('tb_label_custom_labels3', RCUBE_INPUT_POST), + 4 => get_input_value('tb_label_custom_labels4', RCUBE_INPUT_POST), + 5 => get_input_value('tb_label_custom_labels5', RCUBE_INPUT_POST) + ); + } + + return $args; + } } diff --git a/skins/yetiforce/templates/mail.html b/skins/yetiforce/templates/mail.html index b769a7a4..193812a6 100644 --- a/skins/yetiforce/templates/mail.html +++ b/skins/yetiforce/templates/mail.html @@ -1,15 +1,20 @@ - -<roundcube:object name="pagetitle" /> - - + + <roundcube:object name="pagetitle" /> + + @@ -17,251 +22,254 @@
-

+

- -

- - -
- - -
- - -
- - - - -
- -
-
- - - - -
- - -
- -
- - - -
- -
- - - -
-

- -
- -
-

-
-
-
-
-
- - -
-
- - -
- -
- - -   - -
- - - -
- -
- - - -
- -
- -
- -
+
+ + +
+ + +
+ + + - - - - - - - - - - - - - - - +
+
+ + +
+ +
+ +
+ + +
+ +
+ + + +
+

+ +
+ +
+

+ 
+
+
+
+
+ + +
+
+ + +
+ +
+ + +   + +
+ + + + +
+ + +   + + + +
+
+
+ +
+ + + +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + diff --git a/skins/yetiforce/ui.js b/skins/yetiforce/ui.js index 2b9e1253..9a275fe2 100644 --- a/skins/yetiforce/ui.js +++ b/skins/yetiforce/ui.js @@ -13,1161 +13,1123 @@ function rcube_mail_ui() { - var env = {}; - var popups = {}; - var popupconfig = { - forwardmenu: { editable:1 }, - searchmenu: { editable:1, callback:searchmenu }, - attachmentmenu: { }, - listoptions: { editable:1 }, - groupmenu: { above:1 }, - mailboxmenu: { above:1 }, - spellmenu: { callback: spellmenu }, - 'folder-selector': { iconized:1 } - }; - - var me = this; - var mailviewsplit; - var compose_headers = {}; - var prefs; - - // export public methods - this.set = setenv; - this.init = init; - this.init_tabs = init_tabs; - this.show_about = show_about; - this.show_popup = show_popup; - this.toggle_popup = toggle_popup; - this.add_popup = add_popup; - this.set_searchmod = set_searchmod; - this.set_searchscope = set_searchscope; - this.show_uploadform = show_uploadform; - this.show_header_row = show_header_row; - this.hide_header_row = hide_header_row; - this.update_quota = update_quota; - this.get_pref = get_pref; - this.save_pref = save_pref; - this.folder_search_init = folder_search_init; - - - // set minimal mode on small screens (don't wait for document.ready) - if (window.$ && document.body) { - var minmode = get_pref('minimalmode'); - if (parseInt(minmode) || (minmode === null && $(window).height() < 850)) { - $(document.body).addClass('minimal'); - } - - if (bw.tablet) { - $('#viewport').attr('content', "width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"); - } - } - - - /** - * - */ - function setenv(key, val) - { - env[key] = val; - } - - /** - * Get preference stored in browser - */ - function get_pref(key) - { - if (!prefs) { - prefs = rcmail.local_storage_get_item('prefs.larry', {}); - } - - // fall-back to cookies - if (prefs[key] == null) { - var cookie = rcmail.get_cookie(key); - if (cookie != null) { - prefs[key] = cookie; - - // copy value to local storage and remove cookie (if localStorage is supported) - if (rcmail.local_storage_set_item('prefs.larry', prefs)) { - rcmail.set_cookie(key, cookie, new Date()); // expire cookie - } - } - } - - return prefs[key]; - } - - /** - * Saves preference value to browser storage - */ - function save_pref(key, val) - { - prefs[key] = val; - - // write prefs to local storage (if supported) - if (!rcmail.local_storage_set_item('prefs.larry', prefs)) { - // store value in cookie - var exp = new Date(); - exp.setYear(exp.getFullYear() + 1); - rcmail.set_cookie(key, val, exp); - } - } - - /** - * Initialize UI - * Called on document.ready - */ - function init() - { - rcmail.addEventListener('message', message_displayed); - - /*** prepare minmode functions ***/ - $('#taskbar a').each(function(i,elem){ - $(elem).append('' + $('.button-inner', this).html() + '') - }); - - $('#taskbar .minmodetoggle').click(function(e){ - var ismin = $(document.body).toggleClass('minimal').hasClass('minimal'); - save_pref('minimalmode', ismin?1:0); - $(window).resize(); - }); - - /*** mail task ***/ - if (rcmail.env.task == 'mail') { - rcmail.addEventListener('menu-open', menu_toggle) - .addEventListener('menu-close', menu_toggle) - .addEventListener('menu-save', save_listoptions) - .addEventListener('responseafterlist', function(e){ switch_view_mode(rcmail.env.threading ? 'thread' : 'list', true) }) - .addEventListener('responseaftersearch', function(e){ switch_view_mode(rcmail.env.threading ? 'thread' : 'list', true) }); - - var dragmenu = $('#dragmessagemenu'); - if (dragmenu.length) { - rcmail.gui_object('dragmenu', 'dragmessagemenu'); - popups.dragmenu = dragmenu; - } - - if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') { - 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(); - if (this.blur && !rcube_event.is_keyboard(e)) - this.blur(); - return false; - }); - - // add menu link for each attachment - $('#attachment-list > li').each(function() { - $(this).append($('Show options') - .bind('click keypress', function(e) { - if (e.type != 'keypress' || rcube_event.get_keycode(e) == 13) { - attachmentmenu(this, e); - return false; - } - }) - ); - }); - - if (get_pref('previewheaders') == '1') { - toggle_preview_headers(); - } - } - else if (rcmail.env.action == 'compose') { - rcmail.addEventListener('aftersend-attachment', show_uploadform) - .addEventListener('aftertoggle-editor', function(e){ - window.setTimeout(function(){ layout_composeview() }, 200); - if (e && e.mode) - $("select[name='editorSelector']").val(e.mode); - }); - - // Show input elements with non-empty value - var f, v, field, fields = ['cc', 'bcc', 'replyto', 'followupto']; - for (f=0; f < fields.length; f++) { - v = fields[f]; field = $('#_'+v); - if (field.length) { - field.on('change', {v: v}, function(e) { if (this.value) show_header_row(e.data.v, true); }); - if (field.val() != '') - show_header_row(v, true); - } - } - - $('#composeoptionstoggle').click(function(e){ - var expanded = $('#composeoptions').toggle().is(':visible'); - $('#composeoptionstoggle').toggleClass('remove').attr('aria-expanded', expanded ? 'true' : 'false'); - layout_composeview(); - save_pref('composeoptions', expanded ? '1' : '0'); - if (!rcube_event.is_keyboard(e)) - this.blur(); - return false; - }).css('cursor', 'pointer'); - - if (get_pref('composeoptions') !== '0') { - $('#composeoptionstoggle').click(); - } - - // adjust hight when textarea starts to scroll - $("textarea[name='_to'], textarea[name='_cc'], textarea[name='_bcc']").change(function(e){ adjust_compose_editfields(this); }).change(); - rcmail.addEventListener('autocomplete_insert', function(p){ adjust_compose_editfields(p.field); }); - - // toggle compose options if opened in new window and they were visible before - var opener_rc = rcmail.opener(); - if (opener_rc && opener_rc.env.action == 'compose' && $('#composeoptionstoggle', opener.document).hasClass('remove')) - $('#composeoptionstoggle').click(); - - new rcube_splitter({ id:'composesplitterv', p1:'#composeview-left', p2:'#composeview-right', - orientation:'v', relative:true, start:206, min:170, size:12, render:layout_composeview }).init(); - } - else if (rcmail.env.action == 'list' || !rcmail.env.action) { - var previewframe = $('#mailpreviewframe').is(':visible'); - - $('#mailpreviewtoggle').addClass(previewframe ? 'enabled' : 'closed').attr('aria-expanded', previewframe ? 'true' : 'false') - .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; }); - - mailviewsplit = new rcube_splitter({ id:'mailviewsplitter', p1:'#mailview-top', p2:'#mailview-bottom', - orientation:'v', relative:true, start:310, min:560, size:12, offset:4 }); - if (previewframe) - mailviewsplit.init(); - - rcmail.addEventListener('setquota', update_quota) - .addEventListener('enable-command', enable_command) - .addEventListener('afterimport-messages', show_uploadform); - } - else if (rcmail.env.action == 'get') { - new rcube_splitter({ id:'mailpartsplitterv', p1:'#messagepartheader', p2:'#messagepartcontainer', - orientation:'v', relative:true, start:226, min:150, size:12}).init(); - } - - if ($('#mailview-left').length) { - new rcube_splitter({ id:'mailviewsplitterv', p1:'#mailview-left', p2:'#mailview-right', - orientation:'v', relative:true, start:206, 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'; - if (rcmail.env.action) - tab = '#settingstab' + (rcmail.env.action.indexOf('identity')>0 ? 'identities' : rcmail.env.action.replace(/\./g, '')); - - $(tab).addClass('selected') - .children().first().removeAttr('onclick').click(function() { return false; }); - }); - - if (rcmail.env.action == 'folders') { - new rcube_splitter({ id:'folderviewsplitter', p1:'#folderslist', p2:'#folder-details', - orientation:'v', relative:true, start:266, min:180, size:12 }).init(); - - rcmail.addEventListener('setquota', update_quota); - - folder_search_init($('#folderslist')); - } - else if (rcmail.env.action == 'identities') { - new rcube_splitter({ id:'identviewsplitter', p1:'#identitieslist', p2:'#identity-details', - orientation:'v', relative:true, start:266, min:180, size:12 }).init(); - } - else if (rcmail.env.action == 'responses') { - new rcube_splitter({ id:'responseviewsplitter', p1:'#identitieslist', p2:'#identity-details', - orientation:'v', relative:true, start:266, min:180, size:12 }).init(); - } - else if (rcmail.env.action == 'preferences' || !rcmail.env.action) { - new rcube_splitter({ id:'prefviewsplitter', p1:'#sectionslist', p2:'#preferences-box', - orientation:'v', relative:true, start:266, min:180, size:12 }).init(); - } - else if (rcmail.env.action == 'edit-prefs') { - var legend = $('#preferences-details fieldset.advanced legend'), - toggle = $('') - .text(env.toggleoptions) - .attr('title', env.toggleoptions) - .addClass('advanced-toggle'); - - 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 ***/ - else if (rcmail.env.task == 'addressbook') { - rcmail.addEventListener('afterupload-photo', show_uploadform) - .addEventListener('beforepushgroup', push_contactgroup) - .addEventListener('beforepopgroup', pop_contactgroup); - - if (rcmail.env.action == '') { - new rcube_splitter({ id:'addressviewsplitterd', p1:'#addressview-left', p2:'#addressview-right', - orientation:'v', relative:true, start:206, min:150, size:12, render:resize_leftcol }).init(); - new rcube_splitter({ id:'addressviewsplitter', p1:'#addresslist', p2:'#contacts-box', - orientation:'v', relative:true, start:266, min:260, size:12 }).init(); - } - - var dragmenu = $('#dragcontactmenu'); - if (dragmenu.length) { - rcmail.gui_object('dragmenu', 'dragcontactmenu'); - popups.dragmenu = dragmenu; - } - } - - // turn a group of fieldsets into tabs - $('.tabbed').each(function(idx, elem){ init_tabs(elem); }) - - // decorate select elements - $('select.decorated').each(function(){ - if (bw.opera) { - $(this).removeClass('decorated'); - return; - } - - var select = $(this), - parent = select.parent(), - height = Math.max(select.height(), 26) - 2, - width = select.width() - 22, - title = $('option', this).first().text(); - - if ($('option:selected', this).val() != '') - title = $('option:selected', this).text(); - - var overlay = $('' + title + '') - .css('position', 'absolute') - .offset(select.position()) - .insertAfter(select); - - overlay.children().width(width).height(height).css('line-height', (height - 1) + 'px'); - - if (parent.css('position') != 'absolute') - parent.css('position', 'relative'); - - // re-set original select width to fix click action and options width in some browsers - select.width(overlay.width()) - .on(bw.mz ? 'change keyup' : 'change', function() { - var val = $('option:selected', this).text(); - $(this).next().children().text(val); - }); - - select - .on('focus', function(e){ overlay.addClass('focus'); }) - .on('blur', function(e){ overlay.removeClass('focus'); }); - }); - - // set min-width to show all toolbar buttons - var screen = $('body.minwidth'); - if (screen.length) { - screen.css('min-width', $('.toolbar').width() + $('#quicksearchbar').width() + $('#searchfilter').width() + 30); - } - - // don't use $(window).resize() due to some unwanted side-effects - window.onresize = resize; - resize(); - } - - /** - * Update UI on window resize - */ - function resize(e) - { - // resize in intervals to prevent lags and double onresize calls in Chrome (#1489005) - var interval = e ? 10 : 0; - - if (rcmail.resize_timeout) - window.clearTimeout(rcmail.resize_timeout); - - rcmail.resize_timeout = window.setTimeout(function() { - if (rcmail.env.task == 'mail') { - if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') - layout_messageview(); - else if (rcmail.env.action == 'compose') - layout_composeview(); - } - - // make iframe footer buttons float if scrolling is active - $('body.iframe .footerleft').each(function(){ - var footer = $(this), - body = $(document.body), - floating = footer.hasClass('floating'), - overflow = body.outerHeight(true) > $(window).height(); - - if (overflow != floating) { - var action = overflow ? 'addClass' : 'removeClass'; - footer[action]('floating'); - body[action]('floatingbuttons'); - } - }); - }, interval); - } - - /** - * Triggered when a new user message is displayed - */ - function message_displayed(p) - { - var siblings = $(p.object).siblings('div'); - if (siblings.length) - $(p.object).insertBefore(siblings.first()); - - // show a popup dialog on errors - if (p.type == 'error' && rcmail.env.task != 'login') { - // hide original message object, we don't want both - rcmail.hide_message(p.object); - - if (me.message_timer) { - window.clearTimeout(me.message_timer); - } - - if (!me.messagedialog) { - me.messagedialog = $('
').addClass('popupdialog').hide(); - } - - var msg = p.message, - dialog_close = function() { - // check if dialog is still displayed, to prevent from js error - me.messagedialog.is(':visible') && me.messagedialog.dialog('destroy').hide(); - }; - - if (me.messagedialog.is(':visible') && me.messagedialog.text() != msg) - msg = me.messagedialog.html() + '

' + p.message + '

'; - - me.messagedialog.html(msg) - .dialog({ - resizable: false, - closeOnEscape: true, - dialogClass: 'popupmessage ' + p.type, - title: env.errortitle, - close: dialog_close, - position: ['center', 'center'], - hide: {effect: 'fadeOut'}, - width: 420, - minHeight: 90 - }).show(); - - me.messagedialog.closest('div[role=dialog]').attr('role', 'alertdialog'); - - if (p.timeout > 0) - me.message_timer = window.setTimeout(dialog_close, p.timeout); - } - } - - - /** - * Adjust UI objects of the mail view screen - */ - function layout_messageview() - { - //$('#messagecontent').css('top', ($('#messageheader').outerHeight() + 1) + 'px'); - $('#messagecontent').css('top', ($('.ytHeader').outerHeight() + $('#messageheader').outerHeight()) + 'px'); // YetiForce Sp. z o.o. // - $('#message-objects div a').addClass('button'); - - if (!$('#attachment-list li').length) { - $('div.rightcol').hide().attr('aria-hidden', 'true'); - $('div.leftcol').css('margin-right', '0'); - } - } - - - function render_mailboxlist(splitter) - { - // TODO: implement smart shortening of long folder names - } - - - function resize_leftcol(splitter) - { - // STUB - } - - function adjust_compose_editfields(elem) - { - if (elem.nodeName == 'TEXTAREA') { - var $elem = $(elem), line_height = 14, // hard-coded because some browsers only provide the outer height in elem.clientHeight - content_height = elem.scrollHeight, - rows = elem.value.length > 80 && content_height > line_height*1.5 ? 2 : 1; - $elem.css('height', (line_height*rows) + 'px'); - layout_composeview(); - } - } - - function layout_composeview() - { - var body = $('#composebody'), - form = $('#compose-content'), - bottom = $('#composeview-bottom'), - w, h, bh, ovflw, btns = 0, - minheight = 300, - - bh = form.height() - bottom.position().top; - ovflw = minheight - bh; - btns = ovflw > -100 ? 0 : 40; - bottom.height(Math.max(minheight, bh)); - form.css('overflow', ovflw > 0 ? 'auto' : 'hidden'); - - w = body.parent().width() - 5; - h = body.parent().height() - 8; - body.width(w).height(h); - - $('#composebodycontainer > div').width(w+8); - $('#composebody_ifr').height(h + 4 - $('div.mce-toolbar').height()); - $('#googie_edit_layer').width(w).height(h); + var env = {}; + var popups = {}; + var popupconfig = { + forwardmenu: {editable: 1}, + searchmenu: {editable: 1, callback: searchmenu}, + attachmentmenu: {}, + listoptions: {editable: 1}, + groupmenu: {above: 1}, + mailboxmenu: {above: 1}, + spellmenu: {callback: spellmenu}, + 'folder-selector': {iconized: 1} + }; + var me = this; + var mailviewsplit; + var compose_headers = {}; + var prefs; + // export public methods + this.set = setenv; + this.init = init; + this.init_tabs = init_tabs; + this.show_about = show_about; + this.show_popup = show_popup; + this.toggle_popup = toggle_popup; + this.add_popup = add_popup; + this.set_searchmod = set_searchmod; + this.set_searchscope = set_searchscope; + this.show_uploadform = show_uploadform; + this.show_header_row = show_header_row; + this.hide_header_row = hide_header_row; + this.update_quota = update_quota; + this.get_pref = get_pref; + this.save_pref = save_pref; + this.folder_search_init = folder_search_init; + // set minimal mode on small screens (don't wait for document.ready) + if (window.$ && document.body) { + var minmode = get_pref('minimalmode'); + if (parseInt(minmode) || (minmode === null && $(window).height() < 850)) { + $(document.body).addClass('minimal'); + } + + if (bw.tablet) { + $('#viewport').attr('content', "width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"); + } + } + + + /** + * + */ + function setenv(key, val) + { + env[key] = val; + } + + /** + * Get preference stored in browser + */ + function get_pref(key) + { + if (!prefs) { + prefs = rcmail.local_storage_get_item('prefs.larry', {}); + } + + // fall-back to cookies + if (prefs[key] == null) { + var cookie = rcmail.get_cookie(key); + if (cookie != null) { + prefs[key] = cookie; + // copy value to local storage and remove cookie (if localStorage is supported) + if (rcmail.local_storage_set_item('prefs.larry', prefs)) { + rcmail.set_cookie(key, cookie, new Date()); // expire cookie + } + } + } + + return prefs[key]; + } + + /** + * Saves preference value to browser storage + */ + function save_pref(key, val) + { + prefs[key] = val; + // write prefs to local storage (if supported) + if (!rcmail.local_storage_set_item('prefs.larry', prefs)) { + // store value in cookie + var exp = new Date(); + exp.setYear(exp.getFullYear() + 1); + rcmail.set_cookie(key, val, exp); + } + } + + /** + * Initialize UI + * Called on document.ready + */ + function init() + { + rcmail.addEventListener('message', message_displayed); + /*** prepare minmode functions ***/ + $('#taskbar a').each(function (i, elem) { + $(elem).append('' + $('.button-inner', this).html() + '') + }); + $('#taskbar .minmodetoggle').click(function (e) { + var ismin = $(document.body).toggleClass('minimal').hasClass('minimal'); + save_pref('minimalmode', ismin ? 1 : 0); + $(window).resize(); + }); + /*** mail task ***/ + if (rcmail.env.task == 'mail') { + rcmail.addEventListener('menu-open', menu_toggle) + .addEventListener('menu-close', menu_toggle) + .addEventListener('menu-save', save_listoptions) + .addEventListener('responseafterlist', function (e) { + switch_view_mode(rcmail.env.threading ? 'thread' : 'list', true) + }) + .addEventListener('responseaftersearch', function (e) { + switch_view_mode(rcmail.env.threading ? 'thread' : 'list', true) + }); + var dragmenu = $('#dragmessagemenu'); + if (dragmenu.length) { + rcmail.gui_object('dragmenu', 'dragmessagemenu'); + popups.dragmenu = dragmenu; + } + + if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') { + 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(); + if (this.blur && !rcube_event.is_keyboard(e)) + this.blur(); + return false; + }); + // add menu link for each attachment + $('#attachment-list > li').each(function () { + $(this).append($('Show options') + .bind('click keypress', function (e) { + if (e.type != 'keypress' || rcube_event.get_keycode(e) == 13) { + attachmentmenu(this, e); + return false; + } + }) + ); + }); + if (get_pref('previewheaders') == '1') { + toggle_preview_headers(); + } + } else if (rcmail.env.action == 'compose') { + rcmail.addEventListener('aftersend-attachment', show_uploadform) + .addEventListener('aftertoggle-editor', function (e) { + window.setTimeout(function () { + layout_composeview() + }, 200); + if (e && e.mode) + $("select[name='editorSelector']").val(e.mode); + }); + // Show input elements with non-empty value + var f, v, field, fields = ['cc', 'bcc', 'replyto', 'followupto']; + for (f = 0; f < fields.length; f++) { + v = fields[f]; + field = $('#_' + v); + if (field.length) { + field.on('change', {v: v}, function (e) { + if (this.value) + show_header_row(e.data.v, true); + }); + if (field.val() != '') + show_header_row(v, true); + } + } + + $('#composeoptionstoggle').click(function (e) { + var expanded = $('#composeoptions').toggle().is(':visible'); + $('#composeoptionstoggle').toggleClass('remove').attr('aria-expanded', expanded ? 'true' : 'false'); + layout_composeview(); + save_pref('composeoptions', expanded ? '1' : '0'); + if (!rcube_event.is_keyboard(e)) + this.blur(); + return false; + }).css('cursor', 'pointer'); + if (get_pref('composeoptions') !== '0') { + $('#composeoptionstoggle').click(); + } + + // adjust hight when textarea starts to scroll + $("textarea[name='_to'], textarea[name='_cc'], textarea[name='_bcc']").change(function (e) { + adjust_compose_editfields(this); + }).change(); + rcmail.addEventListener('autocomplete_insert', function (p) { + adjust_compose_editfields(p.field); + }); + // toggle compose options if opened in new window and they were visible before + var opener_rc = rcmail.opener(); + if (opener_rc && opener_rc.env.action == 'compose' && $('#composeoptionstoggle', opener.document).hasClass('remove')) + $('#composeoptionstoggle').click(); + new rcube_splitter({id: 'composesplitterv', p1: '#composeview-left', p2: '#composeview-right', + orientation: 'v', relative: true, start: 206, min: 170, size: 12, render: layout_composeview}).init(); + } else if (rcmail.env.action == 'list' || !rcmail.env.action) { + var previewframe = $('#mailpreviewframe').is(':visible'); + $('#mailpreviewtogglebtn .mailpreviewtoggle').addClass(previewframe ? 'enabled' : 'closed').attr('aria-expanded', previewframe ? 'true' : 'false') + .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; + }); + mailviewsplit = { + v: new rcube_splitter({id: 'mailviewsplitter_v', p1: '#mailview-top', p2: '#mailview-bottom', + orientation: 'v', relative: true, start: 310, min: 560, size: 12, offset: 4}), + h: new rcube_splitter({id: 'mailviewsplitter_h', p1: '#mailview-top', p2: '#mailview-bottom', + orientation: 'h', relative: true, start: 310, min: 150, size: 12, offset: 4}) + }; + console.log(previewframe); + if (previewframe) { + mailviewsplit.v.init(); + //mailviewsplit.h.init(); + } + rcmail.addEventListener('setquota', update_quota) + .addEventListener('enable-command', enable_command) + .addEventListener('afterimport-messages', show_uploadform); + } else if (rcmail.env.action == 'get') { + new rcube_splitter({id: 'mailpartsplitterv', p1: '#messagepartheader', p2: '#messagepartcontainer', + orientation: 'v', relative: true, start: 226, min: 150, size: 12}).init(); + } + + if ($('#mailview-left').length) { + new rcube_splitter({id: 'mailviewsplitterv', p1: '#mailview-left', p2: '#mailview-right', + orientation: 'v', relative: true, start: 206, 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'; + if (rcmail.env.action) + tab = '#settingstab' + (rcmail.env.action.indexOf('identity') > 0 ? 'identities' : rcmail.env.action.replace(/\./g, '')); + $(tab).addClass('selected') + .children().first().removeAttr('onclick').click(function () { + return false; + }); + }); + if (rcmail.env.action == 'folders') { + new rcube_splitter({id: 'folderviewsplitter', p1: '#folderslist', p2: '#folder-details', + orientation: 'v', relative: true, start: 266, min: 180, size: 12}).init(); + rcmail.addEventListener('setquota', update_quota); + folder_search_init($('#folderslist')); + } else if (rcmail.env.action == 'identities') { + new rcube_splitter({id: 'identviewsplitter', p1: '#identitieslist', p2: '#identity-details', + orientation: 'v', relative: true, start: 266, min: 180, size: 12}).init(); + } else if (rcmail.env.action == 'responses') { + new rcube_splitter({id: 'responseviewsplitter', p1: '#identitieslist', p2: '#identity-details', + orientation: 'v', relative: true, start: 266, min: 180, size: 12}).init(); + } else if (rcmail.env.action == 'preferences' || !rcmail.env.action) { + new rcube_splitter({id: 'prefviewsplitter', p1: '#sectionslist', p2: '#preferences-box', + orientation: 'v', relative: true, start: 266, min: 180, size: 12}).init(); + } else if (rcmail.env.action == 'edit-prefs') { + var legend = $('#preferences-details fieldset.advanced legend'), + toggle = $('') + .text(env.toggleoptions) + .attr('title', env.toggleoptions) + .addClass('advanced-toggle'); + 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 ***/ + else if (rcmail.env.task == 'addressbook') { + rcmail.addEventListener('afterupload-photo', show_uploadform) + .addEventListener('beforepushgroup', push_contactgroup) + .addEventListener('beforepopgroup', pop_contactgroup); + if (rcmail.env.action == '') { + new rcube_splitter({id: 'addressviewsplitterd', p1: '#addressview-left', p2: '#addressview-right', + orientation: 'v', relative: true, start: 206, min: 150, size: 12, render: resize_leftcol}).init(); + new rcube_splitter({id: 'addressviewsplitter', p1: '#addresslist', p2: '#contacts-box', + orientation: 'v', relative: true, start: 266, min: 260, size: 12}).init(); + } + + var dragmenu = $('#dragcontactmenu'); + if (dragmenu.length) { + rcmail.gui_object('dragmenu', 'dragcontactmenu'); + popups.dragmenu = dragmenu; + } + } + + // turn a group of fieldsets into tabs + $('.tabbed').each(function (idx, elem) { + init_tabs(elem); + }) + + // decorate select elements + $('select.decorated').each(function () { + if (bw.opera) { + $(this).removeClass('decorated'); + return; + } + + var select = $(this), + parent = select.parent(), + height = Math.max(select.height(), 26) - 2, + width = select.width() - 22, + title = $('option', this).first().text(); + if ($('option:selected', this).val() != '') + title = $('option:selected', this).text(); + var overlay = $('' + title + '') + .css('position', 'absolute') + .offset(select.position()) + .insertAfter(select); + overlay.children().width(width).height(height).css('line-height', (height - 1) + 'px'); + if (parent.css('position') != 'absolute') + parent.css('position', 'relative'); + // re-set original select width to fix click action and options width in some browsers + select.width(overlay.width()) + .on(bw.mz ? 'change keyup' : 'change', function () { + var val = $('option:selected', this).text(); + $(this).next().children().text(val); + }); + select + .on('focus', function (e) { + overlay.addClass('focus'); + }) + .on('blur', function (e) { + overlay.removeClass('focus'); + }); + }); + // set min-width to show all toolbar buttons + var screen = $('body.minwidth'); + if (screen.length) { + screen.css('min-width', $('.toolbar').width() + $('#quicksearchbar').width() + $('#searchfilter').width() + 30); + } + + // don't use $(window).resize() due to some unwanted side-effects + window.onresize = resize; + resize(); + } + + /** + * Update UI on window resize + */ + function resize(e) + { + // resize in intervals to prevent lags and double onresize calls in Chrome (#1489005) + var interval = e ? 10 : 0; + if (rcmail.resize_timeout) + window.clearTimeout(rcmail.resize_timeout); + rcmail.resize_timeout = window.setTimeout(function () { + if (rcmail.env.task == 'mail') { + if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') + layout_messageview(); + else if (rcmail.env.action == 'compose') + layout_composeview(); + } + + // make iframe footer buttons float if scrolling is active + $('body.iframe .footerleft').each(function () { + var footer = $(this), + body = $(document.body), + floating = footer.hasClass('floating'), + overflow = body.outerHeight(true) > $(window).height(); + if (overflow != floating) { + var action = overflow ? 'addClass' : 'removeClass'; + footer[action]('floating'); + body[action]('floatingbuttons'); + } + }); + }, interval); + } + + /** + * Triggered when a new user message is displayed + */ + function message_displayed(p) + { + var siblings = $(p.object).siblings('div'); + if (siblings.length) + $(p.object).insertBefore(siblings.first()); + // show a popup dialog on errors + if (p.type == 'error' && rcmail.env.task != 'login') { + // hide original message object, we don't want both + rcmail.hide_message(p.object); + if (me.message_timer) { + window.clearTimeout(me.message_timer); + } + + if (!me.messagedialog) { + me.messagedialog = $('
').addClass('popupdialog').hide(); + } + + var msg = p.message, + dialog_close = function () { + // check if dialog is still displayed, to prevent from js error + me.messagedialog.is(':visible') && me.messagedialog.dialog('destroy').hide(); + }; + if (me.messagedialog.is(':visible') && me.messagedialog.text() != msg) + msg = me.messagedialog.html() + '

' + p.message + '

'; + me.messagedialog.html(msg) + .dialog({ + resizable: false, + closeOnEscape: true, + dialogClass: 'popupmessage ' + p.type, + title: env.errortitle, + close: dialog_close, + position: ['center', 'center'], + hide: {effect: 'fadeOut'}, + width: 420, + minHeight: 90 + }).show(); + me.messagedialog.closest('div[role=dialog]').attr('role', 'alertdialog'); + if (p.timeout > 0) + me.message_timer = window.setTimeout(dialog_close, p.timeout); + } + } + + + /** + * Adjust UI objects of the mail view screen + */ + function layout_messageview() + { + //$('#messagecontent').css('top', ($('#messageheader').outerHeight() + 1) + 'px'); + $('#messagecontent').css('top', ($('.ytHeader').outerHeight() + $('#messageheader').outerHeight()) + 'px'); // YetiForce Sp. z o.o. // + $('#message-objects div a').addClass('button'); + if (!$('#attachment-list li').length) { + $('div.rightcol').hide().attr('aria-hidden', 'true'); + $('div.leftcol').css('margin-right', '0'); + } + } + + + function render_mailboxlist(splitter) + { + // TODO: implement smart shortening of long folder names + } + + + function resize_leftcol(splitter) + { + // STUB + } + + function adjust_compose_editfields(elem) + { + if (elem.nodeName == 'TEXTAREA') { + var $elem = $(elem), line_height = 14, // hard-coded because some browsers only provide the outer height in elem.clientHeight + content_height = elem.scrollHeight, + rows = elem.value.length > 80 && content_height > line_height * 1.5 ? 2 : 1; + $elem.css('height', (line_height * rows) + 'px'); + layout_composeview(); + } + } + + function layout_composeview() + { + var body = $('#composebody'), + form = $('#compose-content'), + bottom = $('#composeview-bottom'), + w, h, bh, ovflw, btns = 0, + minheight = 300, + bh = form.height() - bottom.position().top; + ovflw = minheight - bh; + btns = ovflw > -100 ? 0 : 40; + bottom.height(Math.max(minheight, bh)); + form.css('overflow', ovflw > 0 ? 'auto' : 'hidden'); + w = body.parent().width() - 5; + h = body.parent().height() - 8; + body.width(w).height(h); + $('#composebodycontainer > div').width(w + 8); + $('#composebody_ifr').height(h + 4 - $('div.mce-toolbar').height()); + $('#googie_edit_layer').width(w).height(h); // $('#composebodycontainer')[(btns ? 'addClass' : 'removeClass')]('buttons'); // $('#composeformbuttons')[(btns ? 'show' : 'hide')](); - var abooks = $('#directorylist'); - if (abooks.length) - $('#compose-contacts .scroller').css('top', abooks.position().top + abooks.outerHeight()); - } - - - function update_quota(p) - { - var element = $('#quotadisplay'), menu = $('#quotamenu'), - step = 24, step_count = 20, - y = p.total ? Math.ceil(p.percent / 100 * step_count) * step : 0; - - // never show full-circle if quota is close to 100% but below. - if (p.total && y == step * step_count && p.percent < 100) - y -= step; - - element.css('background-position', '0 -' + y + 'px'); - - if (p.table) { - if (!menu.length) - menu = $('
').appendTo($('body')); - - menu.html(p.table); - element.css('cursor', 'pointer').off('click').on('click', function(e) { - return rcmail.command('menu-open', 'quotamenu', e.target, e); - }); - } - } - - function folder_search_init(container) - { - // animation to unfold list search box - $('.boxtitle a.search', container).click(function(e) { - var title = $('.boxtitle', container), - box = $('.listsearchbox', container), - dir = box.is(':visible') ? -1 : 1, - height = 34 + ($('select', box).length ? 22 : 0); - - box.slideToggle({ - duration: 160, - progress: function(animation, progress) { - if (dir < 0) progress = 1 - progress; - $('.scroller', container).css('top', (title.outerHeight() + height * progress) + 'px'); - }, - complete: function() { - 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(); - } - // TODO: save state in localStorage - } - }); - - return false; - }); - } - - function enable_command(p) - { - if (p.command == 'reply-list' && rcmail.env.reply_all_mode == 1) { - var label = rcmail.gettext(p.status ? 'replylist' : 'replyall'); - if (rcmail.env.action == 'preview') - $('a.button.replyall').attr('title', label); - else - $('a.button.reply-all').text(label).attr('title', label); - } - } - - - /** - * Register a popup menu - */ - function add_popup(popup, config) - { - var obj = popups[popup] = $('#'+popup); - obj.appendTo(document.body); // move it to top for proper absolute positioning - - if (obj.length) - popupconfig[popup] = $.extend(popupconfig[popup] || {}, config || {}); - } - - /** - * Trigger for popup menus - */ - function toggle_popup(popup, e, config) - { - // auto-register menu object - if (config || !popupconfig[popup]) - add_popup(popup, config); - - return rcmail.command('menu-open', popup, e.target, e); - } - - /** - * (Deprecated) trigger for popup menus - */ - function show_popup(popup, show, config) - { - // auto-register menu object - if (config || !popupconfig[popup]) - add_popup(popup, config); - - config = popupconfig[popup] || {}; - var ref = $(config.link ? config.link : '#'+popup+'link'), - pos = ref.offset(); - if (ref.has('.inner')) - ref = ref.children('.inner'); - - // fire command with simulated mouse click event - return rcmail.command('menu-open', - { menu:popup, show:show }, - ref.get(0), - $.Event('click', { target:ref.get(0), pageX:pos.left, pageY:pos.top, clientX:pos.left, clientY:pos.top })); - } - - - /** - * Show/hide the preview pane - */ - function toggle_preview_pane(e) - { - var button = $(e.target), - frame = $('#mailpreviewframe'), - visible = !frame.is(':visible'), - splitter = mailviewsplit.pos || parseInt(get_pref('mailviewsplitter') || 320), - topstyles, bottomstyles, uid; - - frame.toggle(); - button.toggleClass('enabled closed').attr('aria-expanded', visible ? 'true' : 'false'); - - if (visible) { - $('#mailview-top').removeClass('fullheight').css({ bottom:'auto' }); - $('#mailview-bottom').css({ width:'auto' }).show(); - - rcmail.env.contentframe = 'messagecontframe'; - if (uid = rcmail.message_list.get_single_selection()) - rcmail.show_message(uid, false, true); - - // let the splitter set the correct size and position - if (mailviewsplit.handle) { - mailviewsplit.handle.show(); - mailviewsplit.resize(); - } - else - mailviewsplit.init(); - } - else { - rcmail.env.contentframe = null; - rcmail.show_contentframe(false); - - $('#mailview-top').addClass('fullheight').css({ width:'auto', bottom:'0px' }); - $('#mailview-bottom').css({ top:'auto', width:'0px' }).hide(); - - if (mailviewsplit.handle) - mailviewsplit.handle.hide(); - } - - if (rcmail.message_list) { - if (visible && uid) - rcmail.message_list.scrollto(uid); - rcmail.message_list.resize(); - } - - 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() - { - $('#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').attr('aria-expanded', 'true'); - else - button.attr('href', '#details').removeClass('remove').addClass('add').attr('aria-expanded', 'false'); - - save_pref('previewheaders', full.is(':visible') ? '1' : '0'); - } - - - /** - * - */ - function switch_view_mode(mode, force) - { - if (force || !$('#mail'+mode+'mode').hasClass('disabled')) { - $('#maillistmode, #mailthreadmode').removeClass('selected').attr('tabindex', '0').attr('aria-disabled', 'false'); - $('#mail'+mode+'mode').addClass('selected').attr('tabindex', '-1').attr('aria-disabled', 'true'); - } - } - - - /**** popup menu callbacks ****/ - - /** - * Handler for menu-open and menu-close events - */ - function menu_toggle(p) - { - if (p && p.name == 'messagelistmenu') { - show_listoptions(p); - } - else if (p) { - // adjust menu position according to config - var config = popupconfig[p.name] || {}, - ref = $(config.link || '#'+p.name+'link'), - visible = p.obj && p.obj.is(':visible'), - above = config.above; - - // fix position according to config - if (p.obj && visible && ref.length) { - var parent = ref.parent(), - win = $(window), pos; - - if (parent.hasClass('dropbutton')) - ref = parent; - - if (config.above || ref.hasClass('dropbutton')) { - pos = ref.offset(); - p.obj.css({ left:pos.left+'px', top:(pos.top + (config.above ? -p.obj.height() : ref.outerHeight()))+'px' }); - } - } - - // add the right classes - if (p.obj && config.iconized) { - p.obj.children('ul').addClass('iconized'); - } - - // apply some data-attributes from menu config - if (p.obj && config.editable) - p.obj.attr('data-editable', 'true'); - - // trigger callback function - if (typeof config.callback == 'function') { - config.callback(visible, p); - } - } - } - - function searchmenu(show) - { - if (show && rcmail.env.search_mods) { - var n, all, - obj = popups['searchmenu'], - list = $('input:checkbox[name="s_mods[]"]', obj), - mbox = rcmail.env.mailbox, - mods = rcmail.env.search_mods, - scope = rcmail.env.search_scope || 'base'; - - if (rcmail.env.task == 'mail') { - if (scope == 'all') - mbox = '*'; - 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 = '*'; - } - - if (mods[all]) - list.map(function() { - this.checked = true; - this.disabled = this.value != all; - }); - else { - list.prop('disabled', false).prop('checked', false); - for (n in mods) - $('#s_mod_' + n).prop('checked', true); - } - } - } - - function attachmentmenu(elem, event) - { - var id = elem.parentNode.id.replace(/^attach/, ''); - - $('#attachmenuopen').unbind('click').attr('onclick', '').click(function(e) { - return rcmail.command('open-attachment', id, this); - }); - - $('#attachmenudownload').unbind('click').attr('onclick', '').click(function() { - rcmail.command('download-attachment', id, this); - }); - - popupconfig.attachmentmenu.link = elem; - rcmail.command('menu-open', {menu: 'attachmentmenu', id: id}, elem, event); - } - - function spellmenu(show, p) - { - var k, link, li, - lang = rcmail.spellcheck_lang(), - ul = $('ul', p.obj); - - if (!ul.length) { - ul = $('
- +
@@ -285,15 +219,7 @@

-
-
    -
-
-
-
    -
    • -
-
+ diff --git a/skins/larry/templates/contact.html b/skins/larry/templates/contact.html index 59fe6f79..8d8b0c9f 100644 --- a/skins/larry/templates/contact.html +++ b/skins/larry/templates/contact.html @@ -1,31 +1,31 @@ - -<roundcube:object name="pagetitle" /> - + + <roundcube:object name="pagetitle" /> + -

+

-
- +
+
:
- + -
- -
+
+ +
-
- -
+
+ +
-
+
-
- -
+
+ +
diff --git a/skins/larry/templates/contactedit.html b/skins/larry/templates/contactedit.html index da7953ea..548ad1c1 100644 --- a/skins/larry/templates/contactedit.html +++ b/skins/larry/templates/contactedit.html @@ -1,16 +1,16 @@ - -<roundcube:object name="pagetitle" /> - + + <roundcube:object name="pagetitle" /> + -

+

-
:
+
:
diff --git a/skins/larry/templates/contactprint.html b/skins/larry/templates/contactprint.html index f3f169ec..8c93c817 100644 --- a/skins/larry/templates/contactprint.html +++ b/skins/larry/templates/contactprint.html @@ -1,20 +1,20 @@ - -<roundcube:object name="pagetitle" /> - - - - + + <roundcube:object name="pagetitle" /> + + + + - + -
-
- -
- -
+
+
+ +
+ +
- + diff --git a/skins/larry/templates/contactsearch.html b/skins/larry/templates/contactsearch.html index e622ddfd..f16f7e46 100644 --- a/skins/larry/templates/contactsearch.html +++ b/skins/larry/templates/contactsearch.html @@ -1,16 +1,16 @@ - -<roundcube:object name="pagetitle" /> - + + <roundcube:object name="pagetitle" /> + -

+

-
- -

+

+ +

diff --git a/skins/larry/templates/error.html b/skins/larry/templates/error.html index a65733eb..7efe76d1 100644 --- a/skins/larry/templates/error.html +++ b/skins/larry/templates/error.html @@ -1,18 +1,18 @@ - -<roundcube:object name="pagetitle" /> - + + <roundcube:object name="pagetitle" /> + - +
-$__page_content + $__page_content
diff --git a/skins/larry/templates/folderedit.html b/skins/larry/templates/folderedit.html index 18d24694..b32aaa45 100644 --- a/skins/larry/templates/folderedit.html +++ b/skins/larry/templates/folderedit.html @@ -1,23 +1,23 @@ - -<roundcube:object name="pagetitle" /> - + + <roundcube:object name="pagetitle" /> + -

+

-
- -
+
+ +
-
- - - " class="button" onclick="history.back()" />  - -
+
+ + + " class="button" onclick="history.back()" />  + +
diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html index c707d339..a5d0a187 100644 --- a/skins/larry/templates/folders.html +++ b/skins/larry/templates/folders.html @@ -1,8 +1,8 @@ - -<roundcube:object name="pagetitle" /> - + + <roundcube:object name="pagetitle" /> + @@ -10,56 +10,56 @@
-

:

+

:

- + -
+
-
-

- - -

-
- - -
-
- -
- +
+

+ + +

+
+ + +
+
+ +
+ - + -
+
-
-
- -
-
+
+
+ +
+
-
+
diff --git a/skins/larry/templates/identities.html b/skins/larry/templates/identities.html index 163469d1..2343857a 100644 --- a/skins/larry/templates/identities.html +++ b/skins/larry/templates/identities.html @@ -1,8 +1,8 @@ - -<roundcube:object name="pagetitle" /> - + + <roundcube:object name="pagetitle" /> + @@ -10,28 +10,28 @@
-

:

+

:

- + -
-
-

-
- -
-
- -
-
+
+
+

+
+ +
+
+ +
+
-
-
- -
-
+
+
+ +
+
-
+
diff --git a/skins/larry/templates/identityedit.html b/skins/larry/templates/identityedit.html index 8d5e6229..76c0c05c 100644 --- a/skins/larry/templates/identityedit.html +++ b/skins/larry/templates/identityedit.html @@ -1,20 +1,20 @@ - -<roundcube:object name="pagetitle" /> - + + <roundcube:object name="pagetitle" /> + -

+

-
- -
+
+ +
-
- -
+
+ +
diff --git a/skins/larry/templates/importcontacts.html b/skins/larry/templates/importcontacts.html index f18338cc..03ca7476 100644 --- a/skins/larry/templates/importcontacts.html +++ b/skins/larry/templates/importcontacts.html @@ -1,8 +1,8 @@ - -<roundcube:object name="pagetitle" /> - + + <roundcube:object name="pagetitle" /> + @@ -10,25 +10,25 @@
-

:

+

:

-

- +

+ -
-

+
+

-
- -
-

- -

-
+
+ +
+

+ +

+
-
+
diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html index 557b029e..2fa5fc48 100644 --- a/skins/larry/templates/login.html +++ b/skins/larry/templates/login.html @@ -1,56 +1,56 @@ - -<roundcube:object name="pagetitle" /> - - + + <roundcube:object name="pagetitle" /> + + -

+

-
-
-
+ +
+ /images/ajaxloader.gif + /images/ajaxloader_dark.gif + /images/buttons.png + /images/addcontact.png + /images/filetypes.png + /images/listicons.png + /images/messages.png + /images/messages_dark.png + /images/quota.png + /images/selector.png + /images/splitter.png + /images/watermark.jpg + " /> diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html index 2c4e0f2c..fa1f89ff 100644 --- a/skins/larry/templates/mail.html +++ b/skins/larry/templates/mail.html @@ -1,15 +1,15 @@ - -<roundcube:object name="pagetitle" /> - - + + <roundcube:object name="pagetitle" /> + + @@ -17,247 +17,252 @@
-

- - -

- - -
- - -
- - -
- - - - -
- -
-
- - - - -
- -
- - -
- -
- - - -
-

- -
- -
-

-
-
-
-
-
- - -
-
- - +

+ + +

+ - -
- - -   - + +
+ + +
+ + +
+ + + +
- - -
- -
- - - -
- -
- -
- -
- - - - - - - - - - + +
- - -
- -
    -
    • -
    • +
+ + - -