From 640ae109354336a684c9b01e5d842b8aff4e0ea1 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Tue, 7 Apr 2009 16:11:03 +0000
Subject: [PATCH 1/9] added filler text to personal timeline.

---
 actions/all.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/actions/all.php b/actions/all.php
index 8e67ec0f3b..5189f31f51 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -93,6 +93,32 @@ class AllAction extends Action
         $nav->show();
     }
 
+    function showPageNotice()
+    {
+        $notice = $this->user->noticesWithFriends(0, 1);
+        if ($notice->count()) {
+            return;
+        }
+
+        $message = sprintf(_('This is the timeline for %s and friends but noone has posted anything yet.'), $this->user->nickname) . ' ';
+
+        if (common_logged_in()) {
+            $current_user = common_current_user();
+            if ($this->user->id === $current_user->id) {
+                $message .= _('Try subscribing to more people, [join a group](%%action.groups) or post something yourself.');
+            } else {
+                $message .= sprintf(_('You can try to [nudge %s](./) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, '@' . $this->user->nickname);
+            }
+        }
+        else {
+            $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname);
+        }
+
+        $this->elementStart('div', 'blankfiller');
+        $this->raw(common_markup_to_html($message));
+        $this->elementEnd('div');
+    }
+
     function showContent()
     {
         $notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);

From 7f5e2c5e57561a90478af1ce62b7a65641125568 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 7 Apr 2009 18:08:56 +0000
Subject: [PATCH 2/9] Added Invite link to global navigation

---
 lib/action.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/action.php b/lib/action.php
index 5d0d5b7584..4ea9ba4655 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -416,6 +416,11 @@ class Action extends HTMLOutputter // lawsuit
                     $this->menuItem(common_local_url('smssettings'),
                                     _('Connect'), _('Connect to SMS, Twitter'), false, 'nav_connect');
                 }
+                $this->menuItem(common_local_url('invite'),
+                                 _('Invite'),
+                                 sprintf(_('Invite friends and colleagues to join you on %s'),
+                                 common_config('site', 'name')),
+                                 false, 'nav_invitecontact');
                 $this->menuItem(common_local_url('logout'),
                                 _('Logout'), _('Logout from the site'), false, 'nav_logout');
             } else {

From ef2d22a84b0b2cd35801bfbf3c9130826fec61bd Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 7 Apr 2009 18:09:54 +0000
Subject: [PATCH 3/9] Rearranged the global navigation items for better
 usability. Reason a) placement of Search at the edge of the viewport for
 quicker access and b) placement of the links that are always available
 (whether user is logged in or not) in the same location (i.e., Login/Logout,
 Help, Search)

---
 lib/action.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 4ea9ba4655..b93d8d21c7 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -402,13 +402,8 @@ class Action extends HTMLOutputter // lawsuit
             if ($user) {
                 $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
                                 _('Home'), _('Personal profile and friends timeline'), false, 'nav_home');
-            }
-            $this->menuItem(common_local_url('peoplesearch'),
-                            _('Search'), _('Search for people or text'), false, 'nav_search');
-            if ($user) {
                 $this->menuItem(common_local_url('profilesettings'),
                                 _('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
-
                 if (common_config('xmpp', 'enabled')) {
                     $this->menuItem(common_local_url('imsettings'),
                                     _('Connect'), _('Connect to IM, SMS, Twitter'), false, 'nav_connect');
@@ -423,18 +418,21 @@ class Action extends HTMLOutputter // lawsuit
                                  false, 'nav_invitecontact');
                 $this->menuItem(common_local_url('logout'),
                                 _('Logout'), _('Logout from the site'), false, 'nav_logout');
-            } else {
-                $this->menuItem(common_local_url('login'),
-                                _('Login'), _('Login to the site'), false, 'nav_login');
+            }
+            else {
                 if (!common_config('site', 'closed')) {
                     $this->menuItem(common_local_url('register'),
                                     _('Register'), _('Create an account'), false, 'nav_register');
                 }
                 $this->menuItem(common_local_url('openidlogin'),
                                 _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
+                $this->menuItem(common_local_url('login'),
+                                _('Login'), _('Login to the site'), false, 'nav_login');
             }
             $this->menuItem(common_local_url('doc', array('title' => 'help')),
                             _('Help'), _('Help me!'), false, 'nav_help');
+            $this->menuItem(common_local_url('peoplesearch'),
+                            _('Search'), _('Search for people or text'), false, 'nav_search');
             Event::handle('EndPrimaryNav', array($this));
         }
         $this->elementEnd('ul');

From 27a279e7c1185028783f8ed7afe02779e89fa34a Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 7 Apr 2009 18:16:16 +0000
Subject: [PATCH 4/9] Down playing the Register link's styles so it doesn't
 battle for attention when anon_notice is present.

---
 theme/default/css/display.css  | 9 ---------
 theme/identica/css/display.css | 8 --------
 2 files changed, 17 deletions(-)

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index bf46fc6bfd..e240f255fe 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -37,7 +37,6 @@ background:none;
 
 input.submit,
 #form_notice.warning #notice_text-count,
-#nav_register a,
 .form_settings .form_note,
 .entity_remote_subscribe {
 background-color:#A9BF4F;
@@ -48,7 +47,6 @@ input:focus, textarea:focus, select:focus,
 border-color:#A9BF4F;
 }
 input.submit,
-#nav_register a,
 .entity_remote_subscribe {
 color:#fff;
 }
@@ -97,13 +95,6 @@ cursor:wait;
 text-indent:-9999px;
 }
 
-
-#nav_register a {
-text-decoration:none;
-font-weight:bold;
-padding:2px 4px;
-}
-
 #content,
 #site_nav_local_views a,
 #aside_primary {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 9e7c10ac5a..893942031c 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -37,7 +37,6 @@ background:none;
 
 input.submit,
 #form_notice.warning #notice_text-count,
