stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-10 09:19:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move tag ui to the bottom of the form since it's a lower priority

Browse Source 
Internationalize and simplify our error strings.
This commit is contained in:
Bharat Mediratta
2009-11-20 12:42:40 -08:00
parent 1a9a4a09de
commit fab0930d1f
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/gallery/views/simple_uploader.html.php
View File

@@ -61,20 +61,22 @@
var msg = " - ";
if (errorObj.type == "HTTP") {
if (errorObj.info == "500") {
msg += "Error occurred processing the file";
msg += <?= t("Unable to process this file")->for_js() ?>;
// Server error - check server logs
} else if (errorObj.info == "404") {
msg += "The upload script was not found.";
msg += <?= t("The upload script was not found.")->for_js() ?>;
// Server script not found
} else {
// Server Error: status: errorObj.info
msg += "Error occurred communication with the server, status: " + errorObj.info;
msg += (<?= t("Server error: __INFO__")->for_js() ?>.replace("__INFO__", errorObj.info));
}
} else if (errorObj.type == "File Size") {
var sizelimit = $("#g-uploadify").uploadifySettings(sizeLimit);
msg += fileObj.name+' '+errorObj.type+' Limit: '+Math.round(d.sizeLimit/1024)+'KB';
} else {
msg += "Error occurred communication with the server, error " + errorObj.type + ": " + errorObj.info;
msg += (<?= t("Server error: __INFO__ (__TYPE__)")->for_js() ?>
.replace("__INFO__", errorObj.info)
.replace("__TYPE__", errorObj.type));
}
$("#g-add-photos-status ul").append(
"<li class=\"g-error\">" + fileObj.name + msg + "</li>");
@@ -130,13 +132,6 @@
</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 id="g-add-photos-canvas" style="text-align: center;">
<a id="g-add-photos-button" class="ui-corner-all" style="padding-bottom: 1em;" href="#"><?= t("Select Photos...") ?></a>
<span id="g-uploadify"></span>
@@ -146,6 +141,13 @@
</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 ?>
<!-- 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") ?>