From 5daa0e358f0a75261e3240820cd6bcf7a57504fc Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 16 Jun 2009 06:32:17 +0000
Subject: [PATCH 01/11] Using neutral colour for notice hover

---
 theme/default/css/display.css  | 4 ++--
 theme/identica/css/display.css | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 166e62157b..06cf9fb260 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -228,8 +228,8 @@ div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
-.notices li.hover {
-background-color:#fcfcfc;
+.notices li:hover {
+background-color:rgba(194, 194, 194, 0.025);
 }
 
 .notices .notices {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index cab42f16f4..0332a6f1e1 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -228,8 +228,8 @@ div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
-.notices li.hover {
-background-color:#fcfcfc;
+.notices li:hover {
+background-color:rgba(194, 194, 194, 0.025);
 }
 
 .notices .notices {

From c98179378be7c8903a6ba7a9fe37bf6683219555 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 16 Jun 2009 07:45:19 +0000
Subject: [PATCH 02/11] Revert "Using neutral colour for notice hover"

This reverts commit 5daa0e358f0a75261e3240820cd6bcf7a57504fc.
---
 theme/default/css/display.css  | 4 ++--
 theme/identica/css/display.css | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 06cf9fb260..166e62157b 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -228,8 +228,8 @@ div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
-.notices li:hover {
-background-color:rgba(194, 194, 194, 0.025);
+.notices li.hover {
+background-color:#fcfcfc;
 }
 
 .notices .notices {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 0332a6f1e1..cab42f16f4 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -228,8 +228,8 @@ div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
-.notices li:hover {
-background-color:rgba(194, 194, 194, 0.025);
+.notices li.hover {
+background-color:#fcfcfc;
 }
 
 .notices .notices {

From c74a079e47e1ad71bdb92f8659626730b1b0cae3 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 16 Jun 2009 19:40:23 +0000
Subject: [PATCH 03/11] UI updates: Added box-shadow to local views, input
 focus, content Removed borders from local views, content, aside_primary Some
 cleaning

---
 theme/base/css/display.css     | 11 +--------
 theme/default/css/display.css  | 44 ++++++++++++++++++++++------------
 theme/identica/css/display.css | 44 ++++++++++++++++++++++------------
 3 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 0cbd0d774a..3595d6aa3e 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -303,10 +303,6 @@ padding:4px 11px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-left-radius:4px;
 -webkit-border-top-right-radius:4px;
-border-width:1px;
-border-style:solid;
-border-bottom:0;
-text-shadow: 2px 2px 2px #ddd;
 font-weight:bold;
 }
 #site_nav_local_views .nav {
@@ -396,8 +392,6 @@ border-radius:7px;
 -moz-border-radius-topleft:0;
 -webkit-border-radius:7px;
 -webkit-border-top-left-radius:0;
-border-style:solid;
-border-width:1px;
 }
 #shownotice #content {
 min-height:0;
@@ -413,13 +407,11 @@ float:left;
 width:27.917%;
 min-height:259px;
 float:left;
-margin-left:0.385%;
+margin-left:0.7%;
 padding:1.795%;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
-border-width:1px;
-border-style:solid;
 }
 
 #form_notice {
@@ -469,7 +461,6 @@ height:16px;
 #form_notice #notice_data-attach {
 left:183px;
 padding:0;
-
 height:16px;
 }
 #form_notice .form_note {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 166e62157b..148ce6e600 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -19,7 +19,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
 }
 address {
-margin-right:7.18%;
+margin-right:7.1%;
 }
 
 input, textarea, select, option {
@@ -27,7 +27,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
 input, textarea, select,
 .entity_remote_subscribe {
-border-color:#aaa;
+border-color:#AAAAAA;
 }
 #filter_tags ul li {
 border-color:#C3D6DF;
@@ -47,10 +47,13 @@ background-color:#A9BF4F;
 input:focus, textarea:focus, select:focus,
 #form_notice.warning #notice_data-text {
 border-color:#A9BF4F;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 input.submit,
 .entity_remote_subscribe {
-color:#fff;
+color:#FFFFFF;
 }
 
 a,
@@ -79,10 +82,10 @@ background-color:#CEE1E9;
 }
 
 #notice_text-count {
-color:#333;
+color:#333333;
 }
 #form_notice.warning #notice_text-count {
-color:#000;
+color:#000000;
 }
 #form_notice label[for=notice_data-attach] {
 background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
@@ -92,27 +95,38 @@ opacity:0;
 }
 
 #form_notice.processing #notice_action-submit {
