Added separate From and To columns apart from smart From/To column (#1486891)

3 files changed, 11 insertions, 14 deletions

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,