phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] api/skins/default/phpgw.xsl, 1.1.1.1.2.31


From: nomail
Subject: [Phpgroupware-cvs] api/skins/default/phpgw.xsl, 1.1.1.1.2.31
Date: Sun, 23 May 2004 10:46:23 -0000

Update of /api/skins/default
Modified Files:
        Branch: proposal-branch
          phpgw.xsl

date: 2004/05/01 00:10:09;  author: jengo;  state: Exp;  lines: +94 -207

Log Message:
Split the js menus and non js menus into different files, normal menus are 
default ... there is currently a problem with preferences not loading correctly 
bewteeen the API and apps
=====================================================================
Index: api/skins/default/phpgw.xsl
diff -u api/skins/default/phpgw.xsl:1.1.1.1.2.30 
api/skins/default/phpgw.xsl:1.1.1.1.2.31
--- api/skins/default/phpgw.xsl:1.1.1.1.2.30    Mon Apr 26 00:28:22 2004
+++ api/skins/default/phpgw.xsl Sat May  1 00:10:09 2004
@@ -10,129 +10,6 @@
 <xsl:variable name="api_image_path"><xsl:value-of 
select="/PHPGW/API/basepath"/>/api/skins/<xsl:value-of 
select="/PHPGW/API/prefs/api.skin" />/images</xsl:variable>
 <xsl:variable name="app_image_path"><xsl:value-of 
select="/PHPGW/API/basepath"/>/<xsl:value-of select="/PHPGW/API/op/appname" 
/>/skins/<xsl:value-of select="/PHPGW/API/prefs/api.skin" 
/>/images</xsl:variable>
 
-<xsl:template name="build_menu">
-       <table class="sidebox" cellspacing="1" cellpadding="0" width="100%" 
border="0">
-               <tr> 
-                       <td class="sideboxtitle" align="center" 
height="28"><xsl:value-of select="/PHPGW/address@hidden'General Menu']"/></td>
-               </tr>
-               <tr>
-                       <td class="sideboxcontent" bgcolor="#efefef">
-                               <table class="sideboxtext" cellspacing="0" 
cellpadding="0" width="100%" border="0" valign="top">
-                                       <xsl:for-each 
select="/PHPGW/API/apimenu/apimenu_item">
-                                               <xsl:variable name="op" 
select="op" />
-                                               <tr>
-                                                       <td valign="top" 
align="center"><font color="#ff9933">*</font></td>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="/PHPGW/API/form_lock = 1">
-                                                                       <td 
width="100%" height="20" align="left" vAlign="top"><font 
class="fake_link"><xsl:value-of select="title" /></font></td>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <td 
width="100%" height="20" align="left" vAlign="top"><a 
href="{$baseurl}&amp;op={$op}"><xsl:value-of select="title" /></a></td>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </tr>
-                                       </xsl:for-each>
-                               </table>
-                       </td>
-               </tr>
-       </table>
-
-       <xsl:for-each select="/PHPGW/API/appmenus/appmenus_item">
-               <br />
-               <table class="sidebox" cellspacing="1" cellpadding="0" 
width="100%" border="0">
-                       <tr> 
-                               <td class="sideboxtitle" align="center" 
height="28"><xsl:value-of select="title"/></td>
-                       </tr>
-                       <tr>
-                               <td class="sideboxcontent" bgcolor="#efefef">
-                                       <table class="sideboxtext" 
cellspacing="0" cellpadding="0" width="100%" border="0" valign="top">
-                                               <xsl:for-each 
select="links/links_item">
-                                                       <tr>
-                                                               <td 
vAlign="top" align="center"><font color="#ff9933">*</font></td>
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="/PHPGW/API/form_lock = 1">
-                                                                               
        <td width="100%" height="20" align="left" vAlign="top"><font 
class="fake_link"><xsl:value-of select="title" /></font></td>
-                                                                               
</xsl:when>
-                                                                               
<xsl:otherwise>
-                                                                               
        <td width="100%" height="20" align="left" vAlign="top"><a 