-background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
 }
 
+#content {
+box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+}
 #content,
 #site_nav_local_views a,
 #aside_primary {
-border-color:#fff;
+border-color:#FFFFFF;
 }
 #content,
 #site_nav_local_views .current a {
-background-color:#fff;
+background-color:#FFFFFF;
 }
 
 #site_nav_local_views a {
-background-color:rgba(255, 255, 255, 0.2);
+background-color:rgba(194, 194, 194, 0.4);
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
 }
 #site_nav_local_views a:hover {
 background-color:rgba(255, 255, 255, 0.7);
 }
+#site_nav_local_views .current a {
+text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
+}
 
 .error {
 background-color:#F7E8E8;
@@ -123,8 +137,8 @@ background-color:#EFF3DC;
 
 #anon_notice {
 background-color:#C3D6DF;
-color:#fff;
-border-color:#fff;
+color:#FFFFFF;
+border-color:#FFFFFF;
 }
 
 #showstream #anon_notice {
@@ -162,7 +176,7 @@ background-color:transparent;
 .form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
 background-color:#A9BF4F;
-color:#fff;
+color:#FFFFFF;
 }
 .form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
@@ -214,7 +228,7 @@ background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-r
 .notices div.entry-content,
 .notices div.notice-options,
 .notices li.hover .notices div.entry-content,
-.notices li.hover .notices div.notice-options  {
+.notices li.hover .notices div.notice-options {
 opacity:0.4;
 }
 .notices li.hover div.entry-content,
@@ -222,14 +236,14 @@ opacity:0.4;
 opacity:1;
 }
 div.entry-content {
-color:#333;
+color:#333333;
 }
 div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
 .notices li.hover {
-background-color:#fcfcfc;
+background-color:#FCFCFC;
 }
 
 .notices .notices {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index cab42f16f4..ff538f1f12 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -19,7 +19,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
 }
 address {
-margin-right:7.18%;
+margin-right:7.1%;
 }
 
 input, textarea, select, option {
@@ -27,10 +27,10 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
 input, textarea, select,
 .entity_remote_subscribe {
-border-color:#aaa;
+border-color:#AAAAAA;
 }
 #filter_tags ul li {
-border-color:#ddd;
+border-color:#DDDDDD;
 }
 
 .form_settings input.form_action-primary {
@@ -47,10 +47,13 @@ background-color:#9BB43E;
 input:focus, textarea:focus, select:focus,
 #form_notice.warning #notice_data-text {
 border-color:#9BB43E;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 input.submit,
 .entity_remote_subscribe {
-color:#fff;
+color:#FFFFFF;
 }
 
 a,
@@ -79,10 +82,10 @@ background-color:#CEE1E9;
 }
 
 #notice_text-count {
-color:#333;
+color:#333333;
 }
 #form_notice.warning #notice_text-count {
-color:#000;
+color:#000000;
 }
 #form_notice label[for=notice_data-attach] {
 background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
@@ -92,27 +95,38 @@ opacity:0;
 }
 
 #form_notice.processing #notice_action-submit {
-background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
 }
 
+#content {
+box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+}
 #content,
 #site_nav_local_views a,
 #aside_primary {
-border-color:#fff;
+border-color:#FFFFFF;
 }
 #content,
 #site_nav_local_views .current a {
-background-color:#fff;
+background-color:#FFFFFF;
 }
 
 #site_nav_local_views a {
