fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [17654] Stable: Merge 17629:17653 from trunk


From: sigurdne
Subject: [Fmsystem-commits] [17654] Stable: Merge 17629:17653 from trunk
Date: Sat, 20 Jan 2018 07:28:33 -0500 (EST)

Revision: 17654
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17654
Author:   sigurdne
Date:     2018-01-20 07:28:33 -0500 (Sat, 20 Jan 2018)
Log Message:
-----------
Stable: Merge 17629:17653 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/property/inc/class.bocommon.inc.php
    branches/Version-2_0-branch/property/inc/class.bogeneric.inc.php
    branches/Version-2_0-branch/property/inc/class.sogeneric.inc.php
    branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
    branches/Version-2_0-branch/property/setup/phpgw_no.lang
    branches/Version-2_0-branch/property/templates/base/location.xsl

Property Changed:
----------------
    branches/Version-2_0-branch/

Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2018-01-20 12:26:46 UTC (rev 17653)
+++ branches/Version-2_0-branch 2018-01-20 12:28:33 UTC (rev 17654)

Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/dev-syncromind:13653
 /branches/dev-syncromind-2:14933-16846
 /branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359,17361,17363-17366,17368,17370,17372-17378,17380,17382-17392,17394-17424,17426-17430,17432-17477,17479,17481-17487,17489,17491,17493-17509,17511-17512,17514,17516-17581,17583-17584,17586-17596,17598-17600,17602,17604-17606,17608,17610-17628
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359,17361,17363-17366,17368,17370,17372-17378,17380,17382-17392,17394-17424,17426-17430,17432-17477,17479,17481-17487,17489,17491,17493-17509,17511-17512,17514,17516-17581,17583-17584,17586-17596,17598-17600,17602,17604-17606,17608,17610-17628,17630-17653
\ No newline at end of property
Modified: branches/Version-2_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.bocommon.inc.php     
2018-01-20 12:26:46 UTC (rev 17653)
+++ branches/Version-2_0-branch/property/inc/class.bocommon.inc.php     
2018-01-20 12:28:33 UTC (rev 17654)
@@ -189,7 +189,7 @@
                        {
                                foreach ($list as &$entry)
                                {
-                                       if ($entry['id'] === $selected)
+                                       if ((string)$entry['id'] === 
(string)$selected) // in case the value is '0'
                                        {
                                                $entry['selected'] = 1;
                                                break;

Modified: branches/Version-2_0-branch/property/inc/class.bogeneric.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.bogeneric.inc.php    
2018-01-20 12:26:46 UTC (rev 17653)
+++ branches/Version-2_0-branch/property/inc/class.bogeneric.inc.php    
2018-01-20 12:28:33 UTC (rev 17654)
@@ -203,7 +203,7 @@
                                $values['attributes'] = 
$this->custom->find($this->location_info['acl_app'], $system_location, 0, '', 
'ASC', 'attrib_sort', true, true);
                        }
 
-                       if (isset($data['id']) && $data['id'] || (int) 
$data['id'] ===0 )
+                       if (isset($data['id']) && $data['id'] || 
(string)$data['id'] ==='0' )
                        {
                                $values = $this->so->read_single($data, 
$values);
                        }

Modified: branches/Version-2_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sogeneric.inc.php    
2018-01-20 12:26:46 UTC (rev 17653)
+++ branches/Version-2_0-branch/property/inc/class.sogeneric.inc.php    
2018-01-20 12:28:33 UTC (rev 17654)
@@ -334,7 +334,7 @@
                                                        ),
                                                        'edit_msg' => 
lang('edit'),
                                                        'add_msg' => 
lang('add'),
-                                                       'name' => '',
+                                                       'name' => 
lang('category'),
                                                        'acl_app' => 'property',
                                                        'acl_location' => 
'.admin',
                                                        'menu_selection' => 
"admin::property::location::location::category_{$type_id}"

Modified: branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uilocation.inc.php   
2018-01-20 12:26:46 UTC (rev 17653)
+++ branches/Version-2_0-branch/property/inc/class.uilocation.inc.php   
2018-01-20 12:28:33 UTC (rev 17654)
@@ -1802,7 +1802,7 @@
 
                        $type_id = $this->type_id;
 
-                       if ($location_code)
+                       if (!$type_id && $location_code)
                        {
                                $type_id = count($location);
                        }
@@ -1842,6 +1842,7 @@
                        if ($values['error_id'])
                        {
                                $error_id = $values['error_id'];
+                               unset($location_code);
                        }
 
                        if (!$error_id && $location_code)
@@ -1892,6 +1893,7 @@
                                (
                                'values' => $_values,
                                'type_id' => ($type_id - 1),
+                               'required_level' => ($type_id - 1),
                                'no_link' => ($type_id), // disable lookup 
links for location type less than type_id
                                'tenant' => false,
                                'lookup_type' => $lookup_type
@@ -1930,6 +1932,8 @@
                        $additional_fields[$j]['name'] = 'loc' . $type_id;
                        $additional_fields[$j]['value'] = 
isset($values[$additional_fields[$j]['input_name']]) ? 
$values[$additional_fields[$j]['input_name']] : '';
                        $additional_fields[$j]['class'] = 'th_text';
+                       $additional_fields[$j]['required'] = true;
+
                        $insert_record['extra'][] = 
$additional_fields[$j]['input_name'];
 
                        $j++;
@@ -1940,6 +1944,7 @@
                        $additional_fields[$j]['name'] = 'loc' . $type_id . 
'_name';
                        $additional_fields[$j]['value'] = 
isset($values[$additional_fields[$j]['input_name']]) ? 
$values[$additional_fields[$j]['input_name']] : '';
                        $additional_fields[$j]['size'] = 
$additional_fields[$j]['value'] ? strlen($additional_fields[$j]['value']) + 5 : 
30;
+                       $additional_fields[$j]['required'] = true;
                        $insert_record['extra'][] = 
$additional_fields[$j]['input_name'];
                        $j++;
 
@@ -2754,6 +2759,12 @@
                                                
phpgwapi_cache::message_set($e->getMessage(), 'error');
                                        }
                                }
