Menu
▾
▴
[Gemstracker-svn] SF.net SVN: gemstracker:[353] trunk/library
|
From: <gem...@li...> - 2011-12-13 13:33:03
|
Revision: 353
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=353&view=rev
Author: mennodekker
Date: 2011-12-13 13:32:54 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
title is properly set (need to bootstrap project first in view)
fixed layout so meta comes first (allows for ie compativility view overrides)
Modified Paths:
--------------
trunk/library/classes/GemsEscort.php
trunk/library/layouts/scripts/gems.phtml
trunk/library/layouts/scripts/gemsnew.phtml
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2011-12-12 08:47:58 UTC (rev 352)
+++ trunk/library/classes/GemsEscort.php 2011-12-13 13:32:54 UTC (rev 353)
@@ -478,14 +478,15 @@
*/
protected function _initView()
{
+ $this->bootstrap('project');
// Initialize view
$view = new Zend_View();
$view->addHelperPath('MUtil/View/Helper', 'MUtil_View_Helper');
$view->addHelperPath('Gems/View/Helper', 'Gems_View_Helper');
- $view->doctype('XHTML1_STRICT');
- $view->headTitle($this->project->name);
+ $view->doctype(Zend_View_Helper_Doctype::XHTML1_STRICT);
+ $view->headTitle($this->project->getName());
$view->setEncoding('UTF-8');
- $view->headMeta('text/html;charset=UTF-8', 'Content-Type', 'http-equiv');
+ $view->headMeta()->appendHttpEquiv('Content-Type', 'text/html;charset=UTF-8');
// Add it to the ViewRenderer
$viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('ViewRenderer');
Modified: trunk/library/layouts/scripts/gems.phtml
===================================================================
--- trunk/library/layouts/scripts/gems.phtml 2011-12-12 08:47:58 UTC (rev 352)
+++ trunk/library/layouts/scripts/gems.phtml 2011-12-13 13:32:54 UTC (rev 353)
@@ -1,10 +1,10 @@
<?php echo $this->doctype(); ?>
<html <?php echo 'xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.$this->locale.'"' ?> lang="<?php echo $this->locale; ?>">
<head><?php
+ echo $this->headMeta();
echo $this->headTitle();
echo $this->headLink();
echo $this->headStyle();
- echo $this->headMeta();
// Check if jQuery library is needed
if ($this->jQuery) {
Modified: trunk/library/layouts/scripts/gemsnew.phtml
===================================================================
--- trunk/library/layouts/scripts/gemsnew.phtml 2011-12-12 08:47:58 UTC (rev 352)
+++ trunk/library/layouts/scripts/gemsnew.phtml 2011-12-13 13:32:54 UTC (rev 353)
@@ -1,10 +1,10 @@
<?php echo $this->doctype(); ?>
<html <?php echo 'xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.$this->locale.'"' ?> lang="<?php echo $this->locale; ?>">
<head><?php
+ echo $this->headMeta();
echo $this->headTitle();
echo $this->headLink();
echo $this->headStyle();
- echo $this->headMeta();
// Check if jQuery library is needed
if ($this->jQuery) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