-background-color:rgba(135, 180, 200, 0.3);
+background-color:rgba(194, 194, 194, 0.4);
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
 }
 #site_nav_local_views a:hover {
 background-color:rgba(255, 255, 255, 0.7);
 }
+#site_nav_local_views .current a {
+text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
+}
 
 .error {
 background-color:#F7E8E8;
@@ -123,8 +137,8 @@ background-color:#EFF3DC;
 
 #anon_notice {
 background-color:#87B4C8;
-color:#fff;
-border-color:#fff;
+color:#FFFFFF;
+border-color:#FFFFFF;
 }
 
 #showstream #anon_notice {
@@ -162,7 +176,7 @@ background-color:transparent;
 .form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
 background-color:#9BB43E;
-color:#fff;
+color:#FFFFFF;
 }
 .form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
@@ -222,14 +236,14 @@ opacity:0.4;
 opacity:1;
 }
 div.entry-content {
-color:#333;
+color:#333333;
 }
 div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
 .notices li.hover {
-background-color:#fcfcfc;
+background-color:#FCFCFC;
 }
 
 .notices .notices {

From c8e3e0d7166abc5acce78d8d6c984764e4c2f7bc Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 16 Jun 2009 20:56:12 +0000
Subject: [PATCH 04/11] More contrast for tabs

---
 theme/default/css/display.css  | 2 +-
 theme/identica/css/display.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 148ce6e600..12efedf01b 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -116,7 +116,7 @@ background-color:#FFFFFF;
 }
 
 #site_nav_local_views a {
-background-color:rgba(194, 194, 194, 0.4);
+background-color:rgba(194, 194, 194, 0.5);
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
 -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
 -webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index ff538f1f12..fb64013be6 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -116,7 +116,7 @@ background-color:#FFFFFF;
 }
 
 #site_nav_local_views a {
-background-color:rgba(194, 194, 194, 0.4);
+background-color:rgba(194, 194, 194, 0.5);
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
 -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
 -webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);

From fcc86840369c45b0146cc1f3fcd3686e880dea6e Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 16 Jun 2009 21:10:14 +0000
Subject: [PATCH 05/11] Minor margin value change

---
 theme/default/css/display.css  | 2 +-
 theme/identica/css/display.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 12efedf01b..1ad823a5cd 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -19,7 +19,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
 }
 address {
-margin-right:7.1%;
+margin-right:7.2%;
 }
 
 input, textarea, select, option {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index fb64013be6..bc7ac80fbb 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -19,7 +19,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
 }
 address {
-margin-right:7.1%;
+margin-right:7.2%;
 }
 
 input, textarea, select, option {

From 3974ab633c1f75fee71a3a74f7088ca2927468c9 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 16 Jun 2009 21:47:58 +0000
Subject: [PATCH 06/11] Brought back borders for content, navigation,
 aside_primary but applied transparent colour instead, hence not visible. This
 way, other laconica instances make use of the border if they change only the
 colour.

---
 theme/base/css/display.css     | 9 ++++++++-
 theme/default/css/display.css  | 2 +-
 theme/identica/css/display.css | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 3595d6aa3e..49907058e3 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -303,6 +303,9 @@ padding:4px 11px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-left-radius:4px;
 -webkit-border-top-right-radius:4px;
+border-width:1px;
+border-style:solid;
+border-bottom:0;
 font-weight:bold;
 }
 #site_nav_local_views .nav {
@@ -392,6 +395,8 @@ border-radius:7px;
 -moz-border-radius-topleft:0;
 -webkit-border-radius:7px;
 -webkit-border-top-left-radius:0;
+border-width:1px;
+border-style:solid;
 }
 #shownotice #content {
 min-height:0;
@@ -407,11 +412,13 @@ float:left;
 width:27.917%;
 min-height:259px;
 float:left;
-margin-left:0.7%;
+margin-left:0.5%;
 padding:1.795%;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
+border-width:1px;
+border-style:solid;
 }
 
 #form_notice {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 1ad823a5cd..f0d6dace8c 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -108,7 +108,7 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 #content,
 #site_nav_local_views a,
 #aside_primary {
