From b561962b59e8194e6622f87394e7b8565d78c182 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 20 May 2009 23:11:35 +0000
Subject: Color picker reset: Resetting form values will also dynamically
 update the page colors back to their original.

---
 js/farbtastic/farbtastic.go.js | 108 ++++++++++++++++++++++-------------------
 1 file changed, 59 insertions(+), 49 deletions(-)

(limited to 'js')

diff --git a/js/farbtastic/farbtastic.go.js b/js/farbtastic/farbtastic.go.js
index e298c1dab..6a0a5c56b 100644
--- a/js/farbtastic/farbtastic.go.js
+++ b/js/farbtastic/farbtastic.go.js
@@ -1,29 +1,22 @@
 $(document).ready(function() {
-    function UpdateColors(e) {
-        var S = f.linked;
-        var C = f.color;
-
-        if (S && S.value && S.value != C) {
-            UpdateSwatch(S);
-
-            switch (parseInt(f.linked.id.slice(-1))) {
-                case 0: default:
-                    $('body').css({'background-color':C});
-                    break;
-                case 1:
-                    $('#content').css({'background-color':C});
-                    break;
-                case 2:
-                    $('#aside_primary').css({'background-color':C});
-                    break;
-                case 3:
-                    $('body').css({'color':C});
-                    break;
-                case 4:
-                    $('a').css({'color':C});
-                    break;
-            }
-            S.value = C;
+    function UpdateColors(S) {
+        C = $(S).val();
+        switch (parseInt(S.id.slice(-1))) {
+            case 0: default:
+                $('body').css({'background-color':C});
+                break;
+            case 1:
+                $('#content').css({'background-color':C});
+                break;
+            case 2:
+                $('#aside_primary').css({'background-color':C});
+                break;
+            case 3:
+                $('body').css({'color':C});
+                break;
+            case 4:
+                $('a').css({'color':C});
+                break;
         }
     }
 
@@ -33,35 +26,52 @@ $(document).ready(function() {
     }
 
     function UpdateSwatch(e) {
-        $(e).css({
-            "background-color": e.value,
-            "color": f.hsl[2] > 0.5 ? "#000": "#fff"
-        });
+        $(e).css({"background-color": e.value,
+                  "color": f.hsl[2] > 0.5 ? "#000": "#fff"});
     }
 
-    $('#settings_design_color').append('<div id="color-picker"></div>');
-    $('#color-picker').hide();
-
-    var f = $.farbtastic('#color-picker', UpdateColors);
-    var swatches = $('#settings_design_color .swatch');
-
-    swatches
-        .each(UpdateColors)
+    function SynchColors(e) {
+        var S = f.linked;
+        var C = f.color;
 
-        .blur(function() {
-            $(this).val($(this).val().toUpperCase());
-         })
+        if (S && S.value && S.value != C) {
+            S.value = C;
+            UpdateSwatch(S);
+            UpdateColors(S);
+        }
+    }
 
-        .focus(function() {
-            $('#color-picker').show();
-            UpdateFarbtastic(this);
-        })
+    function Init() {
+        $('#settings_design_color').append('<div id="color-picker"></div>');
+        $('#color-picker').hide();
 
-        .change(function() {
-            UpdateFarbtastic(this);
-            UpdateSwatch(this);
-        }).change()
+        f = $.farbtastic('#color-picker', SynchColors);
+        swatches = $('#settings_design_color .swatch');
 
-        ;
+        swatches
+            .each(SynchColors)
+            .blur(function() {
+                $(this).val($(this).val().toUpperCase());
+             })
+            .focus(function() {
+                $('#color-picker').show();
+                UpdateFarbtastic(this);
+            })
+            .change(function() {
+                UpdateFarbtastic(this);
+                UpdateSwatch(this);
+                UpdateColors(this);
+            }).change();
+    }
 
+    var f, swatches;
+    Init();
+    $('#form_settings_design').bind('reset', function(){
+        setTimeout(function(){
+            swatches.each(function(){UpdateColors(this);});
+            $('#color-picker').remove();
+            swatches.unbind();
+            Init();
+        },10);
+    });
 });
-- 
cgit v1.2.3-54-g00ecf


From b23d4230811db02266b9df0a3cefc5e54c36d169 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 20 May 2009 23:37:20 +0000
Subject: Added licensing information for jcrop.go and farbtastic.go scripts

---
 js/farbtastic/farbtastic.go.js |  8 +++++
 js/jcrop/jquery.Jcrop.go.js    | 77 +++++++++++++++++++++++-------------------
 2 files changed, 51 insertions(+), 34 deletions(-)

(limited to 'js')

diff --git a/js/farbtastic/farbtastic.go.js b/js/farbtastic/farbtastic.go.js
index 6a0a5c56b..0149eca7d 100644
--- a/js/farbtastic/farbtastic.go.js
+++ b/js/farbtastic/farbtastic.go.js
@@ -1,3 +1,11 @@
+/** Init for Farbtastic library and page setup
+ *
+ * @package   Laconica
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
 $(document).ready(function() {
     function UpdateColors(S) {
         C = $(S).val();
diff --git a/js/jcrop/jquery.Jcrop.go.js b/js/jcrop/jquery.Jcrop.go.js
index a0399d540..4e1cbfd1e 100644
--- a/js/jcrop/jquery.Jcrop.go.js
+++ b/js/jcrop/jquery.Jcrop.go.js
@@ -1,39 +1,48 @@
-		$(function(){
-			var x = ($('#avatar_crop_x').val()) ? $('#avatar_crop_x').val() : 0;
-			var y = ($('#avatar_crop_y').val()) ? $('#avatar_crop_y').val() : 0;
-			var w = ($('#avatar_crop_w').val()) ? $('#avatar_crop_w').val() : $("#avatar_original img").attr("width");
-			var h = ($('#avatar_crop_h').val()) ? $('#avatar_crop_h').val() : $("#avatar_original img").attr("height");
+/** Init for Jcrop library and page setup
+ *
+ * @package   Laconica
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
 
-			jQuery("#avatar_original img").Jcrop({
-				onChange: showPreview,
-    			setSelect: [ x, y, w, h ],
-				onSelect: updateCoords,
-				aspectRatio: 1,
-				boxWidth: 480,
-				boxHeight: 480,
-				bgColor: '#000',
-				bgOpacity: .4
-			});
-		});
+$(function(){
+    var x = ($('#avatar_crop_x').val()) ? $('#avatar_crop_x').val() : 0;
+    var y = ($('#avatar_crop_y').val()) ? $('#avatar_crop_y').val() : 0;
+    var w = ($('#avatar_crop_w').val()) ? $('#avatar_crop_w').val() : $("#avatar_original img").attr("width");
+    var h = ($('#avatar_crop_h').val()) ? $('#avatar_crop_h').val() : $("#avatar_original img").attr("height");
 
-		function showPreview(coords) {
-			var rx = 96 / coords.w;
-			var ry = 96 / coords.h;
+    jQuery("#avatar_original img").Jcrop({
+        onChange: showPreview,
+        setSelect: [ x, y, w, h ],
+        onSelect: updateCoords,
+        aspectRatio: 1,
+        boxWidth: 480,
+        boxHeight: 480,
+        bgColor: '#000',
+        bgOpacity: .4
+    });
+});
 
-			var img_width = $("#avatar_original img").attr("width");
-			var img_height = $("#avatar_original img").attr("height");
+function showPreview(coords) {
+    var rx = 96 / coords.w;
+    var ry = 96 / coords.h;
 
-			$('#avatar_preview img').css({
-				width: Math.round(rx *img_width) + 'px',
-				height: Math.round(ry * img_height) + 'px',
-				marginLeft: '-' + Math.round(rx * coords.x) + 'px',
-				marginTop: '-' + Math.round(ry * coords.y) + 'px'
-			});
-		};
+    var img_width = $("#avatar_original img").attr("width");
+    var img_height = $("#avatar_original img").attr("height");
 
-		function updateCoords(c) {
-			$('#avatar_crop_x').val(c.x);
-			$('#avatar_crop_y').val(c.y);
-			$('#avatar_crop_w').val(c.w);
-			$('#avatar_crop_h').val(c.h);
-		};
+    $('#avatar_preview img').css({
+        width: Math.round(rx *img_width) + 'px',
+        height: Math.round(ry * img_height) + 'px',
+        marginLeft: '-' + Math.round(rx * coords.x) + 'px',
+        marginTop: '-' + Math.round(ry * coords.y) + 'px'
+    });
+};
+
+function updateCoords(c) {
+    $('#avatar_crop_x').val(c.x);
+    $('#avatar_crop_y').val(c.y);
+    $('#avatar_crop_w').val(c.w);
+    $('#avatar_crop_h').val(c.h);
+};
-- 
cgit v1.2.3-54-g00ecf


From ef2a5c794e7fc82d7f19675a6a11af64135ef4ee Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Fri, 22 May 2009 16:19:14 +0000
Subject: Fixed in reply to JS link for Conversation page. Handles nested
 notices better.

---
 js/util.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'js')

diff --git a/js/util.js b/js/util.js
index 31d9eb4f5..2dfaafd76 100644
--- a/js/util.js
+++ b/js/util.js
@@ -235,10 +235,10 @@ function NoticeHover() {
 function NoticeReply() {
     if ($('#notice_data-text').length > 0) {
         $('#content .notice').each(function() {
-            var notice = $(this);
-            $('.notice_reply', $(this)).click(function() {
-                var nickname = ($('.author .nickname', notice).length > 0) ? $('.author .nickname', notice) : $('.author .nickname');
-                NoticeReplySet(nickname.text(), $('.notice_id', notice).text());
+            var notice = $(this)[0];
+            $($('.notice_reply', notice)[0]).click(function() {
+                var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname');
+                NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text());
                 return false;
             });
         });
-- 
cgit v1.2.3-54-g00ecf


From 7e0a314768fed3c5964e9d404d33a243277559ce Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Sun, 24 May 2009 01:38:11 +0000
Subject: Using event bubbling instead of event handling thanks to Ara
 Pehlivanian http://arapehlivanian.com

---
 js/util.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'js')

diff --git a/js/util.js b/js/util.js
index 2dfaafd76..baa3f119e 100644
--- a/js/util.js
+++ b/js/util.js
@@ -203,7 +203,6 @@ $(document).ready(function(){
                                                               $("#notices_primary .notices").prepend(document._importNode(li, true));
                                                               $("#notices_primary .notice:first").css({display:"none"});
                                                               $("#notices_primary .notice:first").fadeIn(2500);
-                                                              NoticeHover();
                                                               NoticeReply();
                                                          }
 													}
@@ -221,17 +220,16 @@ $(document).ready(function(){
     NoticeReply();
 });
 
+
 function NoticeHover() {
-    $("#content .notice").hover(
-        function () {
-            $(this).addClass('hover');
-        },
-        function () {
-            $(this).removeClass('hover');
-        }
-    );
+    function mouseHandler(e) {
+        $(e.target).closest('li.hentry')[(e.type === 'mouseover') ? 'addClass' : 'removeClass']('hover');
+    };
+    $('#content .notices').mouseover(mouseHandler);
+    $('#content .notices').mouseout(mouseHandler);
 }
 
+
 function NoticeReply() {
     if ($('#notice_data-text').length > 0) {
         $('#content .notice').each(function() {
-- 
cgit v1.2.3-54-g00ecf


From b5ac6e31f2f148164860aeabec6899b75d7292ec Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Sun, 24 May 2009 04:43:34 -0400
Subject: Rearranged attachment info to only appear on each applicable notice
 page and thru an ajax popup.

---
 actions/attachment.php      | 10 ++++-----
 actions/attachment_ajax.php | 24 +-------------------
 actions/attachments.php     |  2 --
 actions/tag.php             |  4 ++--
 js/util.js                  |  7 +++---
 lib/attachmentlist.php      |  6 +----
 lib/noticelist.php          | 55 +++++++++++++++++++++------------------------
 lib/router.php              | 15 ++++++++++---
 theme/base/css/display.css  | 20 ++++++++++++++++-
 9 files changed, 68 insertions(+), 75 deletions(-)

(limited to 'js')

diff --git a/actions/attachment.php b/actions/attachment.php
index b9187ff08..c51c75120 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -31,8 +31,6 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-//require_once INSTALLDIR.'/lib/personalgroupnav.php';
-//require_once INSTALLDIR.'/lib/feedlist.php';
 require_once INSTALLDIR.'/lib/attachmentlist.php';
 
 /**
@@ -67,11 +65,11 @@ class AttachmentAction extends Action
     {
         parent::prepare($args);
 
-        $id = $this->arg('attachment');
-
-        $this->attachment = File::staticGet($id);
+        if ($id = $this->trimmed('attachment')) {
+            $this->attachment = File::staticGet($id);
+        }
 
-        if (!$this->attachment) {
+        if (empty($this->attachment)) {
             $this->clientError(_('No such attachment.'), 404);
             return false;
         }
diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php
index 1620b27dd..6930dc112 100644
--- a/actions/attachment_ajax.php
+++ b/actions/attachment_ajax.php
@@ -45,26 +45,6 @@ require_once INSTALLDIR.'/actions/attachment.php';
 
 class Attachment_ajaxAction extends AttachmentAction
 {
-    /**
-     * Load attributes based on database arguments
-     *
-     * Loads all the DB stuff
-     *
-     * @param array $args $_REQUEST array
-     *
-     * @return success flag
-     */
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-        if (!$this->attachment) {
-            $this->clientError(_('No such attachment.'), 404);
-            return false;
-        }
-        return true;
-    }
-
     /**
      * Show page, a template method.
      *
@@ -87,7 +67,7 @@ class Attachment_ajaxAction extends AttachmentAction
      */
     function showCore()
     {
-        $this->elementStart('div', array('id' => 'core'));
+        $this->elementStart('div', array('id' => 'ajaxcore'));
         if (Event::handle('StartShowContentBlock', array($this))) {
             $this->showContentBlock();
             Event::handle('EndShowContentBlock', array($this));
@@ -95,8 +75,6 @@ class Attachment_ajaxAction extends AttachmentAction
         $this->elementEnd('div');
     }
 
-
-
     /**
      * Last-modified date for page
      *
diff --git a/actions/attachments.php b/actions/attachments.php
index 6b31c839d..d3c90fec2 100644
--- a/actions/attachments.php
+++ b/actions/attachments.php
@@ -31,8 +31,6 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-//require_once INSTALLDIR.'/lib/personalgroupnav.php';
-//require_once INSTALLDIR.'/lib/feedlist.php';
 require_once INSTALLDIR.'/lib/attachmentlist.php';
 
 /**
diff --git a/actions/tag.php b/actions/tag.php
index 47420e4c3..e71ec06a8 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -49,8 +49,8 @@ class TagAction extends Action
     {
         $pop = new PopularNoticeSection($this);
         $pop->show();
-        $freqatt = new FrequentAttachmentSection($this);
-        $freqatt->show();
+//        $freqatt = new FrequentAttachmentSection($this);
+//        $freqatt->show();
     }
 
     function title()
diff --git a/js/util.js b/js/util.js
index 2dfaafd76..4f2b036fa 100644
--- a/js/util.js
+++ b/js/util.js
@@ -17,9 +17,10 @@
  */
 
 $(document).ready(function(){
-    $('.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:$(this).attr('href') + '/ajax'}); return false; });
+// 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:'http://laptop.waglo.com/attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'}); return false; });
 
 	// count character on keyup
 	function counter(event){
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 9485fe3d6..1be7b2fee 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -191,7 +191,7 @@ class AttachmentListItem extends Widget
     }
 
     function linkAttr() {
-        return array('class' => 'attachment', 'href' => common_local_url('attachment', array('attachment' => $this->attachment->id)));
+        return array('class' => 'attachment', 'href' => $this->attachment->url, 'id' => 'attachment-' . $this->attachment->id);
     }
 
     function showLink() {
@@ -200,10 +200,6 @@ class AttachmentListItem extends Widget
         $this->out->elementStart('h4');
         $this->out->element('a', $attr, $text);
 
-        if ($this->attachment->url !== $this->title())
-            $this->out->element('span', null, " ({$this->attachment->url})");
-
-
         $this->out->elementEnd('h4');
     }
 
diff --git a/lib/noticelist.php b/lib/noticelist.php
index a52132171..e3361fc99 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -34,6 +34,7 @@ if (!defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/favorform.php';
 require_once INSTALLDIR.'/lib/disfavorform.php';
+require_once INSTALLDIR.'/lib/attachmentlist.php';
 
 /**
  * widget for displaying a list of notices
@@ -179,9 +180,10 @@ class NoticeListItem extends Widget
     {
         $this->showStart();
         $this->showNotice();
-        $this->showNoticeAttachments();
+        $this->showNoticeAttachmentsIcon();
         $this->showNoticeInfo();
         $this->showNoticeOptions();
+        $this->showNoticeAttachments();
         $this->showEnd();
     }
 
@@ -193,45 +195,38 @@ class NoticeListItem extends Widget
         $this->out->elementEnd('div');
     }
 
-    function showNoticeAttachments()
-    {
+    function showNoticeAttachments() {
+        if ($this->isUsedInList()) {
+            return;
+        }
+        $al = new AttachmentList($this->notice, $this->out);
+        $al->show();
+    }
+
+    function isUsedInList() {
+        return 'shownotice' !== $this->out->args['action'];
+    }
+
+    function attachmentCount() {
         $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';
-        }
+        return $file->find(true);
+    }
 
-        $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';
+    function showNoticeAttachmentsIcon()
+    {
+        if (!($this->isUsedInList() && ($count = $this->attachmentCount()))) {
+            return;
         }
-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);
 
+        $href = common_local_url('shownotice', array('notice' => $this->notice->id)) . '#attachments';
 
+        $this->out->elementStart('p', 'entry-attachments');
+        $this->out->element('a', array('href' => $href, 'title' => "# of attachments: $count"), $count === 1 ? '' : $count);
         $this->out->elementEnd('p');
     }
 
diff --git a/lib/router.php b/lib/router.php
index 70ee0f3fb..39c005609 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -151,26 +151,35 @@ class Router
         $m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),
                     array('q' => '.+'));
 
+/*
+        $m->connect('attachment/ajax_by_url/*url',
+                    array('action' => 'attachment_ajax'));
+*/
         $m->connect('attachment/:attachment/ajax',
                     array('action' => 'attachment_ajax'),
-                    array('notice' => '[0-9]+'));
+                    array('attachment' => '[0-9]+'));
 
+/*
+        TODO
+        not used right now, will revisit later
         $m->connect('attachment/:attachment',
                     array('action' => 'attachment'),
-                    array('notice' => '[0-9]+'));
-
+                    array('attachment' => '[0-9]+'));
+*/
         // notice
 
         $m->connect('notice/new', array('action' => 'newnotice'));
         $m->connect('notice/new?replyto=:replyto',
                     array('action' => 'newnotice'),
                     array('replyto' => '[A-Za-z0-9_-]+'));
+/*
         $m->connect('notice/:notice/attachments/ajax',
                     array('action' => 'attachments_ajax'),
                     array('notice' => '[0-9]+'));
         $m->connect('notice/:notice/attachments',
                     array('action' => 'attachments'),
                     array('notice' => '[0-9]+'));
+*/
         $m->connect('notice/:notice',
                     array('action' => 'shownotice'),
                     array('notice' => '[0-9]+'));
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 5d2b5231c..cb4680c39 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -379,6 +379,12 @@ max-width:1003px;
 overflow:hidden;
 }
 
+#ajaxcore {
+width: 520px;
+height: 600px;
+background: #fff;
+}
+
 #core {
 position:relative;
 width:100%;
@@ -1048,8 +1054,20 @@ margin-bottom:18px;
 margin-left:18px;
 }
 
+p.entry-attachments {
+float: right;
+width: 8%;
+background: url(../images/icons/clip.png) no-repeat;
+text-align: right; 
+height: 48px;
+}
 
-
+p.entry-attachments a {
+text-decoration: none;
+padding-top: 20px;
+display: block;
+height: 48px;
+}
 
 /* TOP_POSTERS */
 .section tbody td {
-- 
cgit v1.2.3-54-g00ecf


From b0a891e92b55ea6d3323e8efe528f46afda7c1fc Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Sun, 24 May 2009 18:40:11 -0400
Subject: Made ajax link to show attachment popups relative in util.js

---
 js/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/util.js b/js/util.js
index 1b75c5e22..6511c0380 100644
--- a/js/util.js
+++ b/js/util.js
@@ -20,7 +20,7 @@ $(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:'http://laptop.waglo.com/attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'}); return false; });
+    $('.attachment').click(function() {$().jOverlay({url:'../attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'}); return false; });
 
 	// count character on keyup
 	function counter(event){
-- 
cgit v1.2.3-54-g00ecf


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: 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

(limited to 'js')

diff --git a/js/util.js b/js/util.js
index 6511c0380..b6848abaa 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 51b8987fe..ae1438892 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 fbef8764a..4a55cbfe5 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 000000000..870f8b2e8
Binary files /dev/null and b/theme/base/images/icons/clip-inline.png differ
-- 
cgit v1.2.3-54-g00ecf


From 84edf12791dc3d44625b156cda6296f1f74f8a9d Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Mon, 25 May 2009 11:13:13 -0400
Subject: Display thumbnail on hover over links in notices when appropriate.

---
 js/util.js                 | 13 +++++++++++++
 lib/attachmentlist.php     |  4 ++--
 lib/router.php             |  4 ++++
 lib/util.php               | 12 +++++++++++-
 theme/base/css/display.css |  8 ++++++++
 5 files changed, 38 insertions(+), 3 deletions(-)

(limited to 'js')

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;
+}
+
-- 
cgit v1.2.3-54-g00ecf


From 7923e84fba66d8e3e7ec24a8a663f0c2c0f0e533 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 25 May 2009 18:54:45 +0000
Subject: Fixed URL for attachment thumbnail and XHR

---
 js/util.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'js')

