[xoops-svn] SF.net SVN: xoops-svn:[11286] RMC/modules/xthemes/trunk/xthemes

[<bi...@us...>]

Revision: 11286
          http://sourceforge.net/p/xoops/svn/11286
Author:   bitc3r0
Date:     2013-03-23 02:09:06 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------


Modified Paths:
--------------
    RMC/modules/xthemes/trunk/xthemes/class/xtassembler.class.php
    RMC/modules/xthemes/trunk/xthemes/settings.php
    RMC/modules/xthemes/trunk/xthemes/templates/xt_themes.php
    RMC/modules/xthemes/trunk/xthemes/xoops_version.php

Modified: RMC/modules/xthemes/trunk/xthemes/class/xtassembler.class.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/class/xtassembler.class.php	2013-03-22 20:15:23 UTC (rev 11285)
+++ RMC/modules/xthemes/trunk/xthemes/class/xtassembler.class.php	2013-03-23 02:09:06 UTC (rev 11286)
@@ -86,7 +86,9 @@
     public function init(){
         
         global $xoopsTpl, $xoopsConfig, $rmc_config, $xoTheme;
-        
+
+	    $xoopsTpl->assign('isHome', defined('XTHEMES_IS_HOME'));
+
         if(!$this->isSupported()) return;
         
         if($this->current->getInfo('dir')!=$xoopsConfig['theme_set']){

Modified: RMC/modules/xthemes/trunk/xthemes/settings.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/settings.php	2013-03-22 20:15:23 UTC (rev 11285)
+++ RMC/modules/xthemes/trunk/xthemes/settings.php	2013-03-23 02:09:06 UTC (rev 11286)
@@ -186,7 +186,8 @@
         $options[$option['section']][$id] = $option;
         
     }
-    
+
+	$tpl->add_style("settings.css",'xthemes');
     $tpl->add_local_script('jquery.ck.js', 'rmcommon', 'include');
     $tpl->add_local_script('xthemes.js', 'xthemes');
     xoops_cp_header();

Modified: RMC/modules/xthemes/trunk/xthemes/templates/xt_themes.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/templates/xt_themes.php	2013-03-22 20:15:23 UTC (rev 11285)
+++ RMC/modules/xthemes/trunk/xthemes/templates/xt_themes.php	2013-03-23 02:09:06 UTC (rev 11286)
@@ -35,7 +35,7 @@
             <div class="current_options">
                 <h4><span><?php _e('Theme Options','xthemes'); ?></span></h4>
                 <?php if(method_exists($current, 'controlPanel')): ?>
-                <a href="theme.php" class="button buttonLight btn btn-warning"><i class="icon-cog"></span> <?php _e('Dashboard','xthemes'); ?></a>
+                <a href="theme.php" class="button buttonLight btn btn-warning"><i class="icon-cog"></i> <?php _e('Dashboard','xthemes'); ?></a>
                 <?php endif; ?>
                 <?php if($xtAssembler->rootMenus()): ?>
                 <a href="navigation.php" class="button btn"><i class="icon-reorder"></i> <?php _e('Menus','xthemes'); ?></a>

Modified: RMC/modules/xthemes/trunk/xthemes/xoops_version.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/xoops_version.php	2013-03-22 20:15:23 UTC (rev 11285)
+++ RMC/modules/xthemes/trunk/xthemes/xoops_version.php	2013-03-23 02:09:06 UTC (rev 11286)
@@ -9,10 +9,10 @@
 
 $amod = xoops_getActiveModules();
 if(!in_array("rmcommon",$amod)){
-    $error = "<strong>WARNING:</strong> xThemes requires %s to be installed!<br />Please install %s before trying to use MyWords";
+    $error = "<strong>WARNING:</strong> xThemes requires %s to be installed!<br />Please install %s before trying to use xThemes";
     $error = str_replace("%s", '<a href="http://www.xoopsmexico.net/downloads/common-utilities/" target="_blank">Common Utilities</a>', $error);
     xoops_error($error);
-    $error = '%s is not installed! This might cause problems with functioning of MyWords and entire system. To solve, install %s or uninstall MyWords and then delete module folder.';
+    $error = '%s is not installed! This might cause problems with functioning of xThemes and entire system. To solve, install %s or uninstall xThemes and then delete module folder.';
     $error = str_replace("%s", '<a href="http://www.xoopsmexico.net/downloads/common-utilities/" target="_blank">Common Utilities</a>', $error);
     trigger_error($error, E_USER_WARNING);
     echo "<br />";