Author: ftoledo Date: 2007-02-26 15:15:34 -0300 (Mon, 26 Feb 2007) New Revision: 4303 Modified: prosistem/alba/trunk/alba/apps/principal/config/app.yml prosistem/alba/trunk/alba/apps/principal/config/config.php prosistem/alba/trunk/alba/apps/principal/templates/js_vars.php prosistem/alba/trunk/alba/apps/principal/templates/layout.php prosistem/alba/trunk/alba/apps/principal/templates/menu.php prosistem/alba/trunk/alba/web/index.php prosistem/alba/trunk/alba/web/principal_dev.php Log: pasando variable global al app.yml Modified: prosistem/alba/trunk/alba/apps/principal/config/app.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/config/app.yml 2007-02-24 23:14:31 UTC (rev 4302) +++ prosistem/alba/trunk/alba/apps/principal/config/app.yml 2007-02-26 18:15:34 UTC (rev 4303) @@ -1,4 +1,7 @@ # default values all: theme: on - \ No newline at end of file + + alba: + version: 1.0rc + menutheme: ThemeAlba \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/config/config.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/config/config.php 2007-02-24 23:14:31 UTC (rev 4302) +++ prosistem/alba/trunk/alba/apps/principal/config/config.php 2007-02-26 18:15:34 UTC (rev 4303) @@ -84,5 +84,4 @@ { require_once(sfConfig::get('sf_symfony_lib_dir').'/symfony.php'); } -define('MENU_THEME','ThemeAlba'); ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/templates/js_vars.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/js_vars.php 2007-02-24 23:14:31 UTC (rev 4302) +++ prosistem/alba/trunk/alba/apps/principal/templates/js_vars.php 2007-02-26 18:15:34 UTC (rev 4303) @@ -1,3 +1,3 @@ <script> - var my<?php echo MENU_THEME?>Base = "<?echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.MENU_THEME.'/'?>"; + var my<?php echo sfConfig::get("app_alba_menutheme")?>Base = "<?echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.sfConfig::get("app_alba_menutheme").'/'?>"; </script> Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-24 23:14:31 UTC (rev 4302) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-26 18:15:34 UTC (rev 4303) @@ -14,7 +14,7 @@ <?php echo include_metas() ?> <?php echo include_title() ?> - <link rel="stylesheet" type="text/css" href="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.MENU_THEME.'/theme.css' ?>"/> + <link rel="stylesheet" type="text/css" href="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.sfConfig::get("app_alba_menutheme").'/theme.css' ?>"/> <link rel="shortcut icon" href="/favicon.ico" /> <style type="text/css"> Modified: prosistem/alba/trunk/alba/apps/principal/templates/menu.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/menu.php 2007-02-24 23:14:31 UTC (rev 4302) +++ prosistem/alba/trunk/alba/apps/principal/templates/menu.php 2007-02-26 18:15:34 UTC (rev 4303) @@ -64,9 +64,9 @@ } ?> <script> - var my<?php echo MENU_THEME?>Base = "<?echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/' .MENU_THEME. '/'?>"; + var my<?php echo sfConfig::get("app_alba_menutheme")?>Base = "<?echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/' .sfConfig::get("app_alba_menutheme"). '/'?>"; </script> -<script src="<?echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.MENU_THEME.'/theme.js'?>"> +<script src="<?echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.sfConfig::get("app_alba_menutheme").'/theme.js'?>"> </script> <div id="menu" align="center"> <? drawMenu(1); ?> @@ -74,6 +74,6 @@ <SCRIPT LANGUAGE="JavaScript"> <!-- -cmDrawFromText ('menu', 'hbr', cm<?php echo MENU_THEME?>, '<?php echo MENU_THEME?>'); +cmDrawFromText ('menu', 'hbr', cm<?php echo sfConfig::get("app_alba_menutheme")?>, '<?php echo sfConfig::get("app_alba_menutheme")?>'); --> </SCRIPT> Modified: prosistem/alba/trunk/alba/web/index.php =================================================================== --- prosistem/alba/trunk/alba/web/index.php 2007-02-24 23:14:31 UTC (rev 4302) +++ prosistem/alba/trunk/alba/web/index.php 2007-02-26 18:15:34 UTC (rev 4303) @@ -4,7 +4,6 @@ define('SF_APP', 'principal'); define('SF_ENVIRONMENT', 'prod'); define('SF_DEBUG', false); -define('ALBA_VERSION', '1.0rc'); require_once(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.SF_APP.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php'); Modified: prosistem/alba/trunk/alba/web/principal_dev.php =================================================================== --- prosistem/alba/trunk/alba/web/principal_dev.php 2007-02-24 23:14:31 UTC (rev 4302) +++ prosistem/alba/trunk/alba/web/principal_dev.php 2007-02-26 18:15:34 UTC (rev 4303) @@ -4,7 +4,6 @@ define('SF_APP', 'principal'); define('SF_ENVIRONMENT', 'dev'); define('SF_DEBUG', true); -define('ALBA_VERSION', '1.0rc'); require_once(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.SF_APP.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php');