phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] api/skins/default phpgw_content.xsl, 1.1.2.2 phpgw.xs


From: seek3r
Subject: [Phpgroupware-cvs] api/skins/default phpgw_content.xsl, 1.1.2.2 phpgw.xsl, 1.1.1.1.2.34
Date: Fri, 25 Feb 2005 09:27:00 +0100

Update of api/skins/default

Modified Files:
     Branch: proposal-branch
            phpgw_content.xsl lines: +92 -64
            phpgw.xsl lines: +22 -34

Log Message:
added support for the app menus

====================================================
Index: api/skins/default/phpgw_content.xsl
diff -u api/skins/default/phpgw_content.xsl:1.1.2.1 
api/skins/default/phpgw_content.xsl:1.1.2.2
--- api/skins/default/phpgw_content.xsl:1.1.2.1 Thu Feb 24 23:21:06 2005
+++ api/skins/default/phpgw_content.xsl Fri Feb 25 08:27:25 2005
@@ -12,81 +12,109 @@

 <xsl:template match="/">
        <html>
-
-               <body bgcolor="#e5e5e5" 
onLoad="parent.document.getElementById('appspace').innerHTML = 
document.getElementById('appcontent').innerHTML;">
-               <!--    <body bgcolor="#e5e5e5" 
onLoad="alert(parent.document.getElementById('appspace').innerHTML);"> -->
-<!--<xsl:apply-templates select="PHPGW/API/hooks/hooks_item" />-->
-<div id="appcontent">
-       <xsl:choose>
-               <xsl:when test="PHPGW/APP != '' or /PHPGW/APPHTML">
-                       <form method="POST" name="phpgw_form" 
action="{/PHPGW/API/baseurl}">
-                               <xsl:if test="//*/nextop != ''">
-                                       <input type="hidden" name="nextop" 
value="{//*/nextop}" />
-                               </xsl:if>
-                               <table cellSpacing="0" cellPadding="0" 
width="100%" border="0">
-                                       <tr>
-                                               <td vAlign="top" height="100%">
-                                                       <table align="center" 
class="box" cellSpacing="1" cellPadding="0" width="100%" border="0">
+               <body bgcolor="#e5e5e5" 
onLoad="parent.document.getElementById('appspace').innerHTML = 
document.getElementById('appspace').innerHTML; 
parent.document.getElementById('appmenu').innerHTML = 
document.getElementById('appmenu').innerHTML;">
+                       <!--<xsl:apply-templates 
select="PHPGW/API/hooks/hooks_item" />-->
+                       <div id="appmenu">
+                               <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>
+                       </div>
+
+                       <div id="appspace">
+                               <xsl:choose>
+                                       <xsl:when test="PHPGW/APP != '' or 
/PHPGW/APPHTML">
+                                               <form method="POST" 
name="phpgw_form" action="{/PHPGW/API/baseurl}">
+                                                       <xsl:if 
test="//*/nextop != ''">
+                                                               <input 
type="hidden" name="nextop" value="{//*/nextop}" />
+                                                       </xsl:if>
+                                                       <table cellSpacing="0" 
cellPadding="0" width="100%" border="0">
                                                                <tr>
-                                                                       <td 
height="23" colSpan="2" align="center" class="articletitle">
-                                                                               
<table border="0" align="center" width="100%">
-                                                                               
        <tr>
-                                                                               
                <td align="left" width="5%">
-                                                                               
                        <xsl:if test="/PHPGW/API/form_lock = 1">
-                                                                               
                                <input type="image" name="op" 
value="api.statecache.clear" src="{$api_image_path}/clear.png" />
-                                                                               
                        </xsl:if>
+                                                                       <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">
+                                                                               
                        <table border="0" align="center" width="100%">
+                                                                               
                                <tr>
+                                                                               
                                        <td align="left" width="5%">
+                                                                               
                                                <xsl:if 
test="/PHPGW/API/form_lock = 1">
+                                                                               
                                                        <input type="image" 
