From bd0daee7fd8d3e58433b0c394b1bc58b8b52e8e3 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 25 Jan 2013 08:27:31 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
skins/larry/embed.css | 10 ++--
skins/classic/embed.css | 35 +++++++++++++++++
skins/larry/print.css | 2 -
program/lib/Roundcube/rcube_imap_generic.php | 2
skins/larry/styles.css | 2 -
skins/larry/svggradients.css | 2 -
skins/larry/addressbook.css | 2 -
program/js/app.js | 17 ++++----
skins/larry/iehacks.css | 2 -
skins/larry/mail.css | 4 -
10 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 4841be0..c2456ac 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -583,11 +583,11 @@
var prevstate = this.env.compose_extwin;
$("input[name='_action']", this.gui_objects.messageform).val('compose');
this.gui_objects.messageform.action = this.url('mail/compose', { _id: this.env.compose_id, _extwin: 1 });
- this.gui_objects.messageform.target = this.open_window('', 1150, 900);
+ this.gui_objects.messageform.target = this.open_window('', 1100, 900);
this.gui_objects.messageform.submit();
}
else {
- this.open_window(this.env.permaurl, 1000, 1200);
+ this.open_window(this.env.permaurl, 900, 900);
}
break;
@@ -1684,11 +1684,10 @@
var w = Math.min(width, screen.width - 10),
h = Math.min(height, screen.height - 100),
l = (screen.width - w) / 2 + (screen.left || 0),
- t = Math.max(0, (screen.height - h) / 2 + (screen.top || 0) - 20);
-
- var wname = 'rcmextwin' + new Date().getTime(),
- extwin = window.open(url + '&_extwin=1', wname, 'width='+w+',height='+h+',top='+t+',left='+l+',resizable=yes,toolbar=no,status=no');
- extwin.moveTo(l,t);
+ t = Math.max(0, (screen.height - h) / 2 + (screen.top || 0) - 20),
+ wname = 'rcmextwin' + new Date().getTime(),
+ extwin = window.open(url + '&_extwin=1', wname,
+ 'width='+w+',height='+h+',top='+t+',left='+l+',resizable=yes,toolbar=no,status=no,location=no');
// write loading... message to empty windows
if (!url && extwin.document) {
@@ -1696,7 +1695,9 @@
}
// focus window, delayed to bring to front
- window.setTimeout(function(){ extwin.focus(); }, 10);
+ window.setTimeout(function() { extwin.focus(); }, 10);
+ // position window with setTimeout for Chrome (#1488931)
+ window.setTimeout(function() { extwin.moveTo(l,t); }, bw.chrome ? 100 : 10);
return wname;
};
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index 8d84bf7..b9a796c 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -906,7 +906,7 @@
*/
function closeConnection()
{
- if ($this->putLine($this->nextTag() . ' LOGOUT')) {
+ if ($this->logged && $this->putLine($this->nextTag() . ' LOGOUT')) {
$this->readReply();
}
diff --git a/skins/classic/embed.css b/skins/classic/embed.css
new file mode 100644
index 0000000..b9715c7
--- /dev/null
+++ b/skins/classic/embed.css
@@ -0,0 +1,35 @@
+/**
+ * Roundcube webmail "embedded" stylesheets
+ *
+ * Copyright (c) 2013, The Roundcube Dev Team
+ *
+ * The contents are subject to the Creative Commons Attribution-ShareAlike
+ * License. It is allowed to copy, distribute, transmit and to adapt the work
+ * by keeping credits to the original autors in the README file.
+ * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
+ */
+
+.rcmail-inline-message {
+ font-family: sans-serif;
+ font-size: 14px;
+ color: #000;
+ margin-bottom: .8em;
+ min-height: 20px;
+ padding: 10px 10px 6px 46px;
+ background: url(images/display/icons.png) 6px 3px no-repeat #F7FDCB;
+ border: 1px solid #C2D071;
+}
+
+.rcmail-inline-message > button {
+ margin-left: 1em;
+ vertical-align: baseline;
+}
+
+.rcmail-inline-message em {
+ font-size: 90%;
+ color: #666;
+}
+
+.rcmail-inline-buttons {
+ margin-bottom: 0;
+}
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index 74bc0d7..54fabfa 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -8,8 +8,6 @@
* License. It is allowed to copy, distribute, transmit and to adapt the work
* by keeping credits to the original autors in the README file.
* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
*/
#addressview-left {
diff --git a/skins/larry/embed.css b/skins/larry/embed.css
index 8c4e95d..2c8ba39 100644
--- a/skins/larry/embed.css
+++ b/skins/larry/embed.css
@@ -11,11 +11,12 @@
.rcmail-inline-message {
font-family: sans-serif;
- font-size: 14px;
- color: #333;
+ font-size: 11px;
+ font-weight: bold;
+ color: #996600;
border: 1px solid #ffdf0e;
- background-color: #fef893;
- padding: 0.6em 1em;
+ background: url("images/messages.png") no-repeat scroll 5px -83px #fef893;
+ padding: 6px 12px 4px 30px;
margin-bottom: 0.8em;
}
@@ -26,7 +27,6 @@
.rcmail-inline-message em {
font-size: 90%;
- color: #666;
}
.rcmail-inline-buttons {
diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css
index 357ea22..871cce4 100644
--- a/skins/larry/iehacks.css
+++ b/skins/larry/iehacks.css
@@ -7,8 +7,6 @@
* License. It is allowed to copy, distribute, transmit and to adapt the work
* by keeping credits to the original autors in the README file.
* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
*/
input.button {
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 6ad1f7a..2e2536a 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -8,8 +8,6 @@
* License. It is allowed to copy, distribute, transmit and to adapt the work
* by keeping credits to the original autors in the README file.
* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
*/
#mailview-left {
@@ -987,7 +985,7 @@
color: #960;
border: 1px solid #ffdf0e;
background-color: #fef893;
- background-position: 5px -85px;
+ background-position: 5px -83px;
padding: 6px 12px 4px 30px;
white-space: normal;
}
diff --git a/skins/larry/print.css b/skins/larry/print.css
index fa25674..6481ea9 100644
--- a/skins/larry/print.css
+++ b/skins/larry/print.css
@@ -7,8 +7,6 @@
* License. It is allowed to copy, distribute, transmit and to adapt the work
* by keeping credits to the original autors in the README file.
* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
*/
body {
font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index f098c68..f7adeba 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -8,8 +8,6 @@
* License. It is allowed to copy, distribute, transmit and to adapt the work
* by keeping credits to the original autors in the README file.
* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
*/
body {
diff --git a/skins/larry/svggradients.css b/skins/larry/svggradients.css
index 06c6f47..2172ac3 100644
--- a/skins/larry/svggradients.css
+++ b/skins/larry/svggradients.css
@@ -7,8 +7,6 @@
* License. It is allowed to copy, distribute, transmit and to adapt the work
* by keeping credits to the original autors in the README file.
* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
*/
input.button {
--
Gitblit v1.9.1