Merge branch 'master' of github.com:roundcube/roundcubemail

13 files changed, 3 insertions, 21 deletions

diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index b33ebd999..9f83853b2 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -71,7 +71,6 @@
 	<div class="iframebox">
 		<roundcube:object name="addressframe" id="contact-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
 	</div>
-	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
 
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 5a6285c68..11662d185 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -179,10 +179,6 @@
 
 </form>
 
-<div id="mailview-bottom" class="uibox">
-	<roundcube:object name="message" id="message" class="statusbar" />
-</div>
-
 </div><!-- end mailview-right -->
 
 </div><!-- end mainscreen -->
diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html
index 988ff952c..56396bf1d 100644
--- a/skins/larry/templates/folders.html
+++ b/skins/larry/templates/folders.html
@@ -31,7 +31,6 @@
 	<div class="iframebox">
 		<roundcube:object name="folderframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
 	</div>
-	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
 </div>
diff --git a/skins/larry/templates/identities.html b/skins/larry/templates/identities.html
index d9270b68a..e3d2cc842 100644
--- a/skins/larry/templates/identities.html
+++ b/skins/larry/templates/identities.html
@@ -28,7 +28,6 @@
 	<div class="iframebox">
 		<roundcube:object name="identityframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
 	</div>
-	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
 </div>
diff --git a/skins/larry/templates/importcontacts.html b/skins/larry/templates/importcontacts.html
index 69b138b9a..d7c690a6a 100644
--- a/skins/larry/templates/importcontacts.html
+++ b/skins/larry/templates/importcontacts.html
@@ -24,9 +24,6 @@
 	<roundcube:object name="importnav" class="button" />
 </p>
 </div>
-
-<roundcube:object name="message" id="message" class="statusbar" />
-
 </div>
 
 <roundcube:include file="/includes/footer.html" />
diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html
index 13e919ad3..8da941189 100644
--- a/skins/larry/templates/login.html
+++ b/skins/larry/templates/login.html
@@ -39,11 +39,13 @@
 
 <roundcube:object name="preloader" images="
   /images/ajaxloader.gif
+  /images/ajaxloader_dark.gif
   /images/buttons.png
   /images/addcontact.png
   /images/filetypes.png
   /images/listicons.png
   /images/messages.png
+  /images/messages_dark.png
   /images/quota.png
   /images/selector.png
   /images/splitter.png
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index f2c52c820..2e7c0c105 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -6,7 +6,7 @@
 <style type="text/css">
 <roundcube:if condition="config:preview_pane == true" />
 	#mailview-top { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-48 : 276" />px; }
-	#mailview-bottom { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+6 : 330" />px; height: auto; }
+	#mailview-bottom { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+6 : 330" />px; height: auto; display: block; }
 	#mailpreviewframe { display: block; }
 <roundcube:endif />
 </style>
@@ -116,8 +116,6 @@
 <roundcube:object name="messagecontentframe" id="messagecontframe" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
 </div>
 
-<roundcube:object name="message" id="message" class="statusbar" />
-
 </div><!-- end mailview-bottom -->
 
 </div><!-- end mailview-right -->
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index 6937b00af..e63705f76 100644
--- a/skins/larry/templates/message.html
+++ b/skins/larry/templates/message.html
@@ -84,8 +84,6 @@
 </div>
 </div>
 
-<roundcube:object name="message" id="message" class="statusbar" />
-
 </div><!-- end mailview-right -->
 
 </div><!-- end mainscreen -->
diff --git a/skins/larry/templates/messageerror.html b/skins/larry/templates/messageerror.html
index a735d47f2..dbe373a12 100644
--- a/skins/larry/templates/messageerror.html
+++ b/skins/larry/templates/messageerror.html
@@ -38,8 +38,6 @@
 
 <div id="messagecontent" class="watermark"></div>
 
-<roundcube:object name="message" id="message" class="statusbar" />
-
 </div><!-- end mailview-right -->
 
 </div><!-- end mainscreen -->
diff --git a/skins/larry/templates/messagepart.html b/skins/larry/templates/messagepart.html
index d0e3a808d..0ec935873 100644
--- a/skins/larry/templates/messagepart.html
+++ b/skins/larry/templates/messagepart.html
@@ -27,7 +27,6 @@
 	<div class="iframebox">
 	<roundcube:object name="messagePartFrame" id="messagepartframe" frameborder="0" />
 	</div>
-	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
 </div>
diff --git a/skins/larry/templates/plugin.html b/skins/larry/templates/plugin.html
index 341f604ac..5b86563ab 100644
--- a/skins/larry/templates/plugin.html
+++ b/skins/larry/templates/plugin.html
@@ -16,7 +16,6 @@
 
 <div id="pluginbody" class="uibox contentbox">
 <roundcube:object name="plugin.body" />
-<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
 </div>
diff --git a/skins/larry/templates/responses.html b/skins/larry/templates/responses.html
index fb40048c8..8e6884539 100644
--- a/skins/larry/templates/responses.html
+++ b/skins/larry/templates/responses.html
@@ -28,7 +28,6 @@
 	<div class="iframebox">
 		<roundcube:object name="responseframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
 	</div>
-	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
 </div>
diff --git a/skins/larry/templates/settings.html b/skins/larry/templates/settings.html
index 427e0a4f5..08df7686e 100644
--- a/skins/larry/templates/settings.html
+++ b/skins/larry/templates/settings.html
@@ -24,7 +24,6 @@
 	<div class="iframebox">
 		<roundcube:object name="prefsframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
 	</div>
-	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
 </div>