diff options
| author | jhilden <jakobhilden@gmail.com> | 2009-08-28 20:54:20 -0400 |
|---|---|---|
| committer | jhilden <jakobhilden@gmail.com> | 2009-08-28 20:54:20 -0400 |
| commit | b518a5173da57d65d454518fd2400fe28cdfef3c (patch) | |
| tree | 7fa6c80b557b7268293bf49333834e95a6cb0ecc | |
| parent | c234f9fd392d355bb7a143e28474bb689ed65e48 (diff) | |
| parent | 974e8f9547284e052eef2d8b9668f9e85c585b49 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
| -rw-r--r-- | lib/gallery.dialog.js | 8 | ||||
| -rw-r--r-- | themes/admin_default/css/screen.css | 2 | ||||
| -rw-r--r-- | themes/default/css/screen.css | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index ace588f6..d1ea3edf 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -30,7 +30,7 @@ $("#gDialog").html(data).gallery_show_loading(); if ($("#gDialog form").length) { - self._trigger("form_loaded", null, $("#gDialog form")); + self.form_loaded(null, $("#gDialog form")); } self._layout(); @@ -70,7 +70,7 @@ $("#gDialog").dialog('option', 'width', dialogWidth); }, - form_loaded: function event(event, ui) { + form_loaded: function(event, ui) { // Should be defined (and localized) in the theme MSG_CANCEL = MSG_CANCEL || 'Cancel'; var eCancel = '<a href="#" class="gCancel">' + MSG_CANCEL + '</a>'; @@ -78,7 +78,7 @@ $("#gDialog .submit").addClass("ui-state-default ui-corner-all"); $("#gDialog .submit").parent().append(eCancel); $("#gDialog .gCancel").click(function(event) { - $("gDialog").dialog("close"); + $("#gDialog").dialog("close"); event.preventDefault(); }); } @@ -92,7 +92,7 @@ ); }, - close_dialog: function (event, ui) { + close_dialog: function(event, ui) { var self = $("#gDialog").dialog("option", "self"); if ($("#gDialog form").length) { self._trigger("form_closing", null, $("#gDialog form")); diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css index 88631e81..062c0e41 100644 --- a/themes/admin_default/css/screen.css +++ b/themes/admin_default/css/screen.css @@ -276,7 +276,7 @@ li.gError select { /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */ #gMessage { - width: 99%; + width: 100%; } #gAdminAkismet .gSuccess, diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 94a67ccf..d39152e4 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -276,7 +276,7 @@ li.gError select { /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */ #gMessage { - width: 99%; + width: 100%; } #gAdminAkismet .gSuccess, |