diff options
Diffstat (limited to 'modules/gallery/views/simple_uploader.html.php')
| -rw-r--r-- | modules/gallery/views/simple_uploader.html.php | 91 |
1 files changed, 42 insertions, 49 deletions
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php index 014919c3..a84a3b00 100644 --- a/modules/gallery/views/simple_uploader.html.php +++ b/modules/gallery/views/simple_uploader.html.php @@ -5,12 +5,10 @@ $("#g-add-photos-canvas").ready(function () { $("#g-uploadify").uploadify({ uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>", - folder: "<?= url::file("var/uploads") ?>", script: "<?= url::site("simple_uploader/add_photo/{$item->id}") ?>", scriptData: <?= json_encode(array( "g3sid" => Session::instance()->id(), "user_agent" => Input::instance()->server("HTTP_USER_AGENT"), - "tags" => "", "csrf" => $csrf)) ?>, fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4", fileDesc: <?= t("Photos and movies")->for_js() ?>, @@ -31,6 +29,12 @@ .attr("disabled", "disabled"); return true; }, + onComplete: function(event, queueID, fileObj, response, data) { + $("#g-add-photos-status tbody").append( + "<tr class=\"g-success\"><td>" + fileObj.name + "</td><td>" + + Math.ceil(fileObj.size / 1000) + " KB" + "</td><td>" + Math.floor(data.speed) + " KB/s </td></tr>"); + return true; + }, onSelect: function(event) { if ($("#g-upload-cancel-all").hasClass("ui-state-disabled")) { $("#g-upload-cancel-all") @@ -40,15 +44,6 @@ return true; } }); - <? if (module::active("tag")): ?> - $('#g-add-photos-tags').autocomplete( - '<?= url::site("tags/autocomplete") ?>', - {max: 30, multiple: true, multipleSeparator: ',', cacheLength: 1} - ); - $('#g-add-photos-tags').blur(function (event) { - $("#g-uploadify").uploadifySettings("scriptData", {"tags": $(this).val()}); - }); - <? endif ?> }); </script> @@ -57,47 +52,45 @@ <legend> <?= t("Add photos to %album_title", array("album_title" => html::purify($item->title))) ?> </legend> </fieldset> -<div id="g-add-photos"> - <? if (ini_get("suhosin.session.encrypt")): ?> - <ul id="g-action-status" class="g-message-block"> - <li class="g-error"> - <?= t("Error: your server is configured to use the <a href=\"%encrypt_url\"><code>suhosin.session.encrypt</code></a> setting from <a href=\"%suhosin_url\">Suhosin</a>. You must disable this setting to upload photos.", + <div id="g-add-photos"> + <? if (ini_get("suhosin.session.encrypt")): ?> + <ul id="g-action-status" class="g-message-block"> + <li class="g-error"> + <?= t("Error: your server is configured to use the <a href=\"%encrypt_url\"><code>suhosin.session.encrypt</code></a> setting from <a href=\"%suhosin_url\">Suhosin</a>. You must disable this setting to upload photos.", array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt", - "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?> - </li> - </ul> - <? endif ?> + "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?> + </li> + </ul> + <? endif ?> - <div> - <p> - <?= t("Photos will be uploaded to album: ") ?> - </p> - <ul class="g-breadcrumbs"> - <? foreach ($item->parents() as $i => $parent): ?> - <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::clean($parent->title) ?> </li> - <? endforeach ?> - <li class="g-active"> <?= html::purify($item->title) ?> </li> - </ul> - </div> - - <? if (module::active("tag")): ?> - <div style="clear: both;"> - <label for="g-add-photos-tags"><?= t("Add tags to all uploaded files") ?></label> - <input type="text" id="g-add-photos-tags" name="tags" value="" /> - </div> - <? endif ?> + <div> + <p> + <?= t("Photos will be uploaded to album: ") ?> + </p> + <ul class="g-breadcrumbs"> + <? foreach ($item->parents() as $i => $parent): ?> + <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::clean($parent->title) ?> </li> + <? endforeach ?> + <li class="g-active"> <?= html::purify($item->title) ?> </li> + </ul> + </div> <div id="g-add-photos-canvas" style="text-align: center;"> - <div id="g-uploadify"></div> - </div> + <div id="g-uploadify"></div> + </div> + <div id="g-add-photos-status" style="text-align: center;"> + <table> + <tbody> + </tbody> + </table> + </div> - <!-- Proxy the done request back to our form, since its been ajaxified --> - <button id="g-upload-done" class="ui-state-default ui-corner-all" onclick="$('#g-add-photos-form').submit()"> - <?= t("Done") ?> - </button> - <button id="g-upload-cancel-all" class="ui-state-default ui-corner-all ui-state-disabled" onclick="$('#g-uploadify').uploadifyClearQueue();return false;" disabled="disabled"> - <?= t("Cancel All") ?> - </button> - -</div> + <!-- Proxy the done request back to our form, since its been ajaxified --> + <button id="g-upload-done" class="ui-state-default ui-corner-all" onclick="$('#g-add-photos-form').submit();return false;"> + <?= t("Done") ?> + </button> + <button id="g-upload-cancel-all" class="ui-state-default ui-corner-all ui-state-disabled" onclick="$('#g-uploadify').uploadifyClearQueue();return false;" disabled="disabled"> + <?= t("Cancel All") ?> + </button> + </div> </form> |