href="{$baseurl}&amp;op={op}"><xsl:value-of select="title" /></a></td>
-                                                                               
</xsl:otherwise>
-                                                                       
</xsl:choose>
-                                                       </tr>
-                                               </xsl:for-each>
-                                       </table>
-                               </td>
-                       </tr>
-               </table>
-       </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="build_menu_js">
-       <td align="left" width="1%">
-               <div onMouseover="javascript:showdiv('apimenu{position()}');" 
onMouseout="javascript:hidediv('apimenu{position()}');">
-                       <table class="sidebox" cellSpacing="1" cellPadding="0" 
width="100%" border="0">
-                               <tr> 
-                                       <td class="sideboxtitle" align="center" 
height="28"><a onMouseOver="" onMouseout="" 
onClick="javascript:autoshowhidediv('apimenu{position()}');"><xsl:value-of 
select="/PHPGW/address@hidden'General Menu']"/></a></td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               <div id="apimenu{position()}" 
style="float:left; width:150px;position: absolute; visibility: hidden;">
-                                                       <table 
class="sideboxcontent" bgColor="#efefef" cellSpacing="0" cellPadding="0" 
width="100%" border="0" valign="top">
-                                                       <xsl:for-each 
select="/PHPGW/API/apimenu/apimenu_item">
-                                                               <xsl:variable 
name="op" select="op" />
-                                                               <tr>
-                                                                       <td 
vAlign="top" align="center"><font color="#ff9933">*</font></td>
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="/PHPGW/API/form_lock = 1">
-                                                                               
        <td width="100%" height="20" align="left" vAlign="top"><font 
class="fake_link"><xsl:value-of select="title" /></font></td>
-                                                                               
</xsl:when>
-                                                                               
<xsl:otherwise>
-                                                                               
        <td width="100%" height="20" align="left" vAlign="top"><a 
href="{$baseurl}&amp;op={$op}"><xsl:value-of select="title" /></a></td>
-                                                                               
</xsl:otherwise>
-                                                                       
</xsl:choose>
-                                                               </tr>
-                                                       </xsl:for-each>
-                                                       </table>
-                                               </div>
-                                       </td>
-                               </tr>
-                       </table>
-               </div>
-       </td>
-
-       <xsl:for-each select="/PHPGW/API/appmenus/appmenus_item">
-               <td align="left" width="1%">
-                       <div 
onMouseover="javascript:showdiv('appmenu{position()}');" 
onMouseout="javascript:hidediv('appmenu{position()}');">
-                               <table class="sidebox" cellSpacing="1" 
cellPadding="0" width="100%" border="0">
-                                       <tr> 
-                                               <td class="sideboxtitle" 
align="center" height="28"><a onMouseOver="" onMouseout="" 
onClick="javascript:autoshowhidediv('appmenu{position()}');"><xsl:value-of 
select="title"/></a></td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       <div 
id="appmenu{position()}" style="float:left; width:150px;position: absolute; 
visibility: hidden;">
-                                                       <table 
class="sideboxcontent" bgColor="#efefef" cellSpacing="0" cellPadding="0" 
width="100%" border="0" valign="top">
-                                                               <xsl:for-each 
select="links/links_item">
-                                                                       <tr>
-                                                                               
<td vAlign="top" align="center"><font color="#ff9933">*</font></td>
-                                                                               
        <xsl:choose>
-                                                                               
                <xsl:when test="/PHPGW/API/form_lock = 1">
-                                                                               
                        <td width="100%" height="20" align="left" 
vAlign="top"><font class="fake_link"><xsl:value-of select="title" /></font></td>
-                                                                               
                </xsl:when>
-                                                                               
                <xsl:otherwise>
-                                                                               
                        <td width="100%" height="20" align="left" 
vAlign="top"><a href="{$baseurl}&amp;op={op}"><xsl:value-of select="title" 
/></a></td>
-                                                                               
                </xsl:otherwise>
-                                                                               
        </xsl:choose>
-                                                                       </tr>
-                                                               </xsl:for-each>
-                                                       </table>
-                                               </div>
-                                               </td>
-                                       </tr>
-                               </table>
-                       </div>
-               </td>
-       </xsl:for-each>
-</xsl:template>
-
 <xsl:template match="/">
 <html>
 <head>
@@ -142,34 +19,15 @@
        </xsl:for-each>
        <link rel="icon" href="favicon.ico" type="image/x-ico" />
        <link rel="shortcut icon" href="favicon.ico" />
