From 0494244e8068198707bf602199413cd216b0d515 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 3 Feb 2013 18:48:30 -0500 Subject: Super first pass: - jQuery 1.90 - jQuery UI 1.10 - Superfish 1.5.1 (minus all plugins) - jQuery Form 3.26.0-2013.01.28 Deleted all other jQuery plugins for now. - Reworked autocomplete to use the latest jQuery code. - Deleted references to $.browser.msie, no longer supported - Basic CSS support for autocomplete - lots more work needed there --- themes/wind/css/screen.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'themes/wind/css/screen.css') diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index d3e0f83c..adddb93c 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -948,6 +948,12 @@ button { display: inline-block; } +/* Autocomplete */ + +.ui-autocomplete { + text-align: left; +} + /* Status and validation messages ~~~~ */ .g-message-block { -- cgit v1.2.3 From 8635de23239de0ebcd7d018dc9240ca8b10c30c3 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 3 Feb 2013 23:10:57 -0500 Subject: Force dialogs to the top of the page. --- themes/wind/css/screen.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'themes/wind/css/screen.css') diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index adddb93c..0e4819ee 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -886,6 +886,10 @@ ul.sf-menu li li li.sfHover ul { opacity: .7; } +.ui-dialog { + z-index: 9999; +} + /* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-button { -- cgit v1.2.3 From f580488fb5914b309a15396611d9b3a9177c65a0 Mon Sep 17 00:00:00 2001 From: shadlaws Date: Wed, 13 Feb 2013 09:45:12 +0100 Subject: Fix Cancel link positioning, fix watermark error reply (seems to have already been broken in v3.0.4...) --- lib/gallery.dialog.js | 7 +++++++ themes/admin_wind/css/screen.css | 2 +- themes/wind/css/screen.css | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'themes/wind/css/screen.css') diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index b1442390..b4557493 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -139,6 +139,13 @@ }, success: function(data) { if (data.html) { + if (data.result == "error") { + // This is an odd case that arises from the watermarks module. This is because we + // have a fake xhr, and we rawurlencode the results because the JS code that uploads + // the file buffers it in an iframe which entitizes the HTML and makes it difficult + // for the JS to process. See ticket #797. + data.html = unescape(data.html); + } $("#g-dialog").html(data.html); $("#g-dialog").dialog("option", "position", "center"); $("#g-dialog form :submit").removeClass("ui-state-disabled") diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 58942387..23d319b2 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -989,7 +989,7 @@ div#g-action-status { } #g-dialog .g-cancel { - margin: .4em 1em; + margin: .59em 1em; } #g-panel { diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 0e4819ee..e19427f3 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -1048,7 +1048,7 @@ div#g-action-status { } #g-dialog .g-cancel { - margin: .4em 1em; + margin: .59em 1em; } #g-panel { -- cgit v1.2.3 From 4dd7b708b24a40ed90ed324d9853aa87b3ec46a0 Mon Sep 17 00:00:00 2001 From: shadlaws Date: Fri, 15 Feb 2013 19:31:20 +0100 Subject: Dialog sizing, titles, and z-index. This should ensure the small <500px dialogs are correct, all titles are correctly sized, and the dialog boxes go to the top for older themes, too. --- lib/gallery.dialog.js | 11 +++++------ modules/gallery/css/gallery.css | 9 +++++++++ themes/wind/css/screen.css | 4 ---- 3 files changed, 14 insertions(+), 10 deletions(-) (limited to 'themes/wind/css/screen.css') diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index b4557493..a771adcb 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -28,9 +28,6 @@ $("#g-dialog").dialog("close"); } $("body").append(eDialog); - if (!self.options.zIndex) { - self.options.zIndex = 9999; - } if (!self.options.close) { self.options.close = self.close_dialog; @@ -79,8 +76,7 @@ _layout: function() { var dialogWidth; var dialogHeight = $("#g-dialog").height(); - var cssWidth = new String($("#g-dialog form").css("width")); - var childWidth = cssWidth.replace(/[^0-9]/g,""); + var childWidth = $("#g-dialog form").width(); var size = $.gallery_get_viewport_size(); if ($("#g-dialog iframe").length) { dialogWidth = size.width() - 100; @@ -89,8 +85,10 @@ } else if ($("#g-dialog .g-dialog-panel").length) { dialogWidth = size.width() - 100; $("#g-dialog").dialog("option", "height", size.height() - 100); - } else { + } else if (childWidth <= 150 || childWidth > 300) { dialogWidth = 500; + } else { + dialogWidth = 300; } $("#g-dialog").dialog('option', 'width', dialogWidth); }, @@ -183,6 +181,7 @@ } else if ($("#g-dialog fieldset legend").length) { $("#g-dialog").dialog('option', 'title', $("#g-dialog fieldset legend:eq(0)").html()); } + $(".ui-dialog-title").width('auto'); }, form_closing: function(event, ui) {}, diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css index 7e711156..d3f7dcca 100644 --- a/modules/gallery/css/gallery.css +++ b/modules/gallery/css/gallery.css @@ -149,6 +149,15 @@ text-align: center; } +/* Dialogs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +/** + * Newer Themeroller-based themes do this on their own, but older + * themes need help ensuring that dialogs and overlays are on top + */ +.ui-front { + z-index: 1000 +} + /** ******************************************************************* * 2) Admin **********************************************************************/ diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index e19427f3..6f98cbba 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -886,10 +886,6 @@ ul.sf-menu li li li.sfHover ul { opacity: .7; } -.ui-dialog { - z-index: 9999; -} - /* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-button { -- cgit v1.2.3 From 4bf41377b8aca8dff15ccce398662e428268fa09 Mon Sep 17 00:00:00 2001 From: shadlaws Date: Mon, 18 Feb 2013 18:29:31 +0100 Subject: Moved autocomplete CSS to gallery.css to ensure it works for all themes (including admin_wind). --- modules/gallery/css/gallery.css | 6 ++++++ themes/wind/css/screen.css | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'themes/wind/css/screen.css') diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css index d3f7dcca..73b8ab4e 100644 --- a/modules/gallery/css/gallery.css +++ b/modules/gallery/css/gallery.css @@ -158,6 +158,12 @@ z-index: 1000 } +/* Autocomplete ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +.ui-autocomplete { + text-align: left; +} + /** ******************************************************************* * 2) Admin **********************************************************************/ diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 6f98cbba..0ece722e 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -948,12 +948,6 @@ button { display: inline-block; } -/* Autocomplete */ - -.ui-autocomplete { - text-align: left; -} - /* Status and validation messages ~~~~ */ .g-message-block { -- cgit v1.2.3