diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 85357dd6..8fe4107f 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -621,8 +621,9 @@ class calendar_ui
// load miniColors js/css files
jqueryui::miniColors();
- $this->rc->output->add_handler('calendarform', array($this, 'calendarform'));
- $this->rc->output->send('calendar.folderform');
+ $this->rc->output->set_env('pagetitle', $this->cal->gettext('calendarprops'));
+ $this->rc->output->add_handler('folderform', array($this, 'calendarform'));
+ $this->rc->output->send('libkolab.folderform');
}
/**
diff --git a/plugins/calendar/localization/en_US.inc b/plugins/calendar/localization/en_US.inc
index cd05ccd5..1eea00d4 100644
--- a/plugins/calendar/localization/en_US.inc
+++ b/plugins/calendar/localization/en_US.inc
@@ -297,6 +297,7 @@ $labels['arialabelsearchform'] = 'Event search form';
$labels['arialabelquicksearchbox'] = 'Event search input';
$labels['arialabelcalsearchform'] = 'Calendars search form';
$labels['calendaractions'] = 'Calendar actions';
+$labels['calendarprops'] = 'Calendar properties';
$labels['arialabeleventattendees'] = 'Event participants list';
$labels['arialabeleventresources'] = 'Event resources list';
$labels['arialabelresourcesearchform'] = 'Resources search form';
diff --git a/plugins/calendar/skins/elastic/templates/folderform.html b/plugins/calendar/skins/elastic/templates/folderform.html
deleted file mode 100644
index d6beaeb9..00000000
--- a/plugins/calendar/skins/elastic/templates/folderform.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- :
-
-
-
-
-
-
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 297b4e43..c5d53c97 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -1501,20 +1501,6 @@ a.dropdown-link:after {
padding-right: 0.5em;
}
-#calendar-kolabform {
- position: relative;
- margin: 0 -8px;
- min-width: 660px;
- min-height: 400px;
-}
-
-#calendar-kolabform table td.title {
- font-weight: bold;
- white-space: nowrap;
- color: #666;
- padding-right: 10px;
-}
-
#resource-selection {
position: absolute;
top: 0;
diff --git a/plugins/calendar/skins/larry/templates/kolabform.html b/plugins/calendar/skins/larry/templates/kolabform.html
deleted file mode 100644
index 77a1c30e..00000000
--- a/plugins/calendar/skins/larry/templates/kolabform.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/plugins/kolab_notes/kolab_notes_ui.php b/plugins/kolab_notes/kolab_notes_ui.php
index 28e17e8b..41de349c 100644
--- a/plugins/kolab_notes/kolab_notes_ui.php
+++ b/plugins/kolab_notes/kolab_notes_ui.php
@@ -284,8 +284,9 @@ class kolab_notes_ui
$this->list = $list;
$this->folder = is_object($folder) ? $folder->name : ''; // UTF7;
- $this->rc->output->add_handler('notebookform', array($this, 'notebookform'));
- $this->rc->output->send('kolab_notes.listform');
+ $this->rc->output->set_env('pagetitle', $this->plugin->gettext('arialabelnotebookform'));
+ $this->rc->output->add_handler('folderform', array($this, 'notebookform'));
+ $this->rc->output->send('libkolab.folderform');
}
/**
diff --git a/plugins/kolab_notes/skins/elastic/templates/listform.html b/plugins/kolab_notes/skins/elastic/templates/listform.html
deleted file mode 100644
index 230378ca..00000000
--- a/plugins/kolab_notes/skins/elastic/templates/listform.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- :
-
-
-
-
-
-
diff --git a/plugins/kolab_notes/skins/larry/templates/listform.html b/plugins/kolab_notes/skins/larry/templates/listform.html
deleted file mode 100644
index 5fc9ea3b..00000000
--- a/plugins/kolab_notes/skins/larry/templates/listform.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-<roundcube:object name="pagetitle" />
-
-
-
-
- :
-
-
-
-
-
-
-
-
-
diff --git a/plugins/tasklist/skins/larry/templates/listform.html b/plugins/libkolab/skins/larry/templates/folderform.html
similarity index 61%
rename from plugins/tasklist/skins/larry/templates/listform.html
rename to plugins/libkolab/skins/larry/templates/folderform.html
index 0fd3b63c..688abe17 100644
--- a/plugins/tasklist/skins/larry/templates/listform.html
+++ b/plugins/libkolab/skins/larry/templates/folderform.html
@@ -6,10 +6,10 @@
- :
+
-
+
diff --git a/plugins/tasklist/localization/en_US.inc b/plugins/tasklist/localization/en_US.inc
index 8c7769b6..9ec5395b 100644
--- a/plugins/tasklist/localization/en_US.inc
+++ b/plugins/tasklist/localization/en_US.inc
@@ -136,7 +136,7 @@ $labels['arialabellistsearchform'] = 'Tasklists search form';
$labels['arialabeltaskselector'] = 'List mode';
$labels['arialabeltasklisting'] = 'Tasks listing';
$labels['arialabelsortmenu'] = 'Tasks sorting options';
-$labels['arialabeltasklistform'] = 'Tasks list form';
+$labels['arialabeltasklistform'] = 'Tasks list properties';
// attendees
$labels['attendee'] = 'Assignee';
diff --git a/plugins/tasklist/skins/elastic/templates/listform.html b/plugins/tasklist/skins/elastic/templates/listform.html
deleted file mode 100644
index 87d345bb..00000000
--- a/plugins/tasklist/skins/elastic/templates/listform.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- :
-
-
-
-
-
-
diff --git a/plugins/tasklist/tasklist_ui.php b/plugins/tasklist/tasklist_ui.php
index 8554d271..eb5567fc 100644
--- a/plugins/tasklist/tasklist_ui.php
+++ b/plugins/tasklist/tasklist_ui.php
@@ -338,8 +338,10 @@ class tasklist_ui
{
$this->action = $action;
$this->list = $list;
- $this->rc->output->add_handler('tasklistform', array($this, 'tasklistform'));
- $this->rc->output->send('tasklist.listform');
+
+ $this->rc->output->set_env('pagetitle', $this->plugin->gettext('arialabeltasklistform'));
+ $this->rc->output->add_handler('folderform', array($this, 'tasklistform'));
+ $this->rc->output->send('libkolab.folderform');
}
function tasklistform($attrib)