[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety parts.inc.php,1.5,1
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety parts.inc.php,1.5,1.6 phpgw.xsl,1.2,1.3 |
|
Date: |
Wed, 23 Oct 2002 16:47:35 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/templates/idsociety
In directory subversions:/tmp/cvs-serv5948/phpgwapi/templates/idsociety
Modified Files:
parts.inc.php phpgw.xsl
Log Message:
removed app_title plus update layout
Index: parts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/parts.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** parts.inc.php 21 Oct 2002 23:47:14 -0000 1.5
--- parts.inc.php 23 Oct 2002 20:47:32 -0000 1.6
***************
*** 51,55 ****
if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home')
{
! $var['welcome_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','welcome2');
$GLOBALS['phpgw_info']['flags']['preload_images'][] =
$GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over');
}
--- 51,55 ----
if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home')
{
! $var['welcome_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','welcome2');
$GLOBALS['phpgw_info']['flags']['preload_images'][] =
$GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over');
}
***************
*** 59,62 ****
--- 59,63 ----
$GLOBALS['phpgw_info']['flags']['preload_images'][] =
$GLOBALS['phpgw']->common->image('phpgwapi','welcome2');
}
+ $var['welcome_img_hover'] =
$GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over');
if ($GLOBALS['phpgw_info']['flags']['currentapp'] !=
'preferences')
***************
*** 70,78 ****
$GLOBALS['phpgw_info']['flags']['preload_images'][] =
$GLOBALS['phpgw']->common->image('phpgwapi','preferences2');
}
$var['logout_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','log_out2');
$GLOBALS['phpgw_info']['flags']['preload_images'][] =
$GLOBALS['phpgw']->common->image_on('phpgwapi','log_out2','_over');
-
if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'about')
{
--- 71,80 ----
$GLOBALS['phpgw_info']['flags']['preload_images'][] =
$GLOBALS['phpgw']->common->image('phpgwapi','preferences2');
}
+ $var['preferences_img_hover'] =
$GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over');
$var['logout_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','log_out2');
$GLOBALS['phpgw_info']['flags']['preload_images'][] =
$GLOBALS['phpgw']->common->image_on('phpgwapi','log_out2','_over');
+ $var['logout_img_hover'] =
$GLOBALS['phpgw']->common->image_on('phpgwapi','log_out2','_over');
if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'about')
{
***************
*** 123,130 ****
while ($app = each($GLOBALS['phpgw_info']['navbar']))
{
! if ($app[1]['title'] != 'Home' && $app[1]['title'] !=
'preferences' && !ereg('About',$app[1]['title']) && $app[1]['title'] !=
'Logout')
{
$title = '<img src="' . $app[1]['icon'] . '"
alt="' . $app[1]['title'] . '" title="'
! . lang($app[1]['title']) . '"
border="0" name="' . str_replace('-','_',$app[0]) . '">';
$img_src_over = $app[1]['icon_hover'];
$img_src_out = $app[1]['icon'];
--- 125,132 ----
while ($app = each($GLOBALS['phpgw_info']['navbar']))
{
! if ($app[0] != 'home' && $app[0] != 'preferences' &&
$app[0] != 'about' && $app[0] != 'logout')
{
$title = '<img src="' . $app[1]['icon'] . '"
alt="' . $app[1]['title'] . '" title="'
! . $app[1]['title'] . '" border="0"
name="' . str_replace('-','_',$app[0]) . '">';
$img_src_over = $app[1]['icon_hover'];
$img_src_out = $app[1]['icon'];
Index: phpgw.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/phpgw.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** phpgw.xsl 22 Oct 2002 00:23:33 -0000 1.2
--- phpgw.xsl 23 Oct 2002 20:47:32 -0000 1.3
***************
*** 4,12 ****
<xsl:variable name="phpgw_css_path"><xsl:value-of
select="phpgw_css_path"/></xsl:variable>
<xsl:variable name="theme_css_path"><xsl:value-of
select="theme_css_path"/></xsl:variable>
! <xsl:variable name="phpgw_charset"><xsl:value-of
select="phpgw_charset"/></xsl:variable>
! <xsl:variable name="phpgw_onload"><xsl:value-of
select="phpgw_onload"/></xsl:variable>
<html>
<head>
! <meta http-equiv="Content-Type"
content="text/html; charset={$phpgw_charset}"/>
<meta name="author" content="phpGroupWare
http://www.phpgroupware.org"/>
<meta name="description"
content="phpGroupWare"/>
--- 4,25 ----
<xsl:variable name="phpgw_css_path"><xsl:value-of
select="phpgw_css_path"/></xsl:variable>
<xsl:variable name="theme_css_path"><xsl:value-of
select="theme_css_path"/></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="logo_img"><xsl:value-of
select="logo_img"/></xsl:variable>
! <xsl:variable name="home_link"><xsl:value-of
select="home_link"/></xsl:variable>
! <xsl:variable name="preferences_link"><xsl:value-of
select="preferences_link"/></xsl:variable>
! <xsl:variable name="logout_link"><xsl:value-of
select="logout_link"/></xsl:variable>
! <xsl:variable name="help_link"><xsl:value-of
select="help_link"/></xsl:variable>
! <xsl:variable name="welcome_img_hover"><xsl:value-of
select="welcome_img_hover"/></xsl:variable>
! <xsl:variable name="preferences_img_hover"><xsl:value-of
select="preferences_img_hover"/></xsl:variable>
! <xsl:variable name="logout_img_hover"><xsl:value-of
select="logout_img_hover"/></xsl:variable>
! <xsl:variable name="about_img_hover"><xsl:value-of
select="about_img_hover"/></xsl:variable>
! <xsl:variable name="welcome_img"><xsl:value-of
select="welcome_img"/></xsl:variable>
! <xsl:variable name="preferences_img"><xsl:value-of
select="preferences_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>
<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"/>
***************
*** 16,24 ****
<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="{$phpgw_css_path}">
<link rel="stylesheet" type="text/css"
href="{$theme_css_path}">
</head>
! <body onLoad="{$phpgw_onload}">
<table width="100%" height="100%"
cellspacing="0" cellpadding="0">
<tr>
--- 29,83 ----
<link rel="shortcut icon" href="favicon.ico"/>
<title><xsl:value-of
select="phpgw_website_title"/></title>
!
! <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>
<link rel="stylesheet" type="text/css"
href="{$phpgw_css_path}">
<link rel="stylesheet" type="text/css"
href="{$theme_css_path}">
</head>
! <body onLoad="{$onload}">
<table width="100%" height="100%"
cellspacing="0" cellpadding="0">
<tr>
***************
*** 30,41 ****
<!-- row 2
images are 15 px high, so this table with these 2 rows is 58 plus 15 equals
73px high -->
<td
width="154" valign="top">
!
<img src="{logo_img}" border="0">
</td>
<td
valign="bottom">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
!
<td width="33%" class="info">{user_info_name}</td>
!
<td width="33%" class="info">{current_users}</td>
!
<td width="33%" class="info" align="right">{user_info_date}</td>
</tr>
</table>
--- 89,107 ----
<!-- row 2
images are 15 px high, so this table with these 2 rows is 58 plus 15 equals
73px high -->
<td
width="154" valign="top">
!
<img src="{$logo_img}" border="0">
</td>
<td
valign="bottom">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
!
<td width="33%" class="info"><xsl:value-of
select="user_info_name"/></td>
!
<xsl:choose>
!
<xsl:when test="current_users">
!
<td width="33%" class="info"><a
href="{$url_current_users}"><xsl:value-of select="current_users"/></a></td>
!
</xsl:when>
!
<xsl:otherwise>
!
<td></td>
!
</xsl:othwerwise>
!
</xsl:choose>
!
<td width="33%" class="info" align="right"><xsl:value-of
select="user_info_date"/></td>
</tr>
</table>
***************
*** 47,54 ****
<table cellpadding="0" cellspacing="0">
<tr>
!
<td><a href="{home_link}"
onMouseOver="nine.src='{welcome_img_hover}'"
onMouseOut="nine.src='{welcome_img}'"><img src="{welcome_img}" border="0"
name="nine"></a></td>
!
<td><a href="{preferences_link}"
onMouseOver="ten.src='{preferences_img_hover}'"
onMouseOut="ten.src='{preferences_img}'"><img src="{preferences_img}"
border="0" name="ten"></a></td>
!
<td><a href="{logout_link}"
onMouseOver="eleven.src='{logout_img_hover}'"
onMouseOut="eleven.src='{logout_img}'"><img src="{logout_img}" border="0"
name="eleven"></a></td>
!
<td><a href="{help_link}"
onMouseOver="help.src='{about_img_hover}'"
onMouseOut="help.src='{about_img}'"><img src="{about_img}" border="0"
name="help"></a></td>
</tr>
</table>
--- 113,120 ----
<table cellpadding="0" cellspacing="0">
<tr>
!
<td><a href="{$home_link}"
onMouseOver="nine.src='{$welcome_img_hover}'"
onMouseOut="nine.src='{$welcome_img}'"><img src="{$welcome_img}" border="0"
name="nine" alt="{$welcome_title}" title="{$welcome_title}"></a></td>
!
<td><a href="{$preferences_link}"
onMouseOver="ten.src='{$preferences_img_hover}'"
onMouseOut="ten.src='{$preferences_img}'"><img src="{$preferences_img}"
border="0" name="ten" alt="{$prefs_title}" title="{$prefs_title}"></a></td>
!
<td><a href="{$logout_link}"
onMouseOver="eleven.src='{$logout_img_hover}'"
onMouseOut="eleven.src='{$logout_img}'"><img src="{$logout_img}" border="0"
name="eleven" alt="{$logout_title}" title="{$logout_title}"></a></td>
!
<td><a href="{$help_link}"
onMouseOver="help.src='{$about_img_hover}'"
onMouseOut="help.src='{$about_img}'"><img src="{$about_img}" border="0"
name="help" alt="{$about_title}" title="{$about_title}"></a></td>
</tr>
</table>
***************
*** 65,74 ****
<xsl:apply-templates select="applications"/>
<tr>
!
<td><img src="{nav_bar_left_top_bg_img}"></td>
</tr>
</table>
<!-- END left_part -->
</td>
! <td width="85%" height="85%"
valign="top">
<xsl:call-template
name="msgbox"/>
<xsl:call-template
name="phpgw_body"/>
--- 131,140 ----
<xsl:apply-templates select="applications"/>
<tr>
!
<td><img src="{$nav_bar_left_top_bg_img}"></td>
</tr>
</table>
<!-- END left_part -->
</td>
! <td width="85%" height="85%"
valign="top" align="center">
<xsl:call-template
name="msgbox"/>
<xsl:call-template
name="phpgw_body"/>
***************
*** 78,82 ****
<td colspan="2" align="center"
valign="middle" class="info">
<!-- BEGIN bottom_part -->
!
{powered}
<!-- END bottom_part -->
</td>
--- 144,157 ----
<td colspan="2" align="center"
valign="middle" class="info">
<!-- 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>
***************
*** 89,142 ****
<xsl:template match="applications">
<tr>
! <td class="info">
!
</td>
</tr>
- </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>
--- 164,170 ----
<xsl:template match="applications">
<tr>
! <td class="left">
! <a href="{$url}"
onMouseOver="{$name}.src='{$img_src_over}'"
onMouseOut="{$name}.src='{$icon}'"><img src="{$icon}" border="0" alt="{$title}"
title="{$title}" name="{$name}"></a>
</td>
</tr>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety parts.inc.php,1.5,1.6 phpgw.xsl,1.2,1.3,
Bettina Gille <address@hidden> <=