holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made changes to the loading of the header, navbar, appheader, and footers

Browse Source
This commit is contained in:
seek3r 2002-05-24 10:38:03 +00:00
parent 48bffd5e2a
commit cf2a12ba1c
33 changed files with 151 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/inc/class.uiXport.inc.php
View File

@ -90,7 +90,6 @@
else
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
echo "<pre>$buffer</pre>";
echo '<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index') . '">'.lang('OK').'</a>';
$GLOBALS['phpgw']->common->phpgw_footer();
@ -99,7 +98,6 @@
else
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
echo "<pre>$buffer</pre>";
echo '<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'). '">'.lang('OK').'</a>';
$GLOBALS['phpgw']->common->phpgw_footer();
@ -109,7 +107,6 @@
else
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$this->template->set_file(array('import' => 'import.tpl'));
@ -173,7 +170,6 @@
$GLOBALS['phpgw_info']['flags']['noheader'] = False;
$GLOBALS['phpgw_info']['flags']['noheader'] = True;
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
echo lang('<b>No conversion type &lt;none&gt; could be located.</b> Please choose a conversion type from the list');
echo '&nbsp<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export') . '">' . lang('OK') . '</a>';
$GLOBALS['phpgw']->common->phpgw_footer();
@ -192,7 +188,6 @@
else
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
echo "<pre>\n";
echo $buffer;
echo "\n</pre>\n";
@ -203,7 +198,6 @@
else
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$this->template->set_file(array('export' => 'export.tpl'));

6
addressbook/inc/class.uiaddressbook.inc.php
View File

@ -262,7 +262,6 @@
function index($entries='')
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$this->template->set_file(array('addressbook_list_t' => 'index.tpl'));
$this->template->set_block('addressbook_list_t','addressbook_header','addressbook_header');
@ -713,7 +712,6 @@
$this->template->set_file(array('add' => 'add.tpl'));
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$custom = $this->fields->read_custom_fields();
$customfields = array();
@ -773,7 +771,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
/* Read in user custom fields, if any */
$custom = $this->fields->read_custom_fields();
@ -838,7 +835,6 @@
if($confirm != 'true')
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$this->template->set_var('lang_sure',lang('Are you sure you want to delete this entry ?'));
$this->template->set_var('no_link',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
@ -881,7 +877,6 @@
elseif(!$submit && $ab_id)
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
}
$this->template->set_file(array('view_t' => 'view.tpl'));
@ -1148,7 +1143,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
if($totalerrors)
{

8
addressbook/inc/class.uifields.inc.php
View File

@ -34,7 +34,6 @@
if(!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
echo lang('access not permitted');
$GLOBALS['phpgw']->common->phpgw_exit();
}
@ -80,7 +79,6 @@
$total_records = count($fields);
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$GLOBALS['phpgw']->template->set_var('left',$GLOBALS['phpgw']->nextmatchs->left('/index.php',$start,$total_records,'menuaction=addressbook.uifields.index'));
$GLOBALS['phpgw']->template->set_var('right',$GLOBALS['phpgw']->nextmatchs->right('/index.php',$start,$total_records,'menuaction=addressbook.uifields.index'));
@ -119,7 +117,6 @@
if(!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
echo lang('access not permitted');
$GLOBALS['phpgw']->common->phpgw_exit();
}
@ -158,7 +155,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
if($errorcount)
{
@ -197,7 +193,6 @@
if(!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
echo lang('access not permitted');
$GLOBALS['phpgw']->common->phpgw_exit();
}
@ -240,7 +235,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
if($errorcount)
{
@ -292,7 +286,6 @@
if(!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
echo lang('access not permitted');
$GLOBALS['phpgw']->common->phpgw_exit();
}
@ -316,7 +309,6 @@
else
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$hidden_vars = '<input type="hidden" name="sort" value="' . $sort . '">' . "\n"
. '<input type="hidden" name="order" value="' . $order .'">' . "\n"

2
addressbook/inc/class.uivcard.inc.php
View File

@ -46,7 +46,6 @@
$action = $GLOBALS['HTTP_POST_VARS']['action'];
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
echo '<body bgcolor="' . $GLOBALS['phpgw_info']['theme']['bg_color'] . '">';
@ -76,7 +75,6 @@
if($nolname || $nofname)
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
}
if(!$ab_id)

1
admin/inc/class.uiaccess_history.inc.php
View File

@ -41,7 +41,6 @@
$order = ($GLOBALS['HTTP_POST_VARS']['order']?$GLOBALS['HTTP_POST_VARS']['order']:0);
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$total_records = $this->bo->total($account_id);

1
admin/inc/class.uiaclmanager.inc.php
View File

@ -29,7 +29,6 @@
function common_header()
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
}
function list_apps()

4
admin/inc/class.uiapplications.inc.php
View File

@ -32,7 +32,6 @@
function get_list()
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$GLOBALS['phpgw']->template->set_file(array('applications' => 'applications.tpl'));
$GLOBALS['phpgw']->template->set_block('applications','list','list');
@ -210,7 +209,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$GLOBALS['phpgw']->template->set_var('lang_header',lang('Add new application'));
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
@ -295,7 +293,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
if ($totalerrors)
{
@ -349,7 +346,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete this application ?'));
$GLOBALS['phpgw']->template->set_var('no','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list') . '">' . lang('No') . '</a>');

4
admin/inc/class.uicategories.inc.php
View File

@ -98,7 +98,6 @@
$global_cats = $GLOBALS['HTTP_POST_VARS']['global_cats'] ? $GLOBALS['HTTP_POST_VARS']['global_cats'] : $GLOBALS['HTTP_GET_VARS']['global_cats'];
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$this->template->set_file(array('cat_list_t' => 'listcats.tpl'));
$this->template->set_block('cat_list_t','cat_list','list');
@ -247,7 +246,6 @@
);
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$this->set_langs();
@ -331,7 +329,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$this->set_langs();
@ -449,7 +446,6 @@
));
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$hidden_vars = '<input type="hidden" name="cat_id" value="' . $this->cat_id . '">' . "\n";
$this->template->set_var('hidden_vars',$hidden_vars);