-border-color:#FFFFFF;
+border-color:transparent;
 }
 #content,
 #site_nav_local_views .current a {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index bc7ac80fbb..25a01abe0b 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -108,7 +108,7 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 #content,
 #site_nav_local_views a,
 #aside_primary {
-border-color:#FFFFFF;
+border-color:transparent;
 }
 #content,
 #site_nav_local_views .current a {

From 54697e52989c8d7dc9e1295679e6c0ef676642e0 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Tue, 16 Jun 2009 19:38:27 -0400
Subject: [PATCH 07/11] Removed more dead code.

---
 actions/attachment.php      | 42 -------------------------------------
 actions/attachment_ajax.php | 41 ------------------------------------
 2 files changed, 83 deletions(-)

diff --git a/actions/attachment.php b/actions/attachment.php
index 16ee723d96..e4dc0e054e 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -98,48 +98,6 @@ class AttachmentAction extends Action
         return $a->title();
     }
 
-    /**
-     * Last-modified date for page
-     *
-     * When was the content of this page last modified? Based on notice,
-     * profile, avatar.
-     *
-     * @return int last-modified date as unix timestamp
-     */
-/*
-    function lastModified()
-    {
-        return max(strtotime($this->notice->created),
-                   strtotime($this->profile->modified),
-                   ($this->avatar) ? strtotime($this->avatar->modified) : 0);
-    }
-*/
-
-    /**
-     * An entity tag for this page
-     *
-     * Shows the ETag for the page, based on the notice ID and timestamps
-     * for the notice, profile, and avatar. It's weak, since we change
-     * the date text "one hour ago", etc.
-     *
-     * @return string etag
-     */
-/*
-    function etag()
-    {
-        $avtime = ($this->avatar) ?
-          strtotime($this->avatar->modified) : 0;
-
-        return 'W/"' . implode(':', array($this->arg('action'),
-                                          common_language(),
-                                          $this->notice->id,
-                                          strtotime($this->notice->created),
-                                          strtotime($this->profile->modified),
-                                          $avtime)) . '"';
-    }
-*/
-
-
     /**
      * Handle input
      *
diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php
index 3d83393c51..5d6773010f 100644
--- a/actions/attachment_ajax.php
+++ b/actions/attachment_ajax.php
@@ -74,46 +74,5 @@ class Attachment_ajaxAction extends AttachmentAction
         }
         $this->elementEnd('div');
     }
-
-    /**
-     * Last-modified date for page
-     *
-     * When was the content of this page last modified? Based on notice,
-     * profile, avatar.
-     *
-     * @return int last-modified date as unix timestamp
-     */
-/*
-    function lastModified()
-    {
-        return max(strtotime($this->notice->created),
-                   strtotime($this->profile->modified),
-                   ($this->avatar) ? strtotime($this->avatar->modified) : 0);
-    }
-*/
-
-    /**
-     * An entity tag for this page
-     *
-     * Shows the ETag for the page, based on the notice ID and timestamps
-     * for the notice, profile, and avatar. It's weak, since we change
-     * the date text "one hour ago", etc.
-     *
-     * @return string etag
-     */
-/*
-    function etag()
-    {
-        $avtime = ($this->avatar) ?
-          strtotime($this->avatar->modified) : 0;
-
-        return 'W/"' . implode(':', array($this->arg('action'),
-                                          common_language(),
-                                          $this->notice->id,
-                                          strtotime($this->notice->created),
-                                          strtotime($this->profile->modified),
-                                          $avtime)) . '"';
-    }
-*/
 }
 

From befbfc9c73a75bac9d7dac4a4b7a21bd515ce1b4 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Tue, 16 Jun 2009 23:10:17 -0400
Subject: [PATCH 08/11] Moved url handling to its proper place, from newnotice
 to Notice.php

