diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2009-06-29 21:03:40 -0700 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2009-06-29 21:03:40 -0700 |
| commit | 21f228b1aed8b32dc9856add51f4ef8a3c7ced95 (patch) | |
| tree | 64d59bd5c8fc16515acbe6770ab28b082a1db336 | |
| parent | 0eb9a2aacd33d9d98726d08f828f10df4e462e9e (diff) | |
Ticket 86 (addendum) - Guard against themes that don't define MSG_CANCEL and add the message to admin_default as
well.
| -rw-r--r-- | lib/gallery.dialog.js | 2 | ||||
| -rw-r--r-- | themes/admin_default/views/admin.html.php | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index 6d986aa0..fc66323e 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -98,6 +98,8 @@ function openDialog(element, on_success) { } function on_form_loaded() { + // Should be defined (and localized) in the theme + MSG_CANCEL = MSG_CANCEL || 'Cancel'; var eCancel = '<a href="javascript: closeDialog()" class="gCancel">' + MSG_CANCEL + '</a>'; if ($("#gDialog .submit").length) { $("#gDialog .submit").addClass("ui-state-default ui-corner-all"); diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index fed1afe6..36deea9e 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -21,6 +21,10 @@ <?= $theme->script("lib/jquery.form.js") ?> <?= $theme->script("lib/jquery-ui.js") ?> <?= $theme->script("lib/gallery.common.js") ?> + <? /* MSG_CANCEL is required by gallery.dialog.js */ ?> + <script type="text/javascript"> + var MSG_CANCEL = "<?= t('Cancel') ?>"; + </script> <?= $theme->script("lib/gallery.dialog.js") ?> <?= $theme->script("lib/superfish/js/superfish.js") ?> <?= $theme->theme_script("js/jquery.dropshadow.js") ?> |