|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [7486] property: make custom attribs searchable at location |
| Date: | Wed, 10 Aug 2011 15:51:11 +0000 |
Revision: 7486
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7486
Author: sigurdne
Date: 2011-08-10 15:51:10 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
property: make custom attribs searchable at location
Modified Paths:
--------------
trunk/property/inc/class.uiadmin_entity.inc.php
trunk/property/inc/class.uiadmin_location.inc.php
trunk/property/templates/base/admin_entity.xsl
trunk/property/templates/base/admin_location.xsl
Modified: trunk/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_entity.inc.php 2011-08-10 06:10:11 UTC
(rev 7485)
+++ trunk/property/inc/class.uiadmin_entity.inc.php 2011-08-10 15:51:10 UTC
(rev 7486)
@@ -2444,23 +2444,10 @@
'lang_lookup_form'
=> lang('show in lookup forms'),
'lang_lookup_form_statustext'
=> lang('check to show this attribue in lookup forms'),
'value_list'
=> $values['list'],
- 'lang_list'
=> lang('show in list'),
- 'lang_list_statustext'
=> lang('check to show this attribute in entity list'),
'value_search'
=> $values['search'],
- 'lang_include_search'
=> lang('Include in search'),
- 'lang_include_search_statustext'
=> lang('check to show this attribute in location list'),
-
'value_history'
=> $values['history'],
- 'lang_history'
=> lang('history'),
- 'lang_history_statustext'
=> lang('Enable history for this attribute'),
-
'value_disabled'
=> $values['disabled'],
- 'lang_disabled'
=> lang('disabled'),
- 'lang_disabled_statustext'
=> lang('This attribute turn up as disabled in the form'),
-
'value_helpmsg'
=> $values['helpmsg'],
- 'lang_helpmsg'
=> lang('help message'),
- 'lang_helpmsg_statustext'
=> lang('Enables help message for this attribute'),
);
//_debug_array($values);
Modified: trunk/property/inc/class.uiadmin_location.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_location.inc.php 2011-08-10 06:10:11 UTC
(rev 7485)
+++ trunk/property/inc/class.uiadmin_location.inc.php 2011-08-10 15:51:10 UTC
(rev 7486)
@@ -1615,6 +1615,7 @@
'lang_datatype_statustext'
=> lang('Select a datatype'),
'lang_no_datatype'
=> lang('No datatype'),
'datatype_list'
=> $this->bocommon->select_datatype($values['column_info']['type']),
+ 'value_search'
=> $values['search'],
'lang_group'
=> lang('group'),
'lang_group_statustext'
=> lang('Select a group'),
Modified: trunk/property/templates/base/admin_entity.xsl
===================================================================
--- trunk/property/templates/base/admin_entity.xsl 2011-08-10 06:10:11 UTC
(rev 7485)
+++ trunk/property/templates/base/admin_entity.xsl 2011-08-10 15:51:10 UTC
(rev 7486)
@@ -1166,7 +1166,7 @@
</xsl:template>
<!-- add attribute / edit attribute -->
- <xsl:template match="edit_attrib">
+ <xsl:template match="edit_attrib" xmlns:php="http://php.net/xsl";>
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
@@ -1334,123 +1334,80 @@
</tr>
<tr>
<td>
- <xsl:value-of
select="lang_list"/>
+ <xsl:value-of
select="php:function('lang', 'show in list')" />
</td>
<td>
- <xsl:choose>
- <xsl:when
test="value_list = 1">
- <input
type="checkbox" name="values[list]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_list_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input
type="checkbox" name="values[list]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_list_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
+ <input type="checkbox"
name="values[list]" value="1">
+ <xsl:if
test="value_list = 1">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'check to show this attribute in
entity list')" />
+ </xsl:attribute>
+ </input>
</td>
</tr>
<tr>
<td>
- <xsl:value-of
select="lang_include_search"/>
+ <xsl:value-of
select="php:function('lang', 'include in search')" />
</td>
<td>
- <xsl:choose>
- <xsl:when
test="value_search = 1">
- <input
type="checkbox" name="values[search]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_include_search_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input
type="checkbox" name="values[search]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_include_search_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
+ <input type="checkbox"
name="values[search]" value="1">
+ <xsl:if
test="value_search = 1">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'check to show this attribute in
location list')" />
+ </xsl:attribute>
+ </input>
</td>
</tr>
<tr>
<td>
- <xsl:value-of
select="lang_history"/>
+ <xsl:value-of
select="php:function('lang', 'history')" />
</td>
<td>
- <xsl:choose>
- <xsl:when
test="value_history = 1">
- <input
type="checkbox" name="values[history]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_history_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input
type="checkbox" name="values[history]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_history_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
+ <input type="checkbox"
name="values[history]" value="1">
+ <xsl:if
test="value_history = 1">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'enable history for this
attribute')" />
+ </xsl:attribute>
+ </input>
</td>
</tr>
<tr>
<td>
- <xsl:value-of
select="lang_disabled"/>
+ <xsl:value-of
select="php:function('lang', 'disabled')" />
</td>
<td>
- <xsl:choose>
- <xsl:when
test="value_disabled = 1">
- <input
type="checkbox" name="values[disabled]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_disabled_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input
type="checkbox" name="values[disabled]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_disabled_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
+ <input type="checkbox"
name="values[disabled]" value="1">
+ <xsl:if
test="value_disabled = 1">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'this attribute turn up as disabled
in the form')" />
+ </xsl:attribute>
+ </input>
</td>
</tr>
-
<tr>
<td valign="top">
- <xsl:value-of
select="lang_helpmsg"/>
+ <xsl:value-of
select="php:function('lang', 'help message')" />
</td>
<td>
- <textarea cols="60"
rows="10" name="values[helpmsg]" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_helpmsg_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <textarea cols="60"
rows="10" name="values[helpmsg]">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'enables help message for this
attribute')" />
</xsl:attribute>
<xsl:value-of
select="value_helpmsg"/>
</textarea>
Modified: trunk/property/templates/base/admin_location.xsl
===================================================================
--- trunk/property/templates/base/admin_location.xsl 2011-08-10 06:10:11 UTC
(rev 7485)
+++ trunk/property/templates/base/admin_location.xsl 2011-08-10 15:51:10 UTC
(rev 7486)
@@ -577,7 +577,7 @@
<!-- add attribute / edit attribute -->
- <xsl:template match="edit_attrib">
+ <xsl:template match="edit_attrib" xmlns:php="http://php.net/xsl";>
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
@@ -804,6 +804,24 @@
</xsl:choose>
</td>
</tr>
+ <tr>
+ <td>
+ <xsl:value-of
select="php:function('lang', 'include in search')" />
+ </td>
+ <td>
+ <input type="checkbox"
name="values[search]" value="1">
+ <xsl:if
test="value_search = 1">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'check to show this attribute in
location list')" />
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+
<xsl:choose>
<xsl:when test="multiple_choice
!= ''">
<tr>
| [Prev in Thread] | Current Thread | [Next in Thread] |