---
 actions/newnotice.php | 19 -------------------
 classes/Notice.php    | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 02976a2ae2..72ccd8c325 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -231,7 +231,6 @@ class NewnoticeAction extends Action
         if (isset($mimetype)) {
             $this->storeFile($notice, $mimetype);
         }
-        $this->saveUrls($notice);
         common_broadcast_notice($notice);
 
         if ($this->boolean('ajax')) {
@@ -284,24 +283,6 @@ class NewnoticeAction extends Action
         }
     }
 
-    /** save all urls in the notice to the db
-     *
-     * follow redirects and save all available file information
-     * (mimetype, date, size, oembed, etc.)
-     *
-     * @param class $notice Notice to pull URLs from
-     *
-     * @return void
-     */
-    function saveUrls($notice, $uploaded = null) {
-        common_replace_urls_callback($notice->content, array($this, 'saveUrl'), $notice->id);
-    }
-
-    function saveUrl($data) {
-        list($url, $notice_id) = $data;
-        $zzz = File::processNew($url, $notice_id);
-    }
-
     /**
      * Show an Ajax-y error message
      *
diff --git a/classes/Notice.php b/classes/Notice.php
index 68602b1f7c..770b5d78b7 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -217,6 +217,7 @@ class Notice extends Memcached_DataObject
 
             $notice->addToInboxes();
             $notice->saveGroups();
+            $notice->saveUrls();
 
             $notice->query('COMMIT');
 
@@ -231,6 +232,24 @@ class Notice extends Memcached_DataObject
         return $notice;
     }
 
+    /** save all urls in the notice to the db
+     *
+     * follow redirects and save all available file information
+     * (mimetype, date, size, oembed, etc.)
+     *
+     * @param class $notice Notice to pull URLs from
+     *
+     * @return void
+     */
+    function saveUrls() {
+        common_replace_urls_callback($this->content, array($this, 'saveUrl'), $this->id);
+    }
+
+    function saveUrl($data) {
+        list($url, $notice_id) = $data;
+        File::processNew($url, $notice_id);
+    }
+
     static function checkDupes($profile_id, $content) {
         $profile = Profile::staticGet($profile_id);
         if (!$profile) {

From 0e4d8c416db4c838e94df3df77c2e4b14a0e1851 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 17 Jun 2009 07:49:41 +0000
Subject: [PATCH 09/11] Removed NoticeHover from JavaScript for speed gain.
 Using CSS instead to handle the notice hover state. The difference is only
 seen in the conversation page.

---
 js/util.js                     | 13 +------------
 theme/default/css/display.css  | 13 +++++++------
 theme/identica/css/display.css | 13 +++++++------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/js/util.js b/js/util.js
index fd2500d447..ce0c20d31b 100644
--- a/js/util.js
+++ b/js/util.js
@@ -230,21 +230,10 @@ $(document).ready(function(){
 					   };
 	$("#form_notice").ajaxForm(PostNotice);
 	$("#form_notice").each(addAjaxHidden);
-    NoticeHover();
     NoticeReply();
     NoticeAttachments();
 });
 
-
-function NoticeHover() {
-    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() {
@@ -319,4 +308,4 @@ function NoticeAttachments() {
             $(this).closest(".entry-title").removeClass('ov');
         }
     );
-}
+}
\ No newline at end of file
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index f0d6dace8c..8dd5ca32cd 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -226,13 +226,11 @@ background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-r
 }
 
 .notices div.entry-content,
