From dac282685d7b6d6efd48c2b8438389133e6e6ad6 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 13 Jun 2014 11:29:52 +0200 Subject: [PATCH] Improve integration with kolab skin (all skin files moved to the skin repo) --- plugins/kolab_delegation/kolab_delegation.php | 4 +- plugins/kolab_delegation/skins/kolab/read.png | Bin 815 -> 0 bytes .../kolab_delegation/skins/kolab/style.css | 107 ------------------ .../skins/kolab/templates/editform.html | 1 - .../skins/kolab/templates/settings.html | 1 - .../kolab_delegation/skins/kolab/write.png | Bin 589 -> 0 bytes .../kolab_delegation/skins/larry/style.css | 18 ++- .../skins/larry/templates/editform.html | 2 +- 8 files changed, 16 insertions(+), 117 deletions(-) delete mode 100644 plugins/kolab_delegation/skins/kolab/read.png delete mode 100644 plugins/kolab_delegation/skins/kolab/style.css delete mode 120000 plugins/kolab_delegation/skins/kolab/templates/editform.html delete mode 120000 plugins/kolab_delegation/skins/kolab/templates/settings.html delete mode 100644 plugins/kolab_delegation/skins/kolab/write.png diff --git a/plugins/kolab_delegation/kolab_delegation.php b/plugins/kolab_delegation/kolab_delegation.php index fb3e4be1..df58e927 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 55e77aa5fc5adc23cc2f1bbbf8cc903e6cccb255..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 815 zcmV+~1JL}5P)RCwB?l50qlQ5eV1c`tJ^-R4Xw zFO-W0d7%OkrMzK*Nkmdv5Q|WkNFSs=l+w2-!X<^@W?w_1%#uc!P#GpjirO5w5;vJ! zo3~xwcklM@-QG*vz%gy=2mf#`&w0-I@jT~wpdbh!DhMI4*=-;{FCVyF>#aV2pkr#r zsPy}3JnMkWm93DD2bl1!%F}23(YuM-WJHB+Zp`Mz7;IyGb@u)6c!@kClc}mbhlnr{ zYy54NOc>_tQ-IgI;{1Cta(x)=Aeb1T(`g%jt)D!34{Q z16?wHS3uscVwjNmZpXdfk)S0BfT($ez6T~iJPsjdx1vf&G|RBmpXCr1oQlci))6&pT}y)BBoOa&~UxBHRJ zjmt|Gn^ut3?A$bVCs##rBS5s@ZatsO9|uw-1s$Y7%v$_bF92V60#bpnAIA`$ zBuO-xKb~@sCN1(5sr1)Uz(mW?3Ar4vLlEGKGzb}S^O2DrnGR7NevPBoq;3x}vTKAM zFV$O=Nhk|scmWa?GEz~1r$GP}C=$-ZAe|m5&S4xXgT7#1$Zc^Be;Ofo1-7)d4c45< zvZM66%CXEG4Rb&yKq!vXPsllVS17~OZ$)tsR-7GAh`3>;8MTpdDxhv5ZMcqO4Y!d!Mz*%LDzlI{ZtDynw#AL zhHu6s2c@_;H7qbB9wZ!d{rv+MOeWLHoY4S2485zat7{n3v@~z&!}#@P#)Oj@nB&*88O&tLTTqTjY}U{pGt?uT{RDm;Gj tXnx;7wOSop^?JSW+vu0&MBqOG1^`l7ih{PFo_YWP002ovPDHLkV1fwha1{Um diff --git a/plugins/kolab_delegation/skins/kolab/style.css b/plugins/kolab_delegation/skins/kolab/style.css deleted file mode 100644 index 46ce2c5c..00000000 --- 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 f1f8b138..00000000 --- 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 08404c16..00000000 --- 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 4a7a5a39e03283d117ee542dd99dd0b74d4d50a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 589 zcmV-T0Thd#IBrg5V0b@`fnhDW8YW_0w!FtvPv5m? z(atx;T-(&O)D+YB?y&M>s$(R^%d^rMS;L~#k8L@pE-9g#D=oms`RCQSl821HPiTAQ z{zvgLQ7*KyX6SzPflat&=5^_{^9%2Nd$R2Be>SyLbi;@W!`WpFAwO;ue>T=v`ekLR z^6B|L^LKkD@r2+~kJqpnr3|Wn?$vztbCiCjp|1M>-WJ`PyC$$t#HR~b&T#{WGOlO~e5cn^|`LhIH@UY;L2)AdOdiVZw#_8)ARXr`3Zixu|R{s3* zu%1=X|KE5697nh%zTGSHTwh1&x2?I#`&;W2KOLB@8c9rA#SoZT&Y=76jLrvlTbY*{ z>MH*(uMoepe}?RIViP}#ml+uuS)Ol~U02lq{Mo%1LYkeaAI`ma!|?aL*y9{xGXRQ# zUT*e|cm8@PAH2Hgotx3eTihJ~6?xhJ>A8gd|4XcaD6y=nBpJ%~|2bn@CXcYH9GBRO zS6|c2Q{FxyrSL#;;iXIG{k5be7#_XiIdlH%pOCG4zdd9i6(9$wqMYzEEmes`Qc56n b3=m)dZiU0UEtbJa00000NkvXXu0mjf3>zSb diff --git a/plugins/kolab_delegation/skins/larry/style.css b/plugins/kolab_delegation/skins/larry/style.css index 348be5e6..06aec7b5 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 8cf4c872..7ae63b2a 100644 --- a/plugins/kolab_delegation/skins/larry/templates/editform.html +++ b/plugins/kolab_delegation/skins/larry/templates/editform.html @@ -11,7 +11,7 @@
- +