1
admin/inc/class.uiconfig.inc.php
View File

@ -155,7 +155,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$t->set_var('title',lang('Site Configuration'));
$t->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname));

1
admin/inc/class.uicurrentsessions.inc.php
View File

@ -31,7 +31,6 @@
function header()
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
}
function store_location($info)

1
admin/inc/class.uilog.inc.php
View File

@ -256,7 +256,6 @@
$this->t->set_var('event_list',$table);
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$this->t->pfp('out','log_list_t');
// $this->set_app_langs();
}

1
admin/inc/class.uimainscreen.inc.php
View File

@ -37,7 +37,6 @@
$message = $GLOBALS['HTTP_POST_VARS']['message'];
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
if ($GLOBALS['HTTP_POST_VARS']['submit'])
{

3
admin/inc/class.uiserver.inc.php
View File

@ -95,7 +95,6 @@
function list_servers()
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$GLOBALS['phpgw']->template->set_file(array('server_list_t' => 'listservers.tpl'));
$GLOBALS['phpgw']->template->set_block('server_list_t','server_list','list');
@ -243,7 +242,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$GLOBALS['phpgw']->template->set_var('title_servers',$GLOBALS['HTTP_GET_VARS']['server_id'] ? lang('Edit Peer Server') : lang('Add Peer Server'));
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.edit&server_id=' . $GLOBALS['HTTP_GET_VARS']['server_id']));
@ -297,7 +295,6 @@
else
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$GLOBALS['phpgw']->template->set_file(array('server_delete' => 'delete_common.tpl'));

1
calendar/preferences.php
View File

@ -106,7 +106,6 @@
}
$phpgw->common->phpgw_header();
echo parse_navbar();
$p = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('calendar'));
$templates = Array(

2
home.php
View File

@ -95,7 +95,6 @@
if ($navbarframe)
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
}
}
}
@ -107,7 +106,6 @@
else
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
}
$GLOBALS['phpgw']->translation->add_app('mainscreen');

