added cancel button for uploads and updated css for errors

diff --git a/actions/ajax_upload.php b/actions/ajax_upload.php
index 973e4220a92640c4adaf085ccedfcce0a3ea3520..a9743cf54baac18306ade45c4fd2d484b3d56b6d 100644 (file)
--- a/actions/ajax_upload.php
+++ b/actions/ajax_upload.php
@@ -14,6 +14,7 @@ if (!$album) {
        exit;
 }
 
+// probably POST limit exceeded
 if (empty($_FILES)) {
        exit;
 }

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index fb4b16832b9df37b8c20535f01b0c0d473273455..3fd3c81aad1c1d642663679bdab2f18a6aaef8b4 100644 (file)
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -350,3 +350,12 @@ z-index:100;
 #uploadifyQueue {
 margin-bottom: 20px;
 }
+
+.uploadifyQueueItem .cancel {
+float: right;
+}
+
+.uploadifyError {
+border: 2px solid #FBCBBC;
+background-color: #FDE5DD;
+}
\ No newline at end of file

diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index 25c65857074907ba29385d7b5d610b22fac3f508..313ca17f9c0f68539904ee6f358b82d41b953990 100644 (file)
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -70,7 +70,7 @@ $("#uploadify").uploadify({
                                                'batch'        : '<?php echo $batch; ?>'
                                         },
        'fileDataName' : 'Image',
-       'cancelImg'  : '/_images/cancel.png',
+       'cancelImg'  : '<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif',
        'multi'      : true,
        'auto'       : false,
        'fileDesc'   : '<?php echo elgg_echo('tidypics:upload:filedesc'); ?>',