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

added option to enable/disable support for old_style apps, added css class for msgbox, fixed home screen if default_app

Browse Source
This commit is contained in:
ceb 2002-10-29 22:15:32 +00:00
parent 498ef1b870
commit 27031e5523
21 changed files with 86 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
header.inc.php.template
View File

@ -9,7 +9,6 @@
* Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. *
\**************************************************************************/
/* $Id$ */
/**************************************************************************\
@ -48,6 +47,9 @@
/* Select which login theme you want */
$GLOBALS['phpgw_info']['login_theme'] = 'submarine';
/* Enables support for non xslt apps or apps which weren't already ported to the last version of class.Templates.inc.php */
$GLOBALS['phpgw_info']['server']['support_old_style_apps'] = True;
/* This is used to control mcrypt's use */
$GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = {ENABLE_MCRYPT};
/* Set this to 'old' for versions < 2.4, otherwise the exact mcrypt version you use. */
@ -96,7 +98,7 @@
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] = $setup_info['phpgwapi']['version'];
$GLOBALS['phpgw_info']['server']['versions']['current_header'] = $setup_info['phpgwapi']['versions']['current_header'];
unset($setup_info);
$GLOBALS['phpgw_info']['server']['versions']['header'] = '1.22';
$GLOBALS['phpgw_info']['server']['versions']['header'] = '1.23';
/* This is a fix for NT */
if(!isset($GLOBALS['phpgw_info']['flags']['noapi']) || !$GLOBALS['phpgw_info']['flags']['noapi'] == True)
{

5
home.php
View File

@ -211,5 +211,8 @@
$GLOBALS['phpgw']->preferences->save_repository();
}
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->portalbox->output);
if (!$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'])
{
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->portalbox->output);
}
?>

5
index.php
View File

