Bugfix html5

NetCommons3 · May 19, 2015 · 81a0955 · 81a0955
1 parent a5cb61f
commit 81a0955
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/View/BbsArticles/view.ctp b/View/BbsArticles/view.ctp
@@ -26,13 +26,11 @@
 						<?php echo $this->element('BbsArticles/view_bbs_article', array(
 							'bbsArticle' => $rootBbsArticle,
 							'parentBbsArticle' => null,
-							'headTag' => 'h1'
 						)); ?>
 					<?php else : ?>
 						<?php echo $this->element('BbsArticles/view_bbs_article', array(
 							'bbsArticle' => $currentBbsArticle,
 							'parentBbsArticle' => null,
-							'headTag' => 'h1'
 						)); ?>
 					<?php endif; ?>
 				</div>
@@ -45,7 +43,6 @@
 							<?php echo $this->element('BbsArticles/view_bbs_article', array(
 								'bbsArticle' => $currentBbsArticle,
 								'parentBbsArticle' => $parentBbsArticle,
-								'headTag' => 'h2'
 							)); ?>
 						</div>
 					</div>
@@ -62,14 +59,12 @@
 												<?php echo $this->element('BbsArticles/view_bbs_article', array(
 														'bbsArticle' => $childBbsArticle,
 														'parentBbsArticle' => $bbsArticleChildren[$childBbsArticle['bbsArticleTree']['parentId']],
-														'headTag' => 'h3'
 													)); ?>
 
 											<?php else : ?>
 												<?php echo $this->element('BbsArticles/view_bbs_article', array(
 														'bbsArticle' => $childBbsArticle,
 														'parentBbsArticle' => $currentBbsArticle,
-														'headTag' => 'h2'
 													)); ?>
 
 											<?php endif; ?>

diff --git a/View/Elements/BbsArticles/view_bbs_article.ctp b/View/Elements/BbsArticles/view_bbs_article.ctp
@@ -8,6 +8,15 @@
  * @license http://www.netcommons.org/license.txt NetCommons License
  * @copyright Copyright 2014, NetCommons Project
  */
+
+if ($currentBbsArticle['bbsArticle']['key'] === $bbsArticle['bbsArticle']['key']) {
+	$headTag = 'h1';
+} elseif ((int)$bbsArticle['bbsArticleTree']['rootId'] === 0) {
+	$headTag = 'h2';
+} else {
+	$headTag = 'h3';
+}
+
 ?>
 
 <div class="panel-heading">
@@ -52,9 +61,7 @@
 						</small>
 
 						<div class="pull-right">
-							<small>
-								<?php echo $this->Date->dateFormat($bbsArticle['bbsArticle']['created']); ?>
-							</small>
+							<?php echo $this->Date->dateFormat($bbsArticle['bbsArticle']['created']); ?>
 						</div>
 
 					<?php if ($headTag === 'h1') : ?>