fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [11731] Merge 11729:11730 from trunk


From: Sigurd Nes
Subject: [Fmsystem-commits] [11731] Merge 11729:11730 from trunk
Date: Fri, 21 Feb 2014 10:28:11 +0000

Revision: 11731
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11731
Author:   sigurdne
Date:     2014-02-21 10:28:10 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Merge 11729:11730 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/templates/base/css/login.css
    branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl

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


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730

Modified: branches/Version-1_0-branch/property/templates/base/css/login.css
===================================================================
--- branches/Version-1_0-branch/property/templates/base/css/login.css   
2014-02-21 10:27:05 UTC (rev 11730)
+++ branches/Version-1_0-branch/property/templates/base/css/login.css   
2014-02-21 10:28:10 UTC (rev 11731)
@@ -1,7 +1,7 @@
 body
 {
-#      background: #537991 url('../images/logo-large.png') no-repeat fixed top 
left;
-#      color: #999
+/*     background: #537991 url('../images/logo-large.png') no-repeat fixed top 
left;
+       color: #999*/
 }
 
 body.MSIE

Modified: branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl        
2014-02-21 10:27:05 UTC (rev 11730)
+++ branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl        
2014-02-21 10:28:10 UTC (rev 11731)
@@ -24,7 +24,7 @@
                                <xsl:variable name="edit_url">
                                        <xsl:value-of select="edit_url"/>
                                </xsl:variable>
-                               <form name="form" method="post" 
action="{$edit_url}">
+                               <form ENCTYPE="multipart/form-data" name="form" 
method="post" action="{$edit_url}">
                                        <table cellpadding="2" cellspacing="2" 
width="79%" align="left">
                                                <xsl:choose>
                                                        <xsl:when 
test="msgbox_data != ''">
@@ -272,497 +272,531 @@
 </td>
 <td align="left">
 