14
phpgwapi/inc/class.Template.inc.php
View File

@ -61,7 +61,19 @@
$this->set_root(PHPGW_TEMPLATE_DIR);
$this->set_file('common', 'common.tpl');
}
$this->set_var('phpgw_css',$GLOBALS['phpgw_info']['theme']['css']);
if(@is_array($GLOBALS['phpgw_info']['theme']['css']))
{
reset($GLOBALS['phpgw_info']['theme']['css']);
//$css_string = '<STYLE type="text/css">'."\n";
while(list($key,$value) = each($GLOBALS['phpgw_info']['theme']['css']))
{
$css_string .= "\n\t$key { $value } ";
}
$css_string .= "\n";
//$css_string .= '</STYLE>'."\n";
$this->set_var('phpgw_css',$css_string);
}
/* Now move on to loading up the requested template set */
$this->set_root($root);

103
phpgwapi/inc/class.common.inc.php
View File

@ -1053,33 +1053,75 @@
$GLOBALS['phpgw_info']['navbar']['logout']['url'] = $GLOBALS['phpgw']->link('/logout.php');
$GLOBALS['phpgw_info']['navbar']['logout']['icon'] = $this->image('phpgwapi',Array('logout','nonav'));
$GLOBALS['phpgw_info']['navbar']['logout']['icon_hover'] = $this->image_on('phpgwapi',Array('logout','nonav'),'-over');
}
/*!
@function app_header
@abstract load header.inc.php for an application
*/
function app_header()
{
if (file_exists(PHPGW_APP_INC . '/header.inc.php'))
/*************************************************************************\
* If they are using frames, we need to set some variables *
\*************************************************************************/
if(((isset($GLOBALS['phpgw_info']['user']['preferences']['common']['useframes']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['useframes']) &&
$GLOBALS['phpgw_info']['server']['useframes'] == 'allowed') ||
($GLOBALS['phpgw_info']['server']['useframes'] == 'always'))
{
include(PHPGW_APP_INC . '/header.inc.php');
$GLOBALS['phpgw_info']['flags']['navbar_target'] = 'phpgw_body';
}
}
/*!
@function phpgw_header
@abstract load the phpgw header
*/
function phpgw_header()
function phpgw_header($forceheader = True, $forcenavbar = True)
{
include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set']
. '/head.inc.php');
$this->navbar(False);
include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set']
. '/navbar.inc.php');
if($forceheader)
{
$GLOBALS['phpgw_info']['flags']['noheader'] = False;
}
if($forcenavbar)
{
$GLOBALS['phpgw_info']['flags']['nonavbar'] = False;
}
if (!@$GLOBALS['phpgw_info']['flags']['noheader'])
{
include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/head.inc.php');
}
if(!function_exists('parse_navbar'))
{
$this->navbar(False);
include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/navbar.inc.php');
}
if (!@$GLOBALS['phpgw_info']['flags']['nonavbar'] && !@$GLOBALS['phpgw_info']['flags']['navbar_target'])
{
echo parse_navbar();
parse_navbar();
}
//elseif (!@$GLOBALS['phpgw_info']['flags']['noheader'] && function_exists('parse_nonavbar'))
//{
// parse_nonavbar();
//}
if (!@$GLOBALS['phpgw_info']['flags']['noheader'] && !@$GLOBALS['phpgw_info']['flags']['nonavbar'])
{
$GLOBALS['phpgw']->hooks->process('after_navbar');
//echo '<table><tr><td>msgbox goes here</td></tr></table>';
}
}
/*!
@function phpgw_appheader
@abstract load header.inc.php for an application
*/
function phpgw_appheader()
{
if (!is_array(MENUACTION))
{
list($app,$class,$method) = explode('.',MENUACTION);
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{
$GLOBALS[$class]->header();
}
}
elseif (file_exists(PHPGW_APP_INC . '/header.inc.php'))
{
include(PHPGW_APP_INC . '/header.inc.php');
}
}
@ -1089,9 +1131,34 @@
if (!isset($GLOBALS['phpgw_info']['flags']['nofooter']) || !$GLOBALS['phpgw_info']['flags']['nofooter'])
{
include(PHPGW_API_INC . '/footer.inc.php');
if((file_exists(PHPGW_APP_INC . '/footer.inc.php') || MENUACTION) &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
!@$GLOBALS['phpgw_info']['flags']['noappfooter'])
{
if(MENUACTION)
{
list($app,$class,$method) = explode('.',MENUACTION);
if(is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['footer'])
{
// eval("\$GLOBALS[$class]->footer();");
$GLOBALS[$class]->footer();
}
elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php'))
{
include(PHPGW_APP_INC . '/footer.inc.php');
}
}
elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php'))
{
include(PHPGW_APP_INC . '/footer.inc.php');
}
}
$GLOBALS['phpgw']->db->disconnect();
parse_navbar_end();
}
/* Clean up mcrypt */
if (@is_object($GLOBALS['phpgw']->crypto))
{

29
phpgwapi/inc/footer.inc.php
View File

@ -34,34 +34,7 @@
/**************************************************************************\
* Include the apps footer files if it exists *
\**************************************************************************/
if((file_exists(PHPGW_APP_INC . '/footer.inc.php') || MENUACTION) &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
!@$GLOBALS['phpgw_info']['flags']['noappfooter'])
{
if(MENUACTION)
{
list($app,$class,$method) = explode('.',MENUACTION);
if(is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['footer'])
{
// eval("\$GLOBALS[$class]->footer();");
$GLOBALS[$class]->footer();
}
elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php'))
{
include(PHPGW_APP_INC . '/footer.inc.php');
}
}
elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php'))
{
include(PHPGW_APP_INC . '/footer.inc.php');
}
}
parse_navbar_end();
$GLOBALS['phpgw']->db->disconnect();
$GLOBALS['phpgw']->common->phpgw_footer();
?>
</BODY>
</HTML>

72
phpgwapi/inc/functions.inc.php
View File

@ -398,35 +398,24 @@
exit;
}
if (!isset($GLOBALS['phpgw_info']['theme']['css']))
{
$GLOBALS['phpgw_info']['theme']['css'] = '';
}
if (isset($GLOBALS['phpgw_info']['theme']['hovlink'])
&& ($GLOBALS['phpgw_info']['theme']['hovlink'] != ''))
{
$csshover = "\t".'A:hover{ text-decoration:none; color: ' .$GLOBALS['phpgw_info']['theme']['hovlink'] .'; }'."\n";
$phpgw_info['theme']['css']['A:hover'] = 'text-decoration:none; color: '.$GLOBALS['phpgw_info']['theme']['hovlink'].';';
}
else
$phpgw_info['theme']['css']['A'] = 'text-decoration:none;';
$phpgw_info['theme']['css']['A:link'] = 'text-decoration:none; color: '.$GLOBALS['phpgw_info']['theme']['link'].';';
$phpgw_info['theme']['css']['A:visited'] = 'text-decoration:none; color: '.$GLOBALS['phpgw_info']['theme']['vlink'].';';
$phpgw_info['theme']['css']['A:active'] = 'text-decoration:none; color: '.$GLOBALS['phpgw_info']['theme']['alink'].';';
if(@file_exists(PHPGW_TEMPLATE_DIR . '/css.inc.php'))
{
$csshover = '';
include(PHPGW_TEMPLATE_DIR . '/css.inc.php');
}
$GLOBALS['phpgw_info']['theme']['css'] = "\t".'a { text-decoration:none; }'."\n"
."\t".'A:link{ text-decoration:none; color: '.$GLOBALS['phpgw_info']['theme']['link'].'; }'."\n"
."\t".'A:visted{ text-decoration:none; color: '.$GLOBALS['phpgw_info']['theme']['vlink'].'; }'."\n"
."\t".'A:active{ text-decoration:none; color: '.$GLOBALS['phpgw_info']['theme']['alink'].'; }'."\n"
.$csshover
.$GLOBALS['phpgw_info']['theme']['css'];
unset($csshover);
if(@file_exists(PHPGW_APP_TPL . '/app.css'))
if(@file_exists(PHPGW_APP_TPL . '/css.inc.php'))
{
$app_css_file = fopen (PHPGW_APP_TPL . '/app.css', "r");
$contents = fread ($app_css_file, filesize ($app_css_file));
fclose ($app_css_file);
$GLOBALS['phpgw_info']['theme']['css'] .= "\n".$contents;
include(PHPGW_APP_TPL . '/css.inc.php');
}
unset($theme_to_load);
@ -439,26 +428,6 @@
$GLOBALS['phpgw']->template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
}
/*************************************************************************\
* These lines remove the css data from memory since the template set will *
* already have loaded it into its own memory space *
\*************************************************************************/
if(!@$GLOBALS['phpgw_info']['flags']['keep_phpgw_css'])
{
// unset($GLOBALS['phpgw_info']['theme']['css']);
}
/*************************************************************************\
* If they are using frames, we need to set some variables *
\*************************************************************************/
if (((isset($GLOBALS['phpgw_info']['user']['preferences']['common']['useframes']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['useframes']) &&
$GLOBALS['phpgw_info']['server']['useframes'] == 'allowed') ||
($GLOBALS['phpgw_info']['server']['useframes'] == 'always'))
{
$GLOBALS['phpgw_info']['flags']['navbar_target'] = 'phpgw_body';
}
/*************************************************************************\
* Verify that the users session is still active otherwise kick them out *
\*************************************************************************/
@ -471,11 +440,7 @@
(@$GLOBALS['phpgw_info']['flags']['admin_only'] &&
! $GLOBALS['phpgw_info']['user']['apps']['admin']))
{
$GLOBALS['phpgw']->common->phpgw_header();
if ($GLOBALS['phpgw_info']['flags']['noheader'])
{
echo parse_navbar();
}
$GLOBALS['phpgw']->common->phpgw_header(False, False);
$GLOBALS['phpgw']->log->write(array('text'=>'W-Permissions, Attempted to access %1','p1'=>$GLOBALS['phpgw_info']['flags']['currentapp']));
@ -487,10 +452,7 @@
/*************************************************************************\
* Load the header unless the developer turns it off *
\*************************************************************************/
if (!@$GLOBALS['phpgw_info']['flags']['noheader'])
{
$GLOBALS['phpgw']->common->phpgw_header();
}
$GLOBALS['phpgw']->common->phpgw_header(False, False);
/*************************************************************************\
* Load the app include files if the exists *
@ -500,12 +462,10 @@
{
include(PHPGW_APP_INC . '/functions.inc.php');
}
if (!@$GLOBALS['phpgw_info']['flags']['noheader'] &&
!@$GLOBALS['phpgw_info']['flags']['noappheader'] &&
file_exists(PHPGW_APP_INC . '/header.inc.php') && !MENUACTION)
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'])
{
include(PHPGW_APP_INC . '/header.inc.php');
$GLOBALS['phpgw']->common->phpgw_appheader();
}
}
error_reporting(E_ERROR | E_WARNING | E_PARSE);

10
phpgwapi/templates/default/navbar.inc.php
View File

@ -111,16 +111,6 @@
}
$tpl->set_var($var);
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{
$GLOBALS[$class]->header();
}
}
$GLOBALS['phpgw']->hooks->process('after_navbar');
return;
}

2
phpgwapi/templates/idsociety/footer.tpl
View File

@ -13,4 +13,6 @@
</td>
</tr>
</table>
</BODY>
<!-- END footer -->
</HTML>

15
phpgwapi/templates/idsociety/head.inc.php
View File

@ -11,17 +11,6 @@
/* $Id$ */
// needed until hovlink is specified in all theme files
if (isset($GLOBALS['phpgw_info']['theme']['hovlink'])
&& ($GLOBALS['phpgw_info']['theme']['hovlink'] != ''))
{
$csshover = 'A:hover{ text-decoration:none; color: ' .$GLOBALS['phpgw_info']['theme']['hovlink'] .'; }';
}
else
{
$csshover = '';
}
$app_css = '';
if(@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
@ -48,10 +37,6 @@
'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'],
'body_tags' => $bodyheader,
'css_link' => $GLOBALS['phpgw_info']['theme']['link'],
'css_alink' => $GLOBALS['phpgw_info']['theme']['alink'],
'css_vlink' => $GLOBALS['phpgw_info']['theme']['vlink'],
'css_hovlink' => $csshover,
'app_css' => $app_css
);
$tpl->set_var($var);

