mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-21 23:43:17 +01:00
make changes to include the template setup.inc.php file, fix icon app image in about, some lay-out improvements in about
This commit is contained in:
parent
a8959cc19b
commit
cd27f2cca3
22
about.php
22
about.php
@ -25,20 +25,10 @@
|
||||
$GLOBALS['phpgw_info']['flags']['noheader'] = True;
|
||||
include('header.inc.php');
|
||||
|
||||
|
||||
if ($app)
|
||||
{
|
||||
if (!($included = $GLOBALS['phpgw']->hooks->single('about',$app)))
|
||||
{
|
||||
function about_app()
|
||||
{
|
||||
global $app;
|
||||
$icon = $GLOBALS['phpgw']->common->image($app,array('navbar','nonav'));
|
||||
include (PHPGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php");
|
||||
$info = $setup_info[$app];
|
||||
$info['title'] = $GLOBALS['phpgw_info']['apps'][$app]['title'];
|
||||
return about_display($info);
|
||||
}
|
||||
$api_only = !($included = file_exists(PHPGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php"));
|
||||
}
|
||||
}
|
||||
@ -90,13 +80,23 @@
|
||||
|
||||
$GLOBALS['phpgw']->common->phpgw_footer();
|
||||
|
||||
function about_app()
|
||||
{
|
||||
global $app;
|
||||
include (PHPGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php");
|
||||
$info = $setup_info[$app];
|
||||
$info['icon'] = $GLOBALS['phpgw']->common->image($app,array('navbar','nonav'));
|
||||
$info['title'] = $GLOBALS['phpgw_info']['apps'][$app]['title'];
|
||||
return about_display($info);
|
||||
}
|
||||
|
||||
function about_template()
|
||||
{
|
||||
$template = $GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi');
|
||||
|
||||
include ($template . "/settings/settings.inc.php");
|
||||
include ($template . "/setup/setup.inc.php");
|
||||
$s = "";
|
||||
$template_info[] = $GLOBALS['egw_info']['template'][$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']];
|
||||
foreach($template_info as $info)
|
||||
{
|
||||
$s .= about_display($info);
|
||||
|
24
index.php
24
index.php
@ -70,22 +70,20 @@
|
||||
);
|
||||
include('./header.inc.php');
|
||||
|
||||
|
||||
// Check if we are using windows or normal webpage
|
||||
// Check if we are using windows or normal webpage
|
||||
$windowed = false;
|
||||
$settings = PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . '/settings/settings.inc.php';
|
||||
$tpl_info = PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . '/setup/setup.inc.php';
|
||||
|
||||
if(@file_exists($settings))
|
||||
if(@file_exists($tpl_info))
|
||||
{
|
||||
|
||||
include($settings);
|
||||
if(isset($template_info)) {
|
||||
if($template_info['idots2']['windowed'])
|
||||
{
|
||||
$windowed = true;
|
||||
|
||||
}
|
||||
}
|
||||
include_once($tpl_info);
|
||||
// if(isset($template_info))
|
||||
// {
|
||||
if($GLOBALS['egw_info']['template'][$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']]['windowed'])
|
||||
{
|
||||
$windowed = true;
|
||||
}
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user