-<textarea cols="60" rows="6" name="values[deposit_claim_text]">
-<xsl:attribute name="title">
-<xsl:value-of select="lang_remark_statustext"/>
-</xsl:attribute>
-<xsl:value-of select="value_deposit_claim_text"/>
-</textarea>
-</td>
-</tr>
-<tr>
-<td valign="top">
-<xsl:value-of select="php:function('lang', 'main claim')" />
-</td>
-</tr>
--->
-                                               <xsl:call-template 
name="b_account_form"/>
-                                               <tr>
-                                                       <td valign="top">
-                                                               <xsl:value-of 
select="lang_amount"/>
-                                                       </td>
-                                                       <td>
-                                                               <input 
type="text" name="values[amount]" value="{value_amount}" 
onMouseout="window.status='';return true;"><xsl:attribute 
name="title"><xsl:value-of 
select="lang_amount_statustext"/></xsl:attribute></input><xsl:text> </xsl:text> 
[ <xsl:value-of select="currency"/> ]
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td align="left">
-                                                               <xsl:value-of 
select="lang_category"/>
-                                                       </td>
-                                                       <td align="left">
-                                                               
<xsl:call-template name="cat_select"/>
-                                                       </td>
-                                               </tr>
-                                               <tr align="left">
-                                                       <td valign="top">
-                                                               <xsl:value-of 
select="lang_remark"/>
-                                                       </td>
-                                                       <td align="left">
-                                                               <textarea 
cols="60" rows="6" name="values[remark]">
-                                                                       
<xsl:attribute name="title">
-                                                                               
<xsl:value-of select="lang_remark_statustext"/>
-                                                                       
</xsl:attribute>
-                                                                       
<xsl:value-of select="value_remark"/>
-                                                               </textarea>
-                                                       </td>
-                                               </tr>
-                                               <tr height="50">
-                                                       <td valign="bottom">
-                                                               <xsl:variable 
name="lang_save">
-                                                                       
<xsl:value-of select="lang_save"/>
-                                                               </xsl:variable>
-                                                               <input 
type="submit" name="values[save]" value="{$lang_save}" 
onMouseout="window.status='';return true;">
-                                                                       
<xsl:attribute name="onMouseover">
-                                                                               
<xsl:text>window.status='</xsl:text>
-                                                                               
<xsl:value-of select="lang_save_statustext"/>
-                                                                               
<xsl:text>'; return true;</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </td>
-                                                       <td valign="bottom">
-                                                               <xsl:variable 
name="lang_apply">
-                                                                       
<xsl:value-of select="lang_apply"/>
-                                                               </xsl:variable>
-                                                               <input 
type="submit" name="values[apply]" value="{$lang_apply}" 
onMouseout="window.status='';return true;">
-                                                                       
<xsl:attribute name="onMouseover">
-                                                                               
<xsl:text>window.status='</xsl:text>
-                                                                               
<xsl:value-of select="lang_apply_statustext"/>
-                                                                               
<xsl:text>'; return true;</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </td>
-                                                       <td align="right" 
valign="bottom">
-                                                               <xsl:variable 
name="lang_cancel">
-                                                                       
<xsl:value-of select="lang_cancel"/>
-                                                               </xsl:variable>
-                                                               <input 
type="submit" name="values[cancel]" value="{$lang_cancel}" 
onMouseout="window.status='';return true;">
-                                                                       
<xsl:attribute name="onMouseover">
-                                                                               
<xsl:text>window.status='</xsl:text>
-                                                                               
<xsl:value-of select="lang_cancel_statustext"/>
-                                                                               
<xsl:text>'; return true;</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td colspan="2">
-                                                               <div 
id="datatable-container_1"/>
-                                                       </td>
-                                               </tr>
-
-                                       </table>
-                               </form>
-                               <script type="text/javascript">
-                                       var property_js = <xsl:value-of 
select="property_js"/>;
-                                       var base_java_url = <xsl:value-of 
select="base_java_url"/>;
-                                       var datatable = new Array();
-                                       var myColumnDefs = new Array();
-
-                                       <xsl:for-each select="datatable">
-                                               datatable[<xsl:value-of 
select="name"/>] = [
-                                                       {
-                                                               
values:<xsl:value-of select="values"/>,
-                                                               total_records: 
<xsl:value-of select="total_records"/>,
-                                                               is_paginator:  
<xsl:value-of select="is_paginator"/>,
-                                                               
footer:<xsl:value-of select="footer"/>,
-                                                               
edit_action:<xsl:value-of select="edit_action"/>
-                                                       }
-                                               ]
-                                       </xsl:for-each>
-
-                                       <xsl:for-each select="myColumnDefs">
-                                               myColumnDefs[<xsl:value-of 
select="name"/>] = <xsl:value-of select="values"/>
-                                       </xsl:for-each>
-                               </script>
-                       </div>
-               </div>
-       </xsl:template>
-
-       <!-- New template-->
-       <!-- view -->
-       <xsl:template match="view" xmlns:php="http://php.net/xsl";>
-               <div align="left">
-                       <table cellpadding="2" cellspacing="2" width="79%" 
align="left">
-                               <tr>
-                                       <td width="25%" align="left">
-                                               <xsl:value-of 
select="lang_claim_id"/>
-                                       </td>
-                                       <td width="75%" align="left">
-                                               <xsl:value-of 
select="value_claim_id"/>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               <xsl:value-of 
select="lang_project_id"/>
-                                       </td>
-                                       <td>
-                                               <xsl:value-of 
select="value_project_id"/>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td valign="top">
-                                               <xsl:value-of 
select="lang_name"/>
-                                       </td>
-                                       <td>
-                                               <xsl:value-of 
select="value_name"/>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td valign="top">
-                                               <xsl:value-of 
select="lang_descr"/>
-                                       </td>
-                                       <td>
-                                               <xsl:value-of 
select="value_descr"/>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               <xsl:value-of 
select="lang_category"/>
-                                       </td>
-                                       <xsl:for-each select="cat_list_project">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="selected='selected'">
-                                                               <td>
-                                                                       
<xsl:value-of select="name"/>
-                                                               </td>
-                                                       </xsl:when>
-                                               </xsl:choose>
-                                       </xsl:for-each>
-                               </tr>
-                               <xsl:call-template name="location_view"/>
-                               <xsl:choose>
-                                       <xsl:when test="contact_phone !=''">
-                                               <tr>
-                                                       <td class="th_text" 
align="left">
-                                                               <xsl:value-of 
select="lang_contact_phone"/>
-                                                       </td>
-                                                       <td align="left">
-                                                               <xsl:value-of 
select="contact_phone"/>
-                                                       </td>
-                                               </tr>
-                                       </xsl:when>
-                               </xsl:choose>
-                               <tr>
-                                       <td valign="top">
-                                               <xsl:value-of 
select="lang_power_meter"/>
-                                       </td>
-                                       <td>
-                                               <xsl:value-of 
select="value_power_meter"/>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               <xsl:value-of 
select="lang_charge_tenant"/>
-                                       </td>
-                                       <td>
-                                               <xsl:choose>
-                                                       <xsl:when 
test="charge_tenant='1'">
-                                                               <b>X</b>
-                                                       </xsl:when>
-                                               </xsl:choose>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td valign="top">
-                                               <xsl:value-of 
select="lang_budget"/>
-                                       </td>
-                                       <td>
-                                               <xsl:value-of 
select="value_budget"/><xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td valign="top">
-                                               <xsl:value-of 
select="lang_reserve"/>
-                                       </td>
-                                       <td>
-                                               <xsl:value-of 
select="value_reserve"/><xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td valign="top">
-                                               <xsl:value-of 
select="lang_reserve_remainder"/>
-                                       </td>
-                                       <td>
-                                               <xsl:value-of 
select="value_reserve_remainder"/><xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                                               <xsl:text> </xsl:text> ( 
<xsl:value-of select="value_reserve_remainder_percent"/>
-                                               <xsl:text> % )</xsl:text>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td valign="top">
-                                               <xsl:value-of 
select="lang_actual_cost"/>
-                                       </td>
-                                       <td>
-                                               <xsl:value-of 
select="sum_workorder_actual_cost"/><xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <xsl:choose>
-                                               <xsl:when 
test="sum_workorder_budget=''">
-                                                       <td class="th_text">
-                                                               <xsl:value-of 
select="lang_no_workorders"/>
-                                                       </td>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <td colspan="2">
-                                                               <table 
width="80%" cellpadding="2" cellspacing="2" align="left">
-                                                                       
<xsl:apply-templates select="table_header_workorder"/>
-                                                                       
<xsl:apply-templates select="workorder_budget"/>
-                                                                       <tr 
class="th">
-                                                                               
<td class="th_text" align="right">
-                                                                               
        <xsl:value-of select="lang_sum"/>
