plugins/calendar plugins/tasklist
Thomas Brüderli
bruederli at kolabsys.com
Thu Jul 31 14:54:03 CEST 2014
plugins/calendar/drivers/kolab/kolab_calendar.php | 2 +-
plugins/calendar/skins/larry/calendar.css | 9 +++------
plugins/calendar/skins/larry/templates/attachment.html | 3 +--
plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php | 2 +-
plugins/tasklist/skins/larry/tasklist.css | 8 ++------
plugins/tasklist/skins/larry/templates/attachment.html | 3 +--
plugins/tasklist/tasklist.php | 2 +-
7 files changed, 10 insertions(+), 19 deletions(-)
New commits:
commit 887ec67df89fcaec0bcb977d9789005437f5f741
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Jul 31 14:53:56 2014 +0200
Fix attachment saving and displaying
diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index ba71846..0ea41e6 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -606,7 +606,7 @@ class kolab_calendar extends kolab_storage_folder_api
foreach ($event['attachments'] as $attachment) {
$key = null;
// Roundcube ID has nothing to do with the storage ID, remove it
- if ($attachment['content']) {
+ if ($attachment['content'] || $attachment['path']) {
unset($attachment['id']);
}
else {
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index d9bf5d0..737e4b2 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -34,12 +34,8 @@ body.calendarmain #mainscreen {
}
}
-body.attachmentwin #mainscreen {
- top: 60px;
-}
-
-body.attachmentwin #topnav .topright {
- margin-top: 20px;
+body.calendar.attachmentwin #mainscreen {
+ top: 32px;
}
#calendarsidebar {
@@ -549,6 +545,7 @@ a.miniColors-trigger {
text-shadow: 0px 1px 1px #fff;
text-decoration: none;
white-space: nowrap;
+ line-height: 20px;
}
#edit-attachments ul li a.file {
diff --git a/plugins/calendar/skins/larry/templates/attachment.html b/plugins/calendar/skins/larry/templates/attachment.html
index 9879a10..a3cc254 100644
--- a/plugins/calendar/skins/larry/templates/attachment.html
+++ b/plugins/calendar/skins/larry/templates/attachment.html
@@ -4,11 +4,10 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
</head>
-<body class="extwin attachmentwin">
+<body class="extwin calendar attachmentwin">
<div id="header">
<div id="topnav">
- <roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" />
<div class="topright">
<a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a>
</div>
diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index bcc5c06..6370301 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -879,7 +879,7 @@ class tasklist_kolab_driver extends tasklist_driver
foreach ($task['attachments'] as $idx => $attachment) {
$key = null;
// Roundcube ID has nothing to do with the storage ID, remove it
- if ($attachment['content']) {
+ if ($attachment['content'] || $attachment['path']) {
unset($attachment['id']);
}
else {
diff --git a/plugins/tasklist/skins/larry/tasklist.css b/plugins/tasklist/skins/larry/tasklist.css
index 96b5e82..f69931c 100644
--- a/plugins/tasklist/skins/larry/tasklist.css
+++ b/plugins/tasklist/skins/larry/tasklist.css
@@ -30,12 +30,8 @@ div.uidialog {
display: none;
}
-body.attachmentwin #mainscreen {
- top: 60px;
-}
-
-body.attachmentwin #topnav .topright {
- margin-top: 20px;
+body.tasklist.attachmentwin #mainscreen {
+ top: 32px;
}
.tasklistview #mainscreen {
diff --git a/plugins/tasklist/skins/larry/templates/attachment.html b/plugins/tasklist/skins/larry/templates/attachment.html
index 9879a10..c07f854 100644
--- a/plugins/tasklist/skins/larry/templates/attachment.html
+++ b/plugins/tasklist/skins/larry/templates/attachment.html
@@ -4,11 +4,10 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
</head>
-<body class="extwin attachmentwin">
+<body class="extwin tasklist attachmentwin">
<div id="header">
<div id="topnav">
- <roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" />
<div class="topright">
<a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a>
</div>
diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index 728c4a3..6dacf6f 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -342,7 +342,7 @@ class tasklist extends rcube_plugin
$this->rc->output->show_message('tasklist.errornotifying', 'error');
}
}
- else if ($success && $rec['_reportpartstat']) {
+ else if ($success && $rec['_reportpartstat'] && $rec['_reportpartstat'] != 'NEEDS-ACTION') {
// get the full record after update
$task = $this->driver->get_task($rec);
More information about the commits
mailing list