From cc50031658f1665d60efdf8e3e5963e01584baf9 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Wed, 8 Apr 2009 00:15:05 +0000
Subject: added filler/guide text to user favorites.

---
 actions/showfavorites.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'actions/showfavorites.php')

diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index d1c9283f0..035b899d2 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -162,6 +162,25 @@ class ShowfavoritesAction extends Action
         $nav->show();
     }
 
+    function showEmptyListMessage()
+    {
+        if (common_logged_in()) {
+            $current_user = common_current_user();
+            if ($this->user->id === $current_user->id) {
+                $message = _('You haven\'t chosen any favorite notices yet. Click the fave button on notices you like to bookmark them for later or shed a spotlight on them.');
+            } else {
+                $message = sprintf(_('%s hasn\'t any notices to his favorites yet. Post something interesting they would add to their favorites :)'), $this->user->nickname);
+            }
+        }
+        else {
+            $message = sprintf(_('%s hasn\'t any notices to his favorites yet. Why not [register an account](%%%%action.register%%%%) and then post something interesting they would add to thier favorites :)'), $this->user->nickname);
+        }
+
+        $this->elementStart('div', 'guide');
+        $this->raw(common_markup_to_html($message));
+        $this->elementEnd('div');
+    }
+
     /**
      * Show the content
      *
@@ -183,9 +202,17 @@ class ShowfavoritesAction extends Action
         $nl = new NoticeList($notice, $this);
 
         $cnt = $nl->show();
+        if (0 == $cnt) {
+            $this->showemptyListMessage();
+        }
 
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
                           $this->page, 'showfavorites',
                           array('nickname' => $this->user->nickname));
     }
+
+    function showPageNotice() {
+        $this->element('p', 'instructions', _('This is a way to share what you like.'));
+    }
 }
+
-- 
cgit v1.2.3-54-g00ecf


From b20815e8e2d6d170fecc7143656b22bc68de3780 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Wed, 8 Apr 2009 00:16:53 +0000
Subject: added missing word to user favorites guide.

---
 actions/showfavorites.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actions/showfavorites.php')

diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 035b899d2..c4c91058f 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -169,11 +169,11 @@ class ShowfavoritesAction extends Action
             if ($this->user->id === $current_user->id) {
                 $message = _('You haven\'t chosen any favorite notices yet. Click the fave button on notices you like to bookmark them for later or shed a spotlight on them.');
             } else {
-                $message = sprintf(_('%s hasn\'t any notices to his favorites yet. Post something interesting they would add to their favorites :)'), $this->user->nickname);
+                $message = sprintf(_('%s hasn\'t added any notices to his favorites yet. Post something interesting they would add to their favorites :)'), $this->user->nickname);
             }
         }
         else {
-            $message = sprintf(_('%s hasn\'t any notices to his favorites yet. Why not [register an account](%%%%action.register%%%%) and then post something interesting they would add to thier favorites :)'), $this->user->nickname);
+            $message = sprintf(_('%s hasn\'t added any notices to his favorites yet. Why not [register an account](%%%%action.register%%%%) and then post something interesting they would add to thier favorites :)'), $this->user->nickname);
         }
 
         $this->elementStart('div', 'guide');
-- 
cgit v1.2.3-54-g00ecf


From afebef50e46dc6285e3b3fcdf7907d26598a4e95 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Wed, 8 Apr 2009 01:20:50 +0000
Subject: showemptListMessage -> showEmptyListMessage method name cleanup.

---
 actions/showfavorites.php | 2 +-
 actions/showstream.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actions/showfavorites.php')

diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index c4c91058f..4d4349505 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -203,7 +203,7 @@ class ShowfavoritesAction extends Action
 
         $cnt = $nl->show();
         if (0 == $cnt) {
-            $this->showemptyListMessage();
+            $this->showEmptyListMessage();
         }
 
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
diff --git a/actions/showstream.php b/actions/showstream.php
index 4181a2bab..ce237dae2 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -357,7 +357,7 @@ class ShowstreamAction extends ProfileAction
         $pnl = new ProfileNoticeList($notice, $this);
         $cnt = $pnl->show();
         if (0 == $cnt) {
-            $this->showemptyListMessage();
+            $this->showEmptyListMessage();
         }
 
         $this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,
-- 
cgit v1.2.3-54-g00ecf