+                               
$GLOBALS['phpgw']->session->appsession('insert_record', 'property', '');
+                               if ($location_code)
+                               {
+                                       self::message_set($this->receipt);
+                                       self::redirect(array('menuaction' => 
'property.uilocation.edit', 'location_code' => $location_code));
+                               }
                        }
                        else
                        {
@@ -2765,23 +2776,18 @@
                                        $values['attributes'] = 
$this->bo->find_attribute(".location.{$this->type_id}");
                                        $values = 
$this->bo->prepare_attribute($values, ".location.{$this->type_id}");
 
-                                       /* restore date from posting */
-                                       $insert_record = 
$GLOBALS['phpgw']->session->appsession('insert_record', 'property');
-                                       if (isset($insert_record['extra']) && 
is_array($insert_record['extra']))
+                               }
+                               /* restore date from posting */
+                               $insert_record = 
$GLOBALS['phpgw']->session->appsession('insert_record', 'property');
+                               if (isset($insert_record['extra']) && 
is_array($insert_record['extra']))
+                               {
+                                       for ($i = 0; $i < 
count($insert_record['extra']); $i++)
                                        {
-                                               for ($i = 0; $i < 
count($insert_record['extra']); $i++)
-                                               {
-                                                       
$values[$insert_record['extra'][$i]] = 
phpgw::get_var($insert_record['extra'][$i], 'string', 'POST');
-                                               }
+                                               
$values[$insert_record['extra'][$i]] = 
phpgw::get_var($insert_record['extra'][$i], 'string', 'POST');
                                        }
                                }
+                               $values['error_id'] = 
$result['values']['error_id'];
                        }
-                       $GLOBALS['phpgw']->session->appsession('insert_record', 
'property', '');
-                       if ($location_code)
-                       {
-                               self::message_set($this->receipt);
-                               self::redirect(array('menuaction' => 
'property.uilocation.edit', 'location_code' => $location_code));
-                       }
                        $this->edit($values);
                }
 

Modified: branches/Version-2_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no.lang    2018-01-20 
12:26:46 UTC (rev 17653)
+++ branches/Version-2_0-branch/property/setup/phpgw_no.lang    2018-01-20 
12:28:33 UTC (rev 17654)
@@ -2393,4 +2393,5 @@
 pending action type    property        no      Handlingstyper
 comma separated email addresses to be notified about tenant claim      
property        no      Kommmaseparert liste over hvem som skal ha e-post om 
leietakerkrav
 record has been saved  property        no      Posten er lagret
-invoice remark property        no      Fakturanotat
\ No newline at end of file
+invoice remark property        no      Fakturanotat
+please select a part of town   property        no      Vennligst velg bydel
\ No newline at end of file

