diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2012-06-18 16:17:55 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2012-06-18 16:17:55 +0000 |
| commit | 527bc809aaa6d48e7c1a7be50de31a4c3adcee90 (patch) | |
| tree | fb7432e06af9191f2300af97685f235325d36f57 /modules/gallery/views | |
| parent | b52e834bd0bab530e98537d52b31d4b37f199739 (diff) | |
| parent | c48df3b8199802a75f30f38c6f7b3440f9fde4ca (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/form_uploadify.html.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index ba4a3621..22332e82 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -59,8 +59,9 @@ var re = /^error: (.*)$/i; var msg = re.exec(response); $("#g-add-photos-status ul").append( - "<li id=\"q" + queueID + "\" class=\"g-success\">" + fileObj.name + " - " + + "<li id=\"q" + queueID + "\" class=\"g-success\"><span></span> - " + <?= t("Completed")->for_js() ?> + "</li>"); + $("#g-add-photos-status li#q" + queueID + " span").text(fileObj.name); setTimeout(function() { $("#q" + queueID).slideUp("slow").remove() }, 5000); success_count++; update_status(); @@ -92,7 +93,8 @@ error_msg + "</a>"; $("#g-add-photos-status ul").append( - "<li id=\"q" + queueID + "\" class=\"g-error\">" + fileObj.name + msg + "</li>"); + "<li id=\"q" + queueID + "\" class=\"g-error\"><span></span>" + msg + "</li>"); + $("#g-add-photos-status li#q" + queueID + " span").text(fileObj.name); $("#g-uploadify").uploadifyCancel(queueID); error_count++; update_status(); |