-#nav_register a,
 .form_settings .form_note,
 .entity_remote_subscribe {
 background-color:#9BB43E;
@@ -48,7 +47,6 @@ input:focus, textarea:focus, select:focus,
 border-color:#9BB43E;
 }
 input.submit,
-#nav_register a,
 .entity_remote_subscribe {
 color:#fff;
 }
@@ -97,12 +95,6 @@ cursor:wait;
 text-indent:-9999px;
 }
 
-#nav_register a {
-text-decoration:none;
-font-weight:bold;
-padding:2px 4px;
-}
-
 #content,
 #site_nav_local_views a,
 #aside_primary {

From c42995e3a2d4bd93881ffd5d3bfea4f6ce427d0a Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 7 Apr 2009 20:02:42 +0000
Subject: [PATCH 5/9] Minimum height for content and aside area.

---
 theme/base/css/display.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 4c9b522549..0ce80cdde4 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -384,6 +384,7 @@ margin-bottom:1em;
 
 #content {
 width:64.009%;
+min-height:259px;
 padding:1.795%;
 float:left;
 border-radius:7px;
@@ -403,6 +404,7 @@ float:left;
 
 #aside_primary {
 width:27.917%;
+min-height:259px;
 float:left;
 margin-left:0.395%;
 padding:1.795%;

From 658462ce855e5ce4325c1b7233dc83b10b14cced Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 7 Apr 2009 21:02:47 +0000
Subject: [PATCH 6/9] Markup and styles for search help and errors

---
 lib/searchaction.php           |  5 ++++-
 theme/base/css/display.css     | 16 +++++++++++++---
 theme/identica/css/display.css |  4 ++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/lib/searchaction.php b/lib/searchaction.php
index 918f8dd9af..e7ad4affda 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -152,8 +152,11 @@ You can also try your search on other engines:
 
 E_O_T
 ), $qe, $qe, $qe, $qe);
-        $this->elementStart('div', 'blankfiller');
+        $this->elementStart('dl', array('id' => 'help_search', 'class' => 'help'));
+        $this->element('dt', null, _('Search help'));
+        $this->elementStart('dd', 'instructions');
         $this->raw(common_markup_to_html($message));
+        $this->elementEnd('dd');
         $this->elementEnd('div');
     }
 }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 0ce80cdde4..6c3c7e9127 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -83,12 +83,13 @@ left:0;
 border:0;
 }
 
-#page_notice .error,
-#page_notice .success {
+.error,
+.success {
 padding:4px 7px;
 border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
+margin-bottom:18px;
 }
 form label.submit {
 display:none;
@@ -1145,4 +1146,13 @@ clear:both;
 margin-bottom:0;
 }
 
-
+.instructions ul {
+list-style-position:inside;
+}
+.instructions p,
+.instructions ul {
+margin-bottom:18px;
+}
+.help dt {
+display:none;
+}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 893942031c..8edb005a68 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -113,10 +113,10 @@ background-color:rgba(255, 255, 255, 0.7);
 }
 
 
-#page_notice .error {
+.error {
 background-color:#F7E8E8;
 }
-#page_notice .success {
+.success {
 background-color:#EFF3DC;
 }
 

From 5dfc09d9d265d1e2e918f9dd615f89909c6c4e74 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 7 Apr 2009 21:04:24 +0000
Subject: [PATCH 7/9] Minor adjustment for error/success styles in default
 stylesheet

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

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index e240f255fe..42e29374f1 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -113,10 +113,10 @@ background-color:rgba(255, 255, 255, 0.7);
 }
 
 
-#page_notice .error {
+.error {
 background-color:#F7E8E8;
 }
-#page_notice .success {
+.success {
 background-color:#EFF3DC;
 }
 

From a6e950b7a1ca7654613dd7f5cefcdae6a3a0f579 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 7 Apr 2009 21:09:27 +0000
Subject: [PATCH 8/9] Renamed 'blankfiller' to 'guide'.