Modified: branches/Version-2_0-branch/property/templates/base/location.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/location.xsl    
2018-01-20 12:26:46 UTC (rev 17653)
+++ branches/Version-2_0-branch/property/templates/base/location.xsl    
2018-01-20 12:28:33 UTC (rev 17654)
@@ -307,7 +307,13 @@
                                                                        
<xsl:variable name="lang_change_type_statustext">
                                                                                
<xsl:value-of select="lang_change_type_statustext"/>
                                                                        
</xsl:variable>
-                                                                       <select 
name="change_type" class="forms" 
onMouseover="window.status='{$lang_change_type_statustext}'; return true;" 
onMouseout="window.status='';return true;">
+                                                                       <select 
name="change_type" class="forms" title="{$lang_change_type_statustext}">
+                                                                               
<xsl:attribute name="data-validation">
+                                                                               
        <xsl:text>required</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                               
<xsl:attribute name="data-validation-error-msg">
+                                                                               
        <xsl:value-of select="$lang_change_type_statustext"/>
+                                                                               
</xsl:attribute>
                                                                                
<option value="">
                                                                                
        <xsl:value-of select="lang_no_change_type"/>
                                                                                
</option>
@@ -331,21 +337,17 @@
                                                                </label>
                                                                <xsl:choose>
                                                                        
<xsl:when test="datatype ='text'">
-                                                                               
<textarea cols="60" rows="4" name="{input_name}" 
onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="onMouseover">
-                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
<textarea cols="60" rows="4" name="{input_name}">
+                                                                               
        <xsl:attribute name="title">
                                                                                
                <xsl:value-of select="statustext"/>
-                                                                               
                <xsl:text>'; return true;</xsl:text>
                                                                                
        </xsl:attribute>
                                                                                
        <xsl:value-of select="value"/>
                                                                                
</textarea>
                                                                        
</xsl:when>
                                                                        
<xsl:when test="datatype ='date'">
-                                                                               
<input type="text" name="{input_name}" value="{value}" 
onFocus="{//dateformat_validate}" onKeyUp="{//onKeyUp}" onBlur="{//onBlur}" 
size="12" maxlength="10" onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="onMouseover">
-                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
<input type="text" name="{input_name}" value="{value}" 
onFocus="{//dateformat_validate}" onKeyUp="{//onKeyUp}" onBlur="{//onBlur}" 
size="12" maxlength="10">
+                                                                               
        <xsl:attribute name="title">
                                                                                
                <xsl:value-of select="descr"/>
-                                                                               
                <xsl:text>'; return true;</xsl:text>
                                                                                
        </xsl:attribute>
                                                                                
</input>
                                                                                
<xsl:text>[</xsl:text>
@@ -353,10 +355,18 @@
                                                                                
<xsl:text>]</xsl:text>
                                                                        
</xsl:when>
                                                                        
<xsl:otherwise>
-                                                                               
<input type="text" name="{input_name}" value="{value}" size="{size}" 
onMouseout="window.status='';return true;">
+                                                                               
<input type="text" name="{input_name}" value="{value}" size="{size}">
                                                                                
        <xsl:attribute name="title">
                                                                                
                <xsl:value-of select="statustext"/>
                                                                                
        </xsl:attribute>
+                                                                               
        <xsl:if test="required = 1">
+                                                                               
                <xsl:attribute name="data-validation">
+                                                                               
                        <xsl:text>required</xsl:text>
+                                                                               
                </xsl:attribute>
+                                                                               
                <xsl:attribute name="data-validation-error-msg">
+                                                                               
                        <xsl:value-of select="input_text"/>
+                                                                               
                </xsl:attribute>
+                                                                               
        </xsl:if>
                                                                                
</input>
                                                                        
</xsl:otherwise>
                                                                </xsl:choose>
@@ -374,7 +384,21 @@
                                                                        <label>
                                                                                
<xsl:value-of select="lang_part_of_town"/>
                                                                        </label>
-                                                                       
<xsl:call-template name="select_part_of_town"/>
+                                                                       
<xsl:variable name="lang_town_statustext">
+                                                                               
<xsl:value-of select="lang_town_statustext"/>
+                                                                       
</xsl:variable>
+                                                                       <select 
name="part_of_town_id" title="{$lang_town_statustext}">
+                                                                               
<xsl:attribute name="data-validation">
+                                                                               
        <xsl:text>required</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                               
