Moved all article templates in themes to article folder

Geeklog-Core · Feb 15, 2022 · 8d2a00d · 8d2a00d
1 parent b7410cc
commit 8d2a00d
Show file tree

Hide file tree

Showing 22 changed files with 9 additions and 3 deletions.
diff --git a/public_html/docs/english/theme.html b/public_html/docs/english/theme.html
@@ -153,6 +153,9 @@ <h2><a name="changes222">Theme changes in Geeklog 2.2.2</a></h2>
 <li>For the <span class="tt">users\profile.thtml</span> file, all {end_block} template variables updated with unique names.</li>
 <li>Edit link for topics added to <span class="tt">topic.thtml</li>
 <li>New block template added called "_admin_list" which allows a theme to specify what block header and footer to use to wrap Admin Lists. Admin lists originally used "_admin_block" which is also used by the main admin page block.</li>
+<li>Template files <span class="tt">archivearticlebodytext.thtml</span>, <span class="tt">archivearticletext.thtml</span>, <span class="tt">articlebodytext.thtml</span>, <span class="tt">articletext.thtml</span>, <span class="tt">featuredarticlebodytext.thtml</span>, and <span class="tt">featuredarticletext.thtml</span> moved from root folder to the folder "article".</li>
+<li>Template file <span class="tt">printable.thtml</span> added to the root folder to the folder.</li>
+<li>Template file <span class="tt">printable.thtml</span> removed from the "article" folder.</li>
 </ul>
 
 <h2><a name="changes221">Theme changes in Geeklog 2.2.1</a></h2>

diff --git a/public_html/docs/japanese/theme.html b/public_html/docs/japanese/theme.html
@@ -117,6 +117,9 @@ <h2><a name="changes222">Theme changes in Geeklog 2.2.2</a></h2>
 <li>For the <span class="tt">users\profile.thtml</span> file, all {end_block} template variables updated with unique names.</li>
 <li>Edit link for topics added to <span class="tt">topic.thtml</li>
 <li>New block template added called "_admin_list" which allows a theme to specify what block header and footer to use to wrap Admin Lists. Admin lists originally used "_admin_block" which is also used by the main admin page block.</li>
+<li>Template files <span class="tt">archivearticlebodytext.thtml</span>, <span class="tt">archivearticletext.thtml</span>, <span class="tt">articlebodytext.thtml</span>, <span class="tt">articletext.thtml</span>, <span class="tt">featuredarticlebodytext.thtml</span>, and <span class="tt">featuredarticletext.thtml</span> moved from root folder to the folder "article".</li>
+<li>Template file <span class="tt">printable.thtml</span> added to the root folder to the folder.</li>
+<li>Template file <span class="tt">printable.thtml</span> removed from the "article" folder.</li>
 </ul>
 
 <h2><a name="changes221">Geeklog 2.2.1におけるテーマの変更点</a></h2>

