From 1db12a9037796610df11a8be819cf126011b5818 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 20 Jun 2014 09:30:17 -0400
Subject: [PATCH] Fix so all pages are displayed correctly in extwin mode (#1489952)
---
skins/larry/templates/settings.html | 2 +-
skins/larry/templates/addressbook.html | 2 +-
skins/larry/templates/importcontacts.html | 25 ++++++++++++++-----------
skins/larry/templates/folders.html | 2 +-
skins/larry/styles.css | 16 ++++++++++------
skins/larry/templates/identities.html | 3 +--
plugins/managesieve/skins/larry/templates/managesieve.html | 2 +-
skins/larry/templates/responses.html | 2 +-
8 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/plugins/managesieve/skins/larry/templates/managesieve.html b/plugins/managesieve/skins/larry/templates/managesieve.html
index 8d648db..494af6a 100644
--- a/plugins/managesieve/skins/larry/templates/managesieve.html
+++ b/plugins/managesieve/skins/larry/templates/managesieve.html
@@ -4,7 +4,7 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
</head>
-<body class="noscroll">
+<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif />
<roundcube:include file="/includes/header.html" />
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 83adaeb..743ad71 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1054,6 +1054,14 @@
bottom: 0;
}
+#mainscreen.offset {
+ top: 132px;
+}
+
+#mainscreen .offset {
+ top: 42px;
+}
+
.minimal #mainscreen {
top: 62px;
}
@@ -1066,12 +1074,8 @@
top: 40px;
}
-#mainscreen.offset {
- top: 132px;
-}
-
-#mainscreen .offset {
- top: 42px;
+.extwin #mainscreen.offset {
+ top: 86px;
}
.uibox {
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index 153cfc4..60ea355 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -4,7 +4,7 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
</head>
-<body class="noscroll">
+<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif />
<roundcube:include file="/includes/header.html" />
diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html
index ffb0a7e..eed5631 100644
--- a/skins/larry/templates/folders.html
+++ b/skins/larry/templates/folders.html
@@ -4,7 +4,7 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
</head>
-<body class="noscroll">
+<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif />
<roundcube:include file="/includes/header.html" />
diff --git a/skins/larry/templates/identities.html b/skins/larry/templates/identities.html
index 5878155..163469d 100644
--- a/skins/larry/templates/identities.html
+++ b/skins/larry/templates/identities.html
@@ -4,7 +4,7 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
</head>
-<body class="noscroll">
+<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif />
<roundcube:include file="/includes/header.html" />
@@ -15,7 +15,6 @@
<roundcube:include file="/includes/settingstabs.html" />
<div id="settings-right" role="main" aria-labelledby="aria-label-identitieslist">
-
<div id="identitieslist" class="uibox listbox">
<h2 class="boxtitle" id="aria-label-identitieslist"><roundcube:label name="identities" /></h2>
<div class="scroller withfooter">
diff --git a/skins/larry/templates/importcontacts.html b/skins/larry/templates/importcontacts.html
index 2bc1d4a..f18338c 100644
--- a/skins/larry/templates/importcontacts.html
+++ b/skins/larry/templates/importcontacts.html
@@ -4,26 +4,29 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
</head>
-<body>
+<roundcube:if condition="env:extwin" /><body class="extwin"><roundcube:else /><body><roundcube:endif />
<roundcube:include file="/includes/header.html" />
<div id="mainscreen">
-<div id="addressbooktoolbar" class="toolbar">
+<h1 class="voice"><roundcube:label name="addressbook" /> : <roundcube:label name="importcontacts" /></h1>
+
+<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+<div id="addressbooktoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
</div>
-<div id="pluginbody" class="offset uibox contentbox">
-<h1 class="boxtitle"><roundcube:label name="importcontacts" /></h1>
+<div id="mainscreencontent" class="uibox contentbox">
+ <h2 class="boxtitle"><roundcube:label name="importcontacts" /></h2>
-<div id="import-box" class="boxcontent">
-<roundcube:object name="importstep" class="propform" />
-<br/>
-<p class="formbuttons">
- <roundcube:object name="importnav" class="button" />
-</p>
-</div>
+ <div id="import-box" class="boxcontent">
+ <roundcube:object name="importstep" class="propform" />
+ <br/>
+ <p class="formbuttons">
+ <roundcube:object name="importnav" class="button" />
+ </p>
+ </div>
</div>
</div>
diff --git a/skins/larry/templates/responses.html b/skins/larry/templates/responses.html
index 538a025..8f91a8f 100644
--- a/skins/larry/templates/responses.html
+++ b/skins/larry/templates/responses.html
@@ -4,7 +4,7 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
</head>
-<body class="noscroll">
+<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif />
<roundcube:include file="/includes/header.html" />
diff --git a/skins/larry/templates/settings.html b/skins/larry/templates/settings.html
index 406b9c9..34c3440 100644
--- a/skins/larry/templates/settings.html
+++ b/skins/larry/templates/settings.html
@@ -4,7 +4,7 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
</head>
-<body class="noscroll">
+<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif />
<roundcube:include file="/includes/header.html" />
--
Gitblit v1.9.1