diff --git a/js/util.js b/js/util.js
index 9ee2a1963..ffaedc690 100644
--- a/js/util.js
+++ b/js/util.js
@@ -23,20 +23,20 @@ $(document).ready(function(){
 
     //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" />');
-    $('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);
-    }
+    $('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() {
+            anchor = $(this);
+            $.get($('address .url')[0].href+'/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
-- 
cgit v1.2.3-54-g00ecf


From 01dad5729827870d87f87118c336dcf2acc4af32 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@csarven-laptop.(none)>
Date: Mon, 25 May 2009 15:53:19 -0400
Subject: Markup cleanup for attachments

---
 actions/attachment.php      |  2 --
 actions/attachment_ajax.php |  2 +-
 js/util.js                  |  6 ------
 lib/attachmentlist.php      | 17 +++++++----------
 lib/noticelist.php          | 14 +-------------
 theme/base/css/display.css  |  3 +++
 6 files changed, 12 insertions(+), 32 deletions(-)

(limited to 'js')

diff --git a/actions/attachment.php b/actions/attachment.php
index c51c75120..16ee723d9 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -176,10 +176,8 @@ class AttachmentAction extends Action
 
     function showContent()
     {
-        $this->elementStart('ul', array('class' => 'attachments'));
         $ali = new Attachment($this->attachment, $this);
         $cnt = $ali->show();
-        $this->elementEnd('ul');
     }
 
     /**
diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php
index 6930dc112..3d83393c5 100644
--- a/actions/attachment_ajax.php
+++ b/actions/attachment_ajax.php
@@ -67,7 +67,7 @@ class Attachment_ajaxAction extends AttachmentAction
      */
     function showCore()
     {
-        $this->elementStart('div', array('id' => 'ajaxcore'));
+        $this->elementStart('div', array('id' => 'core'));
         if (Event::handle('StartShowContentBlock', array($this))) {
             $this->showContentBlock();
             Event::handle('EndShowContentBlock', array($this));
diff --git a/js/util.js b/js/util.js
index ffaedc690..cba6f822e 100644
--- a/js/util.js
+++ b/js/util.js
@@ -17,12 +17,6 @@
  */
 
 $(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; });
-
-    //FIXME
-    //need to link to proper url depending on site config (path name and theme, for instance)
     $('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() {
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 2a0114b12..d0478bad3 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -80,9 +80,9 @@ class AttachmentList extends Widget
 
     function show()
     {
-//        $this->out->elementStart('div', array('id' =>'attachments_primary'));
-        $this->out->elementStart('div', array('id' =>'content'));
-        $this->out->element('h2', null, _('Attachments'));
+        $this->out->elementStart('dl', array('id' =>'attachment'));
+        $this->out->element('dt', null, _('Attachments'));
+        $this->out->elementStart('dd');
         $this->out->elementStart('ul', array('class' => 'attachments'));
 
         $atts = new File;
@@ -92,8 +92,9 @@ class AttachmentList extends Widget
             $item->show();
         }
 
+        $this->out->elementEnd('dd');
         $this->out->elementEnd('ul');
-        $this->out->elementEnd('div');
+        $this->out->elementEnd('dl');
 
         return count($att);
     }
@@ -195,14 +196,10 @@ class AttachmentListItem extends Widget
     }
 
     function showLink() {
-        $attr = $this->linkAttr();
-        $text = $this->linkTitle();
-        $this->out->elementStart('h4');
-        $this->out->elementStart('a', $attr);
-        $this->out->element('span', null, $text);
+        $this->out->elementStart('a', $this->linkAttr());
+        $this->out->element('span', null, $this->linkTitle());
         $this->showRepresentation();
         $this->out->elementEnd('a');
-        $this->out->elementEnd('h4');
     }
 
     function showNoticeAttachment()
diff --git a/lib/noticelist.php b/lib/noticelist.php
index ae1438892..50a95cfcb 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -180,9 +180,9 @@ class NoticeListItem extends Widget
     {
         $this->showStart();
         $this->showNotice();
+        $this->showNoticeAttachments();
         $this->showNoticeInfo();
         $this->showNoticeOptions();
-        $this->showNoticeAttachments();
         $this->showEnd();
     }
 
@@ -214,18 +214,6 @@ class NoticeListItem extends Widget
         return intval($file_oembed->c);
     }
 
-    function showNoticeAttachmentsIcon()
-    {
-        if (!($this->isUsedInList() && ($count = $this->attachmentCount()))) {
-            return;
-        }
-
-        $href = common_local_url('shownotice', array('notice' => $this->notice->id)) . '#attachments';
-        $this->out->elementStart('p', 'entry-attachments');
-        $this->out->element('a', array('href' => $href, 'title' => "# of attachments: $count"), $count === 1 ? '' : $count);
-        $this->out->elementEnd('p');
-    }
-
     function showNoticeInfo()
     {
         $this->out->elementStart('div', 'entry-content');
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 74f369142..aa76910f0 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -861,6 +861,9 @@ top:11px;
 left:0;
 z-index:99;
 }
+#shownotice .notice .attachment img {
+position:static;
+}
 
 
 .notice-options {
-- 
cgit v1.2.3-54-g00ecf


From 3877324fd8ddad36531fb80a5a2ae261015b9780 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 25 May 2009 17:30:57 -0400
Subject: Updated JS to show/hide attachment thumbnails with timers. Minor
 markup changes.

---
 actions/attachment_thumbnail.php | 11 +----------
 js/util.js                       | 26 +++++++++++++++++---------
 theme/base/css/display.css       |  5 ++++-
 3 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'js')

diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index 32fab1324..b4070e747 100644
--- a/actions/attachment_thumbnail.php
+++ b/actions/attachment_thumbnail.php
@@ -71,16 +71,7 @@ class Attachment_thumbnailAction extends AttachmentAction
         if (empty($file_thumbnail->url)) {
             return;
         }
-        $url = $file_thumbnail->url;
-
-        $attr = array(
-              'id' => 'thumbnail'
-            , 'src' => $url
-            , 'alt' => 'Thumbnail'
-        );
-
-        $this->element('img', $attr);
-
+        $this->element('img', array('src' => $file_thumbnail->url, 'alt' => 'Thumbnail'));
     }
 
     /**
diff --git a/js/util.js b/js/util.js
index cba6f822e..b1b6ec82b 100644
--- a/js/util.js
+++ b/js/util.js
@@ -18,18 +18,26 @@
 
 $(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(
+    $("a.thumbnail").hover(
         function() {
-            anchor = $(this);
-            $.get($('address .url')[0].href+'/attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
-                anchor.append(data);
-                $('#thumbnail').fadeIn('def');
-            });
+            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() {
-            setTimeout(function() {
-                $('#thumbnail').fadeOut('slow', function() {$(this).remove();});
-            }, 500);
+            $(this).children('img').remove();
+            $(this).closest(".entry-title").removeClass('ov');
         }
     );
 
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index aa76910f0..9bc1417b1 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -798,6 +798,9 @@ float:left;
 width:100%;
 overflow:hidden;
 }
+.notice .entry-title.ov {
+overflow:visible;
+}
 #shownotice .notice .entry-title {
 font-size:2.2em;
 }
@@ -857,7 +860,7 @@ position:relative;
 }
 .notice .attachment img {
 position:absolute;
-top:11px;
+top:18px;
 left:0;
 z-index:99;
 }
-- 
cgit v1.2.3-54-g00ecf


From af700ea27703bbec5aa1078a84f9fd44c0260322 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Tue, 26 May 2009 21:20:04 -0400
Subject: Let's you upload a file with a notice and have it shown with other
 attachments.

---
 actions/newnotice.php  | 37 +++++++++++++++++++++++++++++++++++--
 js/jquery.form.js      |  4 ++--
 js/util.js             | 12 ++++++++++++
 lib/attachmentlist.php |  6 ++++--
 lib/form.php           | 16 +++++++++++-----
 lib/noticeform.php     | 12 ++++++++++--
 lib/noticelist.php     | 11 +++++++++++
 lib/router.php         |  6 ++++++
 8 files changed, 91 insertions(+), 13 deletions(-)

(limited to 'js')

diff --git a/actions/newnotice.php b/actions/newnotice.php
index ae0ff9636..d7507c118 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -109,6 +109,10 @@ class NewnoticeAction extends Action
         }
     }
 
+    function isFileAttached() {
+        return $_FILES['attach']['error'] === UPLOAD_ERR_OK;
+    }
+
     /**
      * Save a new notice, based on arguments
      *
@@ -158,7 +162,6 @@ class NewnoticeAction extends Action
             $replyto = 'false';
         }
 
-//        $notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
         $notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
                                   ($replyto == 'false') ? null : $replyto);
 
@@ -167,6 +170,9 @@ class NewnoticeAction extends Action
             return;
         }
 
+        if ($this->isFileAttached()) {
+            $this->storeFile($notice);
+        }
         $this->saveUrls($notice);
 
         common_broadcast_notice($notice);
@@ -194,6 +200,33 @@ class NewnoticeAction extends Action
         }
     }
 
+    function storeFile($notice) {
+        $filename = basename($_FILES['attach']['name']);
+        $destination = "file/{$notice->id}-$filename";
+        if (move_uploaded_file($_FILES['attach']['tmp_name'], INSTALLDIR . "/$destination")) {
+            $file = new File;
+//            $file->url = common_local_url('file', array('notice' => $notice->id));
+            $file->url = common_path($destination);
+            $file->size = filesize(INSTALLDIR . "/$destination");
+            $file->date = time();
+            $file->mimetype = $_FILES['attach']['type'];
+            if ($ok = $file->insert()) {
+                $f2p = new File_to_post;
+                $f2p->file_id = $ok; 
+                $f2p->post_id = $notice->id; 
+                $f2p->insert();
+            } else {
+                die('inserting file, dying');
+            }
+        }
+/*
+        $url = common_local_url('file', array('notice' => $notice->id));
+        echo "$destination<br />";
+        die($url);
+*/
+    }
+
+
     /** save all urls in the notice to the db
      *
      * follow redirects and save all available file information
@@ -203,7 +236,7 @@ class NewnoticeAction extends Action
      *
      * @return void
      */
