plugins/tasklist
Thomas Brüderli
bruederli at kolabsys.com
Wed Sep 26 16:45:30 CEST 2012
plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php | 3 ++-
plugins/tasklist/skins/larry/tasklist.css | 5 +++--
plugins/tasklist/tasklist.js | 2 +-
plugins/tasklist/tasklist.php | 4 ++--
4 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 753a016a4e0b2e8cb1dde62f0d18c8c035dfe9f0
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Wed Sep 26 16:45:11 2012 +0200
Minor fixes and improvements
diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index b70a4a0..3aef4dc 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -553,7 +553,8 @@ class tasklist_kolab_driver extends tasklist_driver
// convert from DateTime to internal date format
if (is_a($record['start'], 'DateTime')) {
$task['startdate'] = $record['start']->format('Y-m-d');
- $task['starttime'] = $record['start']->format('h:i');
+ if (!$record['start']->_dateonly)
+ $task['starttime'] = $record['start']->format('h:i');
}
if (is_a($record['dtstamp'], 'DateTime')) {
$task['changed'] = $record['dtstamp'];
diff --git a/plugins/tasklist/skins/larry/tasklist.css b/plugins/tasklist/skins/larry/tasklist.css
index 7f38a1c..dda3896 100644
--- a/plugins/tasklist/skins/larry/tasklist.css
+++ b/plugins/tasklist/skins/larry/tasklist.css
@@ -432,7 +432,7 @@ body.attachmentwin #topnav .topright {
display: block;
position: absolute;
top: 3px;
- right: 110px;
+ right: 10em;
max-width: 14em;
height: 16px;
overflow: hidden;
@@ -451,7 +451,7 @@ body.attachmentwin #topnav .topright {
.taskhead .date {
position: absolute;
- top: 6px;
+ top: 4px;
right: 30px;
text-align: right;
cursor: pointer;
@@ -477,6 +477,7 @@ body.attachmentwin #topnav .topright {
box-shadow: none;
outline: none;
text-align: right;
+ width: 6em;
}
.taskhead .actions,
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 56f29cd..68bcffd 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -248,7 +248,7 @@ function rcube_tasklist_ui(settings)
input.datepicker($.extend({
onClose: function(dateText, inst) {
- if (dateText != rec.date) {
+ if (dateText != (rec.date || '')) {
rec.date = dateText;
save_task(rec, 'edit');
}
diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index b28b2e3..f9ae1c0 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -674,9 +674,9 @@ class tasklist extends rcube_plugin
$mask |= self::FILTER_MASK_TODAY;
if ($duedate <= $tomorrow || ($rec['startdate'] && $start <= $tomorrow))
$mask |= self::FILTER_MASK_TOMORROW;
- if (($start > $tomorrow || $duedate > $tomorrow) && $duedate <= $weeklimit)
+ if ($start > $tomorrow || ($duedate > $tomorrow && $duedate <= $weeklimit))
$mask |= self::FILTER_MASK_WEEK;
- if ($start > $weeklimit || $duedate > $weeklimit)
+ if ($start > $weeklimit || ($rec['date'] && $duedate > $weeklimit))
$mask |= self::FILTER_MASK_LATER;
return $mask;
More information about the commits
mailing list