banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
pull/208/head
Aleksander Machniak 10 years ago
parent fcb7d4fc03 ea5d749822
commit 5af3b33f97
8 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File

2
plugins/help/skins/classic/help.css
Unescape Escape View File

@ -13,7 +13,7 @@
border-bottom: 0;
}
.closelink {
.helpwin .closelink {
position: absolute;
top: 20px;
right: 20px;

4
plugins/help/skins/classic/templates/help.html
Unescape Escape View File

@ -16,11 +16,11 @@ function help_init_settings_tabs()
</script>
</head>
<roundcube:if condition="env:extwin" />
<body class="extwin">
<body class="extwin helpwin">
<roundcube:object name="message" id="message" />
<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
<roundcube:else />
<body>
<body class="helpwin">
<roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" />
<roundcube:endif />

3
plugins/jqueryui/themes/classic/jquery-ui-1.10.4.custom.css vendored
Unescape Escape View File

@ -507,6 +507,9 @@ button.ui-button::-moz-focus-inner {
padding: 1px;
height: 20px;
}
.no-close .ui-dialog-titlebar-close {
display: none !important;
}
.ui-dialog .ui-dialog-content {
position: relative;
border: 0;

26
plugins/jqueryui/themes/classic/roundcube-custom.diff
Unescape Escape View File

@ -1,5 +1,5 @@
--- jquery-ui-1.10.4.custom.orig.css 2014-06-17 00:44:04.000000000 +0200
+++ jquery-ui-1.10.4.custom.css 2014-06-17 13:16:34.000000000 +0200
+++ jquery-ui-1.10.4.custom.css 2014-07-31 08:55:11.000000000 +0200
@@ -226,13 +226,18 @@
width: 3.7em;
}
@ -61,7 +61,17 @@
}
.ui-dialog .ui-dialog-titlebar {
padding: .4em 1em;
@@ -510,7 +526,7 @@
@@ -491,6 +507,9 @@
padding: 1px;
height: 20px;
}
+.no-close .ui-dialog-titlebar-close {
+ display: none !important;
+}
.ui-dialog .ui-dialog-content {
position: relative;
border: 0;
@@ -510,7 +529,7 @@
}
.ui-dialog .ui-dialog-buttonpane button {
margin: .5em .4em .5em 0;
@ -70,7 +80,7 @@
}
.ui-dialog .ui-resizable-se {
width: 12px;
@@ -528,6 +544,9 @@
@@ -528,6 +547,9 @@
margin: 0;
display: block;
outline: none;
@ -80,7 +90,7 @@
}
.ui-menu .ui-menu {
margin-top: -3px;
@@ -559,6 +578,9 @@
@@ -559,6 +581,9 @@
.ui-menu .ui-menu-item a.ui-state-active {
font-weight: normal;
margin: -1px;
@ -90,7 +100,7 @@
}
.ui-menu .ui-state-disabled {
@@ -740,20 +762,29 @@
@@ -740,20 +765,29 @@
float: left;
position: relative;
top: 0;
@ -122,7 +132,7 @@
.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
@@ -806,9 +837,11 @@
@@ -806,9 +840,11 @@
}
.ui-widget-header {
border: 1px solid #999999;
@ -135,7 +145,7 @@
}
.ui-widget-header a {
color: #333333;
@@ -841,6 +874,15 @@
@@ -841,6 +877,15 @@
font-weight: normal;
color: #000000;
}
@ -151,7 +161,7 @@
.ui-state-hover a,
.ui-state-hover a:hover,
.ui-state-hover a:link,
@@ -906,8 +948,8 @@
@@ -906,8 +951,8 @@
.ui-priority-secondary,
.ui-widget-content .ui-priority-secondary,
.ui-widget-header .ui-priority-secondary {

3
plugins/jqueryui/themes/larry/jquery-ui-1.10.4.custom.css vendored
Unescape Escape View File

@ -521,6 +521,9 @@ button.ui-button::-moz-focus-inner {
height: 30px;
background: url("images/ui-dialog-close.png") 0 0 no-repeat;
}
.no-close .ui-dialog-titlebar-close {
display: none !important;
}
.ui-dialog .ui-dialog-content {
position: relative;
border: 0;

31
plugins/jqueryui/themes/larry/jquery-ui-css.diff
Unescape Escape View File

@ -1,5 +1,5 @@
--- jquery-ui-1.10.4.custom.orig.css 2014-06-17 00:47:00.000000000 +0200
+++ jquery-ui-1.10.4.custom.css 2014-07-09 10:42:44.000000000 +0200
+++ jquery-ui-1.10.4.custom.css 2014-07-31 08:54:40.000000000 +0200
@@ -238,6 +238,8 @@
.ui-button-icons-only .ui-button-text {
padding: .4em;
@ -43,7 +43,7 @@
white-space: nowrap;
width: 90%;
overflow: hidden;
@@ -484,50 +495,81 @@
@@ -484,50 +495,84 @@
}
.ui-dialog .ui-dialog-titlebar-close {
position: absolute;
@ -78,6 +78,9 @@
+ width: 30px;
+ height: 30px;
+ background: url("images/ui-dialog-close.png") 0 0 no-repeat;
+}
+.no-close .ui-dialog-titlebar-close {
+ display: none !important;
}
.ui-dialog .ui-dialog-content {
position: relative;
@ -141,7 +144,7 @@
}
.ui-menu .ui-menu {
margin-top: -3px;
@@ -539,6 +581,16 @@
@@ -539,6 +584,16 @@
width: 100%;
/* support: IE10, see #8844 */
list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
@ -158,7 +161,7 @@
}
.ui-menu .ui-menu-divider {
margin: 5px -2px 5px -2px;
@@ -550,15 +602,26 @@
@@ -550,15 +605,26 @@
.ui-menu .ui-menu-item a {
text-decoration: none;
display: block;
@ -187,7 +190,7 @@
}
.ui-menu .ui-state-disabled {
@@ -626,7 +689,13 @@
@@ -626,7 +692,13 @@
font-size: .7em;
display: block;
border: 0;
@ -202,7 +205,7 @@
}
/* For IE8 - See #6727 */
@@ -732,23 +801,41 @@
@@ -732,23 +804,41 @@
padding: .2em;
}
.ui-tabs .ui-tabs-nav {
@ -252,7 +255,7 @@
}
.ui-tabs .ui-tabs-nav li.ui-tabs-active {
margin-bottom: -1px;
@@ -759,14 +846,26 @@
@@ -759,14 +849,26 @@
.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
cursor: text;
}
@ -281,7 +284,7 @@
}
.ui-tooltip {
padding: 8px;
@@ -798,15 +897,21 @@
@@ -798,15 +900,21 @@
}
.ui-widget-content {
border: 1px solid #aaaaaa;
@ -307,7 +310,7 @@
color: #666666;
font-weight: bold;
}
@@ -820,7 +925,7 @@
@@ -820,7 +928,7 @@
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
border: 1px solid #cccccc;
@ -316,7 +319,7 @@
font-weight: bold;
color: #666666;
}
@@ -837,7 +942,7 @@
@@ -837,7 +945,7 @@
.ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus {
border: 1px solid #aaaaaa;
@ -325,7 +328,7 @@
font-weight: bold;
color: #333333;
}
@@ -856,7 +961,7 @@
@@ -856,7 +964,7 @@
.ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active {
border: 1px solid #aaaaaa;
@ -334,7 +337,7 @@
font-weight: bold;
color: #333333;
}
@@ -873,7 +978,7 @@
@@ -873,7 +981,7 @@
.ui-widget-content .ui-state-highlight,
.ui-widget-header .ui-state-highlight {
border: 1px solid #a3a3a3;
@ -343,7 +346,7 @@
color: #004458;
}
.ui-state-highlight a,
@@ -885,7 +990,7 @@
@@ -885,7 +993,7 @@
.ui-widget-content .ui-state-error,
.ui-widget-header .ui-state-error {
border: 1px solid #d7211e;
@ -352,7 +355,7 @@
color: #d64040;
}
.ui-state-error a,
@@ -1164,15 +1269,240 @@
@@ -1164,15 +1272,240 @@
/* Overlays */
.ui-widget-overlay {

2
program/lib/Roundcube/rcube_imap.php
Unescape Escape View File

@ -761,7 +761,7 @@ class rcube_imap extends rcube_storage
$page = $page ? $page : $this->list_page;
// use saved message set
if ($this->search_string && $folder == $this->folder) {
if ($this->search_string) {
return $this->list_search_messages($folder, $page, $slice);
}

4
program/lib/Roundcube/rcube_utils.php
Unescape Escape View File

@ -795,7 +795,7 @@ class rcube_utils
*
* @return object DateTime instance or false on failure
*/
public static function anytodatetime($date)
public static function anytodatetime($date, $timezone = null)
{
if (is_object($date) && is_a($date, 'DateTime')) {
return $date;
@ -807,7 +807,7 @@ class rcube_utils
// try to parse string with DateTime first
if (!empty($date)) {
try {
$dt = new DateTime($date);
$dt = new DateTime($date, $timezone);
}
catch (Exception $e) {
// ignore

Write Preview
Loading…
Cancel
Save