---
 actions/all.php            | 2 +-
 actions/favorited.php      | 2 +-
 actions/groupsearch.php    | 2 +-
 actions/noticesearch.php   | 2 +-
 actions/public.php         | 2 +-
 actions/publictagcloud.php | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/actions/all.php b/actions/all.php
index 5189f31f51..9c6182ccc7 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -114,7 +114,7 @@ class AllAction extends Action
             $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname);
         }
 
-        $this->elementStart('div', 'blankfiller');
+        $this->elementStart('div', 'guide');
         $this->raw(common_markup_to_html($message));
         $this->elementEnd('div');
     }
diff --git a/actions/favorited.php b/actions/favorited.php
index 20a354674f..6935eda23a 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -159,7 +159,7 @@ class FavoritedAction extends Action
             $message .= _('Why not [register an account](%%action.register%%) and be the first to add a notice to your favorites!');
         }
 
-        $this->elementStart('div', 'blankfiller');
+        $this->elementStart('div', 'guide');
         $this->raw(common_markup_to_html($message));
         $this->elementEnd('div');
     }
diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index 31c4ffd948..06b4a77550 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -84,7 +84,7 @@ class GroupsearchAction extends SearchAction
             else {
                 $message = _('Why not [register an account](%%action.register%%) and [create the group](%%action.newgroup%%) yourself!');
             }
-            $this->elementStart('div', 'blankfiller');
+            $this->elementStart('div', 'guide');
             $this->raw(common_markup_to_html($message));
             $this->elementEnd('div');
             $user_group->free();
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index a4308450b4..095d0a454a 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -124,7 +124,7 @@ class NoticesearchAction extends SearchAction
                 $message = sprintf(_('Why not [register an account](%%%%action.register%%%%) and be the first to  [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q));
             }
 
-            $this->elementStart('div', 'blankfiller');
+            $this->elementStart('div', 'guide');
             $this->raw(common_markup_to_html($message));
             $this->elementEnd('div');
             return;
diff --git a/actions/public.php b/actions/public.php
index 5a2720a9ad..d64b651fdb 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -188,7 +188,7 @@ class PublicAction extends Action
             $message .= _('Why not [register an account](%%action.register%%) and be the first to post!');
         }
 
-        $this->elementStart('div', 'blankfiller');
+        $this->elementStart('div', 'guide');
         $this->raw(common_markup_to_html($message));
         $this->elementEnd('div');
     }
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 5bc7e0cbff..4ff41d2a6d 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -77,7 +77,7 @@ class PublictagcloudAction extends Action
             $message .= _('Why not [register an account](%%action.register%%) and be the first to post one!');
         }
 
-        $this->elementStart('div', 'blankfiller');
+        $this->elementStart('div', 'guide');
         $this->raw(common_markup_to_html($message));
         $this->elementEnd('div');
     }

From 05b04b7970d1b0f1e35a64a5537ad61e2fb8db1c Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 7 Apr 2009 21:12:11 +0000
Subject: [PATCH 9/9] Changed text "noone" to "no one".

---
 actions/all.php            | 2 +-
 actions/favorited.php      | 2 +-
 actions/public.php         | 2 +-
 actions/publictagcloud.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/actions/all.php b/actions/all.php
index 9c6182ccc7..9a16326704 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -100,7 +100,7 @@ class AllAction extends Action
             return;
         }
 
-        $message = sprintf(_('This is the timeline for %s and friends but noone has posted anything yet.'), $this->user->nickname) . ' ';
+        $message = sprintf(_('This is the timeline for %s and friends but no one has posted anything yet.'), $this->user->nickname) . ' ';
 
         if (common_logged_in()) {
             $current_user = common_current_user();
diff --git a/actions/favorited.php b/actions/favorited.php
index 6935eda23a..27da25435b 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -150,7 +150,7 @@ class FavoritedAction extends Action
             return;
         }
 
-        $message = _('Favorite notices appear on this page but noone has favorited one yet.') . ' ';
+        $message = _('Favorite notices appear on this page but no one has favorited one yet.') . ' ';
 
         if (common_logged_in()) {
             $message .= _('Be the first to add a notice to your favorites by clicking the fave button next to any notice you like.');
diff --git a/actions/public.php b/actions/public.php
index d64b651fdb..b7b7fc6b76 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -179,7 +179,7 @@ class PublicAction extends Action
             return;
         }
 
-        $message = _('This is the public timeline for %%site.name%% but noone has posted anything yet.') . ' ';
+        $message = _('This is the public timeline for %%site.name%% but no one has posted anything yet.') . ' ';
 
         if (common_logged_in()) {
             $message .= _('Be the first to post!');
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 4ff41d2a6d..0cd8940d4d 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -68,7 +68,7 @@ class PublictagcloudAction extends Action
             return;
         }
 
-        $message = _('Noone has posted a notice with a [hashtag](%%doc.tags%%) yet.') . ' ';
+        $message = _('No one has posted a notice with a [hashtag](%%doc.tags%%) yet.') . ' ';
 
         if (common_logged_in()) {
             $message .= _('Be the first to post one!');