From 5f3acc252738e408ea2447b7541eae66c1e9e09a Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Sun, 24 May 2009 21:13:42 -0400
Subject: [PATCH] Removed big clip and replaced with smaller inline one next to
 each URL (in a notice) that's actually an attachment. Overlay (popup) on
 click.

---
 js/util.js                              |   6 +++++-
 lib/noticelist.php                      |   1 -
 lib/util.php                            |  11 +++++++++++
 theme/base/images/icons/clip-inline.png | Bin 0 -> 1646 bytes
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 theme/base/images/icons/clip-inline.png

diff --git a/js/util.js b/js/util.js
index 6511c0380d..b6848abaa2 100644
--- a/js/util.js
+++ b/js/util.js
@@ -20,7 +20,11 @@ $(document).ready(function(){
 // attachments and attachment pages not used at the moment except for attachment_ajax version
 //    $('.attachments').click(function() {$().jOverlay({zIndex:999, success:function(html) {$('.attachment').click(function() {$().jOverlay({url:$(this).attr('href') + '/ajax'}); return false; });
 //        }, url:$(this).attr('href') + '/ajax'}); return false; });
-    $('.attachment').click(function() {$().jOverlay({url:'../attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'}); return false; });
+
+    //FIXME
+    //need to link to proper url depending on site config (path name and theme, for instance)
+    $('a.attachment').click(function() {$().jOverlay({url:'/attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'}); return false; });
+    $('.entry-title a.attachment').append('&nbsp;<img style="display: inline; vertical-align: middle" src="/theme/base/images/icons/clip-inline.png" alt="Attachment" />');
 
 	// count character on keyup
 	function counter(event){
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 51b8987fe9..ae14388921 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -180,7 +180,6 @@ class NoticeListItem extends Widget
     {
         $this->showStart();
         $this->showNotice();
-        $this->showNoticeAttachmentsIcon();
         $this->showNoticeInfo();
         $this->showNoticeOptions();
         $this->showNoticeAttachments();
diff --git a/lib/util.php b/lib/util.php
index fbef8764a7..4a55cbfe59 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -496,6 +496,17 @@ function common_linkify($url) {
     }
 
     $attrs = array('href' => $longurl, 'rel' => 'external');
+
+// if this URL is an attachment, then we set class='attachment' and id='attahcment-ID'
+// where ID is the id of the attachment for the given URL.
+    $query = "select file_oembed.file_id as file_id from file join file_oembed on file.id = file_oembed.file_id where file.url='$longurl'";
+    $file = new File;
+    $file->query($query);
+    $file->fetch();
+    if (!empty($file->file_id)) {
+        $attrs['class'] = 'attachment';
+        $attrs['id'] = "attachment-{$file->file_id}";
+    }
     return XMLStringer::estring('a', $attrs, $display);
 }
 
diff --git a/theme/base/images/icons/clip-inline.png b/theme/base/images/icons/clip-inline.png
new file mode 100644
index 0000000000000000000000000000000000000000..870f8b2e8ff32f1b5e19a9a2389648bfdfd47ec9
GIT binary patch
literal 1646
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

literal 0
HcmV?d00001