-    function saveUrls($notice) {
+    function saveUrls($notice, $uploaded = null) {
         common_replace_urls_callback($notice->content, array($this, 'saveUrl'), $notice->id);
     }
 
diff --git a/js/jquery.form.js b/js/jquery.form.js
index cb8b5a660..936b847ab 100644
--- a/js/jquery.form.js
+++ b/js/jquery.form.js
@@ -157,7 +157,7 @@ $.fn.ajaxSubmit = function(options) {
     function fileUpload() {
         var form = $form[0];
         
-        if ($(':input[@name=submit]', form).length) {
+        if ($(':input[name=submit]', form).length) {
             alert('Error: Form elements must not be named "submit".');
             return;
         }
@@ -570,7 +570,7 @@ $.fn.clearForm = function() {
 $.fn.clearFields = $.fn.clearInputs = function() {
     return this.each(function() {
         var t = this.type, tag = this.tagName.toLowerCase();
-        if (t == 'text' || t == 'password' || tag == 'textarea')
+        if (t == 'file' || t == 'text' || t == 'password' || tag == 'textarea')
             this.value = '';
         else if (t == 'checkbox' || t == 'radio')
             this.checked = false;
diff --git a/js/util.js b/js/util.js
index b1b6ec82b..85ab48b4c 100644
--- a/js/util.js
+++ b/js/util.js
@@ -17,6 +17,17 @@
  */
 
 $(document).ready(function(){
+    $('input#notice_data-attach').toggle();
+    $('label[for=notice_data-attach]').text('Upload a file as an attachment?');
+    $('label[for=notice_data-attach]').click(function () {
+        if ('Upload a file as an attachment?' == $(this).text()) {
+            $(this).text('Upload: ');
+            $('input#notice_data-attach').slideDown('fast');
+        } else {
+            $('input#notice_data-attach').slideUp('fast', function() {$('label[for=notice_data-attach]').text('Upload a file as an attachment?');});
+        }
+    });
+
     $('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() {
@@ -227,6 +238,7 @@ $(document).ready(function(){
                                                          }
 													}
 													$("#notice_data-text").val("");
+    												$("#notice_data-attach").val("");
                                                     counter();
 												}
 												$("#form_notice").removeClass("processing");
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index d0478bad3..a58a50f6f 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -80,13 +80,15 @@ class AttachmentList extends Widget
 
     function show()
     {
+        $atts = new File;
+        $att = $atts->getAttachments($this->notice->id);
+        if (empty($att)) return 0;
+
         $this->out->elementStart('dl', array('id' =>'attachment'));
         $this->out->element('dt', null, _('Attachments'));
         $this->out->elementStart('dd');
         $this->out->elementStart('ul', array('class' => 'attachments'));
 
-        $atts = new File;
-        $att = $atts->getAttachments($this->notice->id);
         foreach ($att as $n=>$attachment) {
             $item = $this->newListItem($attachment);
             $item->show();
diff --git a/lib/form.php b/lib/form.php
index 5317df471..f872aef0b 100644
--- a/lib/form.php
+++ b/lib/form.php
@@ -52,6 +52,8 @@ require_once INSTALLDIR.'/lib/widget.php';
 
 class Form extends Widget
 {
+    var $enctype = null;
+
     /**
      * Show the form
      *
@@ -63,11 +65,15 @@ class Form extends Widget
 
     function show()
     {
-        $this->out->elementStart('form',
-                                 array('id' => $this->id(),
-                                       'class' => $this->formClass(),
-                                       'method' => 'post',
-                                       'action' => $this->action()));
+        $attributes = array('id' => $this->id(),
+            'class' => $this->formClass(),
+            'method' => 'post',
+            'action' => $this->action());
+
+        if (!empty($this->enctype)) {
+            $attributes['enctype'] = $this->enctype;
+        }
+        $this->out->elementStart('form', $attributes);
         $this->out->elementStart('fieldset');
         $this->formLegend();
         $this->sessionToken();
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 606b5d028..707768cd5 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -89,7 +89,8 @@ class NoticeForm extends Form
         } else {
             $this->user = common_current_user();
         }
-        
+
+        $this->enctype = 'multipart/form-data';
     }
 
     /**
@@ -136,18 +137,25 @@ class NoticeForm extends Form
     {
         $this->out->element('label', array('for' => 'notice_data-text'),
                             sprintf(_('What\'s up, %s?'), $this->user->nickname));
+        $this->out->elementStart('span', array('style' => 'float: right; margin-top: 2em;'));
+//        $this->out->element('a', array('href' => '#attach'), ' [ATTACH]');
+        $this->out->elementEnd('span');
         // XXX: vary by defined max size
         $this->out->element('textarea', array('id' => 'notice_data-text',
                                               'cols' => 35,
                                               'rows' => 4,
                                               'name' => 'status_textarea'),
                             ($this->content) ? $this->content : '');
-
         $this->out->elementStart('dl', 'form_note');
         $this->out->element('dt', null, _('Available characters'));
         $this->out->element('dd', array('id' => 'notice_text-count'),
                             '140');
         $this->out->elementEnd('dl');
+        $this->out->element('br', array('style' => 'clear:both'));
+//        $this->out->elementStart('a', array('href' => '#'));
+        $this->out->element('label', array('for' => 'notice_data-attach'), _('Upload: '));
+//        $this->out->elementEnd('a');
+        $this->out->element('input', array('id' => 'notice_data-attach', 'type' => 'file', 'name' => 'attach'));
 
         if ($this->action) {
             $this->out->hidden('notice_return-to', $this->action, 'returnto');
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 50a95cfcb..420272515 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -206,6 +206,7 @@ class NoticeListItem extends Widget
         return 'shownotice' !== $this->out->args['action'];
     }
 
+/*
     function attachmentCount($discriminant = true) {
         $file_oembed = new File_oembed;
         $query = "select count(*) as c from file_oembed join file_to_post on file_oembed.file_id = file_to_post.file_id where post_id=" . $this->notice->id;
@@ -213,11 +214,16 @@ class NoticeListItem extends Widget
         $file_oembed->fetch();
         return intval($file_oembed->c);
     }
+*/
+
+    function showWithAttachment() {
+    }
 
     function showNoticeInfo()
     {
         $this->out->elementStart('div', 'entry-content');
         $this->showNoticeLink();
+//        $this->showWithAttachment();
         $this->showNoticeSource();
         $this->showContext();
         $this->out->elementEnd('div');
@@ -388,6 +394,11 @@ class NoticeListItem extends Widget
         $this->out->element('abbr', array('class' => 'published',
                                           'title' => $dt),
                             common_date_string($this->notice->created));
+
+        $f2p = File_to_post::staticGet('post_id', $this->notice->id);
+        if (!empty($f2p)) {
+            $this->out->text(_(' (with attachments) '));
+        }
         $this->out->elementEnd('a');
         $this->out->elementEnd('dd');
         $this->out->elementEnd('dl');
diff --git a/lib/router.php b/lib/router.php
index fc119821b..bd482eafa 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -164,6 +164,12 @@ class Router
                     array('action' => 'newnotice'),
                     array('replyto' => '[A-Za-z0-9_-]+'));
 
+/*
+        $m->connect('notice/:notice/file', 
+            array('action' => 'file'), 
+            array('notice' => '[0-9]+'));
+*/
+        
         $m->connect('notice/:notice',
                     array('action' => 'shownotice'),
                     array('notice' => '[0-9]+'));
-- 
cgit v1.2.3-54-g00ecf


From 60ac9bc6fda74278d98890a2c26f3834acad8222 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 27 May 2009 19:43:43 +0000
Subject: Bunch of UI fixes/improvements for attachments (hover, overlay,
 notice view, clip)

---
 js/util.js                                        |  72 ++++++++++++++--------
 lib/attachmentlist.php                            |   6 +-
 theme/base/css/display.css                        |  67 +++++++++++++++-----
 theme/base/images/icons/twotone/green/clip-02.gif | Bin 0 -> 70 bytes
 theme/default/css/display.css                     |   6 ++
 theme/identica/css/display.css                    |   6 ++
 6 files changed, 116 insertions(+), 41 deletions(-)
 create mode 100644 theme/base/images/icons/twotone/green/clip-02.gif

(limited to 'js')

diff --git a/js/util.js b/js/util.js
index b1b6ec82b..08cc1d370 100644
--- a/js/util.js
+++ b/js/util.js
@@ -17,30 +17,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;
@@ -238,6 +214,7 @@ $(document).ready(function(){
 	$("#form_notice").each(addAjaxHidden);
     NoticeHover();
     NoticeReply();
+    NoticeAttachments();
 });
 
 
@@ -276,3 +253,50 @@ function NoticeReplySet(nick,id) {
 	}
 	return true;
 }
+
+function NoticeAttachments() {
+    $.fn.jOverlay.options = {
+        method : 'GET',
+        data : '',
+        url : '',
+        color : '#000',
+        opacity : '0.6',
+        zIndex : 9999,
+        center : true,
+        imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
+        bgClickToClose : true,
+        success : function() {
+            $('#jOverlayContent').append('<button>&#215;</button>');
+            $('#jOverlayContent button').click($.closeOverlay);
+        },
+        timeout : 0
+    };
+
+    $('a.attachment').click(function() {
+        $().jOverlay({url: $('address .url')[0].href+'/attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'});
+        return false;
+    });
+    $("body:not(#shownotice) a.thumbnail").hover(
+        function() {
+            var anchor = $(this);
+            $("a.thumbnail").children('img').remove();
+            anchor.closest(".entry-title").addClass('ov');
+
+            setTimeout(function() {
+                $.get($('address .url')[0].href+'/attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
+                    anchor.append(data);
+                });
+            }, 500);
+
+            setTimeout(function() {
+                anchor.children('img').remove();
+                anchor.closest(".entry-title").removeClass('ov');
+            }, 3000);
+        },
+        function() {
+            $("a.thumbnail").children('img').remove();
+            $(this).closest(".entry-title").removeClass('ov');
+        }
+    );
+}
+
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index d0478bad3..559962acc 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -80,10 +80,10 @@ class AttachmentList extends Widget
 
     function show()
     {
-        $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('ul', array('class' => 'attachments'));
+        $this->out->elementStart('ol', array('class' => 'attachments'));
 
         $atts = new File;
         $att = $atts->getAttachments($this->notice->id);
@@ -93,7 +93,7 @@ class AttachmentList extends Widget
         }
 
         $this->out->elementEnd('dd');
-        $this->out->elementEnd('ul');
+        $this->out->elementEnd('ol');
         $this->out->elementEnd('dl');
 
         return count($att);
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 9bc1417b1..16c9e3c00 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -855,20 +855,6 @@ display:inline-block;
 text-transform:lowercase;
 }
 
-.notice .attachment {
-position:relative;
-}
-.notice .attachment img {
-position:absolute;
-top:18px;
-left:0;
-z-index:99;
-}
-#shownotice .notice .attachment img {
-position:static;
-}
-
-
 .notice-options {
 position:relative;
 font-size:0.95em;
@@ -936,6 +922,59 @@ padding:0;
 }
 
 
+.notice .attachment {
+position:relative;
+padding-left:16px;
+}
+#attachments .attachment {
+padding-left:0;
+}
+.notice .attachment img {
+position:absolute;
+top:18px;
+left:0;
+z-index:99;
+}
+#shownotice .notice .attachment img {
+position:static;
+}
+
+#attachments {
+clear:both;
+float:left;
+width:100%;
+margin-top:18px;
+}
+#attachments dt {
+font-weight:bold;
+font-size:1.3em;
+margin-bottom:4px;
+}
+
+#attachments li {
+margin-bottom:18px;
+list-style-type:decimal;
+float:left;
+clear:both;
+}
+
+#jOverlayContent,
+#jOverlayContent #content {
+width: auto !important;
+}
+#jOverlayContent .external span {
+display:block;
+margin-bottom:11px;
+}
+#jOverlayContent button {
+position:absolute;
+top:0;
+right:0;
+padding:3px 4px;
+font-weight:bold;
+}
+
+
 #usergroups #new_group {
 float: left;
 margin-right: 2em;
diff --git a/theme/base/images/icons/twotone/green/clip-02.gif b/theme/base/images/icons/twotone/green/clip-02.gif
new file mode 100644
index 000000000..77a729799
Binary files /dev/null and b/theme/base/images/icons/twotone/green/clip-02.gif differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 737db7ce9..e08a4783b 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -175,6 +175,12 @@ background-image:url(../../base/images/icons/twotone/green/shield.gif);
 }
 
 /* NOTICES */
