composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

De-hardcoded against the subdirectory "modules" (excepted the data model sources files)

Browse Source 
SVN:trunk[1779]
This commit is contained in:
Romain Quetiez
2012-01-17 15:31:51 +00:00
parent 851db98745
commit 39de3e9af7
9 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/itopwebpage.class.inc.php
View File

@@ -542,12 +542,17 @@ EOF
public function output()
{
$sAbsURLAppRoot = addslashes($this->m_sRootUrl);
$sAbsURLModulesRoot = addslashes(utils::GetAbsoluteUrlModulesRoot());
$this->add_script(
<<<EOF
function GetAbsoluteUrlAppRoot()
{
return '$sAbsURLAppRoot';
}
function GetAbsoluteUrlModulesRoot()
{
return '$sAbsURLModulesRoot';
}
EOF
);
$this->set_base($this->m_sRootUrl.'pages/');

6
application/portalwebpage.class.inc.php
View File

@@ -60,6 +60,7 @@ class PortalWebPage extends NiceWebPage
$this->add_linked_stylesheet("../css/jquery.treeview.css");
$this->add_linked_stylesheet("../css/jquery.autocomplete.css");
$sAbsURLAppRoot = addslashes(utils::GetAbsoluteUrlAppRoot()); // Pass it to Javascript scripts
$sAbsURLModulesRoot = addslashes(utils::GetAbsoluteUrlModulesRoot()); // Pass it to Javascript scripts
$oAppContext = new ApplicationContext();
$sAppContext = addslashes($oAppContext->GetForLink());
if ($sAlternateStyleSheet != '')
@@ -172,6 +173,11 @@ EOF
return '$sAbsURLAppRoot';
}
function GetAbsoluteUrlModulesRoot()
{
return '$sAbsURLModulesRoot';
}
function AddAppContext(sURL)
{
var sContext = '$sAppContext';

17
application/utils.inc.php
View File

@@ -460,10 +460,8 @@ class utils
}
/**
* Returns the absolute URL to the server's root path
* @param $sCurrentRelativePath string NO MORE USED, kept for backward compatibility only !
* @param $bForceHTTPS bool True to force HTTPS, false otherwise
* @return string The absolute URL to the server's root, without the first slash
* Returns the absolute URL to the application root path
* @return string The absolute URL to the application root, without the first slash
*/
static public function GetAbsoluteUrlAppRoot()
{
@@ -757,5 +755,14 @@ class utils
return APPCONF.self::GetCurrentEnvironment().'/'.ITOP_CONFIG_FILE;
}
/**
* Returns the absolute URL to the modules root path
* @return string ...
*/
static public function GetAbsoluteUrlModulesRoot()
{
$sUrl = self::GetAbsoluteUrlAppRoot().'env-'.self::GetCurrentEnvironment().'/';
return $sUrl;
}
}
?>
?>