From 81a0955a0340e293307b458ac1fe60d8b9725f56 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Tue, 19 May 2015 17:58:11 +0900 Subject: [PATCH] Bugfix html5 --- View/BbsArticles/view.ctp | 5 ----- View/Elements/BbsArticles/view_bbs_article.ctp | 13 ++++++++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/View/BbsArticles/view.ctp b/View/BbsArticles/view.ctp index bda1a80..b4a964a 100644 --- a/View/BbsArticles/view.ctp +++ b/View/BbsArticles/view.ctp @@ -26,13 +26,11 @@ element('BbsArticles/view_bbs_article', array( 'bbsArticle' => $rootBbsArticle, 'parentBbsArticle' => null, - 'headTag' => 'h1' )); ?> element('BbsArticles/view_bbs_article', array( 'bbsArticle' => $currentBbsArticle, 'parentBbsArticle' => null, - 'headTag' => 'h1' )); ?> @@ -45,7 +43,6 @@ element('BbsArticles/view_bbs_article', array( 'bbsArticle' => $currentBbsArticle, 'parentBbsArticle' => $parentBbsArticle, - 'headTag' => 'h2' )); ?> @@ -62,14 +59,12 @@ element('BbsArticles/view_bbs_article', array( 'bbsArticle' => $childBbsArticle, 'parentBbsArticle' => $bbsArticleChildren[$childBbsArticle['bbsArticleTree']['parentId']], - 'headTag' => 'h3' )); ?> element('BbsArticles/view_bbs_article', array( 'bbsArticle' => $childBbsArticle, 'parentBbsArticle' => $currentBbsArticle, - 'headTag' => 'h2' )); ?> diff --git a/View/Elements/BbsArticles/view_bbs_article.ctp b/View/Elements/BbsArticles/view_bbs_article.ctp index 708fd49..bb63f3d 100644 --- 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'; +} + ?>
@@ -52,9 +61,7 @@
- - Date->dateFormat($bbsArticle['bbsArticle']['created']); ?> - + Date->dateFormat($bbsArticle['bbsArticle']['created']); ?>