+.notice .attachment {
+background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%;
+}
+#attachments .attachment {
+background:none;
+}
 .notice-options .notice_reply a,
 .notice-options form input.submit {
 background-color:transparent;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index f7abac482..1f1298737 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -175,6 +175,12 @@ background-image:url(../../base/images/icons/twotone/green/shield.gif);
 }
 
 /* NOTICES */
+.notice .attachment {
+background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%;
+}
+#attachments .attachment {
+background:none;
+}
 .notice-options .notice_reply a,
 .notice-options form input.submit {
 background-color:transparent;
-- 
cgit v1.2.3-54-g00ecf


From f0dc97e4da16181b0d6a74361734678d0f37fd5e Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 28 May 2009 22:59:22 +0000
Subject: Smarter call for hover events. It now makes a new GET for attachment
 thumbnails on mouseover only if it hasn't been requested before on that
 notice attachment.

---
 js/util.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'js')

diff --git a/js/util.js b/js/util.js
index 08cc1d370..6cfad3a8e 100644
--- a/js/util.js
+++ b/js/util.js
@@ -261,7 +261,7 @@ function NoticeAttachments() {
         url : '',
         color : '#000',
         opacity : '0.6',
-        zIndex : 9999,
+        zIndex : '9999',
         center : true,
         imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
         bgClickToClose : true,
@@ -279,22 +279,22 @@ function NoticeAttachments() {
     $("body:not(#shownotice) a.thumbnail").hover(
         function() {
             var anchor = $(this);
-            $("a.thumbnail").children('img').remove();
+            $("a.thumbnail").children('img').hide();
             anchor.closest(".entry-title").addClass('ov');
 
-            setTimeout(function() {
-                $.get($('address .url')[0].href+'/attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
-                    anchor.append(data);
-                });
-            }, 500);
-
-            setTimeout(function() {
-                anchor.children('img').remove();
-                anchor.closest(".entry-title").removeClass('ov');
-            }, 3000);
+            if (anchor.children('img').length == 0) {
+                setTimeout(function() {
+                    $.get($('address .url')[0].href+'/attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
+                        anchor.append(data);
+                    });
+                }, 500);
+            }
+            else {
+                anchor.children('img').show();
+            }
         },
         function() {
-            $("a.thumbnail").children('img').remove();
+            $("a.thumbnail").children('img').hide();
             $(this).closest(".entry-title").removeClass('ov');
         }
     );
