Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

diff --git a/actions/showstream.php b/actions/showstream.php
index 08f8a3e80e434527fc6dad3653b59773c59d1c25..10085d94d7d6cb5a05932a8d68110096fa0fb35c 100644 (file)
--- 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
      *

diff --git a/lib/framework.php b/lib/framework.php
index 350a1c268d047b7af61d0e499b1de6ca31313624..da96c8e1d4069fa5ff1ba64f452eabb0dd881ba1 100644 (file)
--- 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);

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index b507713f06c2fcfd65a730dac4f42d73c5a69824..53cb5d3b8752cc11535745f392689c4c5b3d273e 100644 (file)
--- 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');
     }

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 92da5977efec378ebe1665717e4be0adefd53b29..b13a74d667c102cd167eb12b6aee32829a043038 100644 (file)
--- 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*/