From ac67db19802abd7d2a18c1bb804c3bfd887e9bdf Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 2 Nov 2009 07:41:21 +0000
Subject: - Managesieve 2.0: multi-script support

---
 .../managesieve/skins/default/filter_add_act.png   | Bin 1391 -> 0 bytes
 .../managesieve/skins/default/filter_add_pas.png   | Bin 1409 -> 0 bytes
 .../managesieve/skins/default/filter_add_sel.png   | Bin 1305 -> 0 bytes
 .../managesieve/skins/default/filter_del_act.png   | Bin 1337 -> 0 bytes
 .../managesieve/skins/default/filter_del_pas.png   | Bin 1339 -> 0 bytes
 .../managesieve/skins/default/filter_del_sel.png   | Bin 1230 -> 0 bytes
 .../managesieve/skins/default/filter_down_act.png  | Bin 1327 -> 0 bytes
 .../managesieve/skins/default/filter_down_pas.png  | Bin 1350 -> 0 bytes
 .../managesieve/skins/default/filter_down_sel.png  | Bin 1231 -> 0 bytes
 .../managesieve/skins/default/filter_up_act.png    | Bin 1321 -> 0 bytes
 .../managesieve/skins/default/filter_up_pas.png    | Bin 1333 -> 0 bytes
 .../managesieve/skins/default/filter_up_sel.png    | Bin 1192 -> 0 bytes
 plugins/managesieve/skins/default/managesieve.css  | 108 +++++++++++++++++++-
 .../skins/default/managesieve_toolbar.png          | Bin 0 -> 9535 bytes
 .../skins/default/templates/filteredit.html        | 111 +++++++++++++++++++++
 .../skins/default/templates/managesieve.html       |  18 +++-
 .../skins/default/templates/managesieveedit.html   | 109 --------------------
 .../skins/default/templates/setedit.html           |  24 +++++
 18 files changed, 253 insertions(+), 117 deletions(-)
 delete mode 100644 plugins/managesieve/skins/default/filter_add_act.png
 delete mode 100644 plugins/managesieve/skins/default/filter_add_pas.png
 delete mode 100644 plugins/managesieve/skins/default/filter_add_sel.png
 delete mode 100644 plugins/managesieve/skins/default/filter_del_act.png
 delete mode 100644 plugins/managesieve/skins/default/filter_del_pas.png
 delete mode 100644 plugins/managesieve/skins/default/filter_del_sel.png
 delete mode 100644 plugins/managesieve/skins/default/filter_down_act.png
 delete mode 100644 plugins/managesieve/skins/default/filter_down_pas.png
 delete mode 100644 plugins/managesieve/skins/default/filter_down_sel.png
 delete mode 100644 plugins/managesieve/skins/default/filter_up_act.png
 delete mode 100644 plugins/managesieve/skins/default/filter_up_pas.png
 delete mode 100644 plugins/managesieve/skins/default/filter_up_sel.png
 create mode 100644 plugins/managesieve/skins/default/managesieve_toolbar.png
 create mode 100644 plugins/managesieve/skins/default/templates/filteredit.html
 delete mode 100644 plugins/managesieve/skins/default/templates/managesieveedit.html
 create mode 100644 plugins/managesieve/skins/default/templates/setedit.html

(limited to 'plugins/managesieve/skins/default')