-- 
cgit v1.2.3-54-g00ecf


From 6612993c1d59051bbb4dafed73e0111eec8ccfd6 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 28 May 2009 23:16:25 +0000
Subject: Prevents regular hovers over attachment anchors from making a GET
 request for the thumbnail. There is 500 ms delay while on mouseover state
 before going ahead with the request. Fun.

---
 js/util.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/util.js b/js/util.js
index 6cfad3a8e..d5697e880 100644
--- a/js/util.js
+++ b/js/util.js
@@ -276,6 +276,8 @@ function NoticeAttachments() {
         $().jOverlay({url: $('address .url')[0].href+'/attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'});
         return false;
     });
+    
+    var t;
     $("body:not(#shownotice) a.thumbnail").hover(
         function() {
             var anchor = $(this);
@@ -283,7 +285,7 @@ function NoticeAttachments() {
             anchor.closest(".entry-title").addClass('ov');
 
             if (anchor.children('img').length == 0) {
-                setTimeout(function() {
+                t = setTimeout(function() {
                     $.get($('address .url')[0].href+'/attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
                         anchor.append(data);
                     });
@@ -294,6 +296,7 @@ function NoticeAttachments() {
             }
         },
         function() {
+            clearTimeout(t);
             $("a.thumbnail").children('img').hide();
             $(this).closest(".entry-title").removeClass('ov');
         }
-- 
cgit v1.2.3-54-g00ecf


From f56f2f52e74ec3d0037bc33f9bbcee170e982d49 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Sat, 30 May 2009 19:42:15 +0000
Subject: Some cross-browser updates for conversation UI

---
 js/util.js                 |  2 +-
 theme/base/css/display.css | 12 ++++++++++--
 theme/base/css/ie.css      |  6 ++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'js')

diff --git a/js/util.js b/js/util.js
index d5697e880..c710ae839 100644
--- a/js/util.js
+++ b/js/util.js
@@ -261,7 +261,7 @@ function NoticeAttachments() {
         url : '',
         color : '#000',
         opacity : '0.6',
-        zIndex : '9999',
+        zIndex : 99,
         center : true,
         imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
         bgClickToClose : true,
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e3c499a5e..5ad4217cd 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -951,7 +951,7 @@ font-size:1.3em;
 margin-bottom:4px;
 }
 
-#attachments li {
+#attachments ol li {
 margin-bottom:18px;
 list-style-type:decimal;
 float:left;
@@ -962,6 +962,11 @@ clear:both;
 #jOverlayContent #content,
 #jOverlayContent #content_inner {
 width: auto !important;
+margin-bottom:0;
+}
+#jOverlayContent #content {
+padding:11px;
+min-height:auto;
 }
 #jOverlayContent .external span {
 display:block;
@@ -971,8 +976,11 @@ margin-bottom:11px;
 position:absolute;
 top:0;
 right:0;
-padding:3px 4px;
+width:29px;
+height:29px;
+text-align:center;
 font-weight:bold;
+padding:0;
 }
 #jOverlayContent h1 {
 max-width:475px;
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 5d8bea8ae..df0388a5a 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -30,3 +30,9 @@ margin-right:4px;
 .entity_profile {
 width:64%;
 }
+#jOverlayContent .notice * {
+z-index:1;
+}
+#jOverlayContent .notice .attachment img  {
+z-index:9999;
+}
-- 
cgit v1.2.3-54-g00ecf


