From 48f65c6a7129073fb8c04abdfdaaee77dfd6709e Mon Sep 17 00:00:00 2001
From: Charles McNulty <cmcnulty@kznf.com>
Date: Mon, 04 Nov 2013 14:01:55 -0500
Subject: [PATCH] tiny-focus column for determining where focus should be
---
skins/larry/templates/mail.html | 3 ++-
program/steps/mail/func.inc | 8 ++------
program/localization/en_US/labels.inc | 1 +
skins/larry/styles.css | 28 +++++++++-------------------
skins/larry/iehacks.css | 2 +-
config/defaults.inc.php | 2 +-
6 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/config/defaults.inc.php b/config/defaults.inc.php
index ab0e188..b430e1d 100644
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@@ -496,7 +496,7 @@
// 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 8f221a3..8084365 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -53,6 +53,7 @@
$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 b5a8de4..0019d79 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -260,8 +260,6 @@
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 @@
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 @@
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 960ce76..340e851 100644
--- a/skins/larry/iehacks.css
+++ b/skins/larry/iehacks.css
@@ -74,7 +74,7 @@
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 261618f..1726370 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1296,6 +1296,15 @@
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 @@
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 f2c52c8..640c739 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 />
--
Gitblit v1.9.1