mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-23 00:13:35 +01:00
removed app_title plus update default layout to use xslt
This commit is contained in:
ceb
parent
c22b27bd36
commit
6d142e0c7c
@ -353,7 +353,7 @@
|
||||
$app[$this->db->f('app_id')] = Array(
|
||||
'id' => $this->db->f('app_id'),
|
||||
'name' => $this->db->f('app_name'),
|
||||
'title' => $this->db->f('app_title'),
|
||||
'title' => lang($this->db->f('app_name')),
|
||||
'version' => $this->db->f('app_version'),
|
||||
'tables' => $this->db->f('app_tables')
|
||||
);
|
||||
@ -490,7 +490,7 @@
|
||||
Array(
|
||||
'id' => CreateObject('phpgwapi.xmlrpcval',$app_id,'int'),
|
||||
'name' => CreateObject('phpgwapi.xmlrpcval',$app_name,'string'),
|
||||
'title' => CreateObject('phpgwapi.xmlrpcval',$this->db->f('app_title'),'string'),
|
||||
'title' => CreateObject('phpgwapi.xmlrpcval',lang($this->db->f('app_name')),'string'),
|
||||
'version' => CreateObject('phpgwapi.xmlrpcval',$this->db->f('app_version'),'string'),
|
||||
'tables' => CreateObject('phpgwapi.xmlrpcval',$this->db->f('app_tables'),'string')
|
||||
),
|
||||
@ -509,7 +509,7 @@
|
||||
while ($this->db->next_record())
|
||||
{
|
||||
$name = $this->db->f('app_name');
|
||||
$title = $this->db->f('app_title');
|
||||
$title = lang($this->db->f('app_name'));
|
||||
$status = $this->db->f('app_enabled');
|
||||
$version= $this->db->f('app_version');
|
||||
$apps[$name] = CreateObject('phpgwapi.xmlrpcval',
|
||||
|
||||
@ -293,7 +293,7 @@
|
||||
while ($this->db->next_record())
|
||||
{
|
||||
$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array(
|
||||
'title' => $this->db->f('app_title'),
|
||||
'title' => str_replace('- ','-',ucwords(str_replace('_','- ',$this->db->f('app_name')))),
|
||||
'name' => $this->db->f('app_name'),
|
||||
'enabled' => True,
|
||||
'status' => $this->db->f('app_enabled'),
|
||||
|
||||
@ -1162,6 +1162,12 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
|
||||
$var['about_img'] = $this->image('phpgwapi','help');
|
||||
$var['greybar'] = $this->image('phpgwapi','greybar.jpg');
|
||||
break;
|
||||
default:
|
||||
$var['home_img'] = $GLOBALS['phpgw_info']['navbar']['home']['icon'];
|
||||
$var['prefs_img'] = $GLOBALS['phpgw_info']['navbar']['preferences']['icon'];
|
||||
$var['logout_img'] = $GLOBALS['phpgw_info']['navbar']['logout']['icon'];
|
||||
$var['about_img'] = $GLOBALS['phpgw_info']['navbar']['about']['icon'];
|
||||
break;
|
||||
}
|
||||
$var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url'];
|
||||
$var['prefs_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url'];
|
||||
@ -1230,7 +1236,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
|
||||
$var['lang_phpgw_statustext'] = lang('phpGroupWare --> homepage');
|
||||
$var['top_spacer_middle_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle');
|
||||
|
||||
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var,True);
|
||||
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
@ -360,11 +360,10 @@
|
||||
}
|
||||
}
|
||||
$this->db->query("INSERT INTO $appstbl "
|
||||
. "($app_idstr app_name,app_title,app_enabled,app_order,app_tables,app_version) "
|
||||
. "($app_idstr app_name,app_enabled,app_order,app_tables,app_version) "
|
||||
. "VALUES ("
|
||||
. $app_id
|
||||
. "'" . $setup_info[$appname]['name'] . "',"
|
||||
. "'" . $setup_info[$appname]['title'] . "',"
|
||||
. $enable . ","
|
||||
. intval($setup_info[$appname]['app_order']) . ","
|
||||
. "'" . $tables . "',"
|
||||
@ -468,7 +467,6 @@
|
||||
|
||||
$sql = "UPDATE $appstbl "
|
||||
. "SET app_name='" . $setup_info[$appname]['name'] . "',"
|
||||
. " app_title='" . $setup_info[$appname]['title'] . "',"
|
||||
. " app_enabled=" . intval($setup_info[$appname]['enable']) . ","
|
||||
. " app_order=" . intval($setup_info[$appname]['app_order']) . ","
|
||||
. " app_tables='" . $tables . "',"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* phpGroupWare API - XSLT Template class *
|
||||
* Written by Dan Kuykendall <seek3r@phpgroupware.org> *
|
||||
* and Bettina Gille [ceb@phpgroupware.org] *
|
||||
* and Ralf Becker <ralfbecker@outdoortraining.de> *
|
||||
* and Ralf Becker <ralfbecker@outdoor-training.de> *
|
||||
* Copyright (C) 2002 Dan Kuykendall, Bettina Gille, Ralf Becker *
|
||||
* ----------------------------------------------------------------- *
|
||||
* This library is part of the phpGroupWare API *
|
||||
|
||||
@ -138,7 +138,7 @@
|
||||
while ($GLOBALS['phpgw']->db->next_record())
|
||||
{
|
||||
$name = $GLOBALS['phpgw']->db->f('app_name');
|
||||
$title = $GLOBALS['phpgw']->db->f('app_title');
|
||||
$title = lang($GLOBALS['phpgw']->db->f('app_name'));
|
||||
$status = $GLOBALS['phpgw']->db->f('app_enabled');
|
||||
$version= $GLOBALS['phpgw']->db->f('app_version');
|
||||
$apps[$name] = array(
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
/* Basic information about this app */
|
||||
$setup_info['phpgwapi']['name'] = 'phpgwapi';
|
||||
$setup_info['phpgwapi']['version'] = '0.9.15.006';
|
||||
$setup_info['phpgwapi']['version'] = '0.9.15.008';
|
||||
$setup_info['phpgwapi']['versions']['current_header'] = '1.22';
|
||||
$setup_info['phpgwapi']['enable'] = 3;
|
||||
$setup_info['phpgwapi']['app_order'] = 1;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
'fd' => array(
|
||||
'config_app' => array('type' => 'varchar', 'precision' => 50),
|
||||
'config_name' => array('type' => 'varchar', 'precision' => 255, 'nullable' => false),
|
||||
'config_value' => array('type' => 'varchar', 'precision' => 100)
|
||||
'config_value' => array('type' => 'text', 'nullable' => false)
|
||||
),
|
||||
'pk' => array(),
|
||||
'fk' => array(),
|
||||
@ -27,7 +27,6 @@
|
||||
'fd' => array(
|
||||
'app_id' => array('type' => 'auto', 'precision' => 4, 'nullable' => false),
|
||||
'app_name' => array('type' => 'varchar', 'precision' => 25, 'nullable' => false),
|
||||
'app_title' => array('type' => 'varchar', 'precision' => 50),
|
||||
'app_enabled' => array('type' => 'int', 'precision' => 4),
|
||||
'app_order' => array('type' => 'int', 'precision' => 4),
|
||||
'app_tables' => array('type' => 'text'),
|
||||
|
||||
@ -114,4 +114,42 @@
|
||||
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
|
||||
}
|
||||
|
||||
|
||||
|
||||
$test[] = '0.9.15.006';
|
||||
function phpgwapi_upgrade0_9_15_006()
|
||||
{
|
||||
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_config','config_value',array(
|
||||
'type' => 'text',
|
||||
'nullable' => False
|
||||
));
|
||||
|
||||
|
||||
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.007';
|
||||
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
|
||||
}
|
||||
|
||||
|
||||
$test[] = '0.9.15.007';
|
||||
function phpgwapi_upgrade0_9_15_007()
|
||||
{
|
||||
$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_applications',array(
|
||||
'fd' => array(
|
||||
'app_id' => array('type' => 'auto','precision' => '4','nullable' => False),
|
||||
'app_name' => array('type' => 'varchar','precision' => '25','nullable' => False),
|
||||
'app_enabled' => array('type' => 'int','precision' => '4'),
|
||||
'app_order' => array('type' => 'int','precision' => '4'),
|
||||
'app_tables' => array('type' => 'text'),
|
||||
'app_version' => array('type' => 'varchar','precision' => '20','nullable' => False,'default' => '0.0')
|
||||
),
|
||||
'pk' => array('app_id'),
|
||||
'fk' => array(),
|
||||
'ix' => array(),
|
||||
'uc' => array('app_name')
|
||||
),'app_title');
|
||||
|
||||
|
||||
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.008';
|
||||
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
|
||||
}
|
||||
?>
|
||||
|
||||
@ -18,7 +18,7 @@ a:hover
|
||||
color: #EE0000;
|
||||
}
|
||||
|
||||
.navbar
|
||||
.navbar,.bottom
|
||||
{
|
||||
background-color: #AABBCC;
|
||||
}
|
||||
|
||||
@ -1,51 +1,110 @@
|
||||
<!-- $Id$ -->
|
||||
|
||||
<xsl:template name="phpgw">
|
||||
<xsl:variable name="css_path"><xsl:value-of select="css_path"/></xsl:variable>
|
||||
<xsl:variable name="phpgw_charset"><xsl:value-of select="phpgw_charset"/></xsl:variable>
|
||||
<xsl:variable name="phpgw_bg"><xsl:value-of select="phpgw_bg"/></xsl:variable>
|
||||
<xsl:variable name="phpgw_onload"><xsl:value-of select="phpgw_onload"/></xsl:variable>
|
||||
<xsl:variable name="phpgw_top_table_height"><xsl:value-of select="phpgw_top_table_height"/></xsl:variable>
|
||||
<xsl:variable name="phpgw_left_table_width"><xsl:value-of select="phpgw_left_table_width"/></xsl:variable>
|
||||
<xsl:variable name="phpgw_body_table_height"><xsl:value-of select="phpgw_body_table_height"/></xsl:variable>
|
||||
<xsl:variable name="phpgw_body_table_width"><xsl:value-of select="phpgw_body_table_width"/></xsl:variable>
|
||||
<xsl:variable name="phpgw_right_table_width"><xsl:value-of select="phpgw_right_table_width"/></xsl:variable>
|
||||
<xsl:variable name="phpgw_bottom_table_height"><xsl:value-of select="phpgw_bottom_table_height"/></xsl:variable>
|
||||
<xsl:template match="phpgw">
|
||||
<xsl:variable name="phpgw_css_file"><xsl:value-of select="phpgw_css_file"/></xsl:variable>
|
||||
<xsl:variable name="theme_css_file"><xsl:value-of select="theme_css_file"/></xsl:variable>
|
||||
<xsl:variable name="charset"><xsl:value-of select="charset"/></xsl:variable>
|
||||
<xsl:variable name="onload"><xsl:value-of select="onload"/></xsl:variable>
|
||||
<xsl:variable name="home_link"><xsl:value-of select="home_link"/></xsl:variable>
|
||||
<xsl:variable name="prefs_link"><xsl:value-of select="prefs_link"/></xsl:variable>
|
||||
<xsl:variable name="logout_link"><xsl:value-of select="logout_link"/></xsl:variable>
|
||||
<xsl:variable name="about_link"><xsl:value-of select="about_link"/></xsl:variable>
|
||||
<xsl:variable name="home_img"><xsl:value-of select="home_img"/></xsl:variable>
|
||||
<xsl:variable name="prefs_img"><xsl:value-of select="prefs_img"/></xsl:variable>
|
||||
<xsl:variable name="logout_img"><xsl:value-of select="logout_img"/></xsl:variable>
|
||||
<xsl:variable name="about_img"><xsl:value-of select="about_img"/></xsl:variable>
|
||||
<xsl:variable name="home_title"><xsl:value-of select="home_title"/></xsl:variable>
|
||||
<xsl:variable name="prefs_title"><xsl:value-of select="prefs_title"/></xsl:variable>
|
||||
<xsl:variable name="logout_title"><xsl:value-of select="logout_title"/></xsl:variable>
|
||||
<xsl:variable name="about_title"><xsl:value-of select="about_title"/></xsl:variable>
|
||||
<xsl:variable name="phpgw_body"><xsl:value-of select="phpgw_body"/></xsl:variable>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset={$phpgw_charset}"/>
|
||||
<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="noindex"/>
|
||||
<link rel="icon" href="favicon.ico" type="image/x-ico"/>
|
||||
<link rel="shortcut icon" href="favicon.ico"/>
|
||||
<title><xsl:value-of select="phpgw_website_title"/></title>
|
||||
<xsl:apply-templates select="head_js"/>
|
||||
<link rel="stylesheet" type="text/css" href="{$css_path}">
|
||||
<title><xsl:value-of select="website_title"/></title>
|
||||
<link rel="stylesheet" type="text/css" href="{$phpgw_css_file}"/>
|
||||
<link rel="stylesheet" type="text/css" href="{$theme_css_file}"/>
|
||||
</head>
|
||||
<body background="{$phpgw_bg}" onLoad="{$phpgw_onload}">
|
||||
<table border="0" width="100%" height="100%" cellspacing="0" cellpadding="0">
|
||||
<tr>
|
||||
<td width="100%" height="{$phpgw_top_table_height}" valign="top" colspan="3">
|
||||
<xsl:call-template name="phpgw_top"/>
|
||||
<body onLoad="{$onload}">
|
||||
<table width="100%" height="100%" cellspacing="0" cellpadding="0">
|
||||
<tr valign="top" align="right" class="navbar" width="100%">
|
||||
<td>
|
||||
<table width="100%" cellspacing="0" cellpadding="2">
|
||||
<tr width="100%">
|
||||
<td colspan="4">
|
||||
<table cellspacing="0" cellpadding="0" width="100%">
|
||||
<tr>
|
||||
<xsl:apply-templates select="applications"/>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr width="100%">
|
||||
<td width="33%" class="info"><xsl:value-of select="user_info_name"/></td>
|
||||
<xsl:choose>
|
||||
<xsl:when test="current_users">
|
||||
<xsl:variable name="url_current_users"><xsl:value-of select="url_current_users"/></xsl:variable>
|
||||
<td width="33%" class="info"><a href="{$url_current_users}"><xsl:value-of select="current_users"/></a></td>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<td width="33%"></td>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
<td width="33%" class="info" align="right"><xsl:value-of select="user_info_date"/></td>
|
||||
<td>
|
||||
<table cellspacing="0" cellpadding="0" align="right">
|
||||
<tr>
|
||||
<td><a href="{$home_link}" onMouseOver="" onMouseOut=""><img src="{$home_img}" border="0" name="nine" alt="{$home_title}" title="{$home_title}"/></a></td>
|
||||
<td><a href="{$prefs_link}" onMouseOver="" onMouseOut=""><img src="{$prefs_img}" border="0" name="ten" alt="{$prefs_title}" title="{$prefs_title}"/></a></td>
|
||||
<td><a href="{$logout_link}" onMouseOver="" onMouseOut=""><img src="{$logout_img}" border="0" name="eleven" alt="{$logout_title}" title="{$logout_title}"/></a></td>
|
||||
<td><a href="{$about_link}" onMouseOver="" onMouseOut=""><img src="{$about_img}" border="0" name="about" alt="{$about_title}" title="{$about_title}"/></a></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="{$phpgw_left_table_width}" height="{$phpgw_body_table_height}" valign="top">
|
||||
<xsl:call-template name="phpgw_left"/>
|
||||
</td>
|
||||
<td width="{$phpgw_body_table_width}" height="{$phpgw_body_table_height}" valign="top">
|
||||
<xsl:call-template name="msgbox"/>
|
||||
<xsl:call-template name="phpgw_body"/>
|
||||
</td>
|
||||
<td width="{$phpgw_right_table_width}" height="{$phpgw_body_table_height}" align="right" valign="top">
|
||||
<xsl:apply-templates select="phpgw_right"/>
|
||||
<td width="100%" height="100%" valign="top" align="center">
|
||||
<xsl:choose>
|
||||
<xsl:when test="msgbox_data">
|
||||
<xsl:call-template name="msgbox"/>
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
<xsl:choose>
|
||||
<xsl:when test="home">
|
||||
<xsl:call-template name="portal"/>
|
||||
</xsl:when>
|
||||
<xsl:when test="about">
|
||||
<xsl:call-template name="about"/>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of disable-output-escaping="yes" select="body_data"/>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="100%" height="{$phpgw_bottom_table_height}" valign="top" colspan="3">
|
||||
<xsl:call-template name="phpgw_bottom"/>
|
||||
<tr valign="top">
|
||||
<td align="center" valign="top" class="bottom">
|
||||
<!-- BEGIN bottom_part -->
|
||||
<xsl:value-of select="lang_powered_by"/>
|
||||
<a href="http://www.phpgroupware.org" target="blank" onMouseout="window.status='';return true;">
|
||||
<xsl:attribute name="onMouseover">
|
||||
<xsl:text>window.status='</xsl:text>
|
||||
<xsl:value-of select="lang_phpgw_statustext"/>
|
||||
<xsl:text>'; return true;</xsl:text>
|
||||
</xsl:attribute>
|
||||
<xsl:text> phpGroupWare </xsl:text>
|
||||
</a>
|
||||
<xsl:text> </xsl:text><xsl:value-of select="lang_version"/><xsl:text> </xsl:text><xsl:value-of select="phpgw_version"/>
|
||||
<!-- END bottom_part -->
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@ -53,49 +112,13 @@
|
||||
</html>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="head_js">
|
||||
<script language="JavaScript" type="text/javascript">
|
||||
<xsl:text>
|
||||
function MM_swapImgRestore()
|
||||
{ //v3.0
|
||||
var i,x,a=document.MM_sr;
|
||||
for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++)
|
||||
x.src=x.oSrc;
|
||||
}
|
||||
function MM_preloadImages()
|
||||
{ //v3.0
|
||||
var d=document; if(d.images)
|
||||
{
|
||||
if(!d.MM_p)
|
||||
d.MM_p=new Array();
|
||||
var i,j=d.MM_p.length,a=MM_preloadImages.arguments;
|
||||
for(i=0; i<a.length; i++)
|
||||
if (a[i].indexOf("#")!=0)
|
||||
{
|
||||
d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
function MM_findObj(n, d)
|
||||
{ //v4.0
|
||||
var p,i,x; if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
|
||||
d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
|
||||
if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
|
||||
for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
|
||||
if(!x && document.getElementById) x=document.getElementById(n); return x;
|
||||
}
|
||||
function MM_swapImage() { //v3.0
|
||||
var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
|
||||
if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
|
||||
}
|
||||
|
||||
function multiLoad(top_doc,left_doc,body_doc,right_doc,bottom_doc) {
|
||||
if(top_doc != null){ parent.top.location.href=top_doc; }
|
||||
if(left_doc != null){ parent.left.location.href=left_doc; }
|
||||
if(body_doc != null){ parent.body.location.href=body_doc; }
|
||||
if(right_doc != null){ parent.right.location.href=right_doc; }
|
||||
if(bottom_doc != null){ parent.bottom.location.href=bottom_doc; }
|
||||
}
|
||||
</xsl:text>
|
||||
</script>
|
||||
<xsl:template match="applications">
|
||||
<xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
|
||||
<xsl:variable name="name"><xsl:value-of select="name"/></xsl:variable>
|
||||
<xsl:variable name="icon"><xsl:value-of select="icon"/></xsl:variable>
|
||||
<xsl:variable name="title"><xsl:value-of select="title"/></xsl:variable>
|
||||
<td>
|
||||
<a href="{$url}" onMouseOver="" onMouseOut=""><img src="{$icon}" border="0" alt="{$title}" title="{$title}" name="{$name}"/></a>
|
||||
</td>
|
||||
</xsl:template>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user