diff options
Diffstat (limited to 'skins')
| -rw-r--r-- | skins/classic/functions.js | 16 | ||||
| -rw-r--r-- | skins/classic/mail.css | 1 | ||||
| -rw-r--r-- | skins/classic/templates/mail.html | 8 | ||||
| -rw-r--r-- | skins/larry/mail.css | 1 | ||||
| -rw-r--r-- | skins/larry/templates/mail.html | 8 | ||||
| -rw-r--r-- | skins/larry/ui.js | 16 |
6 files changed, 24 insertions, 26 deletions
diff --git a/skins/classic/functions.js b/skins/classic/functions.js index 48f9acd75..9b83b9044 100644 --- a/skins/classic/functions.js +++ b/skins/classic/functions.js @@ -298,22 +298,18 @@ listmenu: function(show) pos.left = pos.left - menuwidth; obj.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)}); + // set form values $('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true); $('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC'); $('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC'); $('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false); $('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true); - // list columns - var found, cols = $('input[name="list_col[]"]'); - for (var i=0; i<cols.length; i++) { - if (cols[i].value != 'from') - found = jQuery.inArray(cols[i].value, rcmail.env.coltypes) != -1; - else - found = (jQuery.inArray('from', rcmail.env.coltypes) != -1 - || jQuery.inArray('to', rcmail.env.coltypes) != -1); - $(cols[i]).prop('checked', found); - } + + // set checkboxes + $('input[name="list_col[]"]').each(function() { + $(this).prop('checked', jQuery.inArray(this.value, rcmail.env.coltypes) != -1); + }); } obj[show?'show':'hide'](); diff --git a/skins/classic/mail.css b/skins/classic/mail.css index 8f90dc1c1..b056a0853 100644 --- a/skins/classic/mail.css +++ b/skins/classic/mail.css @@ -910,6 +910,7 @@ body.messagelist padding: 0 2px; } +#messagelist tr td.fromto, #messagelist tr td.from, #messagelist tr td.to, #messagelist tr td.cc, diff --git a/skins/classic/templates/mail.html b/skins/classic/templates/mail.html index 74e984719..96fe72ecd 100644 --- a/skins/classic/templates/mail.html +++ b/skins/classic/templates/mail.html @@ -159,7 +159,9 @@ <ul class="toolbarmenu"> <li><input type="checkbox" name="list_col[]" value="threads" id="cols_threads" checked="checked" disabled="disabled" /><label for="cols_threads" class="disabled"><roundcube:label name="threads" /></label></li> <li><input type="checkbox" name="list_col[]" value="subject" id="cols_subject" checked="checked" disabled="disabled" /><label for="cols_subject" class="disabled"><roundcube:label name="subject" /></label></li> - <li><input type="checkbox" name="list_col[]" value="from" id="cols_fromto" /><label for="cols_fromto"><roundcube:label name="fromto" /></label></li> + <li><input type="checkbox" name="list_col[]" value="fromto" id="cols_fromto" /><label for="cols_fromto"><roundcube:label name="fromto" /></label></li> + <li><input type="checkbox" name="list_col[]" value="from" id="cols_from" /><label for="cols_from"><roundcube:label name="from" /></label></li> + <li><input type="checkbox" name="list_col[]" value="to" id="cols_to" /><label for="cols_to"><roundcube:label name="to" /></label></li> <li><input type="checkbox" name="list_col[]" value="replyto" id="cols_replyto" /><label for="cols_replyto"><roundcube:label name="replyto" /></label></li> <li><input type="checkbox" name="list_col[]" value="cc" id="cols_cc" /><label for="cols_cc"><roundcube:label name="cc" /></label></li> <li><input type="checkbox" name="list_col[]" value="date" id="cols_date" /><label for="cols_date"><roundcube:label name="date" /></label></li> @@ -178,7 +180,9 @@ <li><input type="radio" name="sort_col" value="arrival" id="sort_arrival" /><label for="sort_arrival"><roundcube:label name="arrival" /></label></li> <li><input type="radio" name="sort_col" value="date" id="sort_date" /><label for="sort_date"><roundcube:label name="sentdate" /></label></li> <li><input type="radio" name="sort_col" value="subject" id="sort_subject" /><label for="sort_subject"><roundcube:label name="subject" /></label></li> - <li><input type="radio" name="sort_col" value="from" id="sort_fromto" /><label for="sort_fromto"><roundcube:label name="fromto" /></label></li> + <li><input type="radio" name="sort_col" value="fromto" id="sort_fromto" /><label for="sort_fromto"><roundcube:label name="fromto" /></label></li> + <li><input type="radio" name="sort_col" value="from" id="sort_from" /><label for="sort_from"><roundcube:label name="from" /></label></li> + <li><input type="radio" name="sort_col" value="to" id="sort_to" /><label for="sort_to"><roundcube:label name="to" /></label></li> <li><input type="radio" name="sort_col" value="to" id="sort_replyto" /><label for="sort_replyto"><roundcube:label name="replyto" /></label></li> <li><input type="radio" name="sort_col" value="cc" id="sort_cc" /><label for="sort_cc"><roundcube:label name="cc" /></label></li> <li><input type="radio" name="sort_col" value="size" id="sort_size" /><label for="sort_size"><roundcube:label name="size" /></label></li> diff --git a/skins/larry/mail.css b/skins/larry/mail.css index 512fb41d8..ee208c30d 100644 --- a/skins/larry/mail.css +++ b/skins/larry/mail.css @@ -422,6 +422,7 @@ a.iconbutton.threadmode.selected { text-align: right; } +#messagelist tr td.fromto, #messagelist tr td.from, #messagelist tr td.to, #messagelist tr td.cc, diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html index 32c64d929..8b205efbe 100644 --- a/skins/larry/templates/mail.html +++ b/skins/larry/templates/mail.html @@ -181,7 +181,9 @@ <ul class="proplist"> <li><label class="disabled"><input type="checkbox" name="list_col[]" value="threads" checked="checked" disabled="disabled" /> <roundcube:label name="threads" /></label></li> <li><label class="disabled"><input type="checkbox" name="list_col[]" value="subject" checked="checked" disabled="disabled" /> <roundcube:label name="subject" /></label></li> - <li><label><input type="checkbox" name="list_col[]" value="from" /> <roundcube:label name="fromto" /></label></li> + <li><label><input type="checkbox" name="list_col[]" value="fromto" /> <roundcube:label name="fromto" /></label></li> + <li><label><input type="checkbox" name="list_col[]" value="from" /> <roundcube:label name="from" /></label></li> + <li><label><input type="checkbox" name="list_col[]" value="to" /> <roundcube:label name="to" /></label></li> <li><label><input type="checkbox" name="list_col[]" value="replyto" /> <roundcube:label name="replyto" /></label></li> <li><label><input type="checkbox" name="list_col[]" value="cc" /> <roundcube:label name="cc" /></label></li> <li><label><input type="checkbox" name="list_col[]" value="date" /> <roundcube:label name="date" /></label></li> @@ -201,7 +203,9 @@ <li><label><input type="radio" name="sort_col" value="arrival" /> <roundcube:label name="arrival" /></label></li> <li><label><input type="radio" name="sort_col" value="date" /> <roundcube:label name="sentdate" /></label></li> <li><label><input type="radio" name="sort_col" value="subject" /> <roundcube:label name="subject" /></label></li> - <li><label><input type="radio" name="sort_col" value="from" /> <roundcube:label name="fromto" /></label></li> + <li><label><input type="radio" name="sort_col" value="fromto" /> <roundcube:label name="fromto" /></label></li> + <li><label><input type="radio" name="sort_col" value="from" /> <roundcube:label name="from" /></label></li> + <li><label><input type="radio" name="sort_col" value="to" /> <roundcube:label name="to" /></label></li> <li><label><input type="radio" name="sort_col" value="cc" /> <roundcube:label name="cc" /></label></li> <li><label><input type="radio" name="sort_col" value="size" /> <roundcube:label name="size" /></label></li> </ul> diff --git a/skins/larry/ui.js b/skins/larry/ui.js index 906db1d52..37baf59be 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -618,18 +618,10 @@ function rcube_mail_ui() $('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false); $('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true); - // list columns - var found, cols = $('input[name="list_col[]"]'); - for (var i=0; i < cols.length; i++) { - if (cols[i].value != 'from') { - found = $.inArray(cols[i].value, rcmail.env.coltypes) != -1; - } - else { - found = ($.inArray('from', rcmail.env.coltypes) != -1 - || $.inArray('to', rcmail.env.coltypes) != -1); - } - $(cols[i]).prop('checked', found); - } + // set checkboxes + $('input[name="list_col[]"]').each(function() { + $(this).prop('checked', $.inArray(this.value, rcmail.env.coltypes) != -1); + }); $dialog.dialog({ modal: true, |