-                                                                               
</td>
-                                                                               
<td class="th_text" align="right">
-                                                                               
        <xsl:value-of select="sum_workorder_budget"/>
-                                                                               
</td>
-                                                                               
<td class="th_text" align="right">
-                                                                               
        <xsl:value-of select="sum_workorder_calculation"/>
-                                                                               
</td>
-                                                                               
<td>
-                                                                               
</td>
-                                                                               
<td>
-                                                                               
</td>
-                                                                               
<td>
-                                                                               
</td>
-                                                                       </tr>
-                                                               </table>
-                                                       </td>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               <xsl:value-of 
select="lang_coordinator"/>
-                                       </td>
-                                       <xsl:for-each select="user_list">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="selected">
-                                                               <td>
-                                                                       
<xsl:value-of select="name"/>
-                                                               </td>
-                                                       </xsl:when>
-                                               </xsl:choose>
-                                       </xsl:for-each>
-                               </tr>
-                               <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 valign="top">
-                                               <xsl:value-of 
select="php:function('lang', 'entry date')" />
-                                       </td>
-                                       <td>
-                                               <xsl:value-of 
select="value_entry_date"/>
-                                       </td>
-                               </tr>
-
-                               <tr>
-                                       <td valign="top">
-                                               <xsl:value-of 
select="lang_start_date"/>
-                                       </td>
-                                       <td>
-                                               <xsl:value-of 
select="value_start_date"/>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td valign="top">
-                                               <xsl:value-of 
select="lang_end_date"/>
-                                       </td>
-                                       <td>
-                                               <xsl:value-of 
select="value_end_date"/>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td align="left">
-                                               <xsl:value-of 
select="lang_status"/>
-                                       </td>
-                                       <xsl:for-each select="status_list">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="selected='selected'">
-                                                               <td>
-                                                                       
<xsl:value-of select="name"/>
-                                                               </td>
-                                                       </xsl:when>
-                                               </xsl:choose>
-                                       </xsl:for-each>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               <xsl:value-of 
select="lang_tenant"/>
-                                       </td>
-                                       <td>
-                                               <input size="{size_last_name}" 
type="text" name="last_name" value="{value_last_name}" readonly="readonly">
-                                               </input>
-                                               <input size="{size_first_name}" 
type="text" name="first_name" value="{value_first_name}" readonly="readonly">
-                                               </input>
-                                       </td>
-                               </tr>
-                               <xsl:call-template name="b_account_view"/>
-                               <tr>
-                                       <td valign="top">
-                                               <xsl:value-of 
select="lang_amount"/>
-                                       </td>
-                                       <td><xsl:value-of 
select="value_amount"/><xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td align="left">
-                                               <xsl:value-of 
select="lang_category"/>
-                                       </td>
-                                       <xsl:for-each select="cat_list">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="selected='selected'">
-                                                               <td>
-                                                                       
<xsl:value-of select="name"/>
-                                                               </td>
-                                                       </xsl:when>
-                                               </xsl:choose>
-                                       </xsl:for-each>
-                               </tr>
-                               <tr align="left">
-                                       <td valign="top">
-                                               <xsl:value-of 
select="lang_remark"/>
-                                       </td>
-                                       <td align="left">
-                                               <textarea cols="60" rows="6" 
name="values[remark]" onMouseout="window.status='';return true;">
-                                                       <xsl:attribute 
name="onMouseover">
-                                                               
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_remark_statustext"/>
-                                                               <xsl:text>'; 
return true;</xsl:text>
-                                                       </xsl:attribute>
-                                                       <xsl:value-of 
select="value_remark"/>
-                                               </textarea>
-                                       </td>
-                               </tr>
-                               <tr height="50">
-                                       <td>
-                                               <xsl:variable 
name="done_action">
-                                                       <xsl:value-of 
select="done_action"/>
-                                               </xsl:variable>
-                                               <xsl:variable name="lang_done">
-                                                       <xsl:value-of 
select="lang_done"/>
-                                               </xsl:variable>
-                                               <form method="post" 
action="{$done_action}">
-                                                       <input type="submit" 
class="forms" name="done" value="{$lang_done}" onMouseover="window.status='Back 
to the list.';return true;" onMouseout="window.status='';return true;"/>
-                                               </form>
-                                       </td>
-                               </tr>
-                       </table>
-               </div>
-       </xsl:template>
-
-       <!-- New template-->
-       <xsl:template match="table_header_workorder">
-               <tr class="th">
-                       <td class="th_text" width="4%" align="right">
-                               <xsl:value-of select="lang_workorder_id"/>
+                   <textarea cols="60" rows="6" 
name="values[deposit_claim_text]">
+                   <xsl:attribute name="title">
+                   <xsl:value-of select="lang_remark_statustext"/>
+                   </xsl:attribute>
+                   <xsl:value-of select="value_deposit_claim_text"/>
+                   </textarea>
+                   </td>
+                   </tr>
+                   <tr>
+                   <td valign="top">
+                   <xsl:value-of select="php:function('lang', 'main claim')" />
+                   </td>
+                   </tr>
+                   -->
+                   <xsl:call-template name="b_account_form"/>
+                   <tr>
+                       <td valign="top">
+                           <xsl:value-of select="lang_amount"/>
                        </td>