-       <xsl:if test="/PHPGW/API/prefs/api.js_menus = 'yes'">
-               <script>
-                       function autoshowhidediv(divid){
-                               
if(document.getElementById(divid).style.visibility == 'hidden'){
-                                       showdiv(divid);                 
-                               }       else {
-                                       hidediv(divid);                 
-                               }
-                       }
-                       function showdiv(divid){
-                               document.getElementById(divid).style.display = 
'block';
-                               document.getElementById(divid).style.visibility 
= 'visible';
-                       }
-                       function hidediv(divid){
-                               document.getElementById(divid).style.display = 
'none';
-                               document.getElementById(divid).style.visibility 
= 'hidden';
-                       }
-               </script>
-       </xsl:if>
 </head>
 <body bgcolor="#e5e5e5">
        <div style="position:absolute; left:4; top:4; bottom:0; padding:0; 
width:98%; height:99%;">
        <table class="box" height="90%" cellSpacing="0" cellPadding="1" 
width="100%" bgcolor="#ffffff" border="0">
        <tr> 
-               <td valign="top">
-                       <table cellspacing="0" cellpadding="0" width="100%" 
bgcolor="#ffffff" border="0">
+               <td vAlign="top">
+                       <table cellSpacing="0" cellPadding="0" width="100%" 
bgcolor="#ffffff" border="0">
                                <tr> 
-                                       <td width="185" rowspan="2" 
align="center" valign="top" class="toppannel"><a 
href="http://www.phpgroupware.org/"; target="_blank"><img border="0" 
title="www.phpGroupWare.org"><xsl:attribute name="src"><xsl:value-of 
select="$api_image_path" />/logo.png</xsl:attribute></img></a></td>
+                                       <td width="185" rowspan="2" 
align="center" vAlign="top" class="toppannel"><a 
href="http://www.phpgroupware.org/"; target="_blank"><img border="0" 
title="www.phpGroupWare.org"><xsl:attribute name="src"><xsl:value-of 
select="$api_image_path" />/logo.png</xsl:attribute></img></a></td>
                                        <td colspan="2" valign="top" 
style="background-repeat: repeat-x;"><xsl:attribute 
name="background"><xsl:value-of select="$api_image_path" 
/>/panel.png</xsl:attribute> 
                                                <table width="100%" border="0" 
cellpadding="0" cellspacing="0" bgcolor="#FFFFFF" style="background-repeat: 
repeat-x;"><xsl:attribute name="background"><xsl:value-of 
select="$api_image_path" />/panel.png</xsl:attribute>
                                                        <tr valign="center">
@@ -205,79 +63,108 @@
                                        </td>
                                        <td width="15" rowspan="2" vAlign="top" 
class="toppannel">&#160;</td>
                                </tr>
-
                                <xsl:if test="count(/PHPGW/API/apps/apps_item) 
> 0">
-                                       <tr>
-                                               <td align="left" vAlign="top" 
class="mainnote">
-                                                       <xsl:for-each 
select="/PHPGW/API/op_history/op_history_item">
-                                                               <xsl:variable 
name="op" select="op" />
-                                                               <xsl:variable 
name="title" select="title" />
-       
-                                                               <xsl:choose>
-                                                                       
<xsl:when test="/PHPGW/API/form_lock = 1">
-                                                                               
<b><xsl:value-of select="$title" /></b>
-                                                                       
</xsl:when>
-                                                                       
<xsl:otherwise>
-                                                                               
<b><a 
href="{$baseurl}&amp;op=api.statecache.restore&amp;position_id={position}"><xsl:value-of
 select="$title" /></a></b>
-                                                                       
</xsl:otherwise>
-                                                               </xsl:choose>
-                                                               <xsl:if 
test="position() != count(/PHPGW/API/op_history/op_history_item)">
-                                                                       
&#160;/&#160;
-                                                               </xsl:if>
-                                                       </xsl:for-each>
-                                               </td>
-                                               <td align="right" vAlign="top" 
class="mainnote"><b><xsl:value-of select="/PHPGW/API/user/fullname"/></b></td>
-                                       </tr>           
-                                       <tr>
-                                               <td colspan="3" align="right" 
vAlign="top" class="mainnote"><xsl:value-of select="/PHPGW/API/currentdate" 
/><!-- current_users --></td>
-                                       </tr>
-                               </xsl:if>
+                               <tr>
+                                       <td align="left" vAlign="top" 
class="mainnote">
+                                               <xsl:for-each 
select="/PHPGW/API/op_history/op_history_item">
+                                                       <xsl:variable name="op" 
select="op" />
+                                                       <xsl:variable 
name="title" select="title" />
+
+                                                       <xsl:choose>
+                                                               <xsl:when 
test="/PHPGW/API/form_lock = 1">
+                                                                       
<b><xsl:value-of select="$title" /></b>
+                                                               </xsl:when>
+                                                               <xsl:otherwise>
+                                                                       <b><a 
href="{$baseurl}&amp;op=api.statecache.restore&amp;position_id={position}"><xsl:value-of
 select="$title" /></a></b>