From a39fa0ce2bceadbfec8c1ddb8d1148edeb84634d Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 1 Jun 2009 15:20:12 -0400
Subject: Unnecessary JavaScript for notice form attachment

---
 js/util.js | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'js')

diff --git a/js/util.js b/js/util.js
index acf44a17c..20f17f6e7 100644
--- a/js/util.js
+++ b/js/util.js
@@ -17,17 +17,6 @@
  */
 
 $(document).ready(function(){
-    $('input#notice_data-attach').toggle();
-    $('label[for=notice_data-attach]').text('Upload a file as an attachment?');
-    $('label[for=notice_data-attach]').click(function () {
-        if ('Upload a file as an attachment?' == $(this).text()) {
-            $(this).text('Upload: ');
-            $('input#notice_data-attach').slideDown('fast');
-        } else {
-            $('input#notice_data-attach').slideUp('fast', function() {$('label[for=notice_data-attach]').text('Upload a file as an attachment?');});
-        }
-    });
-
     $('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() {
-- 
cgit v1.2.3-54-g00ecf


From 0cbd72e0927cbe9b605e34d7bbd86d2046ea0c49 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Mon, 1 Jun 2009 15:52:52 -0400
Subject: Re-added some javascript to toggle upload field.

---
 js/util.js         | 11 +++++++++++
 lib/noticeform.php |  1 +
 2 files changed, 12 insertions(+)

(limited to 'js')

diff --git a/js/util.js b/js/util.js
index 20f17f6e7..acf44a17c 100644
--- a/js/util.js
+++ b/js/util.js
@@ -17,6 +17,17 @@
  */
 
 $(document).ready(function(){
+    $('input#notice_data-attach').toggle();
+    $('label[for=notice_data-attach]').text('Upload a file as an attachment?');
+    $('label[for=notice_data-attach]').click(function () {
+        if ('Upload a file as an attachment?' == $(this).text()) {
+            $(this).text('Upload: ');
+            $('input#notice_data-attach').slideDown('fast');
+        } else {
+            $('input#notice_data-attach').slideUp('fast', function() {$('label[for=notice_data-attach]').text('Upload a file as an attachment?');});
+        }
+    });
+
     $('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() {
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 5a6c7cf38..805cd56b1 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -148,6 +148,7 @@ class NoticeForm extends Form
         $this->out->element('dd', array('id' => 'notice_text-count'),
                             '140');
         $this->out->elementEnd('dl');
+        $this->out->element('br', array('style' => 'clear:both'));
         $this->out->element('label', array('for' => 'notice_data-attach'), _('Attach'));
         $this->out->element('input', array('id' => 'notice_data-attach',
                                            'type' => 'file',
-- 
cgit v1.2.3-54-g00ecf


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: 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(-)

(limited to 'js')

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'));
-- 
cgit v1.2.3-54-g00ecf


From b708b81065b4adc46026e570d8e2cb9d37bc24af Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Fri, 5 Jun 2009 00:00:04 -0400
Subject: Init notice_data-attach UI for form_notice

---
 js/util.js                     | 11 -----------
 lib/noticeform.php             |  1 -
 theme/base/css/display.css     | 16 ++++++++++++++++
 theme/identica/css/display.css |  7 +++++++
 4 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'js')

diff --git a/js/util.js b/js/util.js
index bffbf916f..b712ba8e2 100644
--- a/js/util.js
+++ b/js/util.js
@@ -17,17 +17,6 @@
  */
 
 $(document).ready(function(){
-    $('input#notice_data-attach').toggle();
-    $('label[for=notice_data-attach]').text('Upload a file as an attachment?');
-    $('label[for=notice_data-attach]').click(function () {
-        if ('Upload a file as an attachment?' == $(this).text()) {
-            $(this).text('Upload: ');
-            $('input#notice_data-attach').slideDown('fast');
-        } else {
-            $('input#notice_data-attach').slideUp('fast', function() {$('label[for=notice_data-attach]').text('Upload a file as an attachment?');});
-        }
-    });
-
 	// count character on keyup
 	function counter(event){
 		var maxLength = 140;
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 805cd56b1..5a6c7cf38 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -148,7 +148,6 @@ class NoticeForm extends Form
         $this->out->element('dd', array('id' => 'notice_text-count'),
                             '140');
         $this->out->elementEnd('dl');
-        $this->out->element('br', array('style' => 'clear:both'));
         $this->out->element('label', array('for' => 'notice_data-attach'), _('Attach'));
         $this->out->element('input', array('id' => 'notice_data-attach',
                                            'type' => 'file',
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 7d495c539..7eea54eb2 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -452,6 +452,22 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
+#form_notice label[for=notice_data-attach] {
+text-indent:-9999px;
+display:block;
+}
+#form_notice label[for=notice_data-attach],
+#form_notice #notice_data-attach {
+position:absolute;
+top:25px;
+right:49px;
+width:16px;
+height:16px;
+cursor:pointer;
+}
+#form_notice #notice_data-attach {
+text-indent:-279px;
+}
 #form_notice #notice_submit label {
 display:none;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 1f1298737..8a03a4d77 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -82,6 +82,13 @@ color:#333;
 #form_notice.warning #notice_text-count {
 color:#000;
 }
+#form_notice label[for=notice_data-attach] {
+background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+}
+#form_notice #notice_data-attach {
+opacity:0;
+}
+
 #form_notice.processing #notice_action-submit {
 background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
-- 
cgit v1.2.3-54-g00ecf