14 files changed, 16 insertions, 21 deletions
diff --git a/plugins/managesieve/skins/default/images/add.png b/plugins/managesieve/skins/classic/images/add.png
index 97a6422fb..97a6422fb 100644
--- a/plugins/managesieve/skins/default/images/add.png
+++ b/plugins/managesieve/skins/classic/images/add.png
diff --git a/plugins/managesieve/skins/default/images/del.png b/plugins/managesieve/skins/classic/images/del.png
index 518905bc4..518905bc4 100644
--- a/plugins/managesieve/skins/default/images/del.png
+++ b/plugins/managesieve/skins/classic/images/del.png
diff --git a/plugins/managesieve/skins/default/images/down_small.gif b/plugins/managesieve/skins/classic/images/down_small.gif
index f865893f4..f865893f4 100644
--- a/plugins/managesieve/skins/default/images/down_small.gif
+++ b/plugins/managesieve/skins/classic/images/down_small.gif
diff --git a/plugins/managesieve/skins/default/images/filter.png b/plugins/managesieve/skins/classic/images/filter.png
index a79ba1083..a79ba1083 100644
--- a/plugins/managesieve/skins/default/images/filter.png
+++ b/plugins/managesieve/skins/classic/images/filter.png
diff --git a/plugins/managesieve/skins/default/images/up_small.gif b/plugins/managesieve/skins/classic/images/up_small.gif
index 40deb891f..40deb891f 100644
--- a/plugins/managesieve/skins/default/images/up_small.gif
+++ b/plugins/managesieve/skins/classic/images/up_small.gif
diff --git a/plugins/managesieve/skins/default/managesieve.css b/plugins/managesieve/skins/classic/managesieve.css
index 9527b44e9..9527b44e9 100644
--- a/plugins/managesieve/skins/default/managesieve.css
+++ b/plugins/managesieve/skins/classic/managesieve.css
diff --git a/plugins/managesieve/skins/default/managesieve_mail.css b/plugins/managesieve/skins/classic/managesieve_mail.css
index 87a11cc92..87a11cc92 100644
--- a/plugins/managesieve/skins/default/managesieve_mail.css
+++ b/plugins/managesieve/skins/classic/managesieve_mail.css
diff --git a/plugins/managesieve/skins/default/templates/filteredit.html b/plugins/managesieve/skins/classic/templates/filteredit.html
index 6ecb03cae..6ecb03cae 100644
--- a/plugins/managesieve/skins/default/templates/filteredit.html
+++ b/plugins/managesieve/skins/classic/templates/filteredit.html
diff --git a/plugins/managesieve/skins/default/templates/managesieve.html b/plugins/managesieve/skins/classic/templates/managesieve.html
index 71eebe105..71eebe105 100644
--- a/plugins/managesieve/skins/default/templates/managesieve.html
+++ b/plugins/managesieve/skins/classic/templates/managesieve.html
diff --git a/plugins/managesieve/skins/default/templates/setedit.html b/plugins/managesieve/skins/classic/templates/setedit.html
index 26f7fece6..26f7fece6 100644
--- a/plugins/managesieve/skins/default/templates/setedit.html
+++ b/plugins/managesieve/skins/classic/templates/setedit.html
diff --git a/plugins/managesieve/skins/larry/managesieve.css b/plugins/managesieve/skins/larry/managesieve.css
index f252bd7d6..49ebe007f 100644
--- a/plugins/managesieve/skins/larry/managesieve.css
+++ b/plugins/managesieve/skins/larry/managesieve.css
@@ -216,19 +216,10 @@ span.label
   width: 100%;
 }
 
-#footer .footerleft
+#footer .footerleft label
 {
-  padding-left: 2px;
+  margin-left: 40px;
   white-space: nowrap;
-  float: left;
-}
-
-#footer .footerright
-{
-  padding-right: 2px;
-  white-space: nowrap;
-  text-align: right;
-  float: right;
 }
 
 .itemlist
diff --git a/plugins/managesieve/skins/larry/templates/filteredit.html b/plugins/managesieve/skins/larry/templates/filteredit.html
index 424bdbcd3..602816af7 100644
--- a/plugins/managesieve/skins/larry/templates/filteredit.html
+++ b/plugins/managesieve/skins/larry/templates/filteredit.html
@@ -5,7 +5,7 @@
 <roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/this/managesieve.css" />
 </head>
-<body class="iframe<roundcube:exp expression="env:task != 'mail' ? '' : ' mail'" />">
+<body class="iframe<roundcube:exp expression="env:task != 'mail' ? ' floatingbuttons' : ' mail'" />">
 
 <roundcube:if condition="env:task != 'mail'" />
 <div id="filter-title" class="boxtitle"><roundcube:label name="managesieve.filterdef" /></div>
@@ -16,12 +16,12 @@
 
 <roundcube:if condition="env:task != 'mail'" />
 <div id="footer">
-<div class="footerleft">
+<div class="footerleft formbuttons floating">
 <roundcube:button command="plugin.managesieve-save" type="input" class="button mainaction" label="save" />
-</div>
-<div class="footerright">
-<label for="disabled"><roundcube:label name="managesieve.filterdisabled" /></label>
+<label for="disabled">
 <input type="checkbox" id="disabled" name="_disabled" value="1" />
+<roundcube:label name="managesieve.filterdisabled" />
+</label>
 </div>
 </div>
 <roundcube:endif />
diff --git a/plugins/managesieve/skins/larry/templates/managesieve.html b/plugins/managesieve/skins/larry/templates/managesieve.html
index 740b41658..25bbbaf69 100644
--- a/plugins/managesieve/skins/larry/templates/managesieve.html
+++ b/plugins/managesieve/skins/larry/templates/managesieve.html
@@ -36,8 +36,10 @@
 </div>
 </div>
 
-<div id="filter-box" class="uibox">
-  <roundcube:object name="filterframe" id="filter-frame" style="width:100%; height:96%" frameborder="0" src="/watermark.html" />
+<div id="filter-box" class="uibox contentbox">
+  <div class="iframebox">
+    <roundcube:object name="filterframe" id="filter-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
+  </div>
   <roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
diff --git a/plugins/managesieve/skins/larry/templates/setedit.html b/plugins/managesieve/skins/larry/templates/setedit.html
index 71de8ddf8..9fc115dc7 100644
--- a/plugins/managesieve/skins/larry/templates/setedit.html
+++ b/plugins/managesieve/skins/larry/templates/setedit.html
@@ -5,16 +5,18 @@
 <roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/this/managesieve.css" />
 </head>
-<body class="iframe">
+<body class="iframe floatingbuttons">
 
 <div id="filter-title" class="boxtitle"><roundcube:label name="managesieve.newfilterset" /></div>
 
 <div id="filter-form" class="boxcontent">
 <roundcube:object name="filtersetform" />
 
-<p>
+<div id="footer">
+<div class="footerleft formbuttons floating">
 <roundcube:button command="plugin.managesieve-save" type="input" class="button mainaction" label="save" />
-</p>
+</div>
+</div>
 
 </form>
 </div>