4 commits - plugins/calendar plugins/tasklist
Thomas Brüderli
bruederli at kolabsys.com
Thu Oct 17 17:31:53 CEST 2013
plugins/calendar/calendar.php | 2 +-
plugins/calendar/drivers/database/database_driver.php | 1 +
plugins/calendar/skins/classic/calendar.css | 8 ++++++++
plugins/calendar/skins/classic/images/toolbar.png |binary
plugins/calendar/skins/classic/templates/calendar.html | 2 +-
plugins/calendar/skins/larry/calendar.css | 9 +++++++++
plugins/calendar/skins/larry/images/toolbar.png |binary
plugins/calendar/skins/larry/templates/calendar.html | 2 +-
plugins/tasklist/drivers/database/tasklist_database_driver.php | 1 +
9 files changed, 22 insertions(+), 3 deletions(-)
New commits:
commit d425e9812dc37cb1acd7b62081c8d5c1c0f282fa
Merge: 6a7b0f8 4065542
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Oct 17 17:29:09 2013 +0200
Merge branch 'master' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab
commit 6a7b0f8714856e17758d5df842eb4b6188cd0ef5
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Oct 17 17:28:28 2013 +0200
Move button for event import to the toolbar in order to make the UI consistent with the address book (#1655)
diff --git a/plugins/calendar/skins/classic/calendar.css b/plugins/calendar/skins/classic/calendar.css
index c646b0d..ff3357b 100644
--- a/plugins/calendar/skins/classic/calendar.css
+++ b/plugins/calendar/skins/classic/calendar.css
@@ -253,6 +253,14 @@ pre {
background-position: -64px -32px;
}
+#calendartoolbar a.import {
+ background-position: -168px 0;
+}
+
+#calendartoolbar a.importSel {
+ background-position: -168px -32px;
+}
+
#calendartoolbar a.export {
background-position: -128px 0;
}
diff --git a/plugins/calendar/skins/classic/images/toolbar.png b/plugins/calendar/skins/classic/images/toolbar.png
index 94beddb..d49162a 100644
Binary files a/plugins/calendar/skins/classic/images/toolbar.png and b/plugins/calendar/skins/classic/images/toolbar.png differ
diff --git a/plugins/calendar/skins/classic/templates/calendar.html b/plugins/calendar/skins/classic/templates/calendar.html
index ba80ca3..bb3e4b1 100644
--- a/plugins/calendar/skins/classic/templates/calendar.html
+++ b/plugins/calendar/skins/classic/templates/calendar.html
@@ -36,7 +36,6 @@
<li><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li>
<li><roundcube:button command="calendar-remove" label="calendar.remove" classAct="active" /></li>
<li><roundcube:button command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
- <li><roundcube:button command="events-import" label="calendar.importevents" classAct="active" /></li>
<roundcube:if condition="env:calendar_driver == 'kolab'" />
<li class="separator_above"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
<roundcube:endif />
@@ -159,6 +158,7 @@
<div id="calendartoolbar">
<roundcube:button command="addevent" type="link" class="buttonPas addevent" classAct="button addevent" classSel="button addeventSel" title="calendar.new_event" content=" " />
<roundcube:button command="print" type="link" class="buttonPas print" classAct="button print" classSel="button printSel" title="calendar.print" content=" " />
+ <roundcube:button command="events-import" type="link" class="buttonPas import" classAct="button import" classSel="button importSel" title="calendar.importevents" content=" " />
<roundcube:button command="export" type="link" class="buttonPas export" classAct="button export" classSel="button exportSel" title="calendar.export" content=" " />
<roundcube:container name="toolbar" id="calendartoolbar" />
</div>
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 48160ad..3231436 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -275,6 +275,7 @@ pre {
top: -6px;
left: 0;
height: 40px;
+ white-space: nowrap;
}
#calendartoolbar a.button {
@@ -286,9 +287,17 @@ pre {
}
#calendartoolbar a.button.export {
+ min-width: 50px;
+ max-width: 55px;
background-position: center -40px;
}
+#calendartoolbar a.button.import {
+ min-width: 50px;
+ max-width: 55px;
+ background-position: center -440px;
+}
+
#calendartoolbar a.button.print {
background-position: center -80px;
}
diff --git a/plugins/calendar/skins/larry/images/toolbar.png b/plugins/calendar/skins/larry/images/toolbar.png
index 16ce444..f829837 100644
Binary files a/plugins/calendar/skins/larry/images/toolbar.png and b/plugins/calendar/skins/larry/images/toolbar.png differ
diff --git a/plugins/calendar/skins/larry/templates/calendar.html b/plugins/calendar/skins/larry/templates/calendar.html
index 79ce5ad..341632b 100644
--- a/plugins/calendar/skins/larry/templates/calendar.html
+++ b/plugins/calendar/skins/larry/templates/calendar.html
@@ -14,6 +14,7 @@
<div id="calendartoolbar" class="toolbar">
<roundcube:button command="addevent" type="link" class="button addevent disabled" classAct="button addevent" classSel="button addevent pressed" label="calendar.new_event" title="calendar.new_event" />
<roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="calendar.print" title="calendar.printtitle" />
+ <roundcube:button command="events-import" type="link" class="button import disabled" classAct="button import" classSel="button import pressed" label="import" title="calendar.importevents" />
<roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="calendar.export" title="calendar.exporttitle" />
<roundcube:container name="toolbar" id="calendartoolbar" />
</div>
@@ -50,7 +51,6 @@
<li><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li>
<li><roundcube:button command="calendar-remove" label="calendar.remove" classAct="active" /></li>
<li><roundcube:button command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
- <li><roundcube:button command="events-import" label="calendar.importevents" classAct="active" /></li>
<roundcube:if condition="env:calendar_driver == 'kolab'" />
<li class="separator_above"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
<roundcube:endif />
commit 5aae0e674be3fe3c4f3a49411f7e88d98b0f5724
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Oct 17 17:26:52 2013 +0200
Fix exporting of not activated calednars
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index a31bec7..9d5d67b 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1039,7 +1039,7 @@ class calendar extends rcube_plugin
if (!$start) $start = mktime(0, 0, 0, 1, date('n'), date('Y')-1);
if (!$end) $end = mktime(0, 0, 0, 31, 12, date('Y')+10);
$calid = $calname = get_input_value('source', RCUBE_INPUT_GET);
- $calendars = $this->driver->list_calendars(true);
+ $calendars = $this->driver->list_calendars();
if ($calendars[$calid]) {
$calname = $calendars[$calid]['name'] ? $calendars[$calid]['name'] : $calid;
commit 6f5d53a5b07fb0dec0570d5fbc168defceca7bff
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Oct 17 16:58:05 2013 +0200
Provide the new 'listname' attributes in database drivers, too
diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index e20b9f0..8cd363c 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -90,6 +90,7 @@ class database_driver extends calendar_driver
$arr['showalarms'] = intval($arr['showalarms']);
$arr['active'] = !in_array($arr['id'], $hidden);
$arr['name'] = html::quote($arr['name']);
+ $arr['listname'] = html::quote($arr['name']);
$this->calendars[$arr['calendar_id']] = $arr;
$calendar_ids[] = $this->rc->db->quote($arr['calendar_id']);
}
diff --git a/plugins/tasklist/drivers/database/tasklist_database_driver.php b/plugins/tasklist/drivers/database/tasklist_database_driver.php
index 742d6da..8ad776a 100644
--- a/plugins/tasklist/drivers/database/tasklist_database_driver.php
+++ b/plugins/tasklist/drivers/database/tasklist_database_driver.php
@@ -73,6 +73,7 @@ class tasklist_database_driver extends tasklist_driver
$arr['showalarms'] = intval($arr['showalarms']);
$arr['active'] = !in_array($arr['id'], $hidden);
$arr['name'] = html::quote($arr['name']);
+ $arr['listname'] = html::quote($arr['name']);
$arr['editable'] = true;
$this->lists[$arr['id']] = $arr;
$list_ids[] = $this->rc->db->quote($arr['id']);
More information about the commits
mailing list