23
phpgwapi/templates/idsociety/head.tpl
View File

@ -1,27 +1,16 @@
<!-- BEGIN head -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!-- BEGIN head -->
<HTML>
<HEAD>
<META http-equiv="Content-Type" content="text/html; charset={charset}">
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
<META NAME="description" CONTENT="phpGroupWare">
<META NAME="keywords" CONTENT="phpGroupWare">
<meta name="robots" content="none">
<META NAME="robots" content="none">
<LINK REL="ICON" href="{img_icon}" type="image/x-ico">
<LINK REL="SHORTCUT ICON" href="{img_shortcut}">
<STYLE type="text/css">
<!--
a { text-decoration:none; }
A:link{ text-decoration:none; color: {css_link}; }
A:visted{ text-decoration:none; color: {css_vlink}; }
A:active{ text-decoration:none; color: {css_alink}; }
{css_hovlink}
body { margin-top: 0px; margin-right: 0px; margin-left: 0px; font-family: "{font_family}" }
.tablink { color: #000000; }
{app_css}
-->
</STYLE>
<script language="JavaScript">
<STYLE type="text/css">{phpgw_css}</STYLE>
<SCRIPT language="JavaScript">
<!--
function MM_preloadImages()
{
@ -38,9 +27,9 @@ function MM_preloadImages()
}
}
//-->
</script>
</SCRIPT>
<TITLE>{website_title}</TITLE>
</HEAD>
<!-- idsociety body tags continue into navbar.tpl, so the closing bracket here is there END Head -->
<BODY {body_tags}
<BODY {body_tags}