diff --git a/plugins/managesieve/skins/default/filter_add_act.png b/plugins/managesieve/skins/default/filter_add_act.png
deleted file mode 100644
index d8915dc89..000000000
Binary files a/plugins/managesieve/skins/default/filter_add_act.png and /dev/null differ
diff --git a/plugins/managesieve/skins/default/filter_add_pas.png b/plugins/managesieve/skins/default/filter_add_pas.png
deleted file mode 100644
index b5be80618..000000000
Binary files a/plugins/managesieve/skins/default/filter_add_pas.png and /dev/null differ
diff --git a/plugins/managesieve/skins/default/filter_add_sel.png b/plugins/managesieve/skins/default/filter_add_sel.png
deleted file mode 100644
index 8cb0593e0..000000000
Binary files a/plugins/managesieve/skins/default/filter_add_sel.png and /dev/null differ
diff --git a/plugins/managesieve/skins/default/filter_del_act.png b/plugins/managesieve/skins/default/filter_del_act.png
deleted file mode 100644
index 1974417c8..000000000
Binary files a/plugins/managesieve/skins/default/filter_del_act.png and /dev/null differ
diff --git a/plugins/managesieve/skins/default/filter_del_pas.png b/plugins/managesieve/skins/default/filter_del_pas.png
deleted file mode 100644
index 9f17e38ec..000000000
Binary files a/plugins/managesieve/skins/default/filter_del_pas.png and /dev/null differ
diff --git a/plugins/managesieve/skins/default/filter_del_sel.png b/plugins/managesieve/skins/default/filter_del_sel.png
deleted file mode 100644
index 483ffc08e..000000000
Binary files a/plugins/managesieve/skins/default/filter_del_sel.png and /dev/null differ
diff --git a/plugins/managesieve/skins/default/filter_down_act.png b/plugins/managesieve/skins/default/filter_down_act.png
deleted file mode 100644
index 7a24a4f3c..000000000
Binary files a/plugins/managesieve/skins/default/filter_down_act.png and /dev/null differ
diff --git a/plugins/managesieve/skins/default/filter_down_pas.png b/plugins/managesieve/skins/default/filter_down_pas.png
deleted file mode 100644
index ac65239e6..000000000
Binary files a/plugins/managesieve/skins/default/filter_down_pas.png and /dev/null differ
diff --git a/plugins/managesieve/skins/default/filter_down_sel.png b/plugins/managesieve/skins/default/filter_down_sel.png
deleted file mode 100644
index b7a9e670c..000000000
Binary files a/plugins/managesieve/skins/default/filter_down_sel.png and /dev/null differ
diff --git a/plugins/managesieve/skins/default/filter_up_act.png b/plugins/managesieve/skins/default/filter_up_act.png
deleted file mode 100644
index fd9689bb5..000000000
Binary files a/plugins/managesieve/skins/default/filter_up_act.png and /dev/null differ
diff --git a/plugins/managesieve/skins/default/filter_up_pas.png b/plugins/managesieve/skins/default/filter_up_pas.png
deleted file mode 100644
index c60226cdc..000000000
Binary files a/plugins/managesieve/skins/default/filter_up_pas.png and /dev/null differ
diff --git a/plugins/managesieve/skins/default/filter_up_sel.png b/plugins/managesieve/skins/default/filter_up_sel.png
deleted file mode 100644
index de4c5c3a6..000000000
Binary files a/plugins/managesieve/skins/default/filter_up_sel.png and /dev/null differ
diff --git a/plugins/managesieve/skins/default/managesieve.css b/plugins/managesieve/skins/default/managesieve.css
index ce2493626..d446a3a42 100644
--- a/plugins/managesieve/skins/default/managesieve.css
+++ b/plugins/managesieve/skins/default/managesieve.css
@@ -6,7 +6,7 @@
   position: absolute;
   left: 20px;
   width: 220px;
-  top: 130px;
+  top: 120px;
   bottom: 30px;
   border: 1px solid #999999;
   background-color: #F9F9F9;
@@ -32,13 +32,113 @@
 {
   position: absolute;
   left: 20px;
-  top: 95px;
+  top: 85px;
+}
+
+#filtersetsbuttons
+{
+  position: absolute;
+  left: 250px;
+  top: 85px;
+}
+
+#filtersbuttons a,
+#filtersetsbuttons a
+{
+  display: block;
+  float: left;
+}
+
+#filtersbuttons a.button,
+#filtersbuttons a.buttonPas,
+#filtersetsbuttons a.button,
+#filtersetsbuttons a.buttonPas
+{
+  display: block;
+  float: left;
+  width: 32px;
+  height: 32px;
+  padding: 0;
+  margin-right: 3px;
+  overflow: hidden;
+  background: url('managesieve_toolbar.png') 0 0 no-repeat transparent;
+  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
+}
+
+#filtersbuttons a.buttonPas,
+#filtersetsbuttons a.buttonPas
+{
+  filter: alpha(opacity=35);
+  opacity: 0.35;
+}
+
+#filtersbuttons a.add {
+  background-position: 0px 0px;
+}
+
+#filtersbuttons a.addsel {
+  background-position: 0 -32px;
+}
+
+#filtersbuttons a.del {
+  background-position: -32px 0px;
+}
+
+#filtersbuttons a.delsel {
+  background-position: -32px -32px;
+}
+
+#filtersbuttons a.up {
+  background-position: -64px 0px;
+}
+
+#filtersbuttons a.upsel {
+  background-position: -64px -32px;
+}
+
+#filtersbuttons a.down {
+  background-position: -96px 0px;
+}
+
+#filtersbuttons a.downsel {
+  background-position: -96px -32px;
+}
+
+#filtersetsbuttons a.setadd {
+  background-position: -128px 0px;
+}
+
+#filtersetsbuttons a.setaddsel {
+  background-position: -128px -32px;
+}
+
+#filtersetsbuttons a.setdel {
+  background-position: -160px 0px;
+}
+
+#filtersetsbuttons a.setdelsel {
+  background-position: -160px -32px;
+}
+
+#filtersetsbuttons a.setset {
+  background-position: -192px 0px;
+}
+
+#filtersetsbuttons a.setsetsel {
+  background-position: -192px -32px;
+}
+
+#filtersetselect
+{
+  position: absolute;
+  left: 380px;
+  top: 90px;
 }
 
 #filter-box
 {
   position: absolute;
-  top: 95px;
+  top: 120px;
   left: 250px;
   right: 20px;
   bottom: 30px;
@@ -46,7 +146,7 @@
   overflow: hidden;
   /* css hack for IE */
   width: expression((parseInt(document.documentElement.clientWidth)-30-parseInt(document.getElementById('filterslist').offsetLeft)-parseInt(document.getElementById('filterslist').offsetWidth))+'px');
-  height: expression((parseInt(document.documentElement.clientHeight)-120)+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-155)+'px');
 }
 
 #filter-frame
