plugins/kolab_delegation

Aleksander Machniak machniak at kolabsys.com
Fri Jun 13 11:30:31 CEST 2014


 dev/null                                                     |binary
 plugins/kolab_delegation/kolab_delegation.php                |    4 
 plugins/kolab_delegation/skins/kolab/style.css               |  107 -----------
 plugins/kolab_delegation/skins/kolab/templates/editform.html |    1 
 plugins/kolab_delegation/skins/kolab/templates/settings.html |    1 
 plugins/kolab_delegation/skins/larry/style.css               |   18 +
 plugins/kolab_delegation/skins/larry/templates/editform.html |    2 
 7 files changed, 16 insertions(+), 117 deletions(-)

New commits:
commit dac282685d7b6d6efd48c2b8438389133e6e6ad6
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Jun 13 11:29:52 2014 +0200

    Improve integration with kolab skin (all skin files moved to the skin repo)

diff --git a/plugins/kolab_delegation/kolab_delegation.php b/plugins/kolab_delegation/kolab_delegation.php
index fb3e4be..df58e92 100644
--- a/plugins/kolab_delegation/kolab_delegation.php
+++ b/plugins/kolab_delegation/kolab_delegation.php
@@ -497,8 +497,8 @@ class kolab_delegation extends rcube_plugin
         $write_ico = $attrib['writeicon'] ? html::img(array('src' => $path . $attrib['writeicon'], 'title' => $this->gettext('write'))) : '';
 
         $table = new html_table(array('cellspacing' => 0));
-        $table->add_header('read', $read_ico);
-        $table->add_header('write', $write_ico);
+        $table->add_header(array('class' => 'read', 'title' => $this->gettext('read')), $read_ico);
+        $table->add_header(array('class' => 'write', 'title' => $this->gettext('write')), $write_ico);
         $table->add_header('foldername', $this->rc->gettext('folder'));
 
         $checkbox_read  = new html_checkbox(array('name' => 'read[]', 'class' => 'read'));
