summaryrefslogtreecommitdiff
path: root/plugins/jqueryui
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/jqueryui')
-rw-r--r--plugins/jqueryui/config.inc.php.dist1
-rw-r--r--plugins/jqueryui/jqueryui.php19
-rw-r--r--plugins/jqueryui/package.xml32
-rw-r--r--plugins/jqueryui/themes/classic/images/buttongradient.png (renamed from plugins/jqueryui/themes/default/images/buttongradient.png)bin193 -> 193 bytes
-rw-r--r--plugins/jqueryui/themes/classic/images/listheader.png (renamed from plugins/jqueryui/themes/default/images/listheader.png)bin356 -> 356 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/images/ui-bg_flat_0_aaaaaa_40x100.png (renamed from plugins/jqueryui/themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png)bin180 -> 180 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/images/ui-bg_flat_75_ffffff_40x100.png (renamed from plugins/jqueryui/themes/default/images/ui-bg_flat_75_ffffff_40x100.png)bin178 -> 178 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/images/ui-bg_flat_90_cc3333_40x100.png (renamed from plugins/jqueryui/themes/default/images/ui-bg_flat_90_cc3333_40x100.png)bin212 -> 212 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/images/ui-bg_glass_95_fef1ec_1x400.png (renamed from plugins/jqueryui/themes/default/images/ui-bg_glass_95_fef1ec_1x400.png)bin119 -> 119 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png (renamed from plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png)bin114 -> 114 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png (renamed from plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png)bin101 -> 101 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png (renamed from plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png)bin122 -> 122 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/images/ui-icons_000000_256x240.png (renamed from plugins/jqueryui/themes/default/images/ui-icons_000000_256x240.png)bin4369 -> 4369 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/images/ui-icons_333333_256x240.png (renamed from plugins/jqueryui/themes/default/images/ui-icons_333333_256x240.png)bin4369 -> 4369 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/images/ui-icons_666666_256x240.png (renamed from plugins/jqueryui/themes/default/images/ui-icons_666666_256x240.png)bin4369 -> 4369 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/images/ui-icons_cc3333_256x240.png (renamed from plugins/jqueryui/themes/default/images/ui-icons_cc3333_256x240.png)bin5355 -> 5355 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/images/ui-icons_dddddd_256x240.png (renamed from plugins/jqueryui/themes/default/images/ui-icons_dddddd_256x240.png)bin4369 -> 4369 bytes
-rwxr-xr-xplugins/jqueryui/themes/classic/jquery-ui-1.8.18.custom.css (renamed from plugins/jqueryui/themes/default/jquery-ui-1.8.18.custom.css)0
-rw-r--r--plugins/jqueryui/themes/classic/roundcube-custom.diff (renamed from plugins/jqueryui/themes/default/roundcube-custom.diff)0
-rwxr-xr-xplugins/jqueryui/themes/larry/jquery-ui-1.8.18.custom.css3
20 files changed, 36 insertions, 19 deletions
diff --git a/plugins/jqueryui/config.inc.php.dist b/plugins/jqueryui/config.inc.php.dist
index 65c01757a..a3c3f75a0 100644
--- a/plugins/jqueryui/config.inc.php.dist
+++ b/plugins/jqueryui/config.inc.php.dist
@@ -6,6 +6,7 @@ $rcmail_config['jquery_ui_i18n'] = array('datepicker');
// map Roundcube skins with jquery-ui themes here
$rcmail_config['jquery_ui_skin_map'] = array(
'larry' => 'larry',
+ 'default' => 'larry',
'groupvice4' => 'redmond',
);
diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php
index 69b9ca1c0..f96366ee8 100644
--- a/plugins/jqueryui/jqueryui.php
+++ b/plugins/jqueryui/jqueryui.php
@@ -24,7 +24,7 @@ class jqueryui extends rcube_plugin
$this->include_script("js/jquery-ui-$version.custom.min.js");
// include UI stylesheet
- $skin = $rcmail->config->get('skin', 'default');
+ $skin = $rcmail->config->get('skin');
$ui_map = $rcmail->config->get('jquery_ui_skin_map', array());
$ui_theme = $ui_map[$skin] ? $ui_map[$skin] : $skin;
@@ -32,7 +32,22 @@ class jqueryui extends rcube_plugin
$this->include_stylesheet("themes/$ui_theme/jquery-ui-$version.custom.css");
}
else {
- $this->include_stylesheet("themes/default/jquery-ui-$version.custom.css");
+ $this->include_stylesheet("themes/larry/jquery-ui-$version.custom.css");
+ }
+
+ if ($ui_theme == 'larry') {
+ // patch dialog position function in order to fully fit the close button into the window
+ $rcmail->output->add_script("jQuery.extend(jQuery.ui.dialog.prototype.options.position, {
+ using: function(pos) {
+ var me = jQuery(this),
+ offset = me.css(pos).offset(),
+ topOffset = offset.top - 12;
+ if (topOffset < 0)
+ me.css('top', pos.top - topOffset);
+ if (offset.left + me.outerWidth() + 12 > jQuery(window).width())
+ me.css('left', pos.left - 12);
+ }
+ });", 'foot');
}
// jquery UI localization
diff --git a/plugins/jqueryui/package.xml b/plugins/jqueryui/package.xml
index 18f241a2e..1d265169c 100644
--- a/plugins/jqueryui/package.xml
+++ b/plugins/jqueryui/package.xml
@@ -99,22 +99,22 @@
<file name="js/i18n/jquery.ui.datepicker-zh-HK.js" role="data"></file>
<file name="js/i18n/jquery.ui.datepicker-zh-TW.js" role="data"></file>
- <file name="themes/default/jquery-ui-1.8.14.custom.css" role="data"></file>
- <file name="themes/default/roundcube-custom.diff" role="data"></file>
- <file name="themes/default/images/buttongradient.png" role="data"></file>
- <file name="themes/default/images/ui-bg_flat_90_cc3333_40x100.png" role="data"></file>
- <file name="themes/default/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png" role="data"></file>
- <file name="themes/default/images/ui-icons_cc3333_256x240.png" role="data"></file>
- <file name="themes/default/images/listheader.png" role="data"></file>
- <file name="themes/default/images/ui-bg_glass_95_fef1ec_1x400.png" role="data"></file>
- <file name="themes/default/images/ui-icons_000000_256x240.png" role="data"></file>
- <file name="themes/default/images/ui-icons_dddddd_256x240.png" role="data"></file>
- <file name="themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png" role="data"></file>
- <file name="themes/default/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png" role="data"></file>
- <file name="themes/default/images/ui-icons_333333_256x240.png" role="data"></file>
- <file name="themes/default/images/ui-bg_flat_75_ffffff_40x100.png" role="data"></file>
- <file name="themes/default/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png" role="data"></file>
- <file name="themes/default/images/ui-icons_666666_256x240.png" role="data"></file>
+ <file name="themes/classic/jquery-ui-1.8.14.custom.css" role="data"></file>
+ <file name="themes/classic/roundcube-custom.diff" role="data"></file>
+ <file name="themes/classic/images/buttongradient.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_flat_90_cc3333_40x100.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png" role="data"></file>
+ <file name="themes/classic/images/ui-icons_cc3333_256x240.png" role="data"></file>
+ <file name="themes/classic/images/listheader.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_glass_95_fef1ec_1x400.png" role="data"></file>
+ <file name="themes/classic/images/ui-icons_000000_256x240.png" role="data"></file>
+ <file name="themes/classic/images/ui-icons_dddddd_256x240.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_flat_0_aaaaaa_40x100.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png" role="data"></file>
+ <file name="themes/classic/images/ui-icons_333333_256x240.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_flat_75_ffffff_40x100.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png" role="data"></file>
+ <file name="themes/classic/images/ui-icons_666666_256x240.png" role="data"></file>
<file name="themes/redmont/jquery-ui-1.8.14.custom.css" role="data"></file>
<file name="themes/redmont/images/ui-bg_flat_0_aaaaaa_40x100.png" role="data"></file>
diff --git a/plugins/jqueryui/themes/default/images/buttongradient.png b/plugins/jqueryui/themes/classic/images/buttongradient.png
index 0595474c7..0595474c7 100644
--- a/plugins/jqueryui/themes/default/images/buttongradient.png
+++ b/plugins/jqueryui/themes/classic/images/buttongradient.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/listheader.png b/plugins/jqueryui/themes/classic/images/listheader.png
index 670df0c4a..670df0c4a 100644
--- a/plugins/jqueryui/themes/default/images/listheader.png
+++ b/plugins/jqueryui/themes/classic/images/listheader.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_flat_0_aaaaaa_40x100.png
index 5b5dab2ab..5b5dab2ab 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_flat_0_aaaaaa_40x100.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_flat_75_ffffff_40x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_flat_75_ffffff_40x100.png
index ac8b229af..ac8b229af 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_flat_75_ffffff_40x100.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_flat_90_cc3333_40x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_flat_90_cc3333_40x100.png
index 6a5d37d65..6a5d37d65 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_flat_90_cc3333_40x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_flat_90_cc3333_40x100.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_glass_95_fef1ec_1x400.png b/plugins/jqueryui/themes/classic/images/ui-bg_glass_95_fef1ec_1x400.png
index 4443fdc1a..4443fdc1a 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_glass_95_fef1ec_1x400.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png
index b3533aafe..b3533aafe 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png
index d0a127f4d..d0a127f4d 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png
index ecc0ac16a..ecc0ac16a 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_000000_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_000000_256x240.png
index 7c211aa08..7c211aa08 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_000000_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_000000_256x240.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_333333_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_333333_256x240.png
index fe079a595..fe079a595 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_333333_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_333333_256x240.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_666666_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_666666_256x240.png
index f87de1ca1..f87de1ca1 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_666666_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_666666_256x240.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_cc3333_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_cc3333_256x240.png
index b2fe02927..b2fe02927 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_cc3333_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_cc3333_256x240.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_dddddd_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_dddddd_256x240.png
index 91aada0ab..91aada0ab 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_dddddd_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_dddddd_256x240.png
Binary files differ
diff --git a/plugins/jqueryui/themes/default/jquery-ui-1.8.18.custom.css b/plugins/jqueryui/themes/classic/jquery-ui-1.8.18.custom.css
index 288e624ed..288e624ed 100755
--- a/plugins/jqueryui/themes/default/jquery-ui-1.8.18.custom.css
+++ b/plugins/jqueryui/themes/classic/jquery-ui-1.8.18.custom.css
diff --git a/plugins/jqueryui/themes/default/roundcube-custom.diff b/plugins/jqueryui/themes/classic/roundcube-custom.diff
index f5be87956..f5be87956 100644
--- a/plugins/jqueryui/themes/default/roundcube-custom.diff
+++ b/plugins/jqueryui/themes/classic/roundcube-custom.diff
diff --git a/plugins/jqueryui/themes/larry/jquery-ui-1.8.18.custom.css b/plugins/jqueryui/themes/larry/jquery-ui-1.8.18.custom.css
index e2737f5b2..b51fb9571 100755
--- a/plugins/jqueryui/themes/larry/jquery-ui-1.8.18.custom.css
+++ b/plugins/jqueryui/themes/larry/jquery-ui-1.8.18.custom.css
@@ -56,7 +56,7 @@
.ui-widget { font-family: Lucida Grande,Verdana,Arial,sans-serif; font-size: 1.0em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande,Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 0; background: #fafafa url(images/ui-bg_highlight-soft_75_fafafa_1x100.png) 50% top repeat-x; color: #333; }
+.ui-widget-content { border: 1px solid #aaa; background: #fafafa url(images/ui-bg_highlight-soft_75_fafafa_1x100.png) 50% top repeat-x; color: #333; }
/*.ui-widget-content a { color: #333; }*/
.ui-widget-header { border: 2px solid #fafafa; background: #e4e4e4 url(images/ui-bg_highlight-soft_90_e4e4e4_1x100.png) 50% 50% repeat-x; color: #666666; font-weight: bold; }
.ui-widget-header a { color: #aaaaaa; }
@@ -505,6 +505,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
* http://docs.jquery.com/UI/Dialog#theming
*/
.ui-dialog { position: absolute; padding: 3px; width: 300px; background: #fff; border-radius:6px; box-shadow: 1px 1px 18px #666; -moz-box-shadow: 1px 1px 12px #666; -webkit-box-shadow: #666 1px 1px 12px; }
+.ui-dialog .ui-widget-content { border: 0 }
.ui-dialog .ui-dialog-titlebar { padding: 15px 1em 8px 1em; position: relative; border: 0; border-radius: 5px 5px 0 0; }
.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; font-size: 1.3em; text-shadow: 1px 1px 1px #fff; }
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: -15px; top: -15px; margin:0; width: 30px; height: 30px; z-index:99999; }
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 08:52:58 +0000