summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-06-01 17:40:53 -0400
committerRobin Millette <millette@controlyourself.ca>2009-06-01 17:40:53 -0400
commitfe38827a76520e4a910f9e988b11d0914872d44e (patch)
tree30028f6a3e343576cdef10417986a6c73db24227
parent0cbd72e0927cbe9b605e34d7bbd86d2046ea0c49 (diff)
Remove js that crept back in, added another error string.
-rw-r--r--actions/newnotice.php2
-rw-r--r--js/util.js24
-rw-r--r--lib/attachmentlist.php2
3 files changed, 3 insertions, 25 deletions
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 3e6ff1518..02976a2ae 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -279,6 +279,8 @@ class NewnoticeAction extends Action
} else {
$this->clientError(_('There was a database error while saving your file. Please try again.'));
}
+ } else {
+ $this->clientError(_('File could not be moved to destination directory.'));
}
}
diff --git a/js/util.js b/js/util.js
index acf44a17c..bffbf916f 100644
--- a/js/util.js
+++ b/js/util.js
@@ -28,30 +28,6 @@ $(document).ready(function(){
}
});
- $('a.attachment').click(function() {$().jOverlay({url: $('address .url')[0].href+'/attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'}); return false; });
- $("a.thumbnail").hover(
- function() {
- var anchor = $(this);
- $("a.thumbnail").children('img').remove();
-
- setTimeout(function() {
- anchor.closest(".entry-title").addClass('ov');
- $.get($('address .url')[0].href+'/attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
- anchor.append(data);
- });
- }, 250);
-
- setTimeout(function() {
- anchor.children('img').remove();
- anchor.closest(".entry-title").removeClass('ov');
- }, 3000);
- },
- function() {
- $(this).children('img').remove();
- $(this).closest(".entry-title").removeClass('ov');
- }
- );
-
// count character on keyup
function counter(event){
var maxLength = 140;
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 898be1bb0..45e4fa319 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -83,7 +83,7 @@ class AttachmentList extends Widget
$atts = new File;
$att = $atts->getAttachments($this->notice->id);
if (empty($att)) return 0;
- $this->out->elementStart('dl', array('id' =>'attachment'));
+ $this->out->elementStart('dl', array('id' =>'attachments'));
$this->out->element('dt', null, _('Attachments'));
$this->out->elementStart('dd');
$this->out->elementStart('ol', array('class' => 'attachments'));