diff --git a/plugins/managesieve/skins/default/managesieve_toolbar.png b/plugins/managesieve/skins/default/managesieve_toolbar.png
new file mode 100644
index 000000000..3f96a9681
Binary files /dev/null and b/plugins/managesieve/skins/default/managesieve_toolbar.png differ
diff --git a/plugins/managesieve/skins/default/templates/filteredit.html b/plugins/managesieve/skins/default/templates/filteredit.html
new file mode 100644
index 000000000..164b91ca8
--- /dev/null
+++ b/plugins/managesieve/skins/default/templates/filteredit.html
@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<link rel="stylesheet" type="text/css" href="/this/managesieve.css" />
+</head>
+<body class="iframe">
+
+<script type="text/javascript">
+
+function header_select(id)
+{
+    var obj = document.getElementById('header'+id);
+
+    if (obj.value == 'size')
+    {
+	document.getElementById('rule_size' + id).style.display = 'inline';
+	document.getElementById('rule_op' + id).style.display = 'none';
+	document.getElementById('rule_target' + id).style.display = 'none';
+	document.getElementById('custom_header' + id).style.display = 'none';
+    }
+    else
+    {
+	if (obj.value != '...')
+	    document.getElementById('custom_header' + id).style.display = 'none';
+	else
+	    document.getElementById('custom_header' + id).style.display = 'inline';
+    
+	document.getElementById('rule_size' + id).style.display = 'none';
+	document.getElementById('rule_op' + id).style.display = 'inline';
+	rule_op_select(id);
+    }
+}
+
+function rule_op_select(id)
+{
+    var obj = document.getElementById('rule_op'+id);
+
+    if (obj.value == 'exists' || obj.value == 'notexists')
+    {
+	document.getElementById('rule_target' + id).style.display = 'none';
+    }
+    else
+    {
+	document.getElementById('rule_target' + id).style.display = 'inline';
+    }
+}
+
+function action_type_select(id)
+{
+    var obj = document.getElementById('action_type'+id);
+
+    if (obj.value == 'fileinto')
+    {
+	document.getElementById('action_mailbox' + id).style.display = 'inline';
+	document.getElementById('action_target' + id).style.display = 'none';
+	document.getElementById('action_target_area' + id).style.display = 'none';
+	document.getElementById('action_vacation' + id).style.display = 'none';
+    }
+    else if (obj.value == 'redirect')
+    {
+	document.getElementById('action_target' + id).style.display = 'inline';
+	document.getElementById('action_mailbox' + id).style.display = 'none';
+	document.getElementById('action_target_area' + id).style.display = 'none';
+	document.getElementById('action_vacation' + id).style.display = 'none';
+    }
+    else if (obj.value.match(/^reject|ereject$/))
+    {
+	document.getElementById('action_target_area' + id).style.display = 'inline';
+	document.getElementById('action_vacation' + id).style.display = 'none';
+	document.getElementById('action_target' + id).style.display = 'none';
+	document.getElementById('action_mailbox' + id).style.display = 'none';
+    }
+    else if (obj.value == 'vacation')
+    {
+	document.getElementById('action_vacation' + id).style.display = 'inline';
+        document.getElementById('action_target_area' + id).style.display = 'none';
+	document.getElementById('action_target' + id).style.display = 'none';
+	document.getElementById('action_mailbox' + id).style.display = 'none';
+    }
+    else // discard, keep, stop
+    {
+	document.getElementById('action_target_area' + id).style.display = 'none';
+	document.getElementById('action_vacation' + id).style.display = 'none';
+	document.getElementById('action_target' + id).style.display = 'none';
+	document.getElementById('action_mailbox' + id).style.display = 'none';
+    }
+}
+
+function rule_join_radio(value)
+{
+    document.getElementById('rules').style.display = (value=='any' ? 'none' : 'block');
+}
+</script>
+
+<div id="filter-title" class="boxtitle"><roundcube:label name="managesieve.filterdef" /></div>
+
+<div id="filter-form">
+<roundcube:object name="filterform" />
+
+<p>
+<roundcube:button command="plugin.managesieve-save" type="input" class="button mainaction" label="save" />
+</p>
+
+</form>
+</div>
+
+
+</body>
+</html>
diff --git a/plugins/managesieve/skins/default/templates/managesieve.html b/plugins/managesieve/skins/default/templates/managesieve.html
index d5dd6c454..0913ef5fc 100644
--- a/plugins/managesieve/skins/default/templates/managesieve.html
+++ b/plugins/managesieve/skins/default/templates/managesieve.html
@@ -13,10 +13,20 @@
 <roundcube:include file="/includes/settingstabs.html" />
 
 <div id="filtersbuttons">
