From 7379da83c6310f9cc1cdcee92945c6e9f2177571 Mon Sep 17 00:00:00 2001
From: Paul Baranowski <paul.baranowski@sourcefabric.org>
Date: Fri, 2 Sep 2011 17:29:08 -0400
Subject: [PATCH] CC-2049: Log in/out versus sign in/out of admin interface
 Fixed by removing "Sign in" terminology.

Moved "About" link to underneath the "Help" menu.
Simplified the upper right hand corner of the Admin interface.
---
 airtime_mvc/application/configs/navigation.php        |  7 +++++++
 .../application/controllers/DashboardController.php   |  5 +++++
 .../views/scripts/partialviews/header.phtml           | 11 +----------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index fcdc7578a..085f1a0ff 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -96,6 +96,13 @@ $pages = array(
                 'label'      => 'User Manual',
                 'uri'        => "http://en.flossmanuals.net/airtime/",
                 'target'     => "_blank"
+            ),
+            array(
+                'label'      => 'About',
+                'module'     => 'default',
+                'controller' => 'dashboard',
+                'action'     => 'about',
+                'resource'   =>	'dashboard'
             )
         )
 	)
diff --git a/airtime_mvc/application/controllers/DashboardController.php b/airtime_mvc/application/controllers/DashboardController.php
index 0b776ad88..f51597ad9 100644
--- a/airtime_mvc/application/controllers/DashboardController.php
+++ b/airtime_mvc/application/controllers/DashboardController.php
@@ -26,5 +26,10 @@ class DashboardController extends Zend_Controller_Action
         // action body
     }
 
+    public function aboutAction()
+    {
+        // action body
+    }
+
 }
 
diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml
index 2ef5b307f..cfb2906e1 100644
--- a/airtime_mvc/application/views/scripts/partialviews/header.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml
@@ -40,17 +40,8 @@
   <?php }?>
   <div class="personal-block">
     <ul>
-      <li><a id="about-link" href="#">About</a></li> 
-      <li>&nbsp;</li> 
-      <li>Signed in:</li>
-      <li class="name"><?php echo $this->user ?></li>
-      <li><a href="/Login/logout">Logout</a></li>
+      <li><span class="name"><?php echo $this->user ?></span> | <a href="/Login/logout">Logout</a></li>
     </ul>
   </div>
 </div>
 <div id="jquery_jplayer_1" class="jp-jplayer" style="width:0px; height:0px;"></div>
-
-<div id="about-txt" style="display: none;">
-<a href="http://airtime.sourcefabric.org">Airtime</a> <?php echo AIRTIME_VERSION ?>, the open radio software for scheduling and remote station management.<br>
-© 2011 <a href="http://www.sourcefabric.org">Sourcefabric</a> o.p.s 2011. Airtime is distributed under the <a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">GNU GPL v.3</a>
-</div>