name="op" value="api.statecache.clear" src="{$api_image_path}/clear.png" />
+                                                                               
                                                </xsl:if>
+                                                                               
                                        </td>
+                                                                               
                                        <td align="center">
+                                                                               
                                                <xsl:choose>
+                                                                               
                                                        <xsl:when 
test="/PHPGW/API/title">
+                                                                               
                                                                <xsl:value-of 
select="/PHPGW/API/title"/>
+                                                                               
                                                        </xsl:when>
+                                                                               
                                                        <xsl:otherwise>
+                                                                               
                                                                <xsl:variable 
name="app" select="/PHPGW/API/op/appname"/>
+                                                                               
                                                                <xsl:value-of 
select="/PHPGW/API/apps/apps_item[name=$app]/title"/>
+                                                                               
                                                        </xsl:otherwise>
+                                                                               
                                                </xsl:choose>
+                                                                               
                                                <xsl:if 
test="/PHPGW/API/subtitle"> - <xsl:value-of 
select="/PHPGW/API/subtitle"/></xsl:if>
+                                                                               
                                        </td>
+                                                                               
                                        <td align="right" width="5%">
+                                                                               
                                                <xsl:if 
test="/PHPGW/API/form_lock = 1">
+                                                                               
                                                        <input type="image" 
name="op" value="api.statecache.minimize" src="{$api_image_path}/min.png" 
/></xsl:if>
+                                                                               
                                                <xsl:if 
test="count(/PHPGW/API/op_history/op_history_item) != 1">
+                                                                               
                                                        <input type="image" 
name="op" value="api.statecache.close" src="{$api_image_path}/close.png" />
+                                                                               
                                                        <input type="hidden" 
name="position_id" value="{/PHPGW/API/current_history_position}" />
+                                                                               
                                                </xsl:if>
+                                                                               
                                        </td>
+                                                                               
                                </tr>
+                                                                               
                        </table>
                                                                                
                </td>
-                                                                               
                <td align="center">
+                                                                               
        </tr>
+                                                                               
        <tr align="center">
+                                                                               
                <td height="20" colSpan="2" bgColor="#efefef" class="mainnote">
+                                                                               
                        <xsl:apply-templates select="PHPGW/API/msgbox" />
                                                                                
                        <xsl:choose>
-                                                                               
                                <xsl:when test="/PHPGW/API/title">
-                                                                               
                                        <xsl:value-of 
select="/PHPGW/API/title"/>
+                                                                               
                                <xsl:when test="/PHPGW/APPHTML">
+                                                                               
                                        <xsl:value-of 
disable-output-escaping="yes" select="/PHPGW/APPHTML" />
                                                                                
                                </xsl:when>
                                                                                
                                <xsl:otherwise>
-                                                                               
                                        <xsl:variable name="app" 
select="/PHPGW/API/op/appname"/>
-                                                                               
                                        <xsl:value-of 
select="/PHPGW/API/apps/apps_item[name=$app]/title"/>
+                                                                               
                                        <br />
+                                                                               
                                        <xsl:apply-templates select="PHPGW/APP" 
/>
+                                                                               
                                        <br />
                                                                                
                                </xsl:otherwise>
                                                                                
                        </xsl:choose>
-                                                                               
                        <xsl:if test="/PHPGW/API/subtitle"> - <xsl:value-of 
select="/PHPGW/API/subtitle"/></xsl:if>
-                                                                               
                </td>
-                                                                               
                <td align="right" width="5%">
-                                                                               
                        <xsl:if test="/PHPGW/API/form_lock = 1">
-                                                                               
                                <input type="image" name="op" 
value="api.statecache.minimize" src="{$api_image_path}/min.png" /></xsl:if>
-                                                                               
                        <xsl:if 
test="count(/PHPGW/API/op_history/op_history_item) != 1">
-                                                                               
                                <input type="image" name="op" 