-.notices div.notice-options,
-.notices li.hover .notices div.entry-content,
-.notices li.hover .notices div.notice-options {
+.notices div.notice-options {
 opacity:0.4;
 }
-.notices li.hover div.entry-content,
-.notices li.hover div.notice-options {
+.notices li:hover div.entry-content,
+.notices li:hover div.notice-options {
 opacity:1;
 }
 div.entry-content {
@@ -242,9 +240,12 @@ div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
-.notices li.hover {
+.notices li:hover {
 background-color:#FCFCFC;
 }
+#conversation .notices li:hover {
+background-color:transparent;
+}
 
 .notices .notices {
 background-color:rgba(200, 200, 200, 0.050);
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 25a01abe0b..975702faad 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -226,13 +226,11 @@ background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-r
 }
 
 .notices div.entry-content,
-.notices div.notice-options,
-.notices li.hover .notices div.entry-content,
-.notices li.hover .notices div.notice-options {
+.notices div.notice-options {
 opacity:0.4;
 }
-.notices li.hover div.entry-content,
-.notices li.hover div.notice-options {
+.notices li:hover div.entry-content,
+.notices li:hover div.notice-options {
 opacity:1;
 }
 div.entry-content {
@@ -242,9 +240,12 @@ div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
-.notices li.hover {
+.notices li:hover {
 background-color:#FCFCFC;
 }
+#conversation .notices li:hover {
+background-color:transparent;
+}
 
 .notices .notices {
 background-color:rgba(200, 200, 200, 0.050);

From 4c640aace978a2a57b6d2d4658febde3f9826efa Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 17 Jun 2009 08:14:01 +0000
Subject: [PATCH 10/11] Updated markup yes/no form actions to be consistent
 with the rest of the site

---
 actions/block.php          | 17 ++++++++++-------
 actions/groupblock.php     | 17 ++++++++++-------
 theme/base/css/display.css |  3 ++-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/actions/block.php b/actions/block.php
index 0efee5932c..441016d4e9 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -125,16 +125,18 @@ class BlockAction extends Action
     function areYouSureForm()
     {
         $id = $this->profile->id;
+        $this->elementStart('form', array('id' => 'block-' . $id,
+                                           'method' => 'post',
+                                           'class' => 'form_settings form_entity_block',
+                                           'action' => common_local_url('block')));
+        $this->elementStart('fieldset');
+        $this->hidden('token', common_session_token());
+        $this->element('legend', _('Block user'));
         $this->element('p', null,
                        _('Are you sure you want to block this user? '.
                          'Afterwards, they will be unsubscribed from you, '.
                          'unable to subscribe to you in the future, and '.
                          'you will not be notified of any @-replies from them.'));
-        $this->elementStart('form', array('id' => 'block-' . $id,
-                                           'method' => 'post',
-                                           'class' => 'block',
-                                           'action' => common_local_url('block')));
-        $this->hidden('token', common_session_token());
         $this->element('input', array('id' => 'blockto-' . $id,
                                       'name' => 'blockto',
                                       'type' => 'hidden',
@@ -144,8 +146,9 @@ class BlockAction extends Action
                 $this->hidden($k, $v);
             }
         }
-        $this->submit('no', _('No'));
-        $this->submit('yes', _('Yes'));
+        $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user from this group"));
+        $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Block this user from this group'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/actions/groupblock.php b/actions/groupblock.php
index 93662da799..28685b1d56 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -151,17 +151,19 @@ class GroupblockAction extends Action
     function areYouSureForm()
     {
         $id = $this->profile->id;
+        $this->elementStart('form', array('id' => 'block-' . $id,
+                                           'method' => 'post',
+                                           'class' => 'form_settings form_entity_block',
+                                           'action' => common_local_url('groupblock')));
+        $this->elementStart('fieldset');
+        $this->hidden('token', common_session_token());
+        $this->element('legend', null, _('Block user'));
         $this->element('p', null,
                        sprintf(_('Are you sure you want to block user "%s" from the group "%s"? '.
                                  'They will be removed from the group, unable to post, and '.
                                  'unable to subscribe to the group in the future.'),
                                $this->profile->getBestName(),
                                $this->group->getBestName()));
-        $this->elementStart('form', array('id' => 'block-' . $id,
-                                           'method' => 'post',
-                                           'class' => 'block',
-                                           'action' => common_local_url('groupblock')));
-        $this->hidden('token', common_session_token());
         $this->hidden('blockto-' . $this->profile->id,
                       $this->profile->id,
                       'blockto');
@@ -173,8 +175,9 @@ class GroupblockAction extends Action
                 $this->hidden($k, $v);
             }
         }
-        $this->submit('no', _('No'));
-        $this->submit('yes', _('Yes'));
+        $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user from this group"));
+        $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Block this user from this group'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 49907058e3..403a9c37f4 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -154,7 +154,8 @@ font-weight:bold;
 #form_invite legend,
 #form_notice_delete legend,
 #form_password_recover legend,
-#form_password_change legend {
+#form_password_change legend,
+.form_entity_block legend {
 display:none;
 }
 

From 85a4e32f30fcc1b081cde7c8e0267b4fd0c83e16 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 17 Jun 2009 09:03:59 +0000
Subject: [PATCH 11/11] Updated input submit for making a user admin of a group

---
 theme/base/css/display.css                      |   3 ++-
 theme/base/images/icons/twotone/green/admin.gif | Bin 0 -> 100 bytes
 theme/default/css/display.css                   |   9 +++++++--
 theme/identica/css/display.css                  |   9 +++++++--
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 theme/base/images/icons/twotone/green/admin.gif

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 403a9c37f4..9e35d015d1 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -622,7 +622,8 @@ display:block;
 .entity_send-a-message a,
 .entity_edit a,
 .form_user_nudge input.submit,
-.entity_nudge p {
+.entity_nudge p,
+.form_make_admin input.submit {
 border:0;
 padding-left:20px;
 }
diff --git a/theme/base/images/icons/twotone/green/admin.gif b/theme/base/images/icons/twotone/green/admin.gif
new file mode 100644
index 0000000000000000000000000000000000000000..10fa431cee5d1a5e3f07dd5846eacbbdf922a5f5
GIT binary patch
literal 100
zcmZ?wbhEHb6krfwSjfZ>KSkjG|NjhNp!iSFxhOTUBsE2$JhLQ2!QIn0fI;ym3nK#q
y6N3&&2}lzIlY&U!%w=!+133cyqV&)0uCgw4|B-PZbkU0Bb@yKz%nM*(um%8PTpm*Z

literal 0
HcmV?d00001

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 8dd5ca32cd..935116a74f 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -65,7 +65,8 @@ div.notice-options input,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
 .entity_nudge p,
-.form_settings input.form_action-primary {
+.form_settings input.form_action-primary,
+.form_make_admin input.submit {
 color:#002E6E;
 }
 
@@ -166,7 +167,8 @@ background-image:url(../../base/images/icons/icon_foaf.gif);
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit,
-.entity_nudge p {
+.entity_nudge p,
+.form_make_admin input.submit {
 background-position: 0 40%;
 background-repeat: no-repeat;
 background-color:transparent;
@@ -200,6 +202,9 @@ background-image:url(../../base/images/icons/twotone/green/mail.gif);
 .form_group_unblock input.submit {
 background-image:url(../../base/images/icons/twotone/green/shield.gif);
 }
+.form_make_admin input.submit {
+background-image:url(../../base/images/icons/twotone/green/admin.gif);
+}
 
 /* NOTICES */
 .notice .attachment {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 975702faad..6845fda5f9 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -65,7 +65,8 @@ div.notice-options input,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
 .entity_nudge p,
-.form_settings input.form_action-primary {
+.form_settings input.form_action-primary,
+.form_make_admin input.submit {
 color:#002E6E;
 }
 
@@ -166,7 +167,8 @@ background-image:url(../../base/images/icons/icon_foaf.gif);
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit,
-.entity_nudge p {
+.entity_nudge p,
+.form_make_admin input.submit {
 background-position: 0 40%;
 background-repeat: no-repeat;
 background-color:transparent;
@@ -200,6 +202,9 @@ background-image:url(../../base/images/icons/twotone/green/mail.gif);
 .form_group_unblock input.submit {
 background-image:url(../../base/images/icons/twotone/green/shield.gif);
 }
+.form_make_admin input.submit {
+background-image:url(../../base/images/icons/twotone/green/admin.gif);
+}
 
 /* NOTICES */
 .notice .attachment {