From fe38827a76520e4a910f9e988b11d0914872d44e Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Mon, 1 Jun 2009 17:40:53 -0400
Subject: [PATCH] Remove js that crept back in, added another error string.

---
 actions/newnotice.php  |  2 ++
 js/util.js             | 24 ------------------------
 lib/attachmentlist.php |  2 +-
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 3e6ff15189..02976a2ae2 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 acf44a17c7..bffbf916fa 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 898be1bb00..45e4fa3196 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'));