From d47a4f0951555554c0479953f4410876686954a5 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 09 Feb 2012 08:11:39 -0500
Subject: [PATCH] - Handle identity details box with an iframe (#1487020) - Fix issue where tabs were overlapping box title
---
CHANGELOG | 1
skins/default/settings.css | 22 ++++++-----
skins/default/addressbook.css | 6 +++
skins/default/templates/identityedit.html | 37 +++---------------
skins/default/templates/identities.html | 10 ++---
5 files changed, 30 insertions(+), 46 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 2b52fe1..3b3a5e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Handle identity details box with an iframe (#1487020)
- Fix issue where some text from original message was missing on reply (#1488340)
- Fix parse errors in DDL files for MS SQL Server
- Make contacts list sorting configurable for the admin/user
diff --git a/skins/default/addressbook.css b/skins/default/addressbook.css
index c604c75..c5ce96c 100644
--- a/skins/default/addressbook.css
+++ b/skins/default/addressbook.css
@@ -397,3 +397,9 @@
font-size: 10px;
margin: -5px 0 8px 2px;
}
+
+#contact-title
+{
+ /* fixes issue where tabs were overlapping box title when scrolling */
+ z-index: 10;
+}
diff --git a/skins/default/settings.css b/skins/default/settings.css
index d2ae79b..963600a 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -67,16 +67,9 @@
padding-right: 12px;
}
-#identity-frame
-{
- position: relative;
- margin-top: 20px;
- border: 1px solid #999999;
-}
-
-#identity-details,
#folder-box,
-#prefs-box
+#prefs-box,
+#identity-box
{
position: absolute;
top: 0;
@@ -123,13 +116,22 @@
body.iframe,
#prefs-frame,
-#folder-frame
+#folder-frame,
+#identity-frame
{
background-color: #F2F2F2;
border: none;
min-height: 100%; /* Chrome 14 bug */
}
+#prefs-title,
+#folder-title,
+#identity-title
+{
+ /* fixes issue where tabs were overlapping box title when scrolling */
+ z-index: 10;
+}
+
#formfooter
{
width: 100%;
diff --git a/skins/default/templates/identities.html b/skins/default/templates/identities.html
index f40f394..70484eb 100644
--- a/skins/default/templates/identities.html
+++ b/skins/default/templates/identities.html
@@ -7,7 +7,7 @@
<script type="text/javascript" src="/splitter.js"></script>
<style type="text/css">
#identities-list { width: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter-5 : 295" />px; }
-#identity-details { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px;
+#identity-box { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px;
<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305).')+\\'px\\');') : ''" />
}
</style>
@@ -32,14 +32,12 @@
</div>
<script type="text/javascript">
- var identviewsplit = new rcube_splitter({id:'identviewsplitter', p1: 'identities-list', p2: 'identity-details', orientation: 'v', relative: true, start: 300 });
+ var identviewsplit = new rcube_splitter({id:'identviewsplitter', p1: 'identities-list', p2: 'identity-box', orientation: 'v', relative: true, start: 300 });
rcmail.add_onload('identviewsplit.init()');
</script>
-<div id="identity-details">
- <div style="margin:10px auto; text-align:center">
- <img src="/images/watermark.gif" width="260" height="228" alt="" />
- </div>
+<div id="identity-box">
+ <roundcube:object name="identityframe" id="identity-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
</div>
</div>
diff --git a/skins/default/templates/identityedit.html b/skins/default/templates/identityedit.html
index c8d065d..563b136 100644
--- a/skins/default/templates/identityedit.html
+++ b/skins/default/templates/identityedit.html
@@ -13,43 +13,20 @@
</style>
</head>
-<body>
+<body class="iframe">
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-<roundcube:include file="/includes/settingstabs.html" />
-
-<div id="mainscreen">
-
-<div id="identities-list">
-<div id="identity-title" class="boxtitle"><roundcube:label name="identities" /></div>
-<div class="boxlistcontent">
-<roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" noheader="true" editIcon="" />
-</div>
-<div class="boxfooter">
-<roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" />
-</div>
-</div>
-
-<script type="text/javascript">
- var identviewsplit = new rcube_splitter({id:'identviewsplitter', p1: 'identities-list', p2: 'identity-details', orientation: 'v', relative: true, start: 300 });
- rcmail.add_onload('identviewsplit.init()');
-</script>
-
-<div id="identity-details">
<div id="identity-title" class="boxtitle"><roundcube:object name="steptitle" /></div>
-<div class="boxcontent">
+<div id="identity-details" class="boxcontent">
<roundcube:object name="identityform" id="identity-form" size="40" textareacols="70" textarearows="6" />
-<p>
-<roundcube:button command="delete" type="input" class="button" label="delete" condition="env:action=='edit-identity'" style="margin-right:0.5em" />
-<roundcube:button command="save" type="input" class="button mainaction" label="save" />
-</p>
-</div>
<script type="text/javascript">rcube_init_tabs('identity-form')</script>
+<div id="formfooter">
+<div class="footerleft">
+ <roundcube:button command="delete" type="input" class="button" label="delete" condition="env:action=='edit-identity'" style="margin-right:0.5em" />
+ <roundcube:button command="save" type="input" class="button mainaction" label="save" />
</div>
-
+</div>
</div>
</body>
--
Gitblit v1.9.1