[Phpgroupware-cvs] admin/templates/base app_data.xsl

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    admin
Changes by:     Dave Hall <skwashd>     06/07/09 11:46:03

Modified files:
        templates/base : app_data.xsl 

Log message:
        fix issue with apps with no icon disappearing and tip another table

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/templates/base/app_data.xsl?cvsroot=phpgroupware&r1=1.1&r2=1.2

Patches:
Index: app_data.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/admin/templates/base/app_data.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- app_data.xsl        14 Feb 2006 09:47:27 -0000      1.1
+++ app_data.xsl        9 Jul 2006 11:46:03 -0000       1.2
@@ -1,4 +1,4 @@
-<!-- $Id: app_data.xsl,v 1.1 2006/02/14 09:47:27 skwashd Exp $ -->
+<!-- $Id: app_data.xsl,v 1.2 2006/07/09 11:46:03 skwashd Exp $ -->
 
        <xsl:template name="app_data">
                <xsl:choose>
@@ -47,7 +47,7 @@
 <!-- BEGIN mainscreen -->
 
        <xsl:template match="list">
-               <table width="75%" border="0" cellspacing="0" cellpadding="0">
+               <div id="mainscreen">
                        <xsl:choose>
                                <xsl:when test="app_row_icon">
                                        <xsl:apply-templates 
select="app_row_icon"/>
@@ -56,36 +56,25 @@
                                        <xsl:apply-templates 
select="app_row_noicon"/>
                                </xsl:otherwise>
                        </xsl:choose>
-               </table>
+               </div>
        </xsl:template>
 
        <xsl:template match="app_row_icon">
-               <xsl:variable name="app_icon" select="app_icon"/>
-               <xsl:variable name="app_title" select="app_title"/>
-               <xsl:variable name="app_name" select="app_name"/>
-               <tr class="th_bright">
-                       <td width="5%" valign="middle"><img src="{$app_icon}" 
alt="{$app_title}" name="{$app_title}"/></td>
-                       <td width="95%" valign="middle" 
class="th_text"><xsl:value-of select="app_title"/></td>
-               </tr>
-               <xsl:apply-templates select="link_row"/>
-               <tr>
-                       <td colspan="2"> </td>
-               </tr>
-       </xsl:template>
-
-       <xsl:template match="app_row_noicon">
-               <tr class="th_bright">
-                       <td colspan="2" width="100%" 
class="th_text">&nbsp;[<xsl:value-of select="app_title"/>]</td>
-               </tr>
+               <h2>
+               <xsl:choose>
+                       <xsl:when test="app_icon != ''">
+                               <img src="{app_icon}" alt="{app_title}" 
name="{app_title}"/>
+                       </xsl:when>
+               </xsl:choose>
+               <a name="{app_name}"><xsl:value-of select="app_title"/></a></h2>
+               <ul>
                <xsl:apply-templates select="link_row"/>
-               <tr>
-                       <td colspan="2">&nbsp;</td>
-               </tr>
+               </ul>
        </xsl:template>
 
        <xsl:template match="link_row">
                <xsl:variable name="pref_link" select="pref_link"/>
-               <tr>
+               <li>
                        <xsl:attribute name="class">
                                <xsl:choose>
                                        <xsl:when test="@class">
@@ -99,8 +88,8 @@
                                        </xsl:otherwise>
                                </xsl:choose>
                        </xsl:attribute>
-                       <td colspan="2"><a href="{$pref_link}"><xsl:value-of 
select="pref_text"/></a></td>
-               </tr>
+                       <a href="{$pref_link}"><xsl:value-of 
select="pref_text"/></a>
+               </li>
        </xsl:template>
 
 <!-- BEGIN newOwnerList -->