[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16519] fix links in head
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16519] fix links in head |
|
Date: |
Mon, 3 Apr 2017 08:13:13 -0400 (EDT) |
Revision: 16519
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16519
Author: sigurdne
Date: 2017-04-03 08:13:13 -0400 (Mon, 03 Apr 2017)
Log Message:
-----------
fix links in head
Modified Paths:
--------------
trunk/phpgwapi/templates/activitycalendar/head.inc.php
trunk/phpgwapi/templates/bkbooking/head.inc.php
trunk/phpgwapi/templates/bookingfrontend/head.inc.php
trunk/phpgwapi/templates/frontend/head.inc.php
trunk/phpgwapi/templates/mobilefrontend/head.inc.php
trunk/phpgwapi/templates/portico/head.inc.php
trunk/phpgwapi/templates/pure/head.inc.php
trunk/phpgwapi/templates/simple/head.inc.php
Modified: trunk/phpgwapi/templates/activitycalendar/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/activitycalendar/head.inc.php 2017-04-02
16:26:07 UTC (rev 16518)
+++ trunk/phpgwapi/templates/activitycalendar/head.inc.php 2017-04-03
12:13:13 UTC (rev 16519)
@@ -6,6 +6,20 @@
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
+
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$GLOBALS['phpgw_info']['server']['no_jscombine'] = true;
$GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
@@ -35,7 +49,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -44,7 +58,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -63,7 +77,7 @@
'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
- 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'],
'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
'navbar_config' => $_navbar_config,
'lbl_search' => lang('Search'),
Modified: trunk/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bkbooking/head.inc.php 2017-04-02 16:26:07 UTC
(rev 16518)
+++ trunk/phpgwapi/templates/bkbooking/head.inc.php 2017-04-03 12:13:13 UTC
(rev 16519)
@@ -8,6 +8,20 @@
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
+
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$config = CreateObject('phpgwapi.config','bookingfrontend');
@@ -66,7 +80,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -79,7 +93,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -189,7 +203,7 @@
'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
- 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'],
// 'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
'win_on_events' => $test,
'navbar_config' => $_navbar_config,
Modified: trunk/phpgwapi/templates/bookingfrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bookingfrontend/head.inc.php 2017-04-02
16:26:07 UTC (rev 16518)
+++ trunk/phpgwapi/templates/bookingfrontend/head.inc.php 2017-04-03
12:13:13 UTC (rev 16519)
@@ -8,6 +8,20 @@
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
+
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$config_frontend = CreateObject('phpgwapi.config',$app)->read();
@@ -64,7 +78,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -81,7 +95,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -182,7 +196,7 @@
'site_title' => $site_title,
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
'site_url' => $GLOBALS['phpgw']->link("/{$app}/", array()),
- 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'],
'win_on_events' => $test,
'metainfo_author' => $author,
'metainfo_keywords' => $keywords,
Modified: trunk/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/frontend/head.inc.php 2017-04-02 16:26:07 UTC
(rev 16518)
+++ trunk/phpgwapi/templates/frontend/head.inc.php 2017-04-03 12:13:13 UTC
(rev 16519)
@@ -2,6 +2,19 @@
$GLOBALS['phpgw_info']['server']['no_jscombine']=true;
phpgw::import_class('phpgwapi.jquery');
phpgw::import_class('phpgwapi.template_portico');
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
{
@@ -86,7 +99,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -107,7 +120,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -178,7 +191,7 @@
'home_text' => lang('home'),
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
'site_url' => $GLOBALS['phpgw']->link("/{$app}/", array()),
- 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'],
'win_on_events' => $test,
'metainfo_author' => $author,
'metainfo_keywords' => $keywords,
Modified: trunk/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2017-04-02
16:26:07 UTC (rev 16518)
+++ trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2017-04-03
12:13:13 UTC (rev 16519)
@@ -5,6 +5,19 @@
{
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
@@ -35,7 +48,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -44,7 +57,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -59,7 +72,7 @@
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
'site_url' => $GLOBALS['phpgw']->link('/home.php',
array()),
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
- 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info.
$GLOBALS['phpgw_info']['server']['webserver_url'],
'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
'current_app_header' =>
isset($GLOBALS['phpgw_info']['flags']['app_header']) &&
$GLOBALS['phpgw_info']['flags']['app_header'] ?
$GLOBALS['phpgw_info']['flags']['app_header'] : '',
'current_user' => $GLOBALS['phpgw']->accounts->get(
$GLOBALS['phpgw_info']['user']['id'] )->__toString()
Modified: trunk/phpgwapi/templates/portico/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/portico/head.inc.php 2017-04-02 16:26:07 UTC
(rev 16518)
+++ trunk/phpgwapi/templates/portico/head.inc.php 2017-04-03 12:13:13 UTC
(rev 16519)
@@ -6,6 +6,20 @@
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
+
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
@@ -73,7 +87,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -82,7 +96,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -151,7 +165,7 @@
'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
- 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'],
'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
'border_layout_config' => $_border_layout_config,
'navbar_config' => $_navbar_config,
Modified: trunk/phpgwapi/templates/pure/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/pure/head.inc.php 2017-04-02 16:26:07 UTC (rev
16518)
+++ trunk/phpgwapi/templates/pure/head.inc.php 2017-04-03 12:13:13 UTC (rev
16519)
@@ -1,6 +1,19 @@
<?php
$javascripts = array();
$stylesheets = array();
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
phpgw::import_class('phpgwapi.jquery');
phpgwapi_jquery::load_widget('core');
@@ -23,7 +36,7 @@
/*
$menu_stylesheet_widescreen = <<<HTML
- <link
href="{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.widescreen.css"
type="text/css" rel="stylesheet" media="all and (min-width: 1430px)" />
+ <link
href="{$host_info}{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.widescreen.css"
type="text/css" rel="stylesheet" media="all and (min-width: 1430px)" />
HTML;
*/
}
@@ -72,7 +85,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info. $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -81,7 +94,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info. $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -115,7 +128,7 @@
'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
- 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info.
$GLOBALS['phpgw_info']['server']['webserver_url'],
'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
'menu_stylesheet_widescreen'=> $menu_stylesheet_widescreen,
'template_selector' => $template_selector
Modified: trunk/phpgwapi/templates/simple/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/simple/head.inc.php 2017-04-02 16:26:07 UTC
(rev 16518)
+++ trunk/phpgwapi/templates/simple/head.inc.php 2017-04-03 12:13:13 UTC
(rev 16519)
@@ -8,6 +8,19 @@
* @version $Id$
*/
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
{
@@ -35,37 +48,37 @@
"/phpgwapi/templates/portico/js/base.js"
);
- $stylesheets[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/simple/css/base.css";
+ $stylesheets[] = "/phpgwapi/templates/simple/css/base.css";
}
if(file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/simple/css/' .
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
{
- $stylesheets[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/simple/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
+ $stylesheets[] =
"/phpgwapi/templates/simple/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
}
else
{
- $stylesheets[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/simple/css/simple.css";
+ $stylesheets[] = "/phpgwapi/templates/simple/css/simple.css";
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] = 'simple';
}
if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/base/css/base.css"))
{
- $stylesheets[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/base/css/base.css";
+ $stylesheets[] = "/{$app}/templates/base/css/base.css";
}
if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/simple/css/base.css"))
{
- $stylesheets[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/simple/css/base.css";
+ $stylesheets[] = "/{$app}/templates/simple/css/base.css";
}
if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/simple/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css"))
{
- $stylesheets[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/simple/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
+ $stylesheets[] =
"/{$app}/templates/simple/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
}
foreach ( $stylesheets as $style )
{
- $tpl->set_var('theme_style', $style);
+ $tpl->set_var('theme_style', $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'] . $style);
$tpl->parse('theme_stylesheets', 'theme_stylesheet', true);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16519] fix links in head,
sigurdne <=