From fecb8c706dadb790c3a8c219275b4ba88e00b8ea Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Fri, 15 May 2009 15:04:58 -0400
Subject: Attachments and their list now provide "ajax" view. Also added a few
 sidebars relating tags and attachments.

---
 lib/noticelist.php | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 69 insertions(+), 2 deletions(-)

(limited to 'lib/noticelist.php')

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 8fccba73e..55dd902b4 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -179,22 +179,86 @@ class NoticeListItem extends Widget
     {
         $this->showStart();
         $this->showNotice();
-        $this->showNoticeInfo();
+        $this->showNoticeAttachments();
         $this->showNoticeOptions();
+        $this->showNoticeInfo();
         $this->showEnd();
     }
 
     function showNotice()
     {
-        $this->out->elementStart('div', 'entry-title');
+if (0)
+        $this->out->elementStart('entry-title');
+else
+
+        if ('shownotice' === $this->out->args['action']) {
+            $width = '85%';
+        } else {
+            $width = '90%';
+        }
+
+
+        $this->out->elementStart('div', array('class' => 'entry-title', 'style' => "float: left; width: $width;"));
         $this->showAuthor();
         $this->showContent();
         $this->out->elementEnd('div');
     }
 
+    function showNoticeAttachments()
+    {
+        $f2p = new File_to_post;
+        $f2p->post_id = $this->notice->id;
+        $file = new File;
+        $file->joinAdd($f2p);
+        $file->selectAdd();
+        $file->selectAdd('file.id as id');
+        $count = $file->find(true);
+        if (!$count) return;
+        if (1 === $count) {
+            $href = common_local_url('attachment', array('attachment' => $file->id));
+            $att_class = 'attachment';
+        } else {
+            $href = common_local_url('attachments', array('notice' => $this->notice->id));
+            $att_class = 'attachments';
+        }
+
+        $clip = theme_path('images/icons/clip', 'base');
+        if ('shownotice' === $this->out->args['action']) {
+            $height = '96px';
+            $width = '83%';
+            $width_att = '15%';
+            $clip .= '-big.png';
+            $top = '70px';
+        } else {
+            $height = '48px';
+            $width = '90%';
+            $width_att = '8%';
+            $clip .= '.png';
+            $top = '20px';
+        }
+if (0)
+        $this->out->elementStart('div', 'entry-attachments');
+else
+        $this->out->elementStart('p', array('class' => 'entry-attachments', 'style' => "float: right; width: $width_att; background: url($clip) no-repeat; text-align: right; height: $height;"));
+        $this->out->element('a', array('class' => $att_class, 'style' => "text-decoration: none; padding-top: $top; display: block; height: $height;", 'href' => $href, 'title' => "# of attachments: $count"), $count === 1 ? '' : $count);
+
+
+        $this->out->elementEnd('p');
+    }
+
     function showNoticeInfo()
     {
+if(0)
         $this->out->elementStart('div', 'entry-content');
+else
+
+        if ('shownotice' === $this->out->args['action']) {
+            $width = '85%';
+        } else {
+            $width = '90%';
+        }
+
+        $this->out->elementStart('div', array('class' => 'entry-content', 'style' => "float: left; width: $width;"));
         $this->showNoticeLink();
         $this->showNoticeSource();
         $this->showContext();
@@ -205,7 +269,10 @@ class NoticeListItem extends Widget
     {
         $user = common_current_user();
         if ($user) {
+if(0)
             $this->out->elementStart('div', 'notice-options');
+else
+            $this->out->elementStart('div', array('class' => 'notice-options', 'style' => 'float: right; width: 16%;'));
             $this->showFaveForm();
             $this->showReplyLink();
             $this->showDeleteLink();
-- 
cgit v1.2.3-54-g00ecf


From 9261e48ef039869fb3709d374b7e4346d8773a49 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Mon, 18 May 2009 19:23:18 -0400
Subject: Removed dead code.

---
 classes/File_redirection.php | 2 --
 lib/noticelist.php           | 4 ++--
 lib/util.php                 | 5 -----
 3 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'lib/noticelist.php')

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index a71d1c083..0eae68178 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -201,7 +201,6 @@ class File_redirection extends Memcached_DataObject
 
         if ($short_url) {
             $short_url = (string)$short_url;
-if(1) {
             // store it
             $file = File::staticGet('url', $long_url);
             if (empty($file)) {
@@ -221,7 +220,6 @@ if(1) {
                 $file_redir->file_id = $file_id;
                 $file_redir->insert();
             }
-}
             return $short_url;
         }
         return $long_url;
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 55dd902b4..004905056 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -187,7 +187,7 @@ class NoticeListItem extends Widget
 
     function showNotice()
     {
-if (0)
+if(0)
         $this->out->elementStart('entry-title');
 else
 
@@ -236,7 +236,7 @@ else
             $clip .= '.png';
             $top = '20px';
         }
-if (0)
+if(0)
         $this->out->elementStart('div', 'entry-attachments');
 else
         $this->out->elementStart('p', array('class' => 'entry-attachments', 'style' => "float: right; width: $width_att; background: url($clip) no-repeat; text-align: right; height: $height;"));
diff --git a/lib/util.php b/lib/util.php
index 25c0fb0a1..fbef8764a 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -496,11 +496,6 @@ function common_linkify($url) {
     }
 
     $attrs = array('href' => $longurl, 'rel' => 'external');
-if(0){
-    if ($longurl !== $url) {
-        $attrs['title'] = $longurl;
-    }
-}
     return XMLStringer::estring('a', $attrs, $display);
 }
 
-- 
cgit v1.2.3-54-g00ecf