15
phpgwapi/templates/idsociety/navbar.inc.php
View File

@ -203,19 +203,14 @@
*/
$tpl->set_var($var);
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{
$GLOBALS[$class]->header();
}
}
$GLOBALS['phpgw']->hooks->process('after_navbar');
return;
}
function parse_nonavbar()
{
echo '>';
}
function parse_navbar_end()
{
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);

10
phpgwapi/templates/justweb/navbar.inc.php
View File

@ -141,16 +141,6 @@
$tpl->set_var($var);
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{
$GLOBALS[$class]->header();
}
}
$GLOBALS['phpgw']->hooks->process('after_navbar');
return;
}

10
phpgwapi/templates/linux-at-work.de/navbar.inc.php
View File

@ -125,16 +125,6 @@
*/
$tpl->set_var($var);
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{
$GLOBALS[$class]->header();
}
}
$GLOBALS['phpgw']->hooks->process('after_navbar');
return;
}

10
phpgwapi/templates/verdilak/navbar.inc.php
View File

@ -122,16 +122,6 @@
}
$tpl->set_var($var);
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{
$GLOBALS[$class]->header();
}
}
$GLOBALS['phpgw']->hooks->process('after_navbar');
return;
}

12
phpgwapi/themes/default.theme
View File

@ -44,3 +44,15 @@
// These are for the email only
$phpgw_info['theme']['em_folder'] = '#666699';
$phpgw_info['theme']['em_folder_text'] = '#FFFFFF';
// This is the CSS definition
$phpgw_info['theme']['css']['.navbar'] = 'font-family: Verdana;font-size: 8pt; color:#000000;}';
$phpgw_info['theme']['css']['.bodytext'] = 'font-family: Verdana; font-size: 8pt; color:#000000;';
$phpgw_info['theme']['css']['.whitetext'] = 'font-family: Verdana; font-size: 8pt; color:#ffffff;';
$phpgw_info['theme']['css']['.headertext'] = 'font-family: Verdana; font-size: 11pt; font-weight: bold; color:#ffffff;';
$phpgw_info['theme']['css']['.inputtext'] = ' font-family: Verdana; font-size: 8pt; color="#000000"; background-color="#ffffff";';
$phpgw_info['theme']['css']['.buttontext'] = 'font-family: Verdana; font-size: 8pt; color="#000000"; background-color="#c0c0c0";';
$phpgw_info['theme']['css']['.linktext'] = 'font-family: Verdana; font-size: 8pt; color="#000000"; background-color="#c0c0c0";';
$phpgw_info['theme']['css']['.row_on'] = 'font-family: Verdana; font-size: 8pt; color="#000000"; background-color="#c0c0c0";';
$phpgw_info['theme']['css']['.row_off'] = 'font-family: Verdana; font-size: 8pt; color="#000000"; background-color="#c0c0c0";';

