From dc6fcec0e30e238cfeb19e5676a8c7476bfa8133 Mon Sep 17 00:00:00 2001 From: martin Date: Sun, 30 Jan 2011 18:20:47 -0500 Subject: [PATCH] -user name shows in the top right corner. -fixed bug with development mode not being recognized by Zend. --- application/Bootstrap.php | 2 +- application/layouts/scripts/layout.phtml | 3 +-- application/layouts/scripts/library.phtml | 2 +- application/layouts/scripts/search.phtml | 2 +- application/views/helpers/LoggedInAs.php | 8 +++----- application/views/scripts/error/error.phtml | 18 ++++++++++-------- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/application/Bootstrap.php b/application/Bootstrap.php index bb5be4c15..7b0cde247 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -56,7 +56,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headScript()->appendFile('/js/libs/stuHover.js','text/javascript'); //TODO: Find better place to put this in. - $view->addHelperPath('views/helpers', 'Airtime_View_Helper'); + $view->addHelperPath('../application/views/helpers', 'Airtime_View_Helper'); } } diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml index 450353b1e..5d634bff1 100644 --- a/application/layouts/scripts/layout.phtml +++ b/application/layouts/scripts/layout.phtml @@ -8,9 +8,8 @@ headLink() ?> -loggedInAs() ?> -
partial('partialviews/header.phtml', array("user" => "martin")); ?>
+
partial('partialviews/header.phtml', array("user" => $this->loggedInAs())); ?>
-
partial('partialviews/header.phtml') ?>
+
partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?>
headLink() ?> -
partial('partialviews/header.phtml') ?>
+
partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?>
diff --git a/application/views/helpers/LoggedInAs.php b/application/views/helpers/LoggedInAs.php index 0307fe17d..3d560f9d6 100644 --- a/application/views/helpers/LoggedInAs.php +++ b/application/views/helpers/LoggedInAs.php @@ -4,15 +4,13 @@ class Airtime_View_Helper_LoggedInAs extends Zend_View_Helper_Abstract { public function loggedInAs () { - //$username = "test"; - /* + $username = ""; $auth = Zend_Auth::getInstance(); if ($auth->hasIdentity()) { - $username = $auth->getIdentity()->username; + $username = $auth->getIdentity()->login; } - */ - return "test"; + return $username; } } diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml index 1997506cb..b3f063642 100644 --- a/application/views/scripts/error/error.phtml +++ b/application/views/scripts/error/error.phtml @@ -1,4 +1,5 @@ - + @@ -7,22 +8,23 @@

An error occurred

message ?>

- - exception)): ?> - +

+ + +

Exception information:

Message: exception->getMessage() ?>

- +

Stack trace:

exception->getTraceAsString() ?>
- +

Request Parameters:

- 
request->getParams(), true) ?>
+  
request->getParams(), 1) ?>
   

   
-
+