-                       <td class="th_text" width="10%" align="right">
-                               <xsl:value-of select="lang_budget"/>
+                       <td>
+                           <input type="text" name="values[amount]" 
value="{value_amount}" onMouseout="window.status='';return true;">
+                               <xsl:attribute name="title">
+                                   <xsl:value-of 
select="lang_amount_statustext"/>
+                               </xsl:attribute>
+                           </input>
+                           <xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
                        </td>
-                       <td class="th_text" width="5%" align="right">
-                               <xsl:value-of select="lang_calculation"/>
+                   </tr>
+                   <tr>
+                       <td align="left">
+                           <xsl:value-of select="lang_category"/>
                        </td>
-                       <td class="th_text" width="10%" align="right">
-                               <xsl:value-of select="lang_vendor"/>
+                       <td align="left">
+                           <xsl:call-template name="cat_select"/>
                        </td>
-                       <td class="th_text" width="10%" align="right">
-                               <xsl:value-of select="lang_charge_tenant"/>
+                   </tr>
+                   <tr align="left">
+                       <td valign="top">
+                           <xsl:value-of select="lang_remark"/>
                        </td>
-                       <td class="th_text" width="10%" align="right">
-                               <xsl:value-of select="lang_select"/>
+                       <td align="left">
+                           <textarea cols="60" rows="6" name="values[remark]">
+                               <xsl:attribute name="title">
+                                   <xsl:value-of 
select="lang_remark_statustext"/>
+                               </xsl:attribute>
+                               <xsl:value-of select="value_remark"/>
+                           </textarea>
                        </td>
-               </tr>
-       </xsl:template>
+                   </tr>
+                   <xsl:choose>
+                       <xsl:when test="value_claim_id!=''">
+                           <tr>
+                               <td align="left" valign="top">
+                                   <xsl:value-of select="php:function('lang', 
'files')"/>
+                               </td>
+                               <td>
+                                   <div id="paging_1"> </div>
+                                   <div id="datatable-container_1"/>
+                               </td>
+                           </tr>
+                           <xsl:call-template name="file_upload"/>
+                       </xsl:when>
+                   </xsl:choose>
 