<xsl:attribute name="data-validation-error-msg">
+                                                                               
        <xsl:value-of select="lang_no_part_of_town"/>
+                                                                               
</xsl:attribute>
+                                                                               
<option value="">
+                                                                               
        <xsl:value-of select="lang_no_part_of_town"/>
+                                                                               
</option>
+                                                                               
<xsl:apply-templates select="part_of_town_list"/>
+                                                                       
</select>
                                                                </div>
                                                        </xsl:when>
                                                </xsl:choose>
@@ -387,7 +411,13 @@
                                                                        
<xsl:variable name="lang_owner_statustext">
                                                                                
<xsl:value-of select="lang_owner_statustext"/>
                                                                        
</xsl:variable>
-                                                                       <select 
name="owner_id" class="forms" 
onMouseover="window.status='{$lang_owner_statustext}'; return true;" 
onMouseout="window.status='';return true;">
+                                                                       <select 
name="owner_id" class="forms" title="{$lang_owner_statustext}">
+                                                                               
<xsl:attribute name="data-validation">
+                                                                               
        <xsl:text>required</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                               
<xsl:attribute name="data-validation-error-msg">
+                                                                               
        <xsl:value-of select="$lang_owner_statustext"/>
+                                                                               
</xsl:attribute>
                                                                                
<option value="">
                                                                                
        <xsl:value-of select="lang_select_owner"/>
                                                                                
</option>
@@ -400,23 +430,19 @@
                                                        <xsl:when 
test="edit_street = 1">
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                               
<a href="javascript:street_lookup()" 
onMouseover="window.status='{lang_select_street_help}';return true;" 
onMouseout="window.status='';return true;">
+                                                                               
<a href="javascript:street_lookup()" title="{lang_select_street_help}">
                                                                                
        <xsl:value-of select="lang_street"/>
                                                                                
</a>
                                                                        </label>
                                                                        <input 
type="hidden" name="street_id" value="{value_street_id}"/>
                                                                        <input 
size="30" type="text" name="street_name" value="{value_street_name}" 
onClick="street_lookup();" readonly="readonly">
-                                                                               
<xsl:attribute name="onMouseover">
-                                                                               
        <xsl:text>window.status='</xsl:text>
+                                                                               
<xsl:attribute name="title">
                                                                                
        <xsl:value-of select="lang_select_street_help"/>
-                                                                               
        <xsl:text>'; return true;</xsl:text>
                                                                                
</xsl:attribute>
                                                                        </input>
                                                                        <input 
size="4" type="text" name="street_number" value="{value_street_number}">
-                                                                               
<xsl:attribute name="onMouseover">
-                                                                               
        <xsl:text>window.status='</xsl:text>
+                                                                               
<xsl:attribute name="title">
                                                                                
        <xsl:value-of select="lang_street_num_statustext"/>
-                                                                               
        <xsl:text>'; return true;</xsl:text>
                                                                                
</xsl:attribute>
                                                                        </input>
                                                                </div>
@@ -426,16 +452,14 @@
                                                        <xsl:when 
test="edit_tenant = 1">
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                               
<a href="javascript:tenant_lookup()" 
onMouseover="window.status='{lang_tenant_statustext}';return true;" 
onMouseout="window.status='';return true;">
+                                                                               
<a href="javascript:tenant_lookup()" title="{lang_tenant_statustext}">
                                                                                
        <xsl:value-of select="lang_tenant"/>
                                                                                
</a>
                                                                        </label>
                                                                        <input 
type="hidden" name="tenant_id" value="{value_tenant_id}"/>
                                                                        <input 
size="{size_last_name}" type="text" name="last_name" value="{value_last_name}" 
onClick="tenant_lookup();" readonly="readonly">
-                                                                               
<xsl:attribute name="onMouseover">
-                                                                               
        <xsl:text>window.status='</xsl:text>
+                                                                               
<xsl:attribute name="title">
                                                                                
        <xsl:value-of select="lang_tenant_statustext"/>
-                                                                               
        <xsl:text>'; return true;</xsl:text>
                                                                                
</xsl:attribute>
                                                                        </input>
                                                                        <input 
size="{size_first_name}" type="text" name="first_name" 
value="{value_first_name}" onClick="tenant_lookup();" readonly="readonly">




reply via email to

[Prev in Thread] Current Thread [Next in Thread]