summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/util.js13
-rw-r--r--lib/attachmentlist.php4
-rw-r--r--lib/router.php4
-rw-r--r--lib/util.php12
-rw-r--r--theme/base/css/display.css8
5 files changed, 38 insertions, 3 deletions
diff --git a/js/util.js b/js/util.js
index b6848abaa..9ee2a1963 100644
--- a/js/util.js
+++ b/js/util.js
@@ -25,6 +25,19 @@ $(document).ready(function(){
//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" />');
+ $('a.thumbnail').hover(function() {
+ anchor = $(this);
+ $.get('/attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
+ anchor.append(data);
+ $('#thumbnail').fadeIn('def');
+ });
+ },
+ function() {
+ setTimeout(function() {
+ $('#thumbnail').fadeOut('slow', function() {$(this).remove();});
+ }, 500);
+ }
+ );
// count character on keyup
function counter(event){
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 1be7b2fee..52aa5d9ee 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -171,7 +171,7 @@ class AttachmentListItem extends Widget
}
function linkTitle() {
- return 'Our page for ' . $this->title();
+ return $this->title();
}
/**
@@ -256,7 +256,7 @@ class Attachment extends AttachmentListItem
}
function linkTitle() {
- return 'Direct link to ' . $this->title();
+ return $this->attachment->url;
}
function showRepresentation() {
diff --git a/lib/router.php b/lib/router.php
index 39c005609..d1e2970c5 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -159,6 +159,10 @@ class Router
array('action' => 'attachment_ajax'),
array('attachment' => '[0-9]+'));
+ $m->connect('attachment/:attachment/thumbnail',
+ array('action' => 'attachment_thumbnail'),
+ array('attachment' => '[0-9]+'));
+
/*
TODO
not used right now, will revisit later
diff --git a/lib/util.php b/lib/util.php
index 4a55cbfe5..d56f44f7b 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -503,8 +503,18 @@ function common_linkify($url) {
$file = new File;
$file->query($query);
$file->fetch();
+
if (!empty($file->file_id)) {
- $attrs['class'] = 'attachment';
+ $query = "select file_thumbnail.file_id as file_id from file join file_thumbnail on file.id = file_thumbnail.file_id where file.url='$longurl'";
+ $file2 = new File;
+ $file2->query($query);
+ $file2->fetch();
+
+ if (empty($file2->file_id)) {
+ $attrs['class'] = 'attachment';
+ } else {
+ $attrs['class'] = 'attachment thumbnail';
+ }
$attrs['id'] = "attachment-{$file->file_id}";
}
return XMLStringer::estring('a', $attrs, $display);
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8f72460a8..71a434c54 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1205,3 +1205,11 @@ display:none;
.guide {
clear:both;
}
+
+#thumbnail {
+position:absolute;
+z-index: 999;
+display: none;
+left: 100px;
+}
+