-       <!-- New template-->
-       <xsl:template match="workorder_budget">
-               <xsl:variable name="workorder_link"><xsl:value-of 
select="//workorder_link"/>&amp;id=<xsl:value-of 
select="workorder_id"/></xsl:variable>
-               <xsl:variable name="workorder_id">
-                       <xsl:value-of select="workorder_id"/>
-               </xsl:variable>
-               <tr>
-                       <xsl:attribute name="class">
-                               <xsl:choose>
-                                       <xsl:when test="@class">
-                                               <xsl:value-of select="@class"/>
-                                       </xsl:when>
-                                       <xsl:when test="position() mod 2 = 0">
-                                               <xsl:text>row_off</xsl:text>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:text>row_on</xsl:text>
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                       </xsl:attribute>
-                       <td align="right">
-                               <a href="{$workorder_link}" target="_blank">
-                                       <xsl:value-of select="workorder_id"/>
-                               </a>
+                   <tr height="50">
+                       <td valign="bottom">
+                           <xsl:variable name="lang_save">
+                               <xsl:value-of select="lang_save"/>
+                           </xsl:variable>
+                           <input type="submit" name="values[save]" 
value="{$lang_save}" onMouseout="window.status='';return true;">
+                               <xsl:attribute name="onMouseover">
+                                   <xsl:text>window.status='</xsl:text>
+                                   <xsl:value-of 
select="lang_save_statustext"/>
+                                   <xsl:text>'; return true;</xsl:text>
+                               </xsl:attribute>
+                           </input>
                        </td>
-                       <td align="right">
-                               <xsl:value-of select="budget"/>
+                       <td valign="bottom">
+                           <xsl:variable name="lang_apply">
+                               <xsl:value-of select="lang_apply"/>
+                           </xsl:variable>
+                           <input type="submit" name="values[apply]" 
value="{$lang_apply}" onMouseout="window.status='';return true;">
+                               <xsl:attribute name="onMouseover">
+                                   <xsl:text>window.status='</xsl:text>
+                                   <xsl:value-of 
select="lang_apply_statustext"/>
+                                   <xsl:text>'; return true;</xsl:text>
+                               </xsl:attribute>
+                           </input>
                        </td>
-                       <td align="right">
-                               <xsl:value-of select="calculation"/>
+                       <td align="right" valign="bottom">
+                           <xsl:variable name="lang_cancel">
+                               <xsl:value-of select="lang_cancel"/>
+                           </xsl:variable>
+                           <input type="submit" name="values[cancel]" 
value="{$lang_cancel}" onMouseout="window.status='';return true;">
+                               <xsl:attribute name="onMouseover">
+                                   <xsl:text>window.status='</xsl:text>
+                                   <xsl:value-of 
select="lang_cancel_statustext"/>
+                                   <xsl:text>'; return true;</xsl:text>
+                               </xsl:attribute>
+                           </input>
                        </td>