+                                                               </xsl:otherwise>
+                                                       </xsl:choose>
+                                                       <xsl:if 
test="position() != count(/PHPGW/API/op_history/op_history_item)">
+                                                               &#160;/&#160;
+                                                       </xsl:if>
+                                               </xsl:for-each>
+                                       </td>
+                                       <td align="right" vAlign="top" 
class="mainnote"><b><xsl:value-of select="/PHPGW/API/user/fullname"/></b></td>
+                               </tr>           
+                               <tr>
+                                       <td colspan="3" align="right" 
vAlign="top" class="mainnote"><xsl:value-of select="/PHPGW/API/currentdate" 
/><!-- current_users --></td>
+                               </tr>
+                       </xsl:if>
                        </table>
-
-                       <table cellspacing="0" cellpadding="0" width="100%" 
border="0">
-                               <tr valign="top"> 
+                       <table cellSpacing="0" cellPadding="0" width="100%" 
border="0">
+                               <tr vAlign="top"> 
                                        <td width="5">&#160;</td>
+                                       <td valign="top" width="1">
+                                               <xsl:if 
test="count(/PHPGW/API/apps/apps_item) > 0">
+                                               <table class="sidebox" 
cellSpacing="1" cellPadding="0" width="100%" border="0">
+                                                       <tr> 
+                                                               <td 
class="sideboxtitle" align="center" height="28"><xsl:value-of 
select="/PHPGW/address@hidden'General Menu']"/></td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td 
class="sideboxcontent" bgColor="#efefef">
+                                                                       <table 
class="sideboxtext" cellSpacing="0" cellPadding="0" width="100%" border="0" 
valign="top">
+                                                                               
<xsl:for-each select="/PHPGW/API/apimenu/apimenu_item">
+                                                                               
        <xsl:variable name="op" select="op" />
+                                                                               
        <tr>
+                                                                               
                <td vAlign="top" align="center"><font 
color="#ff9933">*</font></td>
+                                                                               
                <xsl:choose>
+                                                                               
                        <xsl:when test="/PHPGW/API/form_lock = 1">
+                                                                               
                                <td width="100%" height="20" align="left" 
vAlign="top"><font class="fake_link"><xsl:value-of select="title" /></font></td>
+                                                                               
                        </xsl:when>
+                                                                               
                        <xsl:otherwise>
+                                                                               
                                <td width="100%" height="20" align="left" 
vAlign="top"><a href="{$baseurl}&amp;op={$op}"><xsl:value-of select="title" 
/></a></td>
+                                                                               
                        </xsl:otherwise>
+                                                                               
                </xsl:choose>
+                                                                               
        </tr>
+                                                                               
</xsl:for-each>
+                                                                       </table>
+                                                               </td>
+                                                       </tr>
+                                               </table>
 
-                                       <xsl:if 
test="/PHPGW/API/prefs/api.js_menus = 'no'">
-                                               <td width="160">
-                                                       <xsl:call-template 
name="build_menu" />
-                                               </td>
-                                               <td width="5">&#160;</td>
+                                               <xsl:for-each 
select="/PHPGW/API/appmenus/appmenus_item">
+                                               <br />
+                                               <table class="sidebox" 
cellSpacing="1" cellPadding="0" width="100%" border="0">
+                                                       <tr> 
+                                                               <td 
class="sideboxtitle" align="center" height="28"><xsl:value-of 
select="title"/></td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td 
class="sideboxcontent" bgColor="#efefef">
+                                                                       <table 
class="sideboxtext" cellSpacing="0" cellPadding="0" width="100%" border="0" 
valign="top">
+                                                                               
<xsl:for-each select="links/links_item">
+                                                                               
        <tr>
