[Phpgroupware-cvs] filemanager/templates/base widgets.xsl, 1.5 app_data.xsl, 1.6 admin.tpl, 1.2 errors.tpl, 1.2 pref.tpl, 1.2

[ceb]

Update of filemanager/templates/base

Modified Files:
     Branch: MAIN
            widgets.xsl lines: +12 -2
            app_data.xsl lines: +13 -4
Removed Files:
     Branch: MAIN
            admin.tpl
            errors.tpl
            pref.tpl

Log Message:
finished prefs + admin

====================================================
Index: filemanager/templates/base/widgets.xsl
diff -u filemanager/templates/base/widgets.xsl:1.4 
filemanager/templates/base/widgets.xsl:1.5
--- filemanager/templates/base/widgets.xsl:1.4  Sat Jan 22 23:48:25 2005
+++ filemanager/templates/base/widgets.xsl      Sun Jan 23 21:33:14 2005
@@ -66,6 +66,9 @@
                                </a>
                        </xsl:when>
                        <xsl:otherwise>
+                               <xsl:if test="caption_start">
+                                       <xsl:value-of select="caption_start"/>
+                               </xsl:if>
                                <input>
                                        <xsl:attribute 
name="type"><xsl:value-of select="type"/></xsl:attribute>
                                        <xsl:attribute 
name="name"><xsl:value-of select="name"/></xsl:attribute>
@@ -128,8 +131,9 @@
                                                </xsl:otherwise>
                                        </xsl:choose>
                        </xsl:for-each>
+                       <xsl:apply-templates select="table_footer"/>
                </table>
-       </xsl:template>
+       </xsl:template>

        <xsl:template match="table_head">
                <tr class="th">
@@ -184,3 +188,9 @@
                        <xsl:apply-templates select="widget"/>
                </td>
        </xsl:template>
+
+       <xsl:template match="table_footer">
+               <tr>
+                       <xsl:apply-templates select="table_col"/>
+               </tr>
+       </xsl:template>

====================================================
Index: filemanager/templates/base/app_data.xsl
diff -u filemanager/templates/base/app_data.xsl:1.5 
filemanager/templates/base/app_data.xsl:1.6
--- filemanager/templates/base/app_data.xsl:1.5 Sat Jan 22 23:48:25 2005
+++ filemanager/templates/base/app_data.xsl     Sun Jan 23 21:33:14 2005
@@ -6,7 +6,7 @@
                                <xsl:apply-templates select="index" />
                        </xsl:when>
                        <xsl:when test="preferences">
-                               <xsl:apply-templates select="preferences" />
+                               <xsl:apply-templates select="config" />
                        </xsl:when>
                </xsl:choose>
        </xsl:template>
@@ -42,7 +42,13 @@
                                </td>
                        </tr>
                        <tr class="th">
-                               <td colspan="5" align="center"><xsl:value-of 
select="lang_show"/>1 5 10 15 <xsl:value-of select="lang_upload_fields"/></td>
+                               <td colspan="5" align="center">
+                                       <xsl:value-of select="lang_show"/>
+                                       <xsl:for-each 
select="show_upload_boxes">
+                                               <xsl:apply-templates />
+                                       </xsl:for-each>
+                                       <xsl:value-of 
select="lang_upload_fields"/>
+                               </td>
                        </tr>
                        <tr>
                                <td colspan="5">
@@ -167,8 +173,11 @@
                <a href="javascript:addMozillaPanel();"><xsl:value-of 
select="link_label" /></a>
        </xsl:template>

-       <xsl:template match="preferences">
+       <xsl:template match="config">
                <center>
+               <xsl:if test="error != ''">
+                       <b><xsl:value-of select="error"/></b>
+               </xsl:if>
                <xsl:variable name="action_url" select="action_url" />
                <form action="{$action_url}" method="POST">
                                <xsl:apply-templates select="table"/>