tiny-focus column for determining where focus should be

6 files changed, 16 insertions, 28 deletions

diff --git a/config/defaults.inc.php b/config/defaults.inc.php
index ab0e188bd..b430e1d19 100644
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@@ -496,7 +496,7 @@ $config['message_sort_order'] = 'DESC';
 
 // These cols are shown in the message list. Available cols are:
 // subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority'
-$config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment');
+$config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment', 'focus');
 
 // the default locale setting (leave empty for auto-detection)
 // RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 8f221a3a9..8084365d3 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -53,6 +53,7 @@ $labels['size']    = 'Size';
 $labels['priority'] = 'Priority';
 $labels['organization'] = 'Organization';
 $labels['readstatus'] = 'Read status';
+$labels['focus'] = 'Focus';
 $labels['listoptions'] = 'List options...';
 
 $labels['mailboxlist'] = 'Folders';
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index b5a8de408..0019d79c4 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -260,8 +260,6 @@ function rcmail_message_list($attrib)
     array_unshift($a_show_cols, 'subject');
   if (!in_array('threads', $a_show_cols))
     array_unshift($a_show_cols, 'threads');
-  if (!in_array('focus', $a_show_cols))
-    array_unshift($a_show_cols, 'focus');
 
   $_SESSION['skin_path'] = $CONFIG['skin_path'];
 
@@ -311,9 +309,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
     array_unshift($a_show_cols, 'subject');
   if (!in_array('threads', $a_show_cols))
     array_unshift($a_show_cols, 'threads');
-  if (!in_array('focus', $a_show_cols))
-    array_unshift($a_show_cols, 'focus');	
-
+	
   $_SESSION['list_attrib']['columns'] = $a_show_cols;
 
   // Make sure there are no duplicated columns (#1486999)
@@ -339,7 +335,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
   if (empty($a_headers))
     return;
 
-  // remove 'threads', 'attachment', 'flag', 'status' columns, we don't need them here
+  // remove 'threads', 'attachment', 'flag', 'status', 'focus' columns, we don't need them here
   foreach (array('threads', 'attachment', 'flag', 'status', 'priority', 'focus') as $col) {
     if (($key = array_search($col, $a_show_cols)) !== FALSE)
       unset($a_show_cols[$key]);
diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css
index 960ce7648..340e8511f 100644
--- a/skins/larry/iehacks.css
+++ b/skins/larry/iehacks.css
@@ -74,7 +74,7 @@ input.button:active {
 	left: 10px;
 }
 
-.records-table tr.selected td {
+.records-table tr.selected td, .records-table tr.focused > td.focus {
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#019bc6', endColorstr='#017cb4', GradientType=0);
 }
 
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 261618f7f..172637028 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1296,6 +1296,15 @@ table.records-table {
 	border-left: 0;
 }
 
+.records-table td.focus {
+	width: 2px;
+}
+
+.records-table tr.selected > td.focus {
+	filter: none;
+	background: white;
+}
+
 .records-table tr.selected td, .records-table tr.focused > td.focus {
 	color: #fff !important;
 	background: #019bc6;
@@ -1326,25 +1335,6 @@ table.records-table {
 	color: #ccc !important;
 }
 
-.records-table td.focus {
-	/*background: none repeat scroll 0 0 rgba(0, 0, 0, 0);*/
-	width: 2px;
-}
- .records-table tr.focused > td.focus {
-    border-bottom: 1px solid #017cb4;
-    border-top: 1px double #019bc6;
- }
-
-.records-table tr.selected.focused > td.focus {
-	background: none repeat scroll 0 0 white;
-	border-top: none;
-	border-bottom: 1px solid #ddd;
-}
-/*
-.records-table tr.focused > td.focus {
-	background: #019bc6 !important;
-}
-*/
 /*** iFrames ***/
 
 #aboutframe {
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index f2c52c820..640c73950 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -175,7 +175,7 @@
 </div>
 
 <div id="listoptions" class="propform popupdialog">
-<roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" />
+	<roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" />
 	<fieldset class="floating">
 		<legend><roundcube:label name="listcolumns" /></legend>
 		<ul class="proplist">
@@ -192,6 +192,7 @@
 			<li><label><input type="checkbox" name="list_col[]" value="attachment" /> <span><roundcube:label name="attachment" /></span></label></li>
 			<li><label><input type="checkbox" name="list_col[]" value="flag" /> <span><roundcube:label name="flag" /></span></label></li>
 			<li><label><input type="checkbox" name="list_col[]" value="priority" /> <span><roundcube:label name="priority" /></span></label></li>
+			<li><label><input type="checkbox" name="list_col[]" value="focus" /> <span><roundcube:label name="focus" /></span></label></li>		
 		</ul>
 	</fieldset>
 	<roundcube:endif />