11
phpgwapi/themes/idsociety.theme
View File

@ -48,3 +48,14 @@
// These are for the email only
$phpgw_info['theme']['em_folder'] = '#adadad';
$phpgw_info['theme']['em_folder_text'] = '#ffffff';
// This is the CSS definition
$phpgw_info['theme']['css']['.navbar'] = 'font-family: Verdana;font-size: 8pt; color:#000000;}';
$phpgw_info['theme']['css']['.bodytext'] = 'font-family: Verdana; font-size: 8pt; color:#000000;';
$phpgw_info['theme']['css']['.whitetext'] = 'font-family: Verdana; font-size: 8pt; color:#ffffff;';
$phpgw_info['theme']['css']['.headertext'] = 'font-family: Verdana; font-size: 11pt; font-weight: bold; color:#ffffff;';
$phpgw_info['theme']['css']['.inputtext'] = ' font-family: Verdana; font-size: 8pt; color="#000000"; background-color="#ffffff";';
$phpgw_info['theme']['css']['.buttontext'] = 'font-family: Verdana; font-size: 8pt; color="#000000"; background-color="#c0c0c0";';
$phpgw_info['theme']['css']['.linktext'] = 'font-family: Verdana; font-size: 8pt; color="#000000"; background-color="#c0c0c0";';
$phpgw_info['theme']['css']['.row_on'] = 'font-family: Verdana; font-size: 8pt; color="#000000"; background-color="#c0c0c0";';
$phpgw_info['theme']['css']['.row_off'] = 'font-family: Verdana; font-size: 8pt; color="#000000"; background-color="#c0c0c0";';