@ -71,7 +71,10 @@
// eval("\$GLOBALS['obj']->$method();");
execmethod($GLOBALS['HTTP_GET_VARS']['menuaction']);
$GLOBALS['phpgw']->common->stop_xslt_capture(); // send captured output to the xslttpl
if ($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
{
$GLOBALS['phpgw']->common->stop_xslt_capture(); // send captured output to the xslttpl
}
unset($app);
unset($obj);

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

@ -1240,7 +1240,10 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
switch($GLOBALS['phpgw_info']['flags']['currentapp'])
{
case 'home':
$var['home'] = True;
if (!$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'])
{
$var['home'] = True;
}
break;
case 'about':
$var['about'] = True;
@ -1389,7 +1392,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
{
/* Hope we don't get to this point. Better then the user seeing a */
/* complety back screen and not know whats going on */
$GLOBALS['phpgw_info']['theme']['bg_color'] = 'FFFFFF';
$GLOBALS['phpgw']->log->write(array('text'=>'F-Abort, No themes found'));
}
$phpgw_css_file = $GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP . 'templates' . SEP . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']
@ -1419,25 +1421,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
return '';
}
function load_phpgw_body_tags()
{
$GLOBALS['phpgw_info']['flags']['body_tags']['onLoad'] = $this->load_preload_images_data();
if(@is_array($GLOBALS['phpgw_info']['flags']['body_tags']))
{
$body_tags_string = '';
reset($GLOBALS['phpgw_info']['flags']['body_tags']);
while(list($key,$value) = each($GLOBALS['phpgw_info']['flags']['body_tags']))
{
if($value != '')
{
$body_tags_string .= " $key=\"$value\"";
}
}
$GLOBALS['phpgw']->template->set_var('phpgw_body_tags',$body_tags_string);
}
}
/*!
@function phpgw_header
@abstract load the phpgw header
@ -1536,10 +1519,17 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
!@$GLOBALS['phpgw_info']['flags']['noappfooter'])
{
$this->start_xslt_capture(); // if index already turned it off
if($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
{
$this->start_xslt_capture(); // if index already turned it off
}
$this->phpgw_appfooter();
}
$this->stop_xslt_capture();
if ($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
{
$this->stop_xslt_capture();
}
$GLOBALS['phpgw']->xslttpl->pp();
$GLOBALS['phpgw']->db->disconnect();

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

@ -269,10 +269,13 @@
define('PHPGW_ACL_PRIVATE',16);
define('PHPGW_ACL_GROUP_MANAGERS',32);
/****************************************************************************\
* Forcing all non-cooperating apps to send there output through the xslt-tpl *
\****************************************************************************/
$GLOBALS['phpgw']->common->start_xslt_capture();
if ($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
{
/****************************************************************************\
* Forcing all non-cooperating apps to send there output through the xslt-tpl *
\****************************************************************************/
$GLOBALS['phpgw']->common->start_xslt_capture();
}
/****************************************************************************\
* Forcing the footer to run when the rest of the script is done. *

2
phpgwapi/setup/setup.inc.php
View File

@ -14,7 +14,7 @@
/* Basic information about this app */
$setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['version'] = '0.9.15.008';
$setup_info['phpgwapi']['versions']['current_header'] = '1.22';
$setup_info['phpgwapi']['versions']['current_header'] = '1.23';
$setup_info['phpgwapi']['enable'] = 3;
$setup_info['phpgwapi']['app_order'] = 1;

2
phpgwapi/templates/default/css/phpgw.css
View File

@ -50,7 +50,7 @@ table.login
text-align: center;
}
.login,.portal,.about
.login,.portal,.about,.msgbox
{
border-width: 1px;
border-style: ridge;

5
phpgwapi/templates/default/css/submarine.css
View File

@ -39,6 +39,11 @@ a:hover
background-color: #CCEEFF;
}
.msgbox
{
background-color: #FFFFFF;
}
.row_off
{
background-color: #DDF0FF;

6
phpgwapi/templates/default/msgbox.xsl
View File

@ -5,9 +5,9 @@
</xsl:template>
<xsl:template match="msgbox_data">
<table cellpadding="2" cellspacing="2" align="center" bgcolor="#FFFFFF">
<table cellpadding="2" cellspacing="0" align="center" class="msgbox">
<tr>
<td align="center">
<td align="center" valign="middle">
<xsl:variable name="msgbox_img"><xsl:value-of select="msgbox_img"/></xsl:variable>
<xsl:variable name="msgbox_img_alt"><xsl:value-of select="msgbox_img_alt"/></xsl:variable>
<img src="{$msgbox_img}" alt="{$msgbox_img_alt}" onMouseout="window.status='';return true;">
@ -16,7 +16,7 @@
<xsl:value-of select="lang_msgbox_statustext"/>
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</img>
</img><xsl:text> </xsl:text>
<xsl:value-of select="msgbox_text"/>
</td>
</tr>

5
phpgwapi/templates/idsociety/css/dove.css
View File

@ -35,6 +35,11 @@ a:hover
background-color: #e6e6e6;
}
.msgbox
{
background-color: #FFFFFF;
}
.th
{
background-color: #486591;

5
phpgwapi/templates/idsociety/css/fancy.css
View File

@ -35,6 +35,11 @@ a:hover
background-color: #AABBCC;
}
.msgbox
{
background-color: #FFFFFF;
}
.row_on
{
background-color: #EEEEFF;

5
phpgwapi/templates/idsociety/css/idsociety.css
View File

@ -34,6 +34,11 @@ a:hover
background-color: #DDDDDD;
}
.msgbox
{
background-color: #FFFFFF;
}
.row_off
{
background-color: #EEEEEE;

2
phpgwapi/templates/idsociety/css/phpgw.css
View File

@ -86,7 +86,7 @@ table.login
text-align: center;
}
.login,.portal,.about
.login,.portal,.about,.msgbox
{
border-width: 1px;
border-style: ridge;

5
phpgwapi/templates/idsociety/css/submarine.css
View File

@ -29,6 +29,11 @@ a:hover
background-color: #CCEEFF;
}
.msgbox
{
background-color: #FFFFFF;
}
.row_off
{
background-color: #DDF0FF;

2
phpgwapi/templates/justweb/css/phpgw.css
View File

@ -50,7 +50,7 @@ table.login
text-align: center;
}
.login,.portal,.about
.login,.portal,.about,.msgbox
{
border-width: 1px;
border-style: ridge;

5
phpgwapi/templates/justweb/css/submarine.css
View File

@ -39,6 +39,11 @@ a:hover
background-color: #CCEEFF;
}
.msgbox
{
background-color: #FFFFFF;
}
.row_off
{
background-color: #DDF0FF;

2
phpgwapi/templates/linux-at-work.de/css/phpgw.css
View File

@ -50,7 +50,7 @@ table.login
text-align: center;
}
.login,.portal,.about
.login,.portal,.about,.msgbox
{
border-width: 1px;
border-style: ridge;

5
phpgwapi/templates/linux-at-work.de/css/submarine.css
View File

@ -39,6 +39,11 @@ a:hover
background-color: #CCEEFF;
}
.msgbox
{
background-color: #FFFFFF;
}
.row_off
{
background-color: #DDF0FF;

5
phpgwapi/templates/verdilak/css/chestnut.css
View File

@ -29,6 +29,11 @@ a:hover
color: #FFFFFF;
}
.msgbox
{
background-color: #FFFFFF;
}
.portal_text
{
color: #FFFFFF;

2
phpgwapi/templates/verdilak/css/phpgw.css
View File

@ -50,7 +50,7 @@ table.login
text-align: center;
}
.login,.portal,.about
.login,.portal,.about,.msgbox
{
border-width: 1px;
border-style: ridge;

5
phpgwapi/templates/verdilak/css/submarine.css
View File

@ -39,6 +39,11 @@ a:hover
background-color: #CCEEFF;
}
.msgbox
{
background-color: #FFFFFF;
}
.row_off
{
background-color: #DDF0FF;