From a81a599d8afb5143e4268eb4f658ef6731c7b18a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 11:11:06 -0700
Subject: [PATCH 1/4] MESSAGES_PER_PAGE constant missing (merge error?)

---
 lib/framework.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/framework.php b/lib/framework.php
index 350a1c268d..da96c8e1d4 100644
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -33,6 +33,7 @@ define('AVATAR_MINI_SIZE', 24);
 
 define('NOTICES_PER_PAGE', 20);
 define('PROFILES_PER_PAGE', 20);
+define('MESSAGES_PER_PAGE', 20);
 
 define('FOREIGN_NOTICE_SEND', 1);
 define('FOREIGN_NOTICE_RECV', 2);

From 59515d5976504bd5b08598ef0b3e3160c52bece6 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 14:52:42 -0700
Subject: [PATCH 2/4] Extended profile - don't show rel for empty phone number

---
 plugins/ExtendedProfile/extendedprofilewidget.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index b507713f06..53cb5d3b87 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -160,9 +160,11 @@ class ExtendedProfileWidget extends Form
     protected function showPhone($name, $field)
     {
         $this->out->elementStart('div', array('class' => 'phone-display'));
-        $this->out->text($field['value']);
-        if (!empty($field['rel'])) {
-            $this->out->text(' (' . $field['rel'] . ')');
+        if (!empty($field['value'])) {
+            $this->out->text($field['value']);
+            if (!empty($field['rel'])) {
+               $this->out->text(' (' . $field['rel'] . ')');
+            }
         }
         $this->out->elementEnd('div');
     }

From 0bf40bd74807cdb1a62a6d7f073fe4bf83edf6fb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 14:54:14 -0700
Subject: [PATCH 3/4] Output avatar/author along with ProfileNoticeListItem
 items on ShowProfileAction -- they get hidden in CSS anyway, and we need the
 author data for the inline reply form if you end up replying to
 yourself/someone else from a profile stream view.

Note that the other modification -- of the repeat line -- is still going to be inconsistent between things originally on the page and anything that comes over Realtime.
---
 actions/showstream.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index 08f8a3e80e..10085d94d7 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -279,6 +279,18 @@ class ShowstreamAction extends ProfileAction
 
 // We don't show the author for a profile, since we already know who it is!
 
+/**
+ * Slightly modified from standard list; the author & avatar are hidden
+ * in CSS. We used to remove them here too, but as it turns out that
+ * confuses the inline reply code... and we hide them in CSS anyway
+ * since realtime updates come through in original form.
+ *
+ * Remaining customization right now is for the repeat marker, where
+ * it'll list who the original poster was instead of who did the repeat
+ * (since the repeater is you, and the repeatee isn't shown!)
+ * This will remain inconsistent if realtime updates come through,
+ * since those'll get rendered as a regular NoticeListItem.
+ */
 class ProfileNoticeList extends NoticeList
 {
     function newListItem($notice)
@@ -289,11 +301,6 @@ class ProfileNoticeList extends NoticeList
 
 class ProfileNoticeListItem extends DoFollowListItem
 {
-    function showAuthor()
-    {
-        return;
-    }
-
     /**
      * show a link to the author of repeat
      *

From 42a4b1d90cdb45384c1787df2bb690f166e30216 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Wed, 16 Mar 2011 18:20:40 -0400
Subject: [PATCH 4/4] Bit of quick styling for Events.

---
 theme/neo/css/display.css | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 92da5977ef..b13a74d667 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -1144,5 +1144,38 @@ table.profile_list tr.alt {
     font-size: 0em;
 }
 
+/* Event specific styles */
+
+#form_event_rsvp #new_rsvp_data {
+    display: inline;
+    margin: 10px 0px;
+}
+
+#form_event_rsvp input.submit {
+    height: 1.6em;
+    padding: 0px 10px;
+    margin-left: 10px;
+    color:#fff;
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 1.1em;
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);
+    border: 1px solid #d7621c;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    background: #FB6104;
+    background: -moz-linear-gradient(top, #ff9d63 , #FB6104);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#FB6104)); 
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 );
+}
+
+#form_event_rsvp .notice input.submit:hover {
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
+    background: #ff9d63;
+    background: -moz-linear-gradient(top, #FB6104 , #fc8035);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FB6104), color-stop(100%,#fc8035));
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
+}
 
 }/*end of @media screen, projection, tv*/