+                                                                               
                <td vAlign="top" align="center"><font 
color="#ff9933">*</font></td>
+                                                                               
                        <xsl:choose>
+                                                                               
                                <xsl:when test="/PHPGW/API/form_lock = 1">
+                                                                               
                                        <td width="100%" height="20" 
align="left" vAlign="top"><font class="fake_link"><xsl:value-of select="title" 
/></font></td>
+                                                                               
                                </xsl:when>
+                                                                               
                                <xsl:otherwise>
+                                                                               
                                        <td width="100%" height="20" 
align="left" vAlign="top"><a href="{$baseurl}&amp;op={op}"><xsl:value-of 
select="title" /></a></td>
+                                                                               
                                </xsl:otherwise>
+                                                                               
                        </xsl:choose>
+                                                                               
        </tr>
+                                                                               
</xsl:for-each>
+                                                                       </table>
+                                                               </td>
+                                                       </tr>
+                                               </table>
+                                               </xsl:for-each>
                                        </xsl:if>
-
+                                       </td>
+                                       <td width="2">&#160;</td>
                                        <td valign="top">
-                                               <table border="0" 
cellspacing="0" cellpadding="0" width="99%">
+                                               <table border="0" 
cellSpacing="0" cellPadding="0" width="99%">
                                                        <tr>
                                                                <td>
                                                                        
<!--<xsl:apply-templates select="PHPGW/API/hooks/hooks_item" />-->
                                                                        
<xsl:choose>
                                                                                
<xsl:when test="PHPGW/APP != '' or /PHPGW/APPHTML">
                                                                                
        <form method="POST" name="phpgw_form" action="{/PHPGW/API/baseurl}">
-                                                                               
                <table cellspacing="0" cellpadding="0" width="100%" border="0">
+                                                                               
                <table cellSpacing="0" cellPadding="0" width="100%" border="0">
                                                                                
                        <tr> 
-                                                                               
                                <td valign="top" height="100%">
-
-                                                                               
                                        <xsl:if 
test="/PHPGW/API/prefs/api.js_menus = 'yes'">
-                                                                               
                                                <table cellspacing="0" 
cellpadding="0" width="100%" border="0">
-                                                                               
                                                        <tr align="left">
-                                                                               
                                
-                                                                               
                                                                <xsl:if 
test="count(/PHPGW/API/apps/apps_item) > 0">
-                                                                               
                                                                        
<xsl:call-template name="build_menu_js" />
-                                                                               
                                                                </xsl:if>
-                                                                               
                                
-                                                                               
                                                        <td 
width="99%">&#160;</td>
-                                                                               
                                                        </tr>
-                                                                               
                                                </table>
-                                                                               
                                        </xsl:if>
-
-                                                                               
                                </td>
-                                                                               
                        </tr>
-                                                                               
                        <tr>
-                                                                               
                                <td valign="top" height="100%">
-
-                                                                               
                                        <table align="center" class="box" 
cellspacing="1" cellpadding="0" width="100%" border="0" valign="top">
+                                                                               
                                <td vAlign="top" height="100%">
+                                                                               
                                        <table align="center" class="box" 
cellSpacing="1" cellPadding="0" width="100%" border="0">
                                                                                
                                                <tr> 
-                                                                               
                                                        <td height="23" 
colspan="2" align="center" class="articletitle">
+                                                                               
                                                        <td height="23" 
colSpan="2" align="center" class="articletitle">
                                                                                
                                                                <table 
border="0" align="center" width="100%">
                                                                                
                                                                        <tr>
                                                                                
                                                                                
<td align="left" width="5%">
@@ -310,7 +197,7 @@
                                                                                
                                                        </td>
                                                                                
                                                </tr>
                                                                                
                                                <tr align="center"> 
-                                                                               
                                                        <td height="20" 
colspan="2" bgcolor="#efefef" class="mainnote">
+                                                                               
                                                        <td height="20" 
colSpan="2" bgColor="#efefef" class="mainnote">
                                                                                
                                                                
<xsl:apply-templates select="PHPGW/API/msgbox" />
                                                                                
                                                                <xsl:choose>
                                                                                
                                                                        
<xsl:when test="/PHPGW/APPHTML">




reply via email to

[Prev in Thread] Current Thread [Next in Thread]