+                   </tr>
+                   <tr>
+                       <td colspan="2">
+                           <div id="datatable-container_2"/>
+                       </td>
+                   </tr>
+
+               </table>
+           </form>
+           <script type="text/javascript">
+               var property_js = <xsl:value-of select="property_js"/>;
+               var base_java_url = <xsl:value-of select="base_java_url"/>;
+               var datatable = new Array();
+               var myColumnDefs = new Array();
+
+               <xsl:for-each select="datatable">
+                   datatable[<xsl:value-of select="name"/>] = [
+                   {
+                   values:<xsl:value-of select="values"/>,
+                   total_records: <xsl:value-of select="total_records"/>,
+                   edit_action:  <xsl:value-of select="edit_action"/>,
+                   is_paginator:  <xsl:value-of select="is_paginator"/>,
+                   <xsl:if test="rows_per_page">
+                       rows_per_page: "<xsl:value-of select="rows_per_page"/>",
+                   </xsl:if>
+                   <xsl:if test="initial_page">
+                       initial_page: "<xsl:value-of select="initial_page"/>",
+                   </xsl:if>
+                   footer:<xsl:value-of select="footer"/>
+                   }
+                   ]
+               </xsl:for-each>
+
+               <xsl:for-each select="myColumnDefs">
+                   myColumnDefs[<xsl:value-of select="name"/>] = <xsl:value-of 
select="values"/>
+               </xsl:for-each>
+           </script>
+       </div>
+    </div>
+</xsl:template>
+
+<!-- New template-->
+<!-- view -->
+<xsl:template match="view" xmlns:php="http://php.net/xsl";>
+    <div align="left">
+       <table cellpadding="2" cellspacing="2" width="79%" align="left">
+           <tr>
+               <td width="25%" align="left">
+                   <xsl:value-of select="lang_claim_id"/>
+               </td>
+               <td width="75%" align="left">
+                   <xsl:value-of select="value_claim_id"/>
+               </td>
+           </tr>
+           <tr>
+               <td>
+                   <xsl:value-of select="lang_project_id"/>
+               </td>
+               <td>
+                   <xsl:value-of select="value_project_id"/>
+               </td>
+           </tr>
+           <tr>
+               <td valign="top">
+                   <xsl:value-of select="lang_name"/>
+               </td>
+               <td>
+                   <xsl:value-of select="value_name"/>
+               </td>
+           </tr>
+           <tr>
+               <td valign="top">
+                   <xsl:value-of select="lang_descr"/>
+               </td>
+               <td>
+                   <xsl:value-of select="value_descr"/>
+               </td>
+           </tr>
+           <tr>
+               <td>
+                   <xsl:value-of select="lang_category"/>
+               </td>
+               <xsl:for-each select="cat_list_project">
+                   <xsl:choose>
+                       <xsl:when test="selected='selected'">
+                           <td>
+                               <xsl:value-of select="name"/>
+                           </td>
+                       </xsl:when>
+                   </xsl:choose>
+               </xsl:for-each>
+           </tr>
+           <xsl:call-template name="location_view"/>
+           <xsl:choose>
+               <xsl:when test="contact_phone !=''">
+                   <tr>
+                       <td class="th_text" align="left">
+                           <xsl:value-of select="lang_contact_phone"/>
+                       </td>
                        <td align="left">
-                               <xsl:value-of select="vendor_name"/>
+                           <xsl:value-of select="contact_phone"/>
                        </td>
-                       <td align="center">
-                               <xsl:choose>
-                                       <xsl:when test="charge_tenant='1'">
-                                               <b>x</b>
-                                       </xsl:when>
-                               </xsl:choose>
-                               <xsl:choose>
-                                       <xsl:when test="claimed!=''">
-                                               <b>
-                                                       <xsl:text>[</xsl:text>
-                                                       <xsl:value-of 
select="claimed"/>
-                                                       <xsl:text>]</xsl:text>
-                                               </b>
-                                       </xsl:when>
-                               </xsl:choose>
+                   </tr>
+               </xsl:when>
+           </xsl:choose>
+           <tr>
+               <td valign="top">
+                   <xsl:value-of select="lang_power_meter"/>
+               </td>
+               <td>
+                   <xsl:value-of select="value_power_meter"/>
+               </td>
+           </tr>
+           <tr>
+               <td>
+                   <xsl:value-of select="lang_charge_tenant"/>
+               </td>
+               <td>
+                   <xsl:choose>
+                       <xsl:when test="charge_tenant='1'">
+                           <b>X</b>
+                       </xsl:when>
+                   </xsl:choose>
+               </td>
+           </tr>
+           <tr>
+               <td valign="top">
+                   <xsl:value-of select="lang_budget"/>
+               </td>
+               <td>
+                   <xsl:value-of select="value_budget"/>
+                   <xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
+               </td>
+           </tr>
+           <tr>
+               <td valign="top">
+                   <xsl:value-of select="lang_reserve"/>
+               </td>
+               <td>
+                   <xsl:value-of select="value_reserve"/>
+                   <xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
+               </td>
+           </tr>
+           <tr>
+               <td valign="top">
+                   <xsl:value-of select="lang_reserve_remainder"/>
+               </td>
+               <td>
+                   <xsl:value-of select="value_reserve_remainder"/>
+                   <xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
+                   <xsl:text> </xsl:text> ( <xsl:value-of 
select="value_reserve_remainder_percent"/>
+                   <xsl:text> % )</xsl:text>
+               </td>
+           </tr>
+           <tr>
+               <td valign="top">
+                   <xsl:value-of select="lang_actual_cost"/>
+               </td>
+               <td>
+                   <xsl:value-of select="sum_workorder_actual_cost"/>
+                   <xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
+               </td>
+           </tr>
+           <tr>
+               <xsl:choose>
+                   <xsl:when test="sum_workorder_budget=''">
+                       <td class="th_text">
+                           <xsl:value-of select="lang_no_workorders"/>
                        </td>
