Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-user name shows in the top right corner. 

-fixed bug with development mode not being recognized by Zend.
This commit is contained in:
martin 2011-01-30 18:20:47 -05:00
parent 2310c24f26
commit dc6fcec0e3
6 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/Bootstrap.php
View File

@ -56,7 +56,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view->headScript()->appendFile('/js/libs/stuHover.js','text/javascript'); $view->headScript()->appendFile('/js/libs/stuHover.js','text/javascript');
//TODO: Find better place to put this in. //TODO: Find better place to put this in.
$view->addHelperPath('views/helpers', 'Airtime_View_Helper'); $view->addHelperPath('../application/views/helpers', 'Airtime_View_Helper');
} }
} }

3
application/layouts/scripts/layout.phtml
View File

@ -8,9 +8,8 @@
<?php echo $this->headLink() ?> <?php echo $this->headLink() ?>
</head> </head>
<body> <body>
<?php //echo $this->loggedInAs() ?>
<div id="nowplayingbar"><?php echo $this->partial('partialviews/header.phtml', array("user" => "martin")); ?></div> <div id="nowplayingbar"><?php echo $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs())); ?></div>
<div class="logo"></div> <div class="logo"></div>
<?php $partial = array('menu.phtml', 'default'); <?php $partial = array('menu.phtml', 'default');

2
application/layouts/scripts/library.phtml
View File

@ -9,7 +9,7 @@
</head> </head>
<body> <body>
<div id="nowplayingbar"><?= $this->partial('partialviews/header.phtml') ?></div> <div id="nowplayingbar"><?= $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?></div>
<div class="logo"></div> <div class="logo"></div>
<?php $partial = array('menu.phtml', 'default'); <?php $partial = array('menu.phtml', 'default');

2
application/layouts/scripts/search.phtml
View File

@ -8,7 +8,7 @@
<?php echo $this->headLink() ?> <?php echo $this->headLink() ?>
</head> </head>
<body> <body>
<div id="nowplayingbar"><?= $this->partial('partialviews/header.phtml') ?></div> <div id="nowplayingbar"><?= $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?></div>
<div id="nav"><?php echo $this->navigation()->menu()->setRenderInvisible(true) ?></div> <div id="nav"><?php echo $this->navigation()->menu()->setRenderInvisible(true) ?></div>
<div class="wrapper"> <div class="wrapper">

8
application/views/helpers/LoggedInAs.php
View File

@ -4,15 +4,13 @@ class Airtime_View_Helper_LoggedInAs extends Zend_View_Helper_Abstract
{ {
public function loggedInAs () public function loggedInAs ()
{ {
//$username = "test"; $username = "";
/*
$auth = Zend_Auth::getInstance(); $auth = Zend_Auth::getInstance();
if ($auth->hasIdentity()) { if ($auth->hasIdentity()) {
$username = $auth->getIdentity()->username; $username = $auth->getIdentity()->login;
} }
*/ return $username;
return "test";
} }
} }

18
application/views/scripts/error/error.phtml
View File

@ -1,4 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN";
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@ -7,22 +8,23 @@
<body> <body>
<h1>An error occurred</h1> <h1>An error occurred</h1>
<h2><?php echo $this->message ?></h2> <h2><?php echo $this->message ?></h2>
<h2><?php echo "test".APPLICATION_ENV ?></h2>
<?php if (isset($this->exception)): ?>
<?php if ('development' == APPLICATION_ENV): ?>
<h3>Exception information:</h3> <h3>Exception information:</h3>
<p> <p>
<b>Message:</b> <?php echo $this->exception->getMessage() ?> <b>Message:</b> <?php echo $this->exception->getMessage() ?>
</p> </p>
<h3>Stack trace:</h3> <h3>Stack trace:</h3>
<pre><?php echo $this->exception->getTraceAsString() ?> <pre><?php echo $this->exception->getTraceAsString() ?>
</pre> </pre>
<h3>Request Parameters:</h3> <h3>Request Parameters:</h3>
<pre><?php echo var_export($this->request->getParams(), true) ?> <pre><?php echo var_export($this->request->getParams(), 1) ?>
</pre> </pre>
<?php endif ?> <?php endif ?>
</body> </body>
</html> </html>