diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-09-07 21:06:50 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-09-07 21:06:50 -0700 |
| commit | 64f79f069829afc599f4daf926c064e4843bb351 (patch) | |
| tree | bab834dae8ff44f341dc632dd896b3ea58f54951 | |
| parent | ab880120e69b27bdcfed07d3b0729108326b335d (diff) | |
| parent | 5a26dd542a3cb4974870bcfeec4864d1daa616c4 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
| -rw-r--r-- | modules/gallery/helpers/gallery_event.php | 2 | ||||
| -rw-r--r-- | modules/organize/lib/Gallery3WebClient.swf | bin | 148799 -> 148920 bytes | |||
| -rw-r--r-- | modules/organize/views/organize_dialog.html.php | 6 | ||||
| -rw-r--r-- | modules/tag/views/tag_block.html.php | 5 |
4 files changed, 9 insertions, 4 deletions
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php index ec7d1882..0ba98025 100644 --- a/modules/gallery/helpers/gallery_event.php +++ b/modules/gallery/helpers/gallery_event.php @@ -210,7 +210,7 @@ class gallery_event_Core { ->label($user->display_name())); if (Router::$controller == "admin") { - $continue_url = url::site(""); + $continue_url = url::abs_site(""); } else if (isset($theme->item)) { if (access::user_can(identity::guest(), "view", $theme->item)) { $continue_url = $theme->item->abs_url(); diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf Binary files differindex b82c8a42..71daa2f9 100644 --- a/modules/organize/lib/Gallery3WebClient.swf +++ b/modules/organize/lib/Gallery3WebClient.swf diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php index b76813ad..769d6e9a 100644 --- a/modules/organize/views/organize_dialog.html.php +++ b/modules/organize/views/organize_dialog.html.php @@ -19,13 +19,17 @@ <script type="text/javascript"> $("#g-dialog").bind("dialogclose", function(event, ui) { // @todo do a call to organize/closing to end the batch - window.location.reload(); + window.location = $(this).data("reload.location"); }); function closeOrganizeDialog() { $("#g-dialog").dialog("close"); } + function setLocation(url) { + $("#g-dialog").data("reload.location", url); + } + function setTitle(title) { $("#ui-dialog-title-g-dialog").text(<?= t("Organize :: ")->for_js() ?> + title); } diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php index 8b887282..cc204c72 100644 --- a/modules/tag/views/tag_block.html.php +++ b/modules/tag/views/tag_block.html.php @@ -7,7 +7,8 @@ max: 30, multiple: true, multipleSeparator: ',', - cacheLength: 1 + cacheLength: 1, + selectFirst: false, } ); $("#g-add-tag-form").ajaxForm({ @@ -24,4 +25,4 @@ <div id="g-tag-cloud" ref="<?= url::site("tags") ?>"> <?= $cloud ?> </div> -<?= $form ?>
\ No newline at end of file +<?= $form ?> |