|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [7489] property: cleanup |
| Date: | Thu, 11 Aug 2011 08:14:24 +0000 |
Revision: 7489
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7489
Author: sigurdne
Date: 2011-08-11 08:14:23 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
property: cleanup
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 18:26:48 UTC
(rev 7488)
+++ trunk/property/inc/class.uiadmin_entity.inc.php 2011-08-11 08:14:23 UTC
(rev 7489)
@@ -2414,35 +2414,18 @@
'lang_done_attribtext'
=> lang('Back to the list'),
'lang_save_attribtext'
=> lang('Save the attribute'),
- 'lang_datatype'
=> lang('Datatype'),
- 'lang_datatype_statustext'
=> lang('Select a datatype'),
- 'lang_no_datatype'
=> lang('No datatype'),
'datatype_list'
=>
$this->bocommon->select_datatype($values['column_info']['type']),
- 'lang_group'
=> lang('group'),
- 'lang_group_statustext'
=> lang('Select a group'),
- 'lang_no_group'
=> lang('no group'),
'attrib_group_list'
=> $this->bo->get_attrib_group_list($entity_id,$cat_id,
$values['group_id']),
- 'lang_precision'
=> lang('Precision'),
- 'lang_precision_statustext'
=> lang('enter the record length'),
'value_precision'
=> $values['column_info']['precision'],
- 'lang_scale'
=> lang('scale'),
- 'lang_scale_statustext'
=> lang('enter the scale if type is decimal'),
'value_scale'
=> $values['column_info']['scale'],
- 'lang_default'
=> lang('default'),
- 'lang_default_statustext'
=> lang('enter the default value'),
'value_default'
=> $values['column_info']['default'],
- 'lang_nullable'
=> lang('Nullable'),
- 'lang_nullable_statustext'
=> lang('Chose if this column is nullable'),
- 'lang_select_nullable'
=> lang('Select nullable'),
'nullable_list'
=>
$this->bocommon->select_nullable($values['column_info']['nullable']),
'value_lookup_form'
=> $values['lookup_form'],
- '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'],
'value_search'
=> $values['search'],
'value_history'
=> $values['history'],
Modified: trunk/property/inc/class.uiadmin_location.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_location.inc.php 2011-08-10 18:26:48 UTC
(rev 7488)
+++ trunk/property/inc/class.uiadmin_location.inc.php 2011-08-11 08:14:23 UTC
(rev 7489)
@@ -1611,39 +1611,18 @@
'type_id'
=> $values['type_id'],
'entity_list'
=> $this->bo->select_location_type($type_id),
'select_location_type'
=> 'values[type_id]',
- 'lang_datatype'
=> lang('Datatype'),
- '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'),
- 'lang_no_group'
=> lang('no group'),
'attrib_group_list'
=> $this->bo->get_attrib_group_list($type_id, $values['group_id']),
- 'lang_precision'
=> lang('Precision'),
- 'lang_precision_statustext'
=> lang('enter the record length'),
'value_precision'
=> $values['column_info']['precision'],
-
- 'lang_scale'
=> lang('scale'),
- 'lang_scale_statustext'
=> lang('enter the scale if type is decimal'),
'value_scale'
=> $values['column_info']['scale'],
-
- 'lang_default'
=> lang('default'),
- 'lang_default_statustext'
=> lang('enter the default value'),
'value_default'
=> $values['column_info']['default'],
-
- 'lang_nullable'
=> lang('Nullable'),
- 'lang_nullable_statustext'
=> lang('Chose if this column is nullable'),
- 'lang_select_nullable'
=> lang('Select nullable'),
'nullable_list'
=> $this->bocommon->select_nullable($values['column_info']['nullable']),
'value_lookup_form'
=> $values['lookup_form'],
- '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 location list')
);
//_debug_array($data);
Modified: trunk/property/templates/base/admin_entity.xsl
===================================================================
--- trunk/property/templates/base/admin_entity.xsl 2011-08-10 18:26:48 UTC
(rev 7488)
+++ trunk/property/templates/base/admin_entity.xsl 2011-08-11 08:14:23 UTC
(rev 7489)
@@ -1216,11 +1216,9 @@
<xsl:value-of
select="lang_column_name"/>
</td>
<td>
- <input type="text"
name="values[column_name]" value="{value_column_name}" maxlength="50"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text"
name="values[column_name]" value="{value_column_name}" maxlength="50">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_column_name_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -1230,11 +1228,9 @@
<xsl:value-of
select="lang_input_text"/>
</td>
<td>
- <input type="text"
name="values[input_text]" value="{value_input_text}" size ="60" maxlength="50"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text"
name="values[input_text]" value="{value_input_text}" size ="60" maxlength="50">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_input_text_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -1244,11 +1240,9 @@
<xsl:value-of
select="lang_statustext"/>
</td>
<td>
- <textarea cols="60"
rows="10" name="values[statustext]" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <textarea cols="60"
rows="10" name="values[statustext]">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_statustext_attribtext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
<xsl:value-of
select="value_statustext"/>
</textarea>
@@ -1256,78 +1250,86 @@
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="lang_group"/>
+ <xsl:value-of
select="php:function('lang', 'group')" />
</td>
<td valign="top">
- <xsl:variable
name="lang_group_statustext"><xsl:value-of
select="lang_group_statustext"/></xsl:variable>
- <select
name="values[group_id]" class="forms"
onMouseover="window.status='{$lang_group_statustext}'; return true;"
onMouseout="window.status='';return true;">
- <option
value=""><xsl:value-of select="lang_no_group"/></option>
+ <select
name="values[group_id]" class="forms">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'select a group')" />
+ </xsl:attribute>
+
+ <option
value="">
+
<xsl:value-of select="php:function('lang', 'no group')" />
+ </option>
<xsl:apply-templates select="attrib_group_list"/>
</select>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="lang_datatype"/>
+ <xsl:value-of
select="php:function('lang', 'datatype')" />
</td>
<td valign="top">
- <xsl:variable
name="lang_datatype_statustext"><xsl:value-of
select="lang_datatype_statustext"/></xsl:variable>
- <select
name="values[column_info][type]" class="forms"
onMouseover="window.status='{$lang_datatype_statustext}'; return true;"
onMouseout="window.status='';return true;">
- <option
value=""><xsl:value-of select="lang_no_datatype"/></option>
+ <select
name="values[column_info][type]" class="forms">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'select a datatype')" />
+ </xsl:attribute>
+ <option
value="">
+
<xsl:value-of select="php:function('lang', 'no datatype')" />
+ </option>
<xsl:apply-templates select="datatype_list"/>
</select>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="lang_precision"/>
+ <xsl:value-of
select="php:function('lang', 'precision')" />
</td>
<td>
- <input type="text"
name="values[column_info][precision]" value="{value_precision}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_precision_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input type="text"
name="values[column_info][precision]" value="{value_precision}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'enter the record length')" />
</xsl:attribute>
</input>
</td>
</tr>
+
<tr>
<td valign="top">
- <xsl:value-of
select="lang_scale"/>
+ <xsl:value-of
select="php:function('lang', 'scale')" />
</td>
<td>
- <input type="text"
name="values[column_info][scale]" value="{value_scale}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_scale_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input type="text"
name="values[column_info][scale]" value="{value_scale}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'enter the scale if type is
decimal')" />
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="lang_default"/>
+ <xsl:value-of
select="php:function('lang', 'default')" />
</td>
<td>
- <input type="text"
name="values[column_info][default]" value="{value_default}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_default_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input type="text"
name="values[column_info][default]" value="{value_default}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'enter the default value')" />
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="lang_nullable"/>
+ <xsl:value-of
select="php:function('lang', 'nullable')" />
</td>
<td valign="top">
- <xsl:variable
name="lang_nullable_statustext"><xsl:value-of
select="lang_nullable_statustext"/></xsl:variable>
- <select
name="values[column_info][nullable]" class="forms"
onMouseover="window.status='{$lang_nullable_statustext}'; return true;"
onMouseout="window.status='';return true;">
- <option
value=""><xsl:value-of select="lang_select_nullable"/></option>
+ <select
name="values[column_info][nullable]">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'chose if this column is nullable')"
/>
+ </xsl:attribute>
+ <option
value="">
+
<xsl:value-of select="php:function('lang', 'select nullable')" />
+ </option>
<xsl:apply-templates select="nullable_list"/>
</select>
</td>
Modified: trunk/property/templates/base/admin_location.xsl
===================================================================
--- trunk/property/templates/base/admin_location.xsl 2011-08-10 18:26:48 UTC
(rev 7488)
+++ trunk/property/templates/base/admin_location.xsl 2011-08-11 08:14:23 UTC
(rev 7489)
@@ -618,11 +618,9 @@
<xsl:value-of
select="lang_column_name"/>
</td>
<td>
- <input type="text"
name="values[column_name]" value="{value_column_name}" maxlength="20"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text"
name="values[column_name]" value="{value_column_name}" maxlength="20">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_column_name_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -632,11 +630,9 @@
<xsl:value-of
select="lang_input_text"/>
</td>
<td>
- <input type="text"
name="values[input_text]" value="{value_input_text}" size ="60" maxlength="50"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text"
name="values[input_text]" value="{value_input_text}" size ="60" maxlength="50">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_input_text_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -646,11 +642,9 @@
<xsl:value-of
select="lang_statustext"/>
</td>
<td>
- <textarea cols="60"
rows="10" name="values[statustext]" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <textarea cols="60"
rows="10" name="values[statustext]" >
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_statustext_attribtext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
<xsl:value-of
select="value_statustext"/>
</textarea>
@@ -665,7 +659,7 @@
<td valign="top">
<xsl:variable
name="lang_entity_statustext"><xsl:value-of
select="lang_entity_statustext"/></xsl:variable>
<xsl:variable
name="select_location_type"><xsl:value-of
select="select_location_type"/></xsl:variable>
- <select
name="{$select_location_type}" class="forms"
onMouseover="window.status='{$lang_entity_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <select
name="{$select_location_type}" class="forms" title="{$lang_entity_statustext}">
<option
value=""><xsl:value-of select="lang_no_location_type"/></option>
<xsl:apply-templates select="entity_list"/>
</select>
@@ -673,12 +667,17 @@
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="lang_group"/>
+ <xsl:value-of
select="php:function('lang', 'group')" />
</td>
<td valign="top">
- <xsl:variable
name="lang_group_statustext"><xsl:value-of
select="lang_group_statustext"/></xsl:variable>
- <select
name="values[group_id]" class="forms"
onMouseover="window.status='{$lang_group_statustext}'; return true;"
onMouseout="window.status='';return true;">
- <option
value=""><xsl:value-of select="lang_no_group"/></option>
+ <select
name="values[group_id]" class="forms">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'select a group')" />
+ </xsl:attribute>
+
+ <option
value="">
+
<xsl:value-of select="php:function('lang', 'no group')" />
+ </option>
<xsl:apply-templates select="attrib_group_list"/>
</select>
</td>
@@ -686,122 +685,105 @@
<tr>
<td valign="top">
- <xsl:value-of
select="lang_datatype"/>
+ <xsl:value-of
select="php:function('lang', 'datatype')" />
</td>
<td valign="top">
- <xsl:variable
name="lang_datatype_statustext"><xsl:value-of
select="lang_datatype_statustext"/></xsl:variable>
- <select
name="values[column_info][type]" class="forms"
onMouseover="window.status='{$lang_datatype_statustext}'; return true;"
onMouseout="window.status='';return true;">
- <option
value=""><xsl:value-of select="lang_no_datatype"/></option>
+ <select
name="values[column_info][type]" class="forms">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'select a datatype')" />
+ </xsl:attribute>
+ <option
value="">
+
<xsl:value-of select="php:function('lang', 'no datatype')" />
+ </option>
<xsl:apply-templates select="datatype_list"/>
</select>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="lang_precision"/>
+ <xsl:value-of
select="php:function('lang', 'precision')" />
</td>
<td>
- <input type="text"
name="values[column_info][precision]" value="{value_precision}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_precision_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input type="text"
name="values[column_info][precision]" value="{value_precision}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'enter the record length')" />
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="lang_scale"/>
+ <xsl:value-of
select="php:function('lang', 'scale')" />
</td>
<td>
- <input type="text"
name="values[column_info][scale]" value="{value_scale}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_scale_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input type="text"
name="values[column_info][scale]" value="{value_scale}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'enter the scale if type is
decimal')" />
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="lang_default"/>
+ <xsl:value-of
select="php:function('lang', 'default')" />
</td>
<td>
- <input type="text"
name="values[column_info][default]" value="{value_default}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_default_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input type="text"
name="values[column_info][default]" value="{value_default}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'enter the default value')" />
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="lang_nullable"/>
+ <xsl:value-of
select="php:function('lang', 'nullable')" />
</td>
<td valign="top">
- <xsl:variable
name="lang_nullable_statustext"><xsl:value-of
select="lang_nullable_statustext"/></xsl:variable>
- <select
name="values[column_info][nullable]" class="forms"
onMouseover="window.status='{$lang_nullable_statustext}'; return true;"
onMouseout="window.status='';return true;">
- <option
value=""><xsl:value-of select="lang_select_nullable"/></option>
+ <select
name="values[column_info][nullable]">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'chose if this column is nullable')"
/>
+ </xsl:attribute>
+ <option
value="">
+
<xsl:value-of select="php:function('lang', 'select nullable')" />
+ </option>
<xsl:apply-templates select="nullable_list"/>
</select>
</td>
</tr>
<tr>
<td>
- <xsl:value-of
select="lang_lookup_form"/>
+ <xsl:value-of
select="php:function('lang', 'show in lookup forms')" />
</td>
<td>
- <xsl:choose>
- <xsl:when
test="value_lookup_form = 1">
- <input
type="checkbox" name="values[lookup_form]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_lookup_form_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input
type="checkbox" name="values[lookup_form]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_lookup_form_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
+ <input type="checkbox"
name="values[lookup_form]" value="1">
+ <xsl:if
test="value_lookup_form = 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 attribue in
lookup forms')" />
+ </xsl:attribute>
+ </input>
</td>
</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>
| [Prev in Thread] | Current Thread | [Next in Thread] |