From 40b6df30c5a1e8f3597a2ded8bca592530023cca Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 23 Jul 2012 05:01:44 -0400
Subject: [PATCH] Fixed scrollbars in Larry's iframes
---
plugins/managesieve/skins/larry/templates/filteredit.html | 10 +++++-----
plugins/managesieve/Changelog | 1 +
plugins/managesieve/skins/larry/managesieve.css | 13 ++-----------
plugins/managesieve/skins/larry/templates/setedit.html | 8 +++++---
plugins/managesieve/skins/larry/templates/managesieve.html | 6 ++++--
5 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 91c36cf..69ff161 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,4 +1,5 @@
- Added GUI for variables setting - RFC5229 (patch from Paweł Słowik)
+- Fixed scrollbars in Larry's iframes
* version 5.1 [2012-06-21]
-----------------------------------------------------------
diff --git a/plugins/managesieve/skins/larry/managesieve.css b/plugins/managesieve/skins/larry/managesieve.css
index f252bd7..49ebe00 100644
--- a/plugins/managesieve/skins/larry/managesieve.css
+++ b/plugins/managesieve/skins/larry/managesieve.css
@@ -216,19 +216,10 @@
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 424bdbc..602816a 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 740b416..25bbbaf 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 71de8dd..9fc115d 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>
--
Gitblit v1.9.1