diff options
| author | Cash Costello <cash.costello@gmail.com> | 2010-10-29 11:39:34 +0000 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2010-10-29 11:39:34 +0000 |
| commit | 1c8dccf838eb15a9b69924f1f29a4786c6eadbb9 (patch) | |
| tree | c51f491728cc313031068efc32a51355555609e4 | |
| parent | eeee719c4bdfa433d73336484234ad7fcd3698a1 (diff) | |
| download | elgg-1c8dccf838eb15a9b69924f1f29a4786c6eadbb9.tar.gz elgg-1c8dccf838eb15a9b69924f1f29a4786c6eadbb9.tar.bz2 | |
added cancel button for uploads and updated css for errors
| -rw-r--r-- | actions/ajax_upload.php | 1 | ||||
| -rw-r--r-- | views/default/tidypics/css.php | 9 | ||||
| -rw-r--r-- | views/default/tidypics/forms/ajax_upload.php | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/actions/ajax_upload.php b/actions/ajax_upload.php index 973e4220a..a9743cf54 100644 --- 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 fb4b16832..3fd3c81aa 100644 --- 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 25c658570..313ca17f9 100644 --- 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'); ?>', |