2
preferences/changepassword.php
View File

@ -59,7 +59,6 @@
if(is_array($errors))
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$GLOBALS['phpgw']->template->set_var('messages',$GLOBALS['phpgw']->common->error_list($errors));
$GLOBALS['phpgw']->template->pfp('out','form');
$GLOBALS['phpgw']->common->phpgw_exit(True);
@ -85,7 +84,6 @@
else
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$GLOBALS['phpgw']->template->pfp('out','form');
$GLOBALS['phpgw']->common->phpgw_footer();

1
preferences/inc/class.uiaclprefs.inc.php
View File

@ -194,7 +194,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$this->template = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir($acl_app));
$templates = Array (

4
preferences/inc/class.uicategories.inc.php
View File

@ -103,7 +103,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$this->t->set_file(array('cat_list_t' => 'listcats.tpl',
'data_column' => 'listcats.tpl'));
@ -274,7 +273,6 @@
);
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$new_parent = get_var('new_parent',Array('POST'));
$submit = get_var('submit',Array('POST'));
@ -387,7 +385,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$new_parent = get_var('new_parent',Array('POST'));
$submit = get_var('submit',Array('POST'));
@ -536,7 +533,6 @@
$nolink = $GLOBALS['phpgw']->link('/index.php',$link_data);
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$this->t->set_var('deleteheader',lang('Are you sure you want to delete this category ?'));

1
preferences/preferences.php
View File

@ -279,7 +279,6 @@
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
if ($GLOBALS['appname'] == 'preferences')
{