Skip to content

Y
Yii Bootstrap 3
Commit 62aa36fb by Crisu83
Options

Fixed a few bugs in the demo.

parent f038261e
Showing with 26 additions and 19 deletions
demo/protected/config/main.php
...@@ -58,7 +58,6 @@ return array( ...@@ -58,7 +58,6 @@ return array(
'urlFormat'=>'path', 'urlFormat'=>'path',
'urlSuffix'=>'.html', 'urlSuffix'=>'.html',
'rules'=>array( 'rules'=>array(
'demo'=>'site/index',
'setup'=>'site/setup', 'setup'=>'site/setup',
), ),
), ),
......
demo/protected/extensions/seo/widgets/SeoHead.php
...@@ -55,7 +55,7 @@ class SeoHead extends CWidget ...@@ -55,7 +55,7 @@ class SeoHead extends CWidget
if ($behavior !== null && $behavior->metaTitle !== null) if ($behavior !== null && $behavior->metaTitle !== null)
$this->_title = $behavior->metaTitle; $this->_title = $behavior->metaTitle;
else if ($this->defaultDescription !== null) else if ($this->defaultTitle !== null)
$this->_title = $this->defaultTitle; $this->_title = $this->defaultTitle;
if ($behavior !== null && $behavior->metaDescription !== null) if ($behavior !== null && $behavior->metaDescription !== null)
...@@ -95,7 +95,7 @@ class SeoHead extends CWidget ...@@ -95,7 +95,7 @@ class SeoHead extends CWidget
foreach ($this->httpEquivs as $name => $content) foreach ($this->httpEquivs as $name => $content)
echo '<meta http-equiv="'.$name.'" content="'.$content.'" />'.PHP_EOL; echo '<meta http-equiv="'.$name.'" content="'.$content.'" />'.PHP_EOL;
if ($this->_description !== null) if ($this->_title !== null)
echo CHtml::metaTag($this->_title, 'title').PHP_EOL; echo CHtml::metaTag($this->_title, 'title').PHP_EOL;
if ($this->_description !== null) if ($this->_description !== null)
......
demo/protected/views/layouts/main.php
<!doctype html> <!doctype html>
<html> <html xmlns:fb="http://www.facebook.com/2008/fbml" xml:lang="en" lang="en">
<head> <head prefix="og: http://ogp.me/ns# <?php echo Yii::app()->fb->appNamespace; ?>: http://ogp.me/ns/apps/<?php echo Yii::app()->fb->appNamespace; ?>#">
<?php Yii::app()->controller->widget('ext.seo.widgets.SeoHead', array( <?php Yii::app()->controller->widget('ext.seo.widgets.SeoHead', array(
'defaultDescription'=>Yii::app()->params['appDescription'], 'defaultDescription'=>Yii::app()->params['appDescription'],
'httpEquivs'=>array('Content-Type'=>'text/html; charset=utf-8', 'Content-Language'=>'en-US'), 'httpEquivs'=>array('Content-Type'=>'text/html; charset=utf-8', 'Content-Language'=>'en-US'),
'title'=>array('class'=>'ext.seo.widgets.SeoTitle', 'separator'=>' :: '), 'title'=>array('class'=>'ext.seo.widgets.SeoTitle', 'separator'=>' :: '),
)); ?> )); ?>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="stylesheet/less" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/less/styles.less" />
<meta name="language" content="en" /> <script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/less-1.2.1.min.js"></script>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script type="text/javascript" src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script type="text/javascript" src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
<link rel="stylesheet/less" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/less/styles.less" />
<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/less-1.2.1.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
...@@ -91,16 +89,6 @@ ...@@ -91,16 +89,6 @@
<?php echo $content; ?> <?php echo $content; ?>
<section id="comments">
<h2>Comments</h2>
<div class="fb-comments" data-href="<?php echo Yii::app()->request->requestUri; ?>" data-num-posts="10" data-width="470"></div>
<a class="top" href="#top">Back to top &uarr;</a>
</section>
<hr /> <hr />
<footer> <footer>
......
demo/protected/views/site/index.php
...@@ -792,6 +792,16 @@ Yii::app()->user->setFlash('error', '<strong>Oh snap!</strong> Change a few thin ...@@ -792,6 +792,16 @@ Yii::app()->user->setFlash('error', '<strong>Oh snap!</strong> Change a few thin
</section> </section>
<section id="comments">
<h2>Comments</h2>
<div class="fb-comments" data-href="<?php echo Yii::app()->request->requestUri; ?>" data-num-posts="10" data-width="470"></div>
<a class="top" href="#top">Back to top &uarr;</a>
</section>
<div class="subnav subnav-fixed"> <div class="subnav subnav-fixed">
<?php $this->widget('BootMenu', array( <?php $this->widget('BootMenu', array(
......
demo/protected/views/site/setup.php
...@@ -166,6 +166,16 @@ Yii::app()->bootstrap->registerTypeahead('.typeahead', array( ...@@ -166,6 +166,16 @@ Yii::app()->bootstrap->registerTypeahead('.typeahead', array(
</section> </section>
<section id="comments">
<h2>Comments</h2>
<div class="fb-comments" data-href="<?php echo Yii::app()->request->requestUri; ?>" data-num-posts="10" data-width="470"></div>
<a class="top" href="#top">Back to top &uarr;</a>
</section>
<div class="subnav subnav-fixed"> <div class="subnav subnav-fixed">
<?php $this->widget('BootMenu', array( <?php $this->widget('BootMenu', array(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment