summaryrefslogtreecommitdiff
path: root/themes/admin_default
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-08-19 05:14:05 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-08-19 05:14:05 -0700
commitbc42df35ee6cce419cbd9f514f245dcf8c70262b (patch)
treed1ad4c36130edf320368c5e08f79ebb950b6bcec /themes/admin_default
parent2ac916783ad81f49185fa5c8514aefcb330a6128 (diff)
parent3b8323d5b4db4904aba9ea2f922140ab235dd681 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'themes/admin_default')
-rw-r--r--themes/admin_default/js/ui.init.js3
-rw-r--r--themes/admin_default/views/admin.html.php1
2 files changed, 4 insertions, 0 deletions
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index e52f0c4c..daa6dd70 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -19,6 +19,9 @@ $(document).ready(function(){
// Initialize modal dialogs
$(".gDialogLink").gallery_dialog();
+ // Initialize ajax links
+ $(".gDialogLink").gallery_ajax();
+
// Initialize panels
$(".gPanelLink").gallery_panel();
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index d27f9260..3f4128cb 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -25,6 +25,7 @@
<script type="text/javascript">
var MSG_CANCEL = "<?= t('Cancel') ?>";
</script>
+ <?= $theme->script("gallery.ajax.js") ?>
<?= $theme->script("gallery.dialog.js") ?>
<?= $theme->script("superfish/js/superfish.js") ?>
<?= $theme->script("jquery.dropshadow.js") ?>