diff --git a/...layout/denim/archivearticlebodytext.thtml → ...enim/article/archivearticlebodytext.thtml b/...layout/denim/archivearticlebodytext.thtml → ...enim/article/archivearticlebodytext.thtml
diff --git a/...tml/layout/denim/archivearticletext.thtml → ...ut/denim/article/archivearticletext.thtml b/...tml/layout/denim/archivearticletext.thtml → ...ut/denim/article/archivearticletext.thtml
diff --git a/...c_html/layout/denim/articlebodytext.thtml → ...ayout/denim/article/articlebodytext.thtml b/...c_html/layout/denim/articlebodytext.thtml → ...ayout/denim/article/articlebodytext.thtml
diff --git a/public_html/layout/denim/articletext.thtml → ...ml/layout/denim/article/articletext.thtml b/public_html/layout/denim/articletext.thtml → ...ml/layout/denim/article/articletext.thtml
diff --git a/...ayout/denim/featuredarticlebodytext.thtml → ...nim/article/featuredarticlebodytext.thtml b/...ayout/denim/featuredarticlebodytext.thtml → ...nim/article/featuredarticlebodytext.thtml
diff --git a/...ml/layout/denim/featuredarticletext.thtml → ...t/denim/article/featuredarticletext.thtml b/...ml/layout/denim/featuredarticletext.thtml → ...t/denim/article/featuredarticletext.thtml
diff --git a/.../denim_three/archivearticlebodytext.thtml → ...hree/article/archivearticlebodytext.thtml b/.../denim_three/archivearticlebodytext.thtml → ...hree/article/archivearticlebodytext.thtml
diff --git a/...yout/denim_three/archivearticletext.thtml → ...im_three/article/archivearticletext.thtml b/...yout/denim_three/archivearticletext.thtml → ...im_three/article/archivearticletext.thtml
diff --git a/.../layout/denim_three/articlebodytext.thtml → ...denim_three/article/articlebodytext.thtml b/.../layout/denim_three/articlebodytext.thtml → ...denim_three/article/articlebodytext.thtml
diff --git a/...html/layout/denim_three/articletext.thtml → ...out/denim_three/article/articletext.thtml b/...html/layout/denim_three/articletext.thtml → ...out/denim_three/article/articletext.thtml
diff --git a/...denim_three/featuredarticlebodytext.thtml → ...ree/article/featuredarticlebodytext.thtml b/...denim_three/featuredarticlebodytext.thtml → ...ree/article/featuredarticlebodytext.thtml
diff --git a/...out/denim_three/featuredarticletext.thtml → ...m_three/article/featuredarticletext.thtml b/...out/denim_three/featuredarticletext.thtml → ...m_three/article/featuredarticletext.thtml
diff --git a/...modern_curve/archivearticlebodytext.thtml → ...urve/article/archivearticlebodytext.thtml b/...modern_curve/archivearticlebodytext.thtml → ...urve/article/archivearticlebodytext.thtml
diff --git a/...out/modern_curve/archivearticletext.thtml → ...rn_curve/article/archivearticletext.thtml b/...out/modern_curve/archivearticletext.thtml → ...rn_curve/article/archivearticletext.thtml
diff --git a/...layout/modern_curve/articlebodytext.thtml → ...odern_curve/article/articlebodytext.thtml b/...layout/modern_curve/articlebodytext.thtml → ...odern_curve/article/articlebodytext.thtml
diff --git a/...tml/layout/modern_curve/articletext.thtml → ...ut/modern_curve/article/articletext.thtml b/...tml/layout/modern_curve/articletext.thtml → ...ut/modern_curve/article/articletext.thtml
diff --git a/...odern_curve/featuredarticlebodytext.thtml → ...rve/article/featuredarticlebodytext.thtml b/...odern_curve/featuredarticlebodytext.thtml → ...rve/article/featuredarticlebodytext.thtml
diff --git a/...ut/modern_curve/featuredarticletext.thtml → ...n_curve/article/featuredarticletext.thtml b/...ut/modern_curve/featuredarticletext.thtml → ...n_curve/article/featuredarticletext.thtml
diff --git a/system/classes/article.class.php b/system/classes/article.class.php
@@ -1281,7 +1281,7 @@ public function renderImageTags($text)
             $storyTpl = 'articletext.thtml';
         }
 
-        $article = COM_newTemplate(CTL_core_templatePath($_CONF['path_layout']));
+        $article = COM_newTemplate(CTL_core_templatePath($_CONF['path_layout'] . 'article/'));
         $article->set_file(array(
             'article'          => $article_filevar
         ));

diff --git a/system/lib-article.php b/system/lib-article.php
@@ -86,8 +86,8 @@ function STORY_renderArticle($story, $index = '', $storyTpl = 'articletext.thtml
     }
 
     // Change article template file with the topic (feature request #275)
-    $templateDir = $_CONF['path_layout'];
-    $topicDir = $templateDir . 'topics/' . $story->DisplayElements('tid') . '/';
+    $templateDir = $_CONF['path_layout'] . 'article/';
+    $topicDir = $_CONF['path_layout'] . 'topics/' . $story->DisplayElements('tid') . '/';
 
     if (is_dir($topicDir) && file_exists($topicDir . $storyTpl)) {
         $templateDir = $topicDir;