-<roundcube:button command="plugin.managesieve-add" imageSel="/this/filter_add_sel.png" imagePas="/this/filter_add_pas.png" imageAct="/this/filter_add_act.png" width="32" height="32" title="managesieve.filteradd" />
-<roundcube:button command="plugin.managesieve-del" imageSel="/this/filter_del_sel.png" imagePas="/this/filter_del_pas.png" imageAct="/this/filter_del_act.png"  width="32" height="32" title="managesieve.filterdel" />
-<roundcube:button command="plugin.managesieve-up" imageSel="/this/filter_up_sel.png" imagePas="/this/filter_up_pas.png" imageAct="/this/filter_up_act.png"  width="32" height="32" title="managesieve.moveup" />
-<roundcube:button command="plugin.managesieve-down" imageSel="/this/filter_down_sel.png" imagePas="/this/filter_down_pas.png" imageAct="/this/filter_down_act.png"  width="32" height="32" title="managesieve.movedown" />
+<roundcube:button command="plugin.managesieve-add" type="link" class="buttonPas add" classSel="button addsel" classAct="button add" title="managesieve.filteradd" content=" " />
+<roundcube:button command="plugin.managesieve-del" type="link" class="buttonPas del" classSel="button delsel" classAct="button del" title="managesieve.filterdel" content=" " />
+<roundcube:button command="plugin.managesieve-up" type="link" class="buttonPas up" classSel="button upsel" classAct="button up" title="managesieve.moveup" content=" " />
+<roundcube:button command="plugin.managesieve-down" type="link" class="buttonPas down" classSel="button downsel" classAct="button down" title="managesieve.movedown" content=" " />
+</div>
+
+<div id="filtersetsbuttons">
+<roundcube:button command="plugin.managesieve-setadd" type="link" class="buttonPas setadd" classSel="button setaddsel" classAct="button setadd" title="managesieve.filtersetadd" content=" " />
+<roundcube:button command="plugin.managesieve-setdel" type="link" class="buttonPas setdel" classSel="button setdelsel" classAct="button setdel" title="managesieve.filtersetdel" content=" " />
+<roundcube:button command="plugin.managesieve-setact" type="link" class="buttonPas setset" classSel="button setsetsel" classAct="button setset" title="managesieve.filtersetact" content=" " />
+</div>
+<div id="filtersetselect">
+<roundcube:label name="managesieve.filterset" />:
+<roundcube:object name="filtersetslist" id="filtersets-select" />
 </div>
 
 <div id="filterslist">
