[Phpgroupware-cvs] property/templates/default entity.xsl, 1.2, 1.3 admin_entity.xsl, 1.4, 1.5

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/templates/default
In directory subversions:/tmp/cvs-serv2747/templates/default

Modified Files:
        entity.xsl admin_entity.xsl 
Log Message:
no message

Index: admin_entity.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/admin_entity.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_entity.xsl    19 Oct 2003 12:22:34 -0000      1.4
--- admin_entity.xsl    23 Oct 2003 16:52:14 -0000      1.5
***************
*** 257,263 ****
                        </td>
                        <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_status"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
                                <xsl:value-of select="lang_attribute"/>
                        </td>
--- 257,260 ----
***************
*** 272,276 ****
  
        <xsl:template match="values_category"> 
-               <xsl:variable name="lang_status_standardtext"><xsl:value-of 
select="lang_status_standardtext"/></xsl:variable>
                <xsl:variable name="lang_attribute_standardtext"><xsl:value-of 
select="lang_attribute_standardtext"/></xsl:variable>
                <xsl:variable name="lang_edit_standardtext"><xsl:value-of 
select="lang_edit_standardtext"/></xsl:variable>
--- 269,272 ----
***************
*** 302,309 ****
                                <td align="left">
                                        <xsl:value-of select="prefix"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:variable 
name="link_status"><xsl:value-of select="link_status"/></xsl:variable>
-                                       <a href="{$link_status}" 
onMouseover="window.status='{$lang_status_standardtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_status"/></a>
                                </td>
                                <td align="center">
--- 298,301 ----

Index: entity.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/entity.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** entity.xsl  22 Oct 2003 17:01:11 -0000      1.2
--- entity.xsl  23 Oct 2003 16:52:13 -0000      1.3
***************
*** 26,32 ****
                                        <xsl:call-template 
name="filter_district"/>
                                </td>
!                               <td align="left">
!                                       <xsl:call-template 
name="status_filter"/>
!                               </td>
                                <td align="center">
                                        <xsl:call-template 
name="user_id_filter"/>
--- 26,36 ----
                                        <xsl:call-template 
name="filter_district"/>
                                </td>
!                               <xsl:choose>
!                                       <xsl:when test="status_list!=''">
!                                               <td align="left">
!                                                       <xsl:call-template 
name="status_filter"/>
!                                               </td>
!                                       </xsl:when>
!                               </xsl:choose>
                                <td align="center">
                                        <xsl:call-template 
name="user_id_filter"/>
***************
*** 219,230 ****
                        </xsl:choose>
                        <tr>
-                               <td>
-                                       <xsl:value-of select="lang_status"/>
-                               </td>
-                               <td>
-                                       <xsl:call-template 
name="status_select"/>
-                               </td>
-                       </tr>
-                       <tr>
                                <td colspan="2" width="50%" align="left">
                                        <xsl:call-template 
name="attributes_form"/>                                                     
--- 223,226 ----
***************
*** 309,326 ****
                        </xsl:choose>
                        <tr>
-                               <td>
-                                       <xsl:value-of select="lang_status"/>
-                               </td>
-                                       <xsl:for-each select="status_list" >
-                                               <xsl:choose>
-                                                       <xsl:when 
test="selected">
-                                                               <td>
-                                                                       
<xsl:value-of select="name"/>
-                                                               </td>
-                                                       </xsl:when>
-                                               </xsl:choose>
-                                       </xsl:for-each>
-                       </tr>
-                       <tr>
                                <td colspan="2" width="50%" align="left">
                                        <xsl:apply-templates 
select="attributes_view"/>
--- 305,308 ----
***************
*** 430,433 ****
--- 412,431 ----
                                                                        
<xsl:call-template name="choice"/>
                                                                </xsl:when>
+                                                               <xsl:when 
test="datatype='LB'">
+                                                                       <select 
name="values_attribute[{counter}][value]" class="forms" 
onMouseover="window.status='{statustext}'; return true;" 
onMouseout="window.status='';return true;">
+                                                                               
<option value=""><xsl:value-of select="//lang_none"/></option>
+                                                                               
<xsl:for-each select="choice">  
+                                                                               
        <xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
+                                                                               
        <xsl:choose>
+                                                                               
                <xsl:when test="checked='checked'">
+                                                                               
                        <option value="{$id}" selected="selected"><xsl:value-of 
disable-output-escaping="yes" select="value"/></option>
+                                                                               
                </xsl:when>
+                                                                               
                <xsl:otherwise>
+                                                                               
                        <option value="{$id}"><xsl:value-of 
disable-output-escaping="yes" select="value"/></option>
+                                                                               
                </xsl:otherwise>
+                                                                               
        </xsl:choose>                           
+                                                                               
</xsl:for-each>
+                                                                       
</select>
+                                                               </xsl:when>
                                                                <xsl:when 
test="datatype='D'">
                                                                        <input 
type="text" name="values_attribute[{counter}][value]" value="{value}" 
onFocus="{//dateformat_validate}" onKeyUp="{//onKeyUp}" onBlur="{//onBlur}" 
size="12" maxlength="10"  onMouseout="window.status='';return true;" >
***************
*** 503,506 ****
--- 501,520 ----
                                                                <xsl:when 
test="datatype='CH'">
                                                                        
<xsl:call-template name="choice_view"/>
+                                                               </xsl:when>
+                                                               <xsl:when 
test="datatype='LB'">
+                                                                       <select 
disabled="disabled" class="forms" onMouseover="window.status='{statustext}'; 
return true;" onMouseout="window.status='';return true;">
+                                                                               
<option value=""><xsl:value-of select="//lang_none"/></option>
+                                                                               
<xsl:for-each select="choice">  
+                                                                               
        <xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
+                                                                               
        <xsl:choose>
+                                                                               
                <xsl:when test="checked='checked'">
+                                                                               
                        <option value="{$id}" selected="selected"><xsl:value-of 
disable-output-escaping="yes" select="value"/></option>
+                                                                               
                </xsl:when>
+                                                                               
                <xsl:otherwise>
+                                                                               
                        <option value="{$id}"><xsl:value-of 
disable-output-escaping="yes" select="value"/></option>
+                                                                               
                </xsl:otherwise>
+                                                                               
        </xsl:choose>                           
+                                                                               
</xsl:for-each>
+                                                                       
</select>
                                                                </xsl:when>
                                                                <xsl:when 
test="datatype='D'">