Merge pull request #197 from GregMage/xoops_page

Add $xoops_page for theme
XOOPS · Aug 17, 2016 · 03f901d · 03f901d
2 parents c877681 + a203553
commit 03f901d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/htdocs/class/theme.php b/htdocs/class/theme.php
@@ -271,6 +271,19 @@ public function xoInit($options = array())
         $this->template               = new XoopsTpl();
         $this->template->currentTheme =& $this;
         $this->template->assign_by_ref('xoTheme', $this);
+		$xoops_page = str_replace(XOOPS_ROOT_PATH . '/', '', $_SERVER['SCRIPT_FILENAME']);
+		if (strpos($xoops_page, 'modules') !== false){
+            $xoops_page = str_replace('modules/', '', $xoops_page);
+        }
+		$xoops_page = str_replace('.php', '', $xoops_page);
+		if (isset($GLOBALS['xoopsConfig']['startpage'])){
+			$xoops_startpage = $GLOBALS['xoopsConfig']['startpage'];
+			if ($xoops_startpage == '--') {
+				$xoops_startpage = 'system';
+			}
+		} else {
+			$xoops_startpage = 'system';
+		}
         $this->template->assign(array(
                                     'xoops_theme'      => $GLOBALS['xoopsConfig']['theme_set'],
                                     'xoops_imageurl'   => XOOPS_THEME_URL . '/' . $GLOBALS['xoopsConfig']['theme_set'] . '/',
@@ -279,9 +292,10 @@ public function xoInit($options = array())
                                     'xoops_sitename'   => htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES),
                                     'xoops_slogan'     => htmlspecialchars($GLOBALS['xoopsConfig']['slogan'], ENT_QUOTES),
                                     'xoops_dirname'    => isset($GLOBALS['xoopsModule']) && is_object($GLOBALS['xoopsModule']) ? $GLOBALS['xoopsModule']->getVar('dirname') : 'system',
+									'xoops_page'       => $xoops_page,
+									'xoops_startpage'  => $xoops_startpage,
                                     'xoops_banner'     => ($GLOBALS['xoopsConfig']['banners'] && $this->renderBanner) ? xoops_getbanner() : '&nbsp;',
                                     'xoops_pagetitle'  => isset($GLOBALS['xoopsModule']) && is_object($GLOBALS['xoopsModule']) ? $GLOBALS['xoopsModule']->getVar('name') : htmlspecialchars($GLOBALS['xoopsConfig']['slogan'], ENT_QUOTES)));
-
         if (isset($GLOBALS['xoopsUser']) && is_object($GLOBALS['xoopsUser'])) {
             $this->template->assign(array(
                                         'xoops_isuser'     => true,

diff --git a/htdocs/themes/xbootstrap/theme.tpl b/htdocs/themes/xbootstrap/theme.tpl
@@ -50,7 +50,7 @@
 
 <div class="container maincontainer">
 
-<{if $xoops_dirname == "system"}>
+<{if $xoops_page == "index"}>
     <div class="aligncenter home-message row">
     <div class="<{if $xoops_banner != ""}>col-md-6<{else}>col-md-12<{/if}>">
         <h2><{$smarty.const.THEME_ABOUTUS}></h2>

diff --git a/htdocs/themes/xbootstrap/tpl/slider.tpl b/htdocs/themes/xbootstrap/tpl/slider.tpl
@@ -1,4 +1,4 @@
-<{if $xoops_dirname == "system"}>
+<{if $xoops_page == "index"}>
 <div id="myCarousel" class="carousel slide slideshow" data-ride="carousel">
     <!-- Indicators -->
     <ol class="carousel-indicators">