value="api.statecache.close" src="{$api_image_path}/close.png" />
-                                                                               
                                <input type="hidden" name="position_id" 
value="{/PHPGW/API/current_history_position}" />
-                                                                               
                        </xsl:if>
                                                                                
                </td>
                                                                                
        </tr>
                                                                                
</table>
                                                                        </td>
                                                                </tr>
-                                                               <tr 
align="center">
-                                                                       <td 
height="20" colSpan="2" bgColor="#efefef" class="mainnote">
-                                                                               
<xsl:apply-templates select="PHPGW/API/msgbox" />
-                                                                               
<xsl:choose>
-                                                                               
        <xsl:when test="/PHPGW/APPHTML">
-                                                                               
                <xsl:value-of disable-output-escaping="yes" 
select="/PHPGW/APPHTML" />
-                                                                               
        </xsl:when>
-                                                                               
        <xsl:otherwise>
-                                                                               
                <br />
-                                                                               
                <xsl:apply-templates select="PHPGW/APP" />
-                                                                               
                <br />
-                                                                               
        </xsl:otherwise>
-                                                                               
</xsl:choose>
-                                                                       </td>
-                                                               </tr>
                                                        </table>
-                                               </td>
-                                       </tr>
-                               </table>
-                       </form>
-               </xsl:when>
-               <xsl:otherwise>
-                       <xsl:apply-templates select="PHPGW/API/msgbox" />
-               </xsl:otherwise>
-       </xsl:choose>
-</div>
-</body>
+                                               </form>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <xsl:apply-templates 
select="PHPGW/API/msgbox" />
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </div>
+               </body>
 </html>
 </xsl:template>


====================================================
Index: api/skins/default/phpgw.xsl
diff -u api/skins/default/phpgw.xsl:1.1.1.1.2.33 
api/skins/default/phpgw.xsl:1.1.1.1.2.34
--- api/skins/default/phpgw.xsl:1.1.1.1.2.33    Thu Feb 24 23:21:06 2005
+++ api/skins/default/phpgw.xsl Fri Feb 25 08:27:25 2005
@@ -26,15 +26,30 @@

        function set_baseurl (url) {
                baseurl = url;
-       };
+       }

-       function get_content(op) {
-               document.getElementById('appframespace').src = 
baseurl+'?phpgw_content=true&op='+op;
+       function get_url(op,params) {
+               if(baseurl.indexOf('?')==-1) {
+                       var sep = '?';
+               } else {
+                       var sep = '&';
+               }
+
+               if(params=='') {
+                       return baseurl+sep+'phpgw_content=true&op='+op;
+               } else {
+                       return 
baseurl+sep+'phpgw_content=true&op='+op+'&'+params;
+               }
+       }
+
+       function get_content(op,params) {
+               document.getElementById('appframespace').src = get_url(op, 
params='');
        }
+
 //-->]]>
        </script>
 </head>
-<body bgcolor="#e5e5e5" onLoad="javascript: set_baseurl ({$baseurl});">
+<body bgcolor="#e5e5e5" onLoad="javascript: set_baseurl ('{$baseurl}');">
        <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>
@@ -143,41 +158,14 @@
                                                                </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>
+                                               <div id="appmenu"> </div>
                                        </xsl:if>
                                        </td>
                                        <td width="2">&#160;</td>
                                        <td valign="top">
                                                <div 
id="appspace">Loading...</div>
                                                <!--<xsl:apply-templates 
select="PHPGW/API/hooks/hooks_item" />-->
-                                               <iframe src="javascript: 
get_content('{/PHPGW/API/op/opname}');" name="appframespace" id="appframespace" 
width="0" height="0" frameborder="0">
+                                               <iframe 
src="{$baseurl}&amp;phpgw_content=true&amp;op={/PHPGW/API/op/opname}" 
name="appframespace" id="appframespace" width="90" height="90" frameborder="0">
                                                </iframe>
                                        </td>
                                </tr>






reply via email to

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