[Phpgroupware-cvs] hrm/templates/base job.xsl, 1.10 no_access.xsl, 1.1

[sigurdne]

Update of hrm/templates/base

Modified Files:
     Branch: MAIN
            job.xsl lines: +17 -20
Added Files:
     Branch: MAIN
            no_access.xsl 

Log Message:
*** empty log message ***

====================================================
Index: hrm/templates/base/job.xsl
diff -u hrm/templates/base/job.xsl:1.9 hrm/templates/base/job.xsl:1.10
--- hrm/templates/base/job.xsl:1.9      Wed Nov 30 19:19:36 2005
+++ hrm/templates/base/job.xsl  Thu Dec  1 14:37:55 2005
@@ -448,19 +448,12 @@

        <xsl:template match="table_header_task">
                <xsl:variable name="sort_name"><xsl:value-of 
select="sort_name"/></xsl:variable>
-               <xsl:variable name="sort_place"><xsl:value-of 
select="sort_place"/></xsl:variable>
                <tr class="th">
                        <td class="th_text" width="10%" align="left">
                                <a href="{$sort_name}"><xsl:value-of 
select="lang_name"/></a>
                        </td>
-                       <td class="th_text" width="10%" align="left">
-                               <a href="{$sort_place}"><xsl:value-of 
select="lang_place"/></a>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_start_date"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_end_date"/>
+                       <td class="th_text" width="5%" align="left">
+                               <xsl:value-of select="lang_descr"/>
                        </td>
                        <td class="th_text" width="5%" align="center">
                                <xsl:value-of select="lang_view"/>
@@ -497,13 +490,7 @@
                                        <xsl:value-of select="name"/>
                                </td>
                                <td align="left">
-                                       <xsl:value-of select="place"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:value-of select="start_date"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:value-of select="end_date"/>
+                                       <xsl:value-of select="descr"/>
                                </td>
                                <td align="center">
                                        <xsl:variable 
name="link_view"><xsl:value-of select="link_view"/></xsl:variable>
@@ -726,14 +713,13 @@
                                        <tr>
                                                <td>
                                                        <select multiple="true" 
size = "{task_list_size}" name="alternative_task[]" class="forms" 
onMouseover="window.status=''; return true;" 
onMouseout="window.status='';return true;">
-                                                       <!--    <option 
value=""><xsl:value-of select="lang_no_alternative"/></option> -->
                                                                
<xsl:apply-templates select="task_list"/>
                                                        </select>
                                                </td>
-                                               <td valign="top">
+                                       <!--    <td valign="top">
                                                        <input type="button" 
value="{lang_open_popup}" onClick="tasks_popup()"></input>
                                                        <input type="hidden" 
name="accountid" value=""></input>
-                                               </td>
+                                               </td> -->
                                        </tr>
                                </table>
                                </td>
@@ -872,6 +858,17 @@
                                </td>
                                <td>
                                        <xsl:for-each 
select="experience_list[selected='selected']" >
+                                               <xsl:value-of select="name"/>
+                                               <xsl:if test="position() != 
last()">, </xsl:if>
+                                       </xsl:for-each>
+                               </td>
+                       </tr>
+                       <tr>
+                               <td valign="top">
+                                       <xsl:value-of 
select="lang_alternative"/>
+                               </td>
+                               <td>
+                                       <xsl:for-each 
select="task_list[selected='selected']" >
                                                <xsl:value-of select="name"/>
                                                <xsl:if test="position() != 
last()">, </xsl:if>
                                        </xsl:for-each>

====================================================
Index: no_access.xsl
<!-- $Id: no_access.xsl,v 1.1 2005/12/01 14:37:55 sigurdne Exp $ -->

        <xsl:template name="app_data">
                <xsl:choose>
                        <xsl:when test="no_access">
                                <xsl:apply-templates select="no_access"/>
                        </xsl:when>
                </xsl:choose>
        </xsl:template>

        <xsl:template match="no_access">

                <xsl:choose>
                        <xsl:when test="links !=''">
                                <xsl:call-template name="menu"/>
                        </xsl:when>
                </xsl:choose>
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <xsl:choose>
                                <xsl:when test="msgbox_data != ''">
                                        <tr>
                                                <td align="left" colspan="3">
                                                        <xsl:call-template 
name="msgbox"/>
                                                </td>
                                        </tr>
                                </xsl:when>
                        </xsl:choose>
                </table>
        </xsl:template>