diff --git a/plugins/managesieve/skins/default/templates/managesieveedit.html b/plugins/managesieve/skins/default/templates/managesieveedit.html
deleted file mode 100644
index 2302073b6..000000000
--- a/plugins/managesieve/skins/default/templates/managesieveedit.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/this/managesieve.css" />
-</head>
-<body class="iframe">
-
-<script type="text/javascript">
-
-function header_select(id)
-{
-    var obj = document.getElementById('header'+id);
-
-    if (obj.value == 'size')
-    {
-	document.getElementById('rule_size' + id).style.display = 'inline';
-	document.getElementById('rule_op' + id).style.display = 'none';
-	document.getElementById('rule_target' + id).style.display = 'none';
-	document.getElementById('custom_header' + id).style.display = 'none';
-    }
-    else
-    {
-	if (obj.value != '...')
-	    document.getElementById('custom_header' + id).style.display = 'none';
-	else
-	    document.getElementById('custom_header' + id).style.display = 'inline';
-    
-	document.getElementById('rule_size' + id).style.display = 'none';
-	document.getElementById('rule_op' + id).style.display = 'inline';
-	rule_op_select(id);
-    }
-}
-
-function rule_op_select(id)
-{
-    var obj = document.getElementById('rule_op'+id);
-
-    if (obj.value == 'exists' || obj.value == 'notexists')
-    {
-	document.getElementById('rule_target' + id).style.display = 'none';
-    }
-    else
-    {
-	document.getElementById('rule_target' + id).style.display = 'inline';
-    }
-}
-
-function action_type_select(id)
-{
-    var obj = document.getElementById('action_type'+id);
-
-    if (obj.value == 'fileinto')
-    {
-	document.getElementById('action_mailbox' + id).style.display = 'inline';
-	document.getElementById('action_target' + id).style.display = 'none';
-	document.getElementById('action_target_area' + id).style.display = 'none';
-	document.getElementById('action_vacation' + id).style.display = 'none';
-    }
-    else if (obj.value == 'redirect')
-    {
-	document.getElementById('action_target' + id).style.display = 'inline';
-	document.getElementById('action_mailbox' + id).style.display = 'none';
-	document.getElementById('action_target_area' + id).style.display = 'none';
-	document.getElementById('action_vacation' + id).style.display = 'none';
-    }
-    else if (obj.value.match(/^reject|ereject$/))
-    {
-	document.getElementById('action_target_area' + id).style.display = 'inline';
-	document.getElementById('action_vacation' + id).style.display = 'none';
-	document.getElementById('action_target' + id).style.display = 'none';
-	document.getElementById('action_mailbox' + id).style.display = 'none';
-    }
-    else if (obj.value == 'vacation')
-    {
-	document.getElementById('action_vacation' + id).style.display = 'inline';
-        document.getElementById('action_target_area' + id).style.display = 'none';
-	document.getElementById('action_target' + id).style.display = 'none';
-	document.getElementById('action_mailbox' + id).style.display = 'none';
-    }
-    else // discard, keep, stop
-    {
-	document.getElementById('action_target_area' + id).style.display = 'none';
-	document.getElementById('action_vacation' + id).style.display = 'none';
-	document.getElementById('action_target' + id).style.display = 'none';
-	document.getElementById('action_mailbox' + id).style.display = 'none';
-    }
-}
-
-function rule_join_radio(value)
-{
-    document.getElementById('rules').style.display = (value=='any' ? 'none' : 'block');
-}
-</script>
-
-<div id="filter-form">
-<roundcube:object name="filterform" />
-
-<p>
-<roundcube:button command="plugin.managesieve-save" type="input" class="button mainaction" label="save" />
-</p>
-
-</form>
-</div>
-
-
-</body>
-</html>
diff --git a/plugins/managesieve/skins/default/templates/setedit.html b/plugins/managesieve/skins/default/templates/setedit.html
new file mode 100644
index 000000000..343fe4e63
--- /dev/null
+++ b/plugins/managesieve/skins/default/templates/setedit.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<link rel="stylesheet" type="text/css" href="/this/managesieve.css" />
+</head>
+<body class="iframe">
+
+<div id="filter-title" class="boxtitle"><roundcube:label name="managesieve.newfilterset" /></div>
+
+<div id="filter-form">
+<roundcube:object name="filtersetform" />
+
+<p>
+<roundcube:button command="plugin.managesieve-save" type="input" class="button mainaction" label="save" />
+</p>
+
+</form>
+</div>
+
+
+</body>
+</html>
-- 
cgit v1.2.3