0
@@ -19,16 +19,21 @@
0
       photos   = menu_element("Photos",   photos_path)
0
       contacts = menu_element("Contacts",
0
                               person_connections_path(current_person))
0
-      [home, profile, contacts, messages, blog, people, forum, resources]
0
+      links = [home, profile, contacts, messages, blog, people, forum]
0
     elsif logged_in? and admin_view?
0
       home =    menu_element("Home", home_path)
0
       people =  menu_element("People", admin_people_path)
0
       forums =  menu_element(inflect("Forum", Forum.count),
0
                              admin_forums_path)
0
       preferences = menu_element("Prefs", admin_preferences_path)
0
-       [home, people, forums, preferences]
0
+      links = [home, people, forums, preferences]
0
     else
0
-      [home, people, forum, resources]
0
+      links = [home, people]
0
+    end
0
+    if global_prefs.about.blank?
0
+      links
0
+    else
0
+      links.push(menu_element("About", about_url))
0
     end
0
   end
0
   

0
@@ -17,7 +17,8 @@
0
 
0
 class Preference < ActiveRecord::Base
0
   attr_accessible :app_name, :server_name, :domain, :smtp_server, 
0
-                  :email_notifications, :email_verifications, :analytics
0
+                  :email_notifications, :email_verifications, :analytics,
0
+                  :about
0
 
0
   validates_presence_of :domain,       :if => :using_email?
0
   validates_presence_of :smtp_server,  :if => :using_email?

0
@@ -46,6 +46,16 @@
0
     <br />
0
 
0
     <div class="form_row">
0
+      <label for="about">About</label>
0
+      <br />
0
+      <p><%= formatting_note %></p>
0
+
0
+      <%= f.text_area :about, :rows => 10 %>
0
+    </div>
0
+    
0
+    <br />
0
+
0
+    <div class="form_row">
0
       <label for="analytics">Analytics (will be inserted 
0
          just before the <%= h("</body>") %> tag)</label>
0
       <%= f.text_area :analytics, :rows => 10 %>

0
@@ -31,6 +31,12 @@
0
 </p>
0
 
0
 <p>
0
+  <b>About text (nonblank text will lead to an 'about' link):</b>
0
+</p>
0
+<%= display @preferences.about %>
0
+
0
+
0
+<p>
0
   <b>Analytics (will be inserted 
0
      just before the <%= h("</body>") %> tag):</b>
0
 </p>

0
@@ -1 +1,2 @@
0
+<%= display global_prefs.about %>

0
@@ -12,7 +12,7 @@
0
       <div id="header">
0
         <h1>
0
           <a href="/" title="Return to Insoshi homepage">
0
-            <img src="/images/logo-insoshi.png" alt="Insoshi - Social Software" />
0
+            <%= image_tag "logo-insoshi.png" %>
0
           </a>
0
         </h1>
0
         <ul id="nav">

0
@@ -2,10 +2,18 @@
0
   <div class="profile vcard">
0
     <h2>Profile: <span class="fn n"><%= h @person.name %></span></h2>
0
     <%- if current_person?(@person) -%>
0
-      <div class="notice">
0
-        You are viewing your own profile.
0
-        <%= link_to "Click here to edit it", edit_person_path(@person) %>
0
-      </div>
0
+      <%- if current_person.description.blank? -%>
0
+        <div class="error">
0
+          Your description is blank.
0
+          <%= link_to "Click here to add a description",
0
+                      edit_person_path(@person) %>
0
+        </div>
0
+      <%- else -%>
0
+        <div class="notice">
0
+          You are viewing your own profile.
0
+          <%= link_to "Click here to edit it", edit_person_path(@person) %>
0
+        </div>
0
+      <%- end -%>
0
     <%- end -%>
0
     <div class="toolbox">
0
       <%= image_tag @person.main_photo, :class => "profile-image photo",

0
@@ -41,6 +41,7 @@
0
   map.login '/login', :controller => 'sessions', :action => 'new'
0
   map.logout '/logout', :controller => 'sessions', :action => 'destroy'
0
   map.home '/', :controller => 'home'
0
+  map.about '/about', :controller => 'home', :action => 'about'
0
   map.admin_home '/admin/home', :controller => 'home'
0
 
0
   # The priority is based upon order of creation: first created -> highest priority.

0
@@ -1 +1,10 @@
0
+class AddAboutToPreferences < ActiveRecord::Migration
0
+  def self.up
0
+    add_column :preferences, :about, :text
0
+  end
0
+
0
+  def self.down
0
+    remove_column :preferences, :about
0
+  end
0
+end