diff --git a/plugins/kolab_delegation/skins/kolab/read.png b/plugins/kolab_delegation/skins/kolab/read.png
deleted file mode 100644
index 55e77aa..0000000
Binary files a/plugins/kolab_delegation/skins/kolab/read.png and /dev/null differ
diff --git a/plugins/kolab_delegation/skins/kolab/style.css b/plugins/kolab_delegation/skins/kolab/style.css
deleted file mode 100644
index 46ce2c5..0000000
--- a/plugins/kolab_delegation/skins/kolab/style.css
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Stylesheets for the Kolab Delegation configuration UI */
-
-#sectionslist {
-	width: 220px;
-}
-
-#prefs-box {
-	position: absolute;
-	top: 0;
-	left: 232px;
-	right: 0;
-	bottom: 0;
-}
-
-#delegation-frame {
-	border-radius: 3px;
-}
-
-#delegates-table {
-	width: 100%;
-	table-layout: fixed;
-}
-
-div.foldersblock {
-	float: left;
-	margin: 0 3em 2em 0;
-	padding: 0;
-}
-
-div.foldersblock h3 {
-	font-size: 14px;
-	color: #333;
-	margin: 0 0 0.6em 0;
-	padding: 2px 4px 2px 30px;
-}
-
-div.foldersblock h3.contact {
-	background-position: 4px -18px;
-}
-
-div.foldersblock h3.event {
-	background-position: 4px -38px;
-}
-
-div.foldersblock h3.task {
-	background-position: 4px -58x;
-}
-
-div.foldersblock h3.note {
-	background-position: 4px -78px;
-}
-
-#delegatefolders thead td {
-	color: #69939e;
-	font-weight: bold;
-	padding: 2px;
-    padding-top: 4px;
-	min-width: 2em;
-	background: #d6eaf3;
-	border-bottom: 2px solid #fff;
-	text-align: center;
-}
-
-#delegatefolders thead td.foldername {
-  text-align: left;
-}
-
-#delegatefolders thead td img {
-	cursor: pointer;
-}
-
-#delegatefolders tbody td {
-	background: #eee;
-	padding: 2px;
-	border-bottom: 2px solid #fff;
-}
-
-#delegatefolders td label {
-	display: block;
-}
-
-#delegatefolders td.mailbox {
-	padding-right: 3em;
-	padding-left: 2px;
-	min-width: 12em;
-}
-
-#delegatefolders td.virtual {
-	color: #999;
-}
-
-#delegatefolders {
-	overflow: auto;
-	margin-top: 0.5em;
-}
-
-#delegate-delete-dialog {
-	display: none;
-}
-
-#delegate-delete-dialog p {
-	font-weight: bold;
-}
-
-#delegate-delete-dialog input {
-	vertical-align: middle;
-}
diff --git a/plugins/kolab_delegation/skins/kolab/templates/editform.html b/plugins/kolab_delegation/skins/kolab/templates/editform.html
deleted file mode 120000
index f1f8b13..0000000
--- a/plugins/kolab_delegation/skins/kolab/templates/editform.html
+++ /dev/null
@@ -1 +0,0 @@
-../../larry/templates/editform.html
\ No newline at end of file
diff --git a/plugins/kolab_delegation/skins/kolab/templates/settings.html b/plugins/kolab_delegation/skins/kolab/templates/settings.html
deleted file mode 120000
index 08404c1..0000000
--- a/plugins/kolab_delegation/skins/kolab/templates/settings.html
+++ /dev/null
@@ -1 +0,0 @@
-../../larry/templates/settings.html
\ No newline at end of file
diff --git a/plugins/kolab_delegation/skins/kolab/write.png b/plugins/kolab_delegation/skins/kolab/write.png
deleted file mode 100644
index 4a7a5a3..0000000
Binary files a/plugins/kolab_delegation/skins/kolab/write.png and /dev/null differ
diff --git a/plugins/kolab_delegation/skins/larry/style.css b/plugins/kolab_delegation/skins/larry/style.css
index 348be5e..06aec7b 100644
--- a/plugins/kolab_delegation/skins/larry/style.css
+++ b/plugins/kolab_delegation/skins/larry/style.css
@@ -8,14 +8,10 @@
   background-position: 6px -23px;
 }
 
-#sectionslist {
-	width: 220px;
-}
-
 #prefs-box {
 	position: absolute;
 	top: 0;
-	left: 232px;
+	left: 272px;
 	right: 0;
 	bottom: 0;
 }
@@ -114,3 +110,15 @@ div.foldersblock h3.note {
 #delegate-delete-dialog input {
 	vertical-align: middle;
 }
+
+.foldersblock th.read {
+  background: url(read.png) center no-repeat;
+  width: 18px;
+  height: 20px;
+}
+
+.foldersblock th.write {
+  background: url(write.png) center no-repeat;
+  width: 18px;
+  height: 20px;
+}
diff --git a/plugins/kolab_delegation/skins/larry/templates/editform.html b/plugins/kolab_delegation/skins/larry/templates/editform.html
index 8cf4c87..7ae63b2 100644
--- a/plugins/kolab_delegation/skins/larry/templates/editform.html
+++ b/plugins/kolab_delegation/skins/larry/templates/editform.html
@@ -11,7 +11,7 @@
 <div id="preferences-details" class="boxcontent">
 	<form action="#" method="post" id="delegateform">
 		<roundcube:object name="plugin.delegateform" form="delegateform" class="propform" />
-		<roundcube:object name="plugin.delegatefolders" form="delegateform" id="delegatefolders" readicon="read.png" writeicon="write.png" />
+		<roundcube:object name="plugin.delegatefolders" form="delegateform" id="delegatefolders" />
 	</form>
 </div>
 




More information about the commits mailing list