-                       <td align="center">
-                               <xsl:choose>
-                                       <xsl:when test="selected = 1">
-                                               <input type="checkbox" 
name="values[workorder][]" value="{$workorder_id}" checked="checked" 
onMouseout="window.status='';return true;">
-                                                       <xsl:attribute 
name="title">
-                                                               <xsl:value-of 
select="//lang_select_workorder_statustext"/>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <input type="checkbox" 
name="values[workorder][]" value="{$workorder_id}" 
onMouseout="window.status='';return true;">
-                                                       <xsl:attribute 
name="title">
-                                                               <xsl:value-of 
select="//lang_select_workorder_statustext"/>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </xsl:otherwise>
-                               </xsl:choose>
+                   </xsl:when>
+                   <xsl:otherwise>
+                       <td colspan="2">
+                           <table width="80%" cellpadding="2" cellspacing="2" 
align="left">
+                               <xsl:apply-templates 
select="table_header_workorder"/>
+                               <xsl:apply-templates select="workorder_budget"/>
+                               <tr class="th">
+                                   <td class="th_text" align="right">
+                                       <xsl:value-of select="lang_sum"/>
+                                   </td>
+                                   <td class="th_text" align="right">
+                                       <xsl:value-of 
select="sum_workorder_budget"/>
+                                   </td>
+                                   <td class="th_text" align="right">
+                                       <xsl:value-of 
select="sum_workorder_calculation"/>
+                                   </td>
+                                   <td>
+                                   </td>
+                                   <td>
+                                   </td>
+                                   <td>
+                                   </td>
+                               </tr>
+                           </table>
                        </td>
-               </tr>
-       </xsl:template>
+                   </xsl:otherwise>
+               </xsl:choose>
+           </tr>
+           <tr>
+               <td>
+                   <xsl:value-of select="lang_coordinator"/>
+               </td>
+               <xsl:for-each select="user_list">
+                   <xsl:choose>
+                       <xsl:when test="selected">
+                           <td>
+                               <xsl:value-of select="name"/>
+                           </td>
+                       </xsl:when>
+                   </xsl:choose>
+               </xsl:for-each>
+           </tr>
+           <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 valign="top">
+                   <xsl:value-of select="php:function('lang', 'entry date')" />
+               </td>
+               <td>
+                   <xsl:value-of select="value_entry_date"/>
+               </td>
+           </tr>
+
+           <tr>
+               <td valign="top">
+                   <xsl:value-of select="lang_start_date"/>
+               </td>
+               <td>
+                   <xsl:value-of select="value_start_date"/>
+               </td>
+           </tr>
+           <tr>
+               <td valign="top">
+                   <xsl:value-of select="lang_end_date"/>
+               </td>
+               <td>
+                   <xsl:value-of select="value_end_date"/>
+               </td>
+           </tr>
+           <tr>
+               <td align="left">
+                   <xsl:value-of select="lang_status"/>
+               </td>
+               <xsl:for-each select="status_list">
+                   <xsl:choose>
+                       <xsl:when test="selected='selected'">
+                           <td>
+                               <xsl:value-of select="name"/>
+                           </td>
+                       </xsl:when>
+                   </xsl:choose>
+               </xsl:for-each>
+           </tr>
+           <tr>
+               <td>
+                   <xsl:value-of select="lang_tenant"/>
+               </td>
+               <td>
+                   <input size="{size_last_name}" type="text" name="last_name" 
value="{value_last_name}" readonly="readonly">
+                   </input>
+                   <input size="{size_first_name}" type="text" 
name="first_name" value="{value_first_name}" readonly="readonly">
+                   </input>
+               </td>
+           </tr>
+           <xsl:call-template name="b_account_view"/>
+           <tr>
+               <td valign="top">
+                   <xsl:value-of select="lang_amount"/>
+               </td>
+               <td>
+                   <xsl:value-of select="value_amount"/>
+                   <xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
+               </td>
+           </tr>
+           <tr>
+               <td align="left">
+                   <xsl:value-of select="lang_category"/>
+               </td>
+               <xsl:for-each select="cat_list">
+                   <xsl:choose>
+                       <xsl:when test="selected='selected'">
+                           <td>
+                               <xsl:value-of select="name"/>
+                           </td>
+                       </xsl:when>
+                   </xsl:choose>
+               </xsl:for-each>
+           </tr>
+           <tr align="left">
+               <td valign="top">
+                   <xsl:value-of select="lang_remark"/>
+               </td>
+               <td align="left">
+                   <textarea cols="60" rows="6" name="values[remark]" 
onMouseout="window.status='';return true;">
+                       <xsl:attribute name="onMouseover">
+                           <xsl:text>window.status='</xsl:text>
+                           <xsl:value-of select="lang_remark_statustext"/>
+                           <xsl:text>'; return true;</xsl:text>
+                       </xsl:attribute>
+                       <xsl:value-of select="value_remark"/>
+                   </textarea>
+               </td>
+           </tr>
+           <tr height="50">
+               <td>
+                   <xsl:variable name="done_action">
+                       <xsl:value-of select="done_action"/>
+                   </xsl:variable>
+                   <xsl:variable name="lang_done">
+                       <xsl:value-of select="lang_done"/>
+                   </xsl:variable>
+                   <form method="post" action="{$done_action}">
+                       <input type="submit" class="forms" name="done" 
value="{$lang_done}" onMouseover="window.status='Back to the list.';return 
true;" onMouseout="window.status='';return true;"/>
+                   </form>
+               </td>
+           </tr>
+       </table>
+    </div>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template match="table_header_workorder">
+    <tr class="th">
+       <td class="th_text" width="4%" align="right">
+           <xsl:value-of select="lang_workorder_id"/>
+       </td>
+       <td class="th_text" width="10%" align="right">
+           <xsl:value-of select="lang_budget"/>
+       </td>
+       <td class="th_text" width="5%" align="right">
+           <xsl:value-of select="lang_calculation"/>
+       </td>
+       <td class="th_text" width="10%" align="right">
+           <xsl:value-of select="lang_vendor"/>
+       </td>
+       <td class="th_text" width="10%" align="right">
+           <xsl:value-of select="lang_charge_tenant"/>
+       </td>
+       <td class="th_text" width="10%" align="right">
+           <xsl:value-of select="lang_select"/>
+       </td>
+    </tr>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template match="workorder_budget">
+    <xsl:variable name="workorder_link">
+       <xsl:value-of select="//workorder_link"/>&amp;id=<xsl:value-of 
select="workorder_id"/>
+    </xsl:variable>
+    <xsl:variable name="workorder_id">
+       <xsl:value-of select="workorder_id"/>
+    </xsl:variable>
+    <tr>
+       <xsl:attribute name="class">
+           <xsl:choose>
+               <xsl:when test="@class">
+                   <xsl:value-of select="@class"/>
+               </xsl:when>
+               <xsl:when test="position() mod 2 = 0">
+                   <xsl:text>row_off</xsl:text>
+               </xsl:when>
+               <xsl:otherwise>
+                   <xsl:text>row_on</xsl:text>
+               </xsl:otherwise>
+           </xsl:choose>
+       </xsl:attribute>
+       <td align="right">
+           <a href="{$workorder_link}" target="_blank">
+               <xsl:value-of select="workorder_id"/>
+           </a>
+       </td>
+       <td align="right">
+           <xsl:value-of select="budget"/>
+       </td>
+       <td align="right">
+           <xsl:value-of select="calculation"/>
+       </td>
+       <td align="left">
+           <xsl:value-of select="vendor_name"/>
+       </td>
+       <td align="center">
+           <xsl:choose>
+               <xsl:when test="charge_tenant='1'">
+                   <b>x</b>
+               </xsl:when>
+           </xsl:choose>
+           <xsl:choose>
+               <xsl:when test="claimed!=''">
+                   <b>
+                       <xsl:text>[</xsl:text>
+                       <xsl:value-of select="claimed"/>
+                       <xsl:text>]</xsl:text>
+                   </b>
+               </xsl:when>
+           </xsl:choose>
+       </td>
+       <td align="center">
+           <xsl:choose>
+               <xsl:when test="selected = 1">
+                   <input type="checkbox" name="values[workorder][]" 
value="{$workorder_id}" checked="checked" onMouseout="window.status='';return 
true;">
+                       <xsl:attribute name="title">
+                           <xsl:value-of 
select="//lang_select_workorder_statustext"/>
+                       </xsl:attribute>
+                   </input>
+               </xsl:when>
+               <xsl:otherwise>
+                   <input type="checkbox" name="values[workorder][]" 
value="{$workorder_id}" onMouseout="window.status='';return true;">
+                       <xsl:attribute name="title">
+                           <xsl:value-of 
select="//lang_select_workorder_statustext"/>
+                       </xsl:attribute>
+                   </input>
+               </xsl:otherwise>
+           </xsl:choose>
+       </td>
+    </tr>
+</xsl:template>




reply via email to

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