[Phpgroupware-cvs] hrm/templates/default job.xsl,1.6 user.xsl,1.3

[sigurdne]

Update of hrm/templates/default

Modified Files:
     Branch: MAIN
            job.xsl lines: +29 -6
            user.xsl lines: +6 -2

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

====================================================
Index: hrm/templates/default/job.xsl
diff -u hrm/templates/default/job.xsl:1.5 hrm/templates/default/job.xsl:1.6
--- hrm/templates/default/job.xsl:1.5   Wed Nov 23 13:11:53 2005
+++ hrm/templates/default/job.xsl       Mon Nov 28 15:06:48 2005
@@ -618,14 +618,13 @@
                        </tr>
                        <tr>
                                <td valign="top">
-                                       <xsl:value-of select="lang_place"/>
+                                       <xsl:value-of select="lang_experience"/>
                                </td>
                                <td>
-                               <xsl:variable 
name="lang_place_status_text"><xsl:value-of 
select="lang_place_status_text"/></xsl:variable>
-                                       <select name="place_id" onChange 
="modplace(this.form)" class="forms" 
onMouseover="window.status='{$lang_place_status_text}'; return true;" 
onMouseout="window.status='';return true;">
-                                               <option value=""><xsl:value-of 
select="lang_no_place"/></option>
-                                               <option 
value="new_place"><xsl:value-of select="lang_new_place"/></option>
-                                               <xsl:apply-templates 
select="place_list"/>
+                               <xsl:variable 
name="lang_experience_status_text"><xsl:value-of 
select="lang_experience_status_text"/></xsl:variable>
+                                       <select name="experience_id" onChange 
="modexperience(this.form)" class="forms" 
onMouseover="window.status='{$lang_experience_status_text}'; return true;" 
onMouseout="window.status='';return true;">
+                                               <option value=""><xsl:value-of 
select="lang_no_experience"/></option>
+                                               <xsl:apply-templates 
select="experience_list"/>
                                        </select>
                                </td>
                        </tr>
@@ -826,6 +825,30 @@


        <xsl:template match="parent_list">
+       <xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
+               <xsl:choose>
+                       <xsl:when test="selected">
+                               <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <option value="{$id}"><xsl:value-of 
disable-output-escaping="yes" select="name"/></option>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </xsl:template>
+
+       <xsl:template match="skill_list">
+       <xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
+               <xsl:choose>
+                       <xsl:when test="selected">
+                               <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <option value="{$id}"><xsl:value-of 
disable-output-escaping="yes" select="name"/></option>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </xsl:template>
+
+       <xsl:template match="experience_list">
        <xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
                <xsl:choose>
                        <xsl:when test="selected">

====================================================
Index: hrm/templates/default/user.xsl
diff -u hrm/templates/default/user.xsl:1.2 hrm/templates/default/user.xsl:1.3
--- hrm/templates/default/user.xsl:1.2  Wed Nov 23 13:11:53 2005
+++ hrm/templates/default/user.xsl      Mon Nov 28 15:06:48 2005
@@ -288,7 +288,11 @@
                                        <xsl:value-of select="lang_category"/>
                                </td>
                                <td>
-                                       <xsl:call-template name="cat_select"/>
+                                       <xsl:variable 
name="lang_cat_statustext"><xsl:value-of 
select="lang_cat_statustext"/></xsl:variable>
+                                       <select name="values[cat_id]" 
class="forms" onMouseover="window.status='{$lang_cat_statustext}'; return 
true;" onMouseout="window.status='';return true;">
+                                               <option value=""><xsl:value-of 
select="lang_no_cat"/></option>
+                                               <xsl:apply-templates 
select="cat_list"/>
+                                       </select>
                                </td>
                        </tr>
                        <tr>
@@ -705,7 +709,7 @@
        </xsl:template>

        <xsl:template match="cat_list">
-       <xsl:variable name="id"><xsl:value-of select="cat_id"/></xsl:variable>
+       <xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
                <xsl:choose>
                        <xsl:when test="selected">
                                <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>