[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8441] Merge 8433:8440 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8441] Merge 8433:8440 from trunk |
|
Date: |
Tue, 27 Dec 2011 11:55:57 +0000 |
Revision: 8441
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8441
Author: sigurdne
Date: 2011-12-27 11:55:56 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Merge 8433:8440 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/admin/inc/class.soconfig.inc.php
branches/Version-1_0-branch/admin/inc/class.uiconfig2.inc.php
branches/Version-1_0-branch/admin/templates/base/config.xsl
branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php
branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/abook_form.xsl
branches/Version-1_0-branch/property/templates/base/abook_view.xsl
branches/Version-1_0-branch/property/templates/base/admin.xsl
branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
branches/Version-1_0-branch/property/templates/base/admin_location.xsl
branches/Version-1_0-branch/property/templates/base/agreement.xsl
branches/Version-1_0-branch/property/templates/base/alarm.xsl
branches/Version-1_0-branch/property/templates/base/alarm_form.xsl
branches/Version-1_0-branch/property/templates/base/alarm_view.xsl
branches/Version-1_0-branch/property/templates/base/app_data.xsl
branches/Version-1_0-branch/property/templates/base/app_delete.xsl
branches/Version-1_0-branch/property/templates/base/async.xsl
branches/Version-1_0-branch/property/templates/base/attrib_history.xsl
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
branches/Version-1_0-branch/property/templates/base/attributes_view.xsl
branches/Version-1_0-branch/property/templates/base/b_account_form.xsl
branches/Version-1_0-branch/property/templates/base/b_account_view.xsl
branches/Version-1_0-branch/property/templates/base/branch_select.xsl
branches/Version-1_0-branch/property/templates/base/budget.xsl
branches/Version-1_0-branch/property/templates/base/building_part_select.xsl
branches/Version-1_0-branch/property/templates/base/calendar_info.xsl
branches/Version-1_0-branch/property/templates/base/cat_filter.xsl
branches/Version-1_0-branch/property/templates/base/cat_select.xsl
branches/Version-1_0-branch/property/templates/base/cat_sub_select.xsl
branches/Version-1_0-branch/property/templates/base/chapter_filter.xsl
branches/Version-1_0-branch/property/templates/base/chapter_select.xsl
branches/Version-1_0-branch/property/templates/base/choice.xsl
branches/Version-1_0-branch/property/templates/base/columns.xsl
branches/Version-1_0-branch/property/templates/base/confirm_custom.xsl
branches/Version-1_0-branch/property/templates/base/contact_form.xsl
branches/Version-1_0-branch/property/templates/base/contact_view.xsl
branches/Version-1_0-branch/property/templates/base/custom.xsl
branches/Version-1_0-branch/property/templates/base/date_search.xsl
branches/Version-1_0-branch/property/templates/base/dim_d_select.xsl
branches/Version-1_0-branch/property/templates/base/document.xsl
branches/Version-1_0-branch/property/templates/base/ecodimb_form.xsl
branches/Version-1_0-branch/property/templates/base/ecodimb_view.xsl
branches/Version-1_0-branch/property/templates/base/entity.xsl
branches/Version-1_0-branch/property/templates/base/event.xsl
branches/Version-1_0-branch/property/templates/base/event_form.xsl
branches/Version-1_0-branch/property/templates/base/event_schedule.xsl
branches/Version-1_0-branch/property/templates/base/event_schedule_week.xsl
branches/Version-1_0-branch/property/templates/base/event_view.xsl
branches/Version-1_0-branch/property/templates/base/files.xsl
branches/Version-1_0-branch/property/templates/base/fileuploader.xsl
branches/Version-1_0-branch/property/templates/base/filter_district.xsl
branches/Version-1_0-branch/property/templates/base/filter_filter.xsl
branches/Version-1_0-branch/property/templates/base/filter_location.xsl
branches/Version-1_0-branch/property/templates/base/filter_member_of.xsl
branches/Version-1_0-branch/property/templates/base/filter_part_of_town.xsl
branches/Version-1_0-branch/property/templates/base/filter_permission.xsl
branches/Version-1_0-branch/property/templates/base/filter_select.xsl
branches/Version-1_0-branch/property/templates/base/filter_submodule.xsl
branches/Version-1_0-branch/property/templates/base/filter_vendor.xsl
branches/Version-1_0-branch/property/templates/base/gab.xsl
branches/Version-1_0-branch/property/templates/base/generic.xsl
branches/Version-1_0-branch/property/templates/base/group_filter.xsl
branches/Version-1_0-branch/property/templates/base/group_select.xsl
branches/Version-1_0-branch/property/templates/base/grouping_select.xsl
branches/Version-1_0-branch/property/templates/base/help_data.xsl
branches/Version-1_0-branch/property/templates/base/hour_data_view.xsl
branches/Version-1_0-branch/property/templates/base/ifc.xsl
branches/Version-1_0-branch/property/templates/base/import.xsl
branches/Version-1_0-branch/property/templates/base/investment.xsl
branches/Version-1_0-branch/property/templates/base/invoice.xsl
branches/Version-1_0-branch/property/templates/base/invoice_reporting.xsl
branches/Version-1_0-branch/property/templates/base/jasper.xsl
branches/Version-1_0-branch/property/templates/base/location.xsl
branches/Version-1_0-branch/property/templates/base/location_form.xsl
branches/Version-1_0-branch/property/templates/base/location_view.xsl
branches/Version-1_0-branch/property/templates/base/lookup.xsl
branches/Version-1_0-branch/property/templates/base/menu.xsl
branches/Version-1_0-branch/property/templates/base/migrate.xsl
branches/Version-1_0-branch/property/templates/base/nextmatchs.xsl
branches/Version-1_0-branch/property/templates/base/no_access.xsl
branches/Version-1_0-branch/property/templates/base/owner_filter.xsl
branches/Version-1_0-branch/property/templates/base/owner_select.xsl
branches/Version-1_0-branch/property/templates/base/pricebook.xsl
branches/Version-1_0-branch/property/templates/base/project.xsl
branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
branches/Version-1_0-branch/property/templates/base/project_group_view.xsl
branches/Version-1_0-branch/property/templates/base/receipt.xsl
branches/Version-1_0-branch/property/templates/base/request.xsl
branches/Version-1_0-branch/property/templates/base/responsible.xsl
branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
branches/Version-1_0-branch/property/templates/base/search_field.xsl
branches/Version-1_0-branch/property/templates/base/search_field_grouped.xsl
branches/Version-1_0-branch/property/templates/base/select_district.xsl
branches/Version-1_0-branch/property/templates/base/select_location.xsl
branches/Version-1_0-branch/property/templates/base/select_multi_user.xsl
branches/Version-1_0-branch/property/templates/base/select_part_of_town.xsl
branches/Version-1_0-branch/property/templates/base/select_permission.xsl
branches/Version-1_0-branch/property/templates/base/select_submodule.xsl
branches/Version-1_0-branch/property/templates/base/select_vendor.xsl
branches/Version-1_0-branch/property/templates/base/status_filter.xsl
branches/Version-1_0-branch/property/templates/base/status_select.xsl
branches/Version-1_0-branch/property/templates/base/table_header.xsl
branches/Version-1_0-branch/property/templates/base/template.xsl
branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
branches/Version-1_0-branch/property/templates/base/tenant_form.xsl
branches/Version-1_0-branch/property/templates/base/tenant_view.xsl
branches/Version-1_0-branch/property/templates/base/tolerance_select.xsl
branches/Version-1_0-branch/property/templates/base/tts.xsl
branches/Version-1_0-branch/property/templates/base/unit_select.xsl
branches/Version-1_0-branch/property/templates/base/user_id_filter.xsl
branches/Version-1_0-branch/property/templates/base/user_id_select.xsl
branches/Version-1_0-branch/property/templates/base/user_lid_filter.xsl
branches/Version-1_0-branch/property/templates/base/user_lid_select.xsl
branches/Version-1_0-branch/property/templates/base/values.xsl
branches/Version-1_0-branch/property/templates/base/vendor_form.xsl
branches/Version-1_0-branch/property/templates/base/vendor_view.xsl
branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
branches/Version-1_0-branch/property/templates/base/wo_hour_cat_filter.xsl
branches/Version-1_0-branch/property/templates/base/wo_hour_cat_select.xsl
branches/Version-1_0-branch/property/templates/base/workorder.xsl
branches/Version-1_0-branch/property/templates/base/yui_property_i18n.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
+
/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
Modified: branches/Version-1_0-branch/admin/inc/class.soconfig.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.soconfig.inc.php
2011-12-27 11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/admin/inc/class.soconfig.inc.php
2011-12-27 11:55:56 UTC (rev 8441)
@@ -274,7 +274,7 @@
$querymethod = " AND name $this->like
'%$query%'";
}
- $sql = "SELECT $attrib_table.id,
$attrib_table.section_id, $value_table.id as value_id, $attrib_table.name,
$attrib_table.input_type, $value_table.value"
+ $sql = "SELECT $attrib_table.id,
$attrib_table.section_id, $value_table.id as value_id, $attrib_table.name,
$attrib_table.descr, $attrib_table.input_type, $value_table.value"
. " FROM ($section_table {$this->join} $attrib_table ON
($section_table.id = $attrib_table.section_id))"
. " {$this->left_join} $value_table ON
($attrib_table.section_id = $value_table.section_id AND $attrib_table.id =
$value_table.attrib_id)"
. " WHERE location_id = {$this->location_id} AND
$attrib_table.section_id = '$section_id' $querymethod";
@@ -312,7 +312,8 @@
'section_id' =>
$this->db->f('section_id'),
'value_id' =>
$this->db->f('value_id'),
'name' =>
$this->db->f('name', true),
- 'value' => $value
+ 'value' => $value,
+ 'descr' =>
$this->db->f('descr', true),
);
}
return $config_info;
Modified: branches/Version-1_0-branch/admin/inc/class.uiconfig2.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.uiconfig2.inc.php
2011-12-27 11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/admin/inc/class.uiconfig2.inc.php
2011-12-27 11:55:56 UTC (rev 8441)
@@ -376,7 +376,7 @@
'text_delete'
=> lang('delete'),
'text_value'
=> $entry['value']?$entry['value']:lang('no value'),
'lang_delete_config_text' =>
lang('delete the config'),
- 'lang_value_text'
=> lang('values for this config section'),
+ 'lang_value_text'
=> $entry['descr']?$entry['descr']:lang('values for this config section'),
);
}
@@ -426,14 +426,17 @@
'lang_add' =>
lang('add'),
'lang_add_statustext' => lang('add a value'),
'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'admin.uiconfig2.edit_attrib', 'section_id'=> $section_id, 'location_id' =>
$this->location_id)),
+ 'lang_done' =>
lang('done'),
+ 'lang_done_statustext' => lang('back to the
list'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'admin.uiconfig2.index', 'location_id' => $this->location_id)),
);
$msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($receipt);
$data = array
(
- 'lang_section'
=> lang('section'),
- 'value_section_name'
=> $section['name'],
+ 'lang_section'
=> lang('section'),
+ 'value_section_name'
=> $section['name'],
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'allow_allrows'
=> true,
'allrows'
=> $this->allrows,
Modified: branches/Version-1_0-branch/admin/templates/base/config.xsl
===================================================================
--- branches/Version-1_0-branch/admin/templates/base/config.xsl 2011-12-27
11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/admin/templates/base/config.xsl 2011-12-27
11:55:56 UTC (rev 8441)
@@ -322,6 +322,19 @@
</input>
</form>
</td>
+ <xsl:choose>
+ <xsl:when test="done_action !=''">
+ <td>
+ <form method="post"
action="{done_action}">
+ <input
type="submit" name="add" value="{lang_done}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_done_statustext"/>
+
</xsl:attribute>
+ </input>
+ </form>
+ </td>
+ </xsl:when>
+ </xsl:choose>
</tr>
</xsl:template>
Modified: branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php 2011-12-27
11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php 2011-12-27
11:55:56 UTC (rev 8441)
@@ -12,7 +12,7 @@
// Basic information about this app
$setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'phpgwapi';
- $setup_info['phpgwapi']['version'] = '0.9.17.537';
+ $setup_info['phpgwapi']['version'] = '0.9.17.538';
$setup_info['phpgwapi']['versions']['current_header'] = '1.31';
$setup_info['phpgwapi']['versions']['system'] = '1.0';
$setup_info['phpgwapi']['enable'] = 3;
Modified: branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
2011-12-27 11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
2011-12-27 11:55:56 UTC (rev 8441)
@@ -703,7 +703,7 @@
'fd' => array(
'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
'location_id' => array('type' =>
'int','precision' => 4,'nullable' => False),
- 'location_item_id' => array('type' =>
'int','precision' => 4,'nullable' => False),
+ 'location_item_id' => array('type' =>
'int','precision' => 8,'nullable' => False),//bigint
'contact_id' => array('type' =>
'int','precision' => 4,'nullable' => False),
'is_active' => array('type' => 'int',
'precision' => 2,'nullable' => true),
'notification_method' => array('type' =>
'varchar', 'precision' => 20,'nullable' => true),
Modified: branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
2011-12-27 11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
2011-12-27 11:55:56 UTC (rev 8441)
@@ -3026,3 +3026,26 @@
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
}
}
+ $test[] = '0.9.17.537';
+ /**
+ * change datatype to bigint
+ *
+ * @return string the new version number
+ */
+
+ function phpgwapi_upgrade0_9_17_537()
+ {
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_notification','location_item_id',array(
+ 'type' => 'int',
+ 'precision' => '8',
+ 'nullable' => False
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['phpgwapi']['currentver'] =
'0.9.17.538';
+ return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+ }
+ }
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2011-12-27 11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2011-12-27 11:55:56 UTC (rev 8441)
@@ -926,275 +926,295 @@
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('date_search' => $data));
}
- function edit()
+ function edit($mode = 'edit')
{
$id = (int)phpgw::get_var('id', 'int');
- if(!$this->acl_add && !$this->acl_edit)
+
+ if($mode == 'edit' && (!$this->acl_add &&
!$this->acl_edit))
{
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiproject.view', 'id'=> $id));
}
- $values =
phpgw::get_var('values');
- $values_attribute =
phpgw::get_var('values_attribute');
- $add_request =
phpgw::get_var('add_request');
- $values['project_group'] =
phpgw::get_var('project_group');
- $values['ecodimb'] =
phpgw::get_var('ecodimb');
- $values['b_account_id'] =
phpgw::get_var('b_account_id', 'int', 'POST');
- $values['b_account_name'] =
phpgw::get_var('b_account_name', 'string', 'POST');
- $values['contact_id'] =
phpgw::get_var('contact', 'int', 'POST');
- $auto_create = false;
+ if($mode == 'view')
+ {
+ if( !$this->acl_read)
+ {
+ $this->bocommon->no_access();
+ return;
+ }
- $location_id =
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location);
-
- $datatable = array();
-
- /*$datatable['config']['base_java_url'] =
"menuaction:'property.uiproject.edit',"
- ."id:'{$id}'";*/
-
- $config =
CreateObject('phpgwapi.config','property');
- $bolocation =
CreateObject('property.bolocation');
-
- $insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record','property');
-
- $insert_record_entity =
$GLOBALS['phpgw']->session->appsession("insert_record_values{$this->acl_location}",'property');
-
- if(isset($insert_record_entity) &&
is_array($insert_record_entity))
+ if(!$id)
+ {
+ phpgwapi_cache::message_set('ID is
required for the function uiproject::view()', 'error');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiproject.index'));
+ }
+ }
+ else
{
- for ($j=0;$j<count($insert_record_entity);$j++)
+ if(!$this->acl_add && !$this->acl_edit)
{
-
$insert_record['extra'][$insert_record_entity[$j]] =
$insert_record_entity[$j];
+ $this->bocommon->no_access();
+ return;
}
}
-
$GLOBALS['phpgw']->xslttpl->add_file(array('project','attributes_form'));
+ $location_id =
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location);
+ $config =
CreateObject('phpgwapi.config','property');
+ $config->read();
+ $bolocation =
CreateObject('property.bolocation');
- $bypass = phpgw::get_var('bypass', 'bool');
-
- if($add_request)
+ if($mode == 'edit')
{
- $receipt =
$this->bo->add_request($add_request,$id);
- }
- if($_POST && !$bypass && isset($insert_record) &&
is_array($insert_record))
- {
- $values =
$this->bocommon->collect_locationdata($values,$insert_record);
- }
- else
- {
- $location_code =
phpgw::get_var('location_code');
- $tenant_id =
phpgw::get_var('tenant_id', 'int');
- $values['descr'] =
phpgw::get_var('descr');
- $p_entity_id =
phpgw::get_var('p_entity_id', 'int');
- $p_cat_id =
phpgw::get_var('p_cat_id', 'int');
- $values['p'][$p_entity_id]['p_entity_id']
= $p_entity_id;
- $values['p'][$p_entity_id]['p_cat_id']
= $p_cat_id;
- $values['p'][$p_entity_id]['p_num']
= phpgw::get_var('p_num');
+ $values
= phpgw::get_var('values');
+ $values_attribute =
phpgw::get_var('values_attribute');
+ $add_request =
phpgw::get_var('add_request');
+ $values['project_group'] =
phpgw::get_var('project_group');
+ $values['ecodimb'] =
phpgw::get_var('ecodimb');
+ $values['b_account_id'] =
phpgw::get_var('b_account_id', 'int', 'POST');
+ $values['b_account_name'] =
phpgw::get_var('b_account_name', 'string', 'POST');
+ $values['contact_id'] =
phpgw::get_var('contact', 'int', 'POST');
+ $auto_create = false;
- $origin =
phpgw::get_var('origin');
- $origin_id =
phpgw::get_var('origin_id', 'int');
+ $datatable = array();
- //23.jun 08: This will be handled by the
interlink code - just doing a quick hack for now...
- if($origin == '.ticket' && $origin_id &&
!$values['descr'])
- {
- $boticket=
CreateObject('property.botts');
- $ticket =
$boticket->read_single($origin_id);
- $values['descr'] = $ticket['details'];
- $values['name'] = $ticket['subject'] ?
$ticket['subject'] : $ticket['category_name'];
- $ticket_notes =
$boticket->read_additional_notes($origin_id);
- $i = count($ticket_notes)-1;
-
if(isset($ticket_notes[$i]['value_note']) && $ticket_notes[$i]['value_note'])
- {
- $values['descr'] .= ": " .
$ticket_notes[$i]['value_note'];
- }
- $values['contact_id'] =
$ticket['contact_id'];
- $tts_status_create_project =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_create_project'])
?
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_create_project']
: '';
- if($tts_status_create_project)
- {
-
$boticket->update_status(array('status' => $tts_status_create_project),
$origin_id);
- }
+ $insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record','property');
- if (
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['auto_create_project_from_ticket'])
- &&
$GLOBALS['phpgw_info']['user']['preferences']['property']['auto_create_project_from_ticket']
== 'yes')
- {
- $auto_create = true;
- }
- }
+ $insert_record_entity =
$GLOBALS['phpgw']->session->appsession("insert_record_values{$this->acl_location}",'property');
- if($p_entity_id && $p_cat_id)
+ if(isset($insert_record_entity) &&
is_array($insert_record_entity))
{
-
- if(!is_object($boadmin_entity))
+ for
($j=0;$j<count($insert_record_entity);$j++)
{
- $boadmin_entity =
CreateObject('property.boadmin_entity');
+
$insert_record['extra'][$insert_record_entity[$j]] =
$insert_record_entity[$j];
}
-
- $entity_category =
$boadmin_entity->read_single_category($p_entity_id,$p_cat_id);
-
$values['p'][$p_entity_id]['p_cat_name'] = $entity_category['name'];
}
- if($location_code)
- {
- $values['location_data'] =
$bolocation->read_single($location_code,array('tenant_id'=>$tenant_id,'p_num'=>$p_num,
'view' => true));
- }
- }
- if(isset($values['origin']) && $values['origin'])
- {
- $origin = $values['origin'];
- $origin_id = $values['origin_id'];
- }
+ $bypass = phpgw::get_var('bypass', 'bool');
- $interlink = CreateObject('property.interlink');
-
- if(isset($origin) && $origin)
- {
- unset($values['origin']);
- unset($values['origin_id']);
- $values['origin'][0]['location']= $origin;
- $values['origin'][0]['descr']=
$interlink->get_location_name($origin);
- $values['origin'][0]['data'][]= array(
- 'id' => $origin_id,
- 'link' =>
$interlink->get_relation_link(array('location' => $origin), $origin_id),
- );
- }
-
- $config->read();
-
- $save='';
- if (isset($values['save']))
- {
- if($GLOBALS['phpgw']->session->is_repost())
+ if($add_request)
{
-
$receipt['error'][]=array('msg'=>lang('Hmm... looks like a repost!'));
+ $receipt =
$this->bo->add_request($add_request,$id);
}
- $save=true;
-
- if(!isset($values['location']))
+ if($_POST && !$bypass && isset($insert_record)
&& is_array($insert_record))
{
-
$receipt['error'][]=array('msg'=>lang('Please select a location !'));
- $error_id=true;
+ $values =
$this->bocommon->collect_locationdata($values,$insert_record);
}
-
- if(!isset($values['b_account_id']) ||
!$values['b_account_id'])
- {
-
$receipt['error'][]=array('msg'=>lang('Please select an account group!'));
- $error_id=true;
- }
else
{
- $sogeneric =
CreateObject('property.sogeneric');
-
$sogeneric->get_location_info('b_account_category',false);
- $status_data =
$sogeneric->read_single(array('id' => (int)$values['b_account_id']),array());
+ $location_code =
phpgw::get_var('location_code');
+ $tenant_id =
phpgw::get_var('tenant_id', 'int');
+ $values['descr'] =
phpgw::get_var('descr');
+ $p_entity_id =
phpgw::get_var('p_entity_id', 'int');
+ $p_cat_id =
phpgw::get_var('p_cat_id', 'int');
+
$values['p'][$p_entity_id]['p_entity_id'] = $p_entity_id;
+ $values['p'][$p_entity_id]['p_cat_id']
= $p_cat_id;
+ $values['p'][$p_entity_id]['p_num']
= phpgw::get_var('p_num');
- if(isset($status_data['project_group'])
&& $status_data['project_group'])//mandatory for this account group
+ $origin =
phpgw::get_var('origin');
+ $origin_id =
phpgw::get_var('origin_id', 'int');
+
+ //23.jun 08: This will be handled by
the interlink code - just doing a quick hack for now...
+ if($origin == '.ticket' && $origin_id
&& !$values['descr'])
{
-
if(!isset($values['project_group']) || !$values['project_group'])
+ $boticket=
CreateObject('property.botts');
+ $ticket =
$boticket->read_single($origin_id);
+ $values['descr'] =
$ticket['details'];
+ $values['name'] =
$ticket['subject'] ? $ticket['subject'] : $ticket['category_name'];
+ $ticket_notes =
$boticket->read_additional_notes($origin_id);
+ $i = count($ticket_notes)-1;
+
if(isset($ticket_notes[$i]['value_note']) && $ticket_notes[$i]['value_note'])
{
-
$receipt['error'][]=array('msg'=>lang('Please select a project group!'));
- $error_id=true;
+ $values['descr'] .= ":
" . $ticket_notes[$i]['value_note'];
}
+ $values['contact_id'] =
$ticket['contact_id'];
+ $tts_status_create_project
=
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_create_project'])
?
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_create_project']
: '';
+ if($tts_status_create_project)
+ {
+
$boticket->update_status(array('status' => $tts_status_create_project),
$origin_id);
+ }
+
+ if (
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['auto_create_project_from_ticket'])
+ &&
$GLOBALS['phpgw_info']['user']['preferences']['property']['auto_create_project_from_ticket']
== 'yes')
+ {
+ $auto_create = true;
+ }
}
- }
- if(!isset($values['end_date']) ||
!$values['end_date'])
- {
-
$receipt['error'][]=array('msg'=>lang('Please select an end date!'));
- $error_id=true;
- }
+ if($p_entity_id && $p_cat_id)
+ {
+ if(!is_object($boadmin_entity))
+ {
+ $boadmin_entity =
CreateObject('property.boadmin_entity');
+ }
- if(!$values['name'])
- {
-
$receipt['error'][]=array('msg'=>lang('Please enter a project NAME !'));
- $error_id=true;
- }
+ $entity_category =
$boadmin_entity->read_single_category($p_entity_id,$p_cat_id);
+
$values['p'][$p_entity_id]['p_cat_name'] = $entity_category['name'];
+ }
- if(!$values['cat_id'])
- {
-
$receipt['error'][]=array('msg'=>lang('Please select a category !'));
- $error_id=true;
- }
+ if($location_code)
+ {
+ $values['location_data'] =
$bolocation->read_single($location_code,array('tenant_id'=>$tenant_id,'p_num'=>$p_num,
'view' => true));
+ }
- if(!$values['coordinator'])
- {
-
$receipt['error'][]=array('msg'=>lang('Please select a coordinator !'));
- $error_id=true;
}
- if(!$values['status'])
+ if(isset($values['origin']) &&
$values['origin'])
{
-
$receipt['error'][]=array('msg'=>lang('Please select a status !'));
- $error_id=true;
+ $origin = $values['origin'];
+ $origin_id = $values['origin_id'];
}
- if(isset($values['budget']) &&
$values['budget'] && !ctype_digit(ltrim($values['budget'],'-')))
- {
-
$receipt['error'][]=array('msg'=>lang('budget') . ': ' . lang('Please enter an
integer !'));
- $error_id=true;
- }
+ $interlink =
CreateObject('property.interlink');
- if(isset($values['reserve']) &&
$values['reserve'] && !ctype_digit(ltrim($values['reserve'],'-')))
+ if(isset($origin) && $origin)
{
-
$receipt['error'][]=array('msg'=>lang('reserve') . ': ' . lang('Please enter an
integer !'));
- $error_id=true;
+ unset($values['origin']);
+ unset($values['origin_id']);
+ $values['origin'][0]['location']=
$origin;
+ $values['origin'][0]['descr']=
$interlink->get_location_name($origin);
+ $values['origin'][0]['data'][]= array(
+ 'id' => $origin_id,
+ 'link' =>
$interlink->get_relation_link(array('location' => $origin), $origin_id),
+ );
}
- if(isset($values_attribute) &&
is_array($values_attribute))
+
+ $save='';
+ if (isset($values['save']))
{
- foreach ($values_attribute as
$attribute )
+
if($GLOBALS['phpgw']->session->is_repost())
{
- if($attribute['nullable'] != 1
&& (!$attribute['value'] && !$values['extra'][$attribute['name']]))
+
$receipt['error'][]=array('msg'=>lang('Hmm... looks like a repost!'));
+ }
+
+ $save=true;
+
+ if(!isset($values['location']))
+ {
+
$receipt['error'][]=array('msg'=>lang('Please select a location !'));
+ $error_id=true;
+ }
+
+ if(!isset($values['b_account_id']) ||
!$values['b_account_id'])
+ {
+
$receipt['error'][]=array('msg'=>lang('Please select an account group!'));
+ $error_id=true;
+ }
+ else
+ {
+ $sogeneric =
CreateObject('property.sogeneric');
+
$sogeneric->get_location_info('b_account_category',false);
+ $status_data =
$sogeneric->read_single(array('id' => (int)$values['b_account_id']),array());
+
+
if(isset($status_data['project_group']) &&
$status_data['project_group'])//mandatory for this account group
{
-
$receipt['error'][]=array('msg'=>lang('Please enter value for attribute %1',
$attribute['input_text']));
+
if(!isset($values['project_group']) || !$values['project_group'])
+ {
+
$receipt['error'][]=array('msg'=>lang('Please select a project group!'));
+ $error_id=true;
+ }
}
}
- }
+ if(!isset($values['end_date']) ||
!$values['end_date'])
+ {
+
$receipt['error'][]=array('msg'=>lang('Please select an end date!'));
+ $error_id=true;
+ }
- if($id)
- {
- $values['id'] = $id;
- $action='edit';
- }
+ if(!$values['name'])
+ {
+
$receipt['error'][]=array('msg'=>lang('Please enter a project NAME !'));
+ $error_id=true;
+ }
- if(!$receipt['error'])
- {
+ if(!$values['cat_id'])
+ {
+
$receipt['error'][]=array('msg'=>lang('Please select a category !'));
+ $error_id=true;
+ }
- if($values['copy_project'])
+ if(!$values['coordinator'])
{
- $action='add';
+
$receipt['error'][]=array('msg'=>lang('Please select a coordinator !'));
+ $error_id=true;
}
- $receipt =
$this->bo->save($values,$action,$values_attribute);
+ if(!$values['status'])
+ {
+
$receipt['error'][]=array('msg'=>lang('Please select a status !'));
+ $error_id=true;
+ }
- if (! $receipt['error'])
+ if(isset($values['budget']) &&
$values['budget'] && !ctype_digit(ltrim($values['budget'],'-')))
{
- $id = $receipt['id'];
+
$receipt['error'][]=array('msg'=>lang('budget') . ': ' . lang('Please enter an
integer !'));
+ $error_id=true;
}
- if (
isset($GLOBALS['phpgw_info']['server']['smtp_server'])
- &&
$GLOBALS['phpgw_info']['server']['smtp_server'] )
- //
&& $config->config_data['project_approval'] )
+ if(isset($values['reserve']) &&
$values['reserve'] && !ctype_digit(ltrim($values['reserve'],'-')))
{
- $historylog =
CreateObject('property.historylog','project');
- if
(!is_object($GLOBALS['phpgw']->send))
+
$receipt['error'][]=array('msg'=>lang('reserve') . ': ' . lang('Please enter an
integer !'));
+ $error_id=true;
+ }
+
+ if(isset($values_attribute) &&
is_array($values_attribute))
+ {
+ foreach ($values_attribute as
$attribute )
{
- $GLOBALS['phpgw']->send
= CreateObject('phpgwapi.send');
+
if($attribute['nullable'] != 1 && (!$attribute['value'] &&
!$values['extra'][$attribute['name']]))
+ {
+
$receipt['error'][]=array('msg'=>lang('Please enter value for attribute %1',
$attribute['input_text']));
+ }
}
+ }
- $action_params['responsible'] =
$_account_id;
-
$from_name=$GLOBALS['phpgw_info']['user']['fullname'];
-
$from_email=$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
+ if($id)
+ {
+ $values['id'] = $id;
+ $action='edit';
+ }
- $subject = lang(Approval).": ".
$id;
- $message = '<a href ="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.edit','id'=> $id),false,true).'">' . lang('project %1 needs
approval',$id) .'</a>';
+ if(!$receipt['error'])
+ {
+ if($values['copy_project'])
+ {
+ $action='add';
+ }
- $bcc = '';//$from_email;
+ $receipt =
$this->bo->save($values,$action,$values_attribute);
- $action_params = array
+ if (! $receipt['error'])
+ {
+ $id = $receipt['id'];
+ }
+
+ if (
isset($GLOBALS['phpgw_info']['server']['smtp_server'])
+ &&
$GLOBALS['phpgw_info']['server']['smtp_server'] )
+ // &&
$config->config_data['project_approval'] )
+ {
+ $historylog =
CreateObject('property.historylog','project');
+ if
(!is_object($GLOBALS['phpgw']->send))
+ {
+
$GLOBALS['phpgw']->send = CreateObject('phpgwapi.send');
+ }
+
+
$action_params['responsible'] = $_account_id;
+
$from_name=$GLOBALS['phpgw_info']['user']['fullname'];
+
$from_email=$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
+
+ $subject =
lang(Approval).": ". $id;
+ $message = '<a href ="'
. $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.edit','id'=> $id),false,true).'">' . lang('project %1 needs
approval',$id) .'</a>';
+
+ $bcc = '';//$from_email;
+
+ $action_params = array
(
'appname'
=> 'property',
'location'
=> '.project',
@@ -1202,130 +1222,130 @@
'responsible'
=> '',
'responsible_type' => 'user',
'action'
=> 'approval',
-
'remark'
=> '',
'deadline'
=> ''
);
- if
(isset($values['mail_address']) && is_array($values['mail_address']))
- {
- foreach
($values['mail_address'] as $_account_id => $_address)
+ if
(isset($values['mail_address']) && is_array($values['mail_address']))
{
-
if(isset($values['approval'][$_account_id]) &&
$values['approval'][$_account_id])
+ foreach
($values['mail_address'] as $_account_id => $_address)
{
- $rcpt =
$GLOBALS['phpgw']->send->msg('email',$_address, $subject,
stripslashes($message), '', $cc, $bcc, $from_email, $from_name, 'html');
-
$action_params['responsible'] = $_account_id;
-
execMethod('property.sopending_action.set_pending_action', $action_params);
-
if(!$rcpt)
+
if(isset($values['approval'][$_account_id]) &&
$values['approval'][$_account_id])
{
-
$receipt['error'][]=array('msg'=>"uiproject::edit: sending message to '" .
$_address . "', subject='$subject' failed !!!");
-
$receipt['error'][]=array('msg'=> $GLOBALS['phpgw']->send->err['desc']);
-
$bypass_error=true;
+
$rcpt = $GLOBALS['phpgw']->send->msg('email',$_address, $subject,
stripslashes($message), '', $cc, $bcc, $from_email, $from_name, 'html');
+
$action_params['responsible'] = $_account_id;
+
execMethod('property.sopending_action.set_pending_action', $action_params);
+
if(!$rcpt)
+
{
+
$receipt['error'][]=array('msg'=>"uiproject::edit: sending message to
'" . $_address . "', subject='$subject' failed !!!");
+
$receipt['error'][]=array('msg'=> $GLOBALS['phpgw']->send->err['desc']);
+
$bypass_error=true;
+
}
+
else
+
{
+
$historylog->add('AP', $id, lang('%1 is notified',$_address));
+
$receipt['message'][]=array('msg'=>lang('%1 is notified',$_address));
+
}
}
- else
- {
-
$historylog->add('AP', $id, lang('%1 is notified',$_address));
-
$receipt['message'][]=array('msg'=>lang('%1 is notified',$_address));
- }
}
}
- }
- $toarray = array();
- $toarray_sms = array();
- if
(isset($receipt['notice_owner']) && is_array($receipt['notice_owner']) )
- {
-
if($this->account!=$values['coordinator']
- &&
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner']
- //
&&
$config->config_data['mailnotification']
- )
+ $toarray = array();
+ $toarray_sms = array();
+ if
(isset($receipt['notice_owner']) && is_array($receipt['notice_owner']) )
{
-
$prefs_coordinator =
$this->bocommon->create_preferences('property',$values['coordinator']);
- $toarray[] =
$prefs_coordinator['email'];
+
if($this->account!=$values['coordinator']
+ &&
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner']
+ // &&
$config->config_data['mailnotification']
+ )
+ {
+
$prefs_coordinator =
$this->bocommon->create_preferences('property',$values['coordinator']);
+
$toarray[] = $prefs_coordinator['email'];
+ }
}
- }
- $notify_list =
execMethod('property.notify.read', array
+ $notify_list =
execMethod('property.notify.read', array
(
'location_id' => $location_id,
'location_item_id' => $id
)
);
- $subject=lang('project %1 has
been edited',$id);
- $sms_text = "{$subject}.
\r\n{$GLOBALS['phpgw_info']['user']['fullname']}
\r\n{$GLOBALS['phpgw_info']['user']['preferences']['property']['email']}";
- $sms =
CreateObject('sms.sms');
+ $subject=lang('project
%1 has been edited',$id);
+ $sms_text =
"{$subject}. \r\n{$GLOBALS['phpgw_info']['user']['fullname']}
\r\n{$GLOBALS['phpgw_info']['user']['preferences']['property']['email']}";
+ $sms =
CreateObject('sms.sms');
- foreach($notify_list as $entry)
- {
- if($entry['is_active']
&& $entry['notification_method'] == 'email' && $entry['email'])
+ foreach($notify_list as
$entry)
{
- $toarray[] =
"{$entry['first_name']} {$entry['last_name']}<{$entry['email']}>";
+
if($entry['is_active'] && $entry['notification_method'] == 'email' &&
$entry['email'])
+ {
+
$toarray[] = "{$entry['first_name']} {$entry['last_name']}<{$entry['email']}>";
+ }
+ else
if($entry['is_active'] && $entry['notification_method'] == 'sms' &&
$entry['sms'])
+ {
+
$sms->websend2pv($this->account,$entry['sms'],$sms_text);
+
$toarray_sms[] = "{$entry['first_name']}
{$entry['last_name']}({$entry['sms']})";
+
$receipt['message'][]=array('msg'=>lang('%1 is
notified',"{$entry['first_name']} {$entry['last_name']}"));
+ }
}
- else
if($entry['is_active'] && $entry['notification_method'] == 'sms' &&
$entry['sms'])
+ unset($entry);
+
+ if($toarray_sms)
{
-
$sms->websend2pv($this->account,$entry['sms'],$sms_text);
- $toarray_sms[]
= "{$entry['first_name']} {$entry['last_name']}({$entry['sms']})";
-
$receipt['message'][]=array('msg'=>lang('%1 is
notified',"{$entry['first_name']} {$entry['last_name']}"));
+
$historylog->add('MS',$id,implode(',',$toarray_sms));
}
- }
- unset($entry);
-
- if($toarray_sms)
- {
-
$historylog->add('MS',$id,implode(',',$toarray_sms));
- }
- if ($toarray)
- {
- $to =
implode(';',$toarray);
-
$from_name=$GLOBALS['phpgw_info']['user']['fullname'];
-
$from_email=$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
+ if ($toarray)
+ {
+ $to =
implode(';',$toarray);
+
$from_name=$GLOBALS['phpgw_info']['user']['fullname'];
+
$from_email=$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
- $body = '<a href ="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.edit', 'id'=> $id),false, true).'">' . lang('project %1 has
been edited',$id) .'</a>' . "\n";
+ $body = '<a
href ="' . $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.edit', 'id'=> $id),false, true).'">' . lang('project %1 has
been edited',$id) .'</a>' . "\n";
-
foreach($receipt['notice_owner'] as $notice)
- {
- $body .=
$notice . "\n";
- }
+
foreach($receipt['notice_owner'] as $notice)
+ {
+ $body
.= $notice . "\n";
+ }
- $body .= lang('Altered
by') . ': ' . $from_name . "\n";
- $body .= lang('remark')
. ': ' . $values['remark'] . "\n";
+ $body .=
lang('Altered by') . ': ' . $from_name . "\n";
+ $body .=
lang('remark') . ': ' . $values['remark'] . "\n";
- $body = nl2br($body);
+ $body =
nl2br($body);
- $returncode =
$GLOBALS['phpgw']->send->msg('email',$to,$subject,$body, false,false,false,
$from_email, $from_name, 'html');
+ $returncode =
$GLOBALS['phpgw']->send->msg('email',$to,$subject,$body, false,false,false,
$from_email, $from_name, 'html');
- if (!$returncode)
// not nice, but better than failing silently
- {
-
$receipt['error'][]=array('msg'=>"uiproject::edit: sending message to '$to'
subject='$subject' failed !!!");
-
$receipt['error'][]=array('msg'=> $GLOBALS['phpgw']->send->err['desc']);
-
$bypass_error=true;
+ if
(!$returncode) // not nice, but better than failing silently
+ {
+
$receipt['error'][]=array('msg'=>"uiproject::edit: sending message to '$to'
subject='$subject' failed !!!");
+
$receipt['error'][]=array('msg'=> $GLOBALS['phpgw']->send->err['desc']);
+
$bypass_error=true;
+ }
+ else
+ {
+
$historylog->add('ON', $id, lang('%1 is notified',$to));
+
$receipt['message'][]=array('msg'=>lang('%1 is notified',$to));
+ }
}
- else
- {
-
$historylog->add('ON', $id, lang('%1 is notified',$to));
-
$receipt['message'][]=array('msg'=>lang('%1 is notified',$to));
- }
}
}
- }
- if($receipt['error'] && !isset($bypass_error))
- {
- if(isset($values['location']) &&
is_array($values['location']))
+ if($receipt['error'] &&
!isset($bypass_error))
{
- $location_code=implode("-",
$values['location']);
- $values['extra']['view'] = true;
- $values['location_data'] =
$bolocation->read_single($location_code,$values['extra']);
- }
+ if(isset($values['location'])
&& is_array($values['location']))
+ {
+
$location_code=implode("-", $values['location']);
+
$values['extra']['view'] = true;
+
$values['location_data'] =
$bolocation->read_single($location_code,$values['extra']);
+ }
- if(isset($values['extra']['p_num']))
- {
-
$values['p'][$values['extra']['p_entity_id']]['p_num']=$values['extra']['p_num'];
-
$values['p'][$values['extra']['p_entity_id']]['p_entity_id']=$values['extra']['p_entity_id'];
-
$values['p'][$values['extra']['p_entity_id']]['p_cat_id']=$values['extra']['p_cat_id'];
-
$values['p'][$values['extra']['p_entity_id']]['p_cat_name']=phpgw::get_var('entity_cat_name_'.$values['extra']['p_entity_id'],
'string', 'POST');
+
if(isset($values['extra']['p_num']))
+ {
+
$values['p'][$values['extra']['p_entity_id']]['p_num']=$values['extra']['p_num'];
+
$values['p'][$values['extra']['p_entity_id']]['p_entity_id']=$values['extra']['p_entity_id'];
+
$values['p'][$values['extra']['p_entity_id']]['p_cat_id']=$values['extra']['p_cat_id'];
+
$values['p'][$values['extra']['p_entity_id']]['p_cat_name']=phpgw::get_var('entity_cat_name_'.$values['extra']['p_entity_id'],
'string', 'POST');
+ }
}
}
}
@@ -1364,6 +1384,7 @@
$values =
$this->bocommon->preserve_attribute_values($values,$values_attribute);
}
+/*
$table_header_history[] = array
(
'lang_date' => lang('Date'),
@@ -1382,9 +1403,10 @@
'lang_status' =>
lang('status')
);
+*/
if ($id)
{
- $function_msg = lang('Edit Project');
+ $function_msg = lang("{$mode} project");
}
else
{
@@ -1418,7 +1440,7 @@
$this->cat_id = $values['cat_id'];
}
- $lookup_type='form';
+ $lookup_type = $mode == 'edit' ? 'form' : 'view';
//_debug_array($values);
$location_data=$bolocation->initiate_ui_location(array
@@ -1443,15 +1465,16 @@
'b_account_id' =>
$values['b_account_id'],
'b_account_name' =>
$values['b_account_name'],
'role'
=> 'group',
- // 'disabled'
=> isset($values['workorder_budget'][0]['b_account_id']) &&
$values['workorder_budget'][0]['b_account_id'] ? true : false
+ 'type'
=> $lookup_type
)
);
$ecodimb_data=$this->bocommon->initiate_ecodimb_lookup(array
(
'ecodimb'
=> $values['ecodimb'],
- 'ecodimb_descr' =>
$values['ecodimb_descr'])
- );
+ 'ecodimb_descr' =>
$values['ecodimb_descr'],
+ 'disabled'
=> $mode == 'view'
+ ));
}
$contact_data=$this->bocommon->initiate_ui_contact_lookup(array
@@ -1459,7 +1482,8 @@
'contact_id' =>
$values['contact_id'],
'contact_name' =>
$values['contact_name'],
'field' =>
'contact',
- 'type' =>
'form')
+ 'type' =>
$lookup_type
+ )
);
@@ -1475,10 +1499,10 @@
}
$link_data = array
- (
- 'menuaction' =>
'property.uiproject.edit',
- 'id' => $id
- );
+ (
+ 'menuaction' => 'property.uiproject.edit',
+ 'id' => $id
+ );
$link_request_data = array
(
@@ -1706,8 +1730,11 @@
$myColumnDefs[] = $notify_info['column_defs'];
- $myButtons = array();
- $myButtons[] = $notify_info['buttons'];
+ $myButtons = array();
+ if($mode == 'edit')
+ {
+ $myButtons[] = $notify_info['buttons'];
+ }
// _debug_array($myButtons);die();
//----------------------------------------------datatable settings--------
@@ -1718,6 +1745,7 @@
$data = array
(
+ 'mode'
=> $mode,
'suppressmeter'
=> isset($config->config_data['project_suppressmeter']) &&
$config->config_data['project_suppressmeter'] ? 1 : '',
'suppresscoordination'
=> $suppresscoordination,
'custom_attributes'
=> array('attributes' => $values['attributes']),
@@ -1850,7 +1878,11 @@
'value_approval_mail_address'
=> $supervisor_email,
'currency'
=>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
- 'base_java_url'
=>
"{menuaction:'property.notify.update_data',location_id:{$location_id},location_item_id:{$id}}",
+ 'base_java_url'
=>
"{menuaction:'property.notify.update_data',location_id:{$location_id},location_item_id:{$id}}",
+ 'edit_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'property.uiproject.edit', 'id' => $id)),
+ 'lang_edit_statustext'
=> lang('Edit this entry '),
+ 'lang_edit'
=> lang('Edit'),
+
);
//_debug_array($data);die;
@@ -1924,32 +1956,6 @@
$this->bo->delete($project_id);
return "project_id ".$project_id." ".lang("has
been deleted");
}
-
- $confirm = phpgw::get_var('confirm', 'bool',
'POST');
- $link_data = array
- (
- 'menuaction' =>
'property.uiproject.index',
- 'project_id' => $project_id
- );
-
-
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
-
- $data = array
- (
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.delete', 'project_id'=> $project_id)),
- 'lang_confirm_msg' => lang('do you
really want to delete this entry'),
- 'lang_yes' => lang('yes'),
- 'lang_yes_statustext' => lang('Delete
the entry'),
- 'lang_no_statustext' => lang('Back
to the list'),
- 'lang_no' => lang('no')
- );
-
- $appname = lang('project');
- $function_msg = lang('delete
project');
-
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
-
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
@@ -2126,201 +2132,14 @@
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('bulk_update_status' =>
$data));
}
-
function view()
{
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uilocation.stop', 'perm'=>1, 'acl_location'=> $this->acl_location));
+ $this->bocommon->no_access();
+ return;
}
-
- $receipt =
$GLOBALS['phpgw']->session->appsession('receipt','property');
-
$GLOBALS['phpgw']->session->appsession('receipt','property','');
- $bolocation =
CreateObject('property.bolocation');
-
- $id = phpgw::get_var('id', 'int');
-
-
$GLOBALS['phpgw']->xslttpl->add_file(array('project','attributes_form'));
-
- $values = $this->bo->read_single($id);
-
- $record_history = $this->bo->read_record_history($id);
-
- $table_header_history[] = array
- (
- 'lang_date' => lang('Date'),
- 'lang_user' => lang('User'),
- 'lang_action' =>
lang('Action'),
- 'lang_new_value' => lang('New
value')
- );
-
- $table_header_workorder_budget[] = array
- (
- 'lang_workorder_id' =>
lang('Workorder'),
- 'lang_budget' =>
lang('Budget'),
- 'lang_calculation' =>
lang('Calculation'),
- 'lang_vendor' =>
lang('Vendor')
- );
-
- $function_msg = lang('View Project');
-
- if ($values['cat_id'])
- {
- $this->cat_id = $values['cat_id'];
- }
-
- $location_data=$bolocation->initiate_ui_location(array(
- 'values' => $values['location_data'],
- 'type_id' =>
count(explode('-',$values['location_data']['location_code'])),
- 'no_link' => false, // disable lookup
links for location type less than type_id
- 'tenant' =>
$values['location_data']['tenant_id'],
- 'lookup_type' => 'view',
- 'lookup_entity' =>
$this->bocommon->get_lookup_entity('project'),
- 'entity_data' =>
isset($values['p'])?$values['p']:''
- ));
-
- if($values['contact_phone'])
- {
- for
($i=0;$i<count($location_data['location']);$i++)
- {
-
if($location_data['location'][$i]['input_name'] == 'contact_phone')
- {
-
unset($location_data['location'][$i]['value']);
- }
- }
- }
-
- $values['sum'] =
isset($values['budget'])?$values['budget']:0;
-
- if(isset($values['reserve']) && $values['reserve']!=0)
- {
-
$reserve_remainder=$values['reserve']-$values['deviation'];
- $remainder_percent=
number_format(($reserve_remainder/$values['reserve'])*100, 2, ',', '');
- $values['sum'] = $values['sum'] +
$values['reserve'];
- }
-
- //_debug_array($values);
- $msgbox_data = $this->bocommon->msgbox_data($receipt);
-
- $categories =
$this->cats->formatted_xslt_list(array('selected' => $this->cat_id));
-
- $project_group_data =
$this->bocommon->initiate_project_group_lookup(array(
- 'project_group' =>
$values['project_group'],
- 'project_group_descr' =>
$values['project_group_descr'],
- 'type' =>
'view'));
-
- $config =
CreateObject('phpgwapi.config','property');
- $config->read();
-
- $suppresscoordination =
isset($config->config_data['project_suppresscoordination']) &&
$config->config_data['project_suppresscoordination'] ? 1 : '';
- $data = array
- (
- 'suppressmeter'
=> isset($config->config_data['project_suppressmeter']) &&
$config->config_data['project_suppressmeter'] ? 1 : '',
- 'suppresscoordination'
=> $suppresscoordination,
- 'tabs'
=> self::_generate_tabs(array(),array('coordination' =>
$suppresscoordination)),
-
- 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
-
- 'project_group_data'
=> $project_group_data,
- 'value_origin'
=> $values['origin'],
- 'custom_attributes'
=> array('attributes' => $values['attributes']),
-
- 'table_header_workorder_budget'
=> $table_header_workorder_budget,
- 'lang_no_workorders'
=> lang('No workorder budget'),
- 'workorder_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiworkorder.view')),
- 'record_history'
=> $record_history,
- 'table_header_history'
=> $table_header_history,
- 'lang_history'
=> lang('History'),
- 'lang_no_history'
=> lang('No history'),
-
- 'lang_start_date'
=> lang('Project start date'),
- 'value_start_date'
=> $values['start_date'],
-
- 'lang_end_date'
=> lang('Project end date'),
- 'value_end_date'
=> $values['end_date'],
-
- 'lang_charge_tenant'
=> lang('Charge tenant'),
- 'charge_tenant'
=> isset($values['charge_tenant'])?$values['charge_tenant']:'',
-
- 'lang_power_meter'
=> lang('Power meter'),
- 'value_power_meter'
=> $values['power_meter'],
-
- 'lang_budget'
=> lang('Budget'),
- 'value_budget'
=> $values['budget'],
-
- 'lang_reserve'
=> lang('reserve'),
- 'value_reserve'
=> $values['reserve'],
-
- 'value_sum'
=> (isset($values['sum'])?$values['sum']:''),
-
- 'lang_reserve_remainder'
=> lang('reserve remainder'),
- 'value_reserve_remainder'
=> isset($reserve_remainder)?$reserve_remainder:'',
- 'value_reserve_remainder_percent'
=> isset($remainder_percent)?$remainder_percent:'',
-
- 'vendor_data'
=> isset($vendor_data)?$vendor_data:'',
- 'location_data'
=> $location_data,
- 'location_type'
=> 'view',
- 'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.index')),
- 'lang_year'
=> lang('Year'),
- 'lang_category'
=> lang('category'),
- 'lang_save'
=> lang('save'),
- 'lang_done'
=> lang('done'),
- 'lang_name'
=> lang('Name'),
-
- 'lang_project_id'
=> lang('Project ID'),
- 'value_project_id'
=> $values['project_id'],
- 'value_name'
=> $values['name'],
-
- 'lang_other_branch'
=> lang('Other branch'),
- 'value_other_branch'
=> $values['other_branch'],
-
- 'lang_descr'
=> lang('Description'),
- 'value_descr'
=> $values['descr'],
- 'lang_done_statustext'
=> lang('Back to the list'),
- 'select_name'
=> 'values[cat_id]',
-
- 'cat_list'
=> $categories['cat_list'],
- 'lang_workorder_id'
=> lang('Workorder ID'),
- 'sum_workorder_budget'
=> $values['sum_workorder_budget'],
- 'sum_workorder_calculation'
=> $values['sum_workorder_calculation'],
- 'workorder_budget'
=> $values['workorder_budget'],
- 'sum_workorder_actual_cost'
=> $values['sum_workorder_actual_cost'],
- 'lang_actual_cost'
=> lang('Actual cost'),
- 'lang_coordinator'
=> lang('Coordinator'),
- 'lang_sum'
=> lang('Sum'),
- 'select_user_name'
=> 'values[coordinator]',
- 'lang_no_user'
=> lang('Select coordinator'),
- 'user_list'
=>
$this->bocommon->get_user_list('select',$values['coordinator'],$extra=false,$default=false,$start=-1,$sort='ASC',$order='account_lastname',$query='',$offset=-1),
-
- 'status_list'
=> $this->bo->select_status_list('select',$values['status']),
- 'lang_no_status'
=> lang('Select status'),
- 'lang_status'
=> lang('Status'),
-
- 'branch_list'
=> $this->bo->select_branch_p_list($values['project_id']),
- 'lang_branch'
=> lang('branch'),
-
- 'key_responsible_list'
=> $this->bo->select_branch_list($values['key_responsible']),
- 'lang_key_responsible'
=> lang('key responsible'),
-
- 'key_fetch_list'
=> $this->bo->select_key_location_list($values['key_fetch']),
- 'lang_key_fetch'
=> lang('key fetch location'),
-
- 'key_deliver_list'
=> $this->bo->select_key_location_list($values['key_deliver']),
- 'lang_key_deliver'
=> lang('key deliver location'),
-
- 'edit_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.edit', 'id'=> $id)),
- 'lang_edit_statustext'
=> lang('Edit this entry project'),
- 'lang_edit'
=> lang('Edit'),
- 'currency'
=>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
-
- 'lang_contact_phone'
=> lang('Contact phone'),
- 'contact_phone'
=> $values['contact_phone'],
- );
-
- $appname = lang('project');
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
-
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
-
+ $this->edit('view');
}
protected function _generate_tabs($tabs_ = array(), $suppress =
array())
Modified: branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2011-12-27 11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2011-12-27 11:55:56 UTC (rev 8441)
@@ -1094,7 +1094,10 @@
}
}
-
if(!isset($values['condition'][0]['condition_type']) ||
!$values['condition'][0]['degree'])
+ $_condition = array_keys($values['condition']);
+ $__condition = isset($_condition[0]) &&
$_condition[0] ? $_condition[0] : 0;
+
+
if(!isset($values['condition'][$__condition]['condition_type']) ||
!isset($values['condition'][$__condition]['degree']))
{
$receipt['error'][]=array('msg'=>lang('Please select a condition!'));
}
Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2011-12-27 11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2011-12-27 11:55:56 UTC (rev 8441)
@@ -1777,7 +1777,7 @@
'value_billable_hours'
=> $values['billable_hours'],
'base_java_url'
=>
"{menuaction:'property.notify.update_data',location_id:{$location_id},location_item_id:'{$id}'}",
'edit_action'
=>
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'property.uiworkorder.edit', 'id' => $id)),
- 'lang_edit_statustext'
=> lang('Edit this entry workorder'),
+ 'lang_edit_statustext'
=> lang('Edit this entry '),
'lang_edit'
=> lang('Edit'),
);
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-12-27
11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-12-27
11:55:56 UTC (rev 8441)
@@ -1896,6 +1896,7 @@
delivered date property no Utført dato
closed date property no Avsluttet dato
cost categories property no Kostnadskategori
+negative value for budget property no Negativ verdi for
kostnadsestimat
no symptoms property no Ingen Symptomer
minor symptoms property no Svake Symptomer
medium symptoms property no Middels Symptomer
Modified: branches/Version-1_0-branch/property/templates/base/abook_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/abook_form.xsl
2011-12-27 11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/property/templates/base/abook_form.xsl
2011-12-27 11:55:56 UTC (rev 8441)
@@ -1,34 +1,34 @@
-<!-- $Id$ -->
-
+ <!-- $Id$ -->
<xsl:template name="abook_form">
<xsl:apply-templates select="abook_data"/>
</xsl:template>
+ <!-- New template-->
<xsl:template match="abook_data">
<script type="text/javascript">
self.name="first_Window";
function abook_lookup()
{
Window1=window.open('<xsl:value-of
select="abook_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
- }
+ }
</script>
-
<tr>
<td valign="top">
- <a href="javascript:abook_lookup()"
onMouseover="window.status='{lang_select_abook_help}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_contact"/></a>
+ <a href="javascript:abook_lookup()"
onMouseover="window.status='{lang_select_abook_help}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of select="lang_contact"/>
+ </a>
</td>
<td>
- <input size="5" type="text" name="vendor_id"
value="{value_abid}" onClick="vendor_lookup();" readonly="readonly">
+ <input size="5" type="text" name="vendor_id"
value="{value_abid}" onClick="vendor_lookup();" readonly="readonly">
<xsl:attribute name="title">
<xsl:value-of
select="lang_select_contact_help"/>
</xsl:attribute>
</input>
- <input size="30" type="text"
name="vendor_name" value="{value_contact_name}" onClick="abook_lookup();"
readonly="readonly">
+ <input size="30" type="text" name="vendor_name"
value="{value_contact_name}" onClick="abook_lookup();" readonly="readonly">
<xsl:attribute name="title">
<xsl:value-of
select="lang_select_contact_help"/>
</xsl:attribute>
</input>
</td>
</tr>
-
</xsl:template>
Modified: branches/Version-1_0-branch/property/templates/base/abook_view.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/abook_view.xsl
2011-12-27 11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/property/templates/base/abook_view.xsl
2011-12-27 11:55:56 UTC (rev 8441)
@@ -1,9 +1,9 @@
-<!-- $Id$ -->
-
+ <!-- $Id$ -->
<xsl:template name="abook_view">
<xsl:apply-templates select="abook_data"/>
</xsl:template>
+ <!-- New template-->
<xsl:template match="abook_data">
<tr>
<td valign="top">
Modified: branches/Version-1_0-branch/property/templates/base/admin.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/admin.xsl
2011-12-27 11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/property/templates/base/admin.xsl
2011-12-27 11:55:56 UTC (rev 8441)
@@ -1,5 +1,4 @@
-<!-- $Id$ -->
-
+ <!-- $Id$ -->
<xsl:template name="app_data">
<xsl:choose>
<xsl:when test="edit_id">
@@ -14,6 +13,7 @@
</xsl:choose>
</xsl:template>
+ <!-- New template-->
<xsl:template match="list_permission">
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
<xsl:choose>
@@ -32,7 +32,6 @@
<td align="center">
<xsl:call-template name="cat_filter"/>
</td>
-
<xsl:choose>
<xsl:when test="is_admin != '' and
grant= 1">
<td align="center">
@@ -51,13 +50,15 @@
</tr>
</table>
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
<form method="post" action="{$form_action}">
<tr height="30">
<td valign="top" align="left">
<xsl:value-of
select="lang_enable_inheritance"/>
<xsl:text>: </xsl:text>
- <input type="checkbox"
name="enable_inheritance" value="true"
title="{lang_enable_inheritance_statustext}"></input>
+ <input type="checkbox"
name="enable_inheritance" value="true"
title="{lang_enable_inheritance_statustext}"/>
</td>
</tr>
<tr class="th">
@@ -84,15 +85,19 @@
</xsl:choose>
</tr>
<xsl:apply-templates select="values_users"/>
-
<tr height="50">
<td>
- <xsl:variable
name="location"><xsl:value-of select="location"/></xsl:variable>
- <xsl:variable
name="processed"><xsl:value-of select="processed"/></xsl:variable>
- <xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
- <INPUT type="hidden"
name="location" value="{$location}" ></INPUT>
- <INPUT type="hidden"
name="processed" value="{$processed}" ></INPUT>
-
+ <xsl:variable name="location">
+ <xsl:value-of
select="location"/>
+ </xsl:variable>
+ <xsl:variable name="processed">
+ <xsl:value-of
select="processed"/>
+ </xsl:variable>
+ <xsl:variable name="lang_save">
+ <xsl:value-of
select="lang_save"/>
+ </xsl:variable>
+ <INPUT type="hidden"
name="location" value="{$location}"/>
+ <INPUT type="hidden"
name="processed" value="{$processed}"/>
<input type="submit"
name="set_permission" value="{$lang_save}" onMouseout="window.status='';return
true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
@@ -100,14 +105,17 @@
<xsl:text>';
return true;</xsl:text>
</xsl:attribute>
</input>
-
</td>
</tr>
</form>
<tr>
<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>
+ <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"
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
@@ -120,10 +128,9 @@
</td>
</tr>
</table>
-
</xsl:template>
-
+ <!-- New template-->
<xsl:template match="values_groups">
<xsl:choose>
<xsl:when test="account_id !=''">
@@ -141,7 +148,6 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
-
<td align="left">
<xsl:value-of select="name"/>
</td>
@@ -161,12 +167,12 @@
</tr>
</table>
</td>
-
</tr>
</xsl:when>
</xsl:choose>
</xsl:template>
+ <!-- New template-->
<xsl:template match="values_users">
<xsl:choose>
<xsl:when test="account_id !=''">
@@ -184,7 +190,6 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
-
<td align="left">
<xsl:value-of select="name"/>
</td>
@@ -204,12 +209,12 @@
</tr>
</table>
</td>
-
</tr>
</xsl:when>
</xsl:choose>
</xsl:template>
+ <!-- New template-->
<xsl:template name="value_header">
<td>
</td>
@@ -245,41 +250,41 @@
</td>
<td class="th_text" align="center">
<xsl:value-of select="lang_initials"/>
- </td>
+ </td>
</xsl:when>
</xsl:choose>
</xsl:template>
+ <!-- New template-->
<xsl:template name="right">
<td align="left">
<xsl:value-of select="lang_right"/>
</td>
<td align="center">
-
<xsl:choose>
<xsl:when test="type = 'users'">
<xsl:choose>
<xsl:when test="read_right =
'checked'">
- <input type="checkbox"
name="values[right][{account_id}_1]" value="1" checked="checked" />
+ <input type="checkbox"
name="values[right][{account_id}_1]" value="1" checked="checked"/>
</xsl:when>
<xsl:when test="read_right =
'from_group'">
- <input type="checkbox"
name="" checked="checked" disabled="disabled" />
+ <input type="checkbox"
name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[right][{account_id}_1]" value="1" />
+ <input type="checkbox"
name="values[right][{account_id}_1]" value="1"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when test="read_right =
'checked'">
- <input type="checkbox"
name="values[right][{account_id}_1]" value="1" checked="checked" />
+ <input type="checkbox"
name="values[right][{account_id}_1]" value="1" checked="checked"/>
</xsl:when>
<xsl:when test="read_right =
'from_group'">
- <input type="checkbox"
name="values[right][{account_id}_1]" value="1" checked="checked" />
+ <input type="checkbox"
name="values[right][{account_id}_1]" value="1" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[right][{account_id}_1]" value="1" />
+ <input type="checkbox"
name="values[right][{account_id}_1]" value="1"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -290,26 +295,26 @@
<xsl:when test="type = 'users'">
<xsl:choose>
<xsl:when test="add_right =
'checked'">
- <input type="checkbox"
name="values[right][{account_id}_2]" value="2" checked="checked" />
+ <input type="checkbox"
name="values[right][{account_id}_2]" value="2" checked="checked"/>
</xsl:when>
<xsl:when test="add_right =
'from_group'">
- <input type="checkbox"
name="" checked="checked" disabled="disabled" />
+ <input type="checkbox"
name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[right][{account_id}_2]" value="2" />
+ <input type="checkbox"
name="values[right][{account_id}_2]" value="2"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when test="add_right =
'checked'">
- <input type="checkbox"
name="values[right][{account_id}_2]" value="2" checked="checked" />
+ <input type="checkbox"
name="values[right][{account_id}_2]" value="2" checked="checked"/>
</xsl:when>
<xsl:when test="add_right =
'from_group'">
- <input type="checkbox"
name="values[right][{account_id}_2]" value="2" checked="checked" />
+ <input type="checkbox"
name="values[right][{account_id}_2]" value="2" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[right][{account_id}_2]" value="2" />
+ <input type="checkbox"
name="values[right][{account_id}_2]" value="2"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -320,26 +325,26 @@
<xsl:when test="type = 'users'">
<xsl:choose>
<xsl:when test="edit_right =
'checked'">
- <input type="checkbox"
name="values[right][{account_id}_4]" value="4" checked="checked" />
+ <input type="checkbox"
name="values[right][{account_id}_4]" value="4" checked="checked"/>
</xsl:when>
<xsl:when test="edit_right =
'from_group'">
- <input type="checkbox"
name="" checked="checked" disabled="disabled" />
+ <input type="checkbox"
name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[right][{account_id}_4]" value="4" />
+ <input type="checkbox"
name="values[right][{account_id}_4]" value="4"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when test="edit_right =
'checked'">
- <input type="checkbox"
name="values[right][{account_id}_4]" value="4" checked="checked" />
+ <input type="checkbox"
name="values[right][{account_id}_4]" value="4" checked="checked"/>
</xsl:when>
<xsl:when test="edit_right =
'from_group'">
- <input type="checkbox"
name="values[right][{account_id}_4]" value="4" checked="checked" />
+ <input type="checkbox"
name="values[right][{account_id}_4]" value="4" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[right][{account_id}_4]" value="4" />
+ <input type="checkbox"
name="values[right][{account_id}_4]" value="4"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -350,26 +355,26 @@
<xsl:when test="type = 'users'">
<xsl:choose>
<xsl:when test="delete_right =
'checked'">
- <input type="checkbox"
name="values[right][{account_id}_8]" value="8" checked="checked" />
+ <input type="checkbox"
name="values[right][{account_id}_8]" value="8" checked="checked"/>
</xsl:when>
<xsl:when test="delete_right =
'from_group'">
- <input type="checkbox"
name="" checked="checked" disabled="disabled" />
+ <input type="checkbox"
name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[right][{account_id}_8]" value="8" />
+ <input type="checkbox"
name="values[right][{account_id}_8]" value="8"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when test="delete_right =
'checked'">
- <input type="checkbox"
name="values[right][{account_id}_8]" value="8" checked="checked" />
+ <input type="checkbox"
name="values[right][{account_id}_8]" value="8" checked="checked"/>
</xsl:when>
<xsl:when test="delete_right =
'from_group'">
- <input type="checkbox"
name="values[right][{account_id}_8]" value="8" checked="checked" />
+ <input type="checkbox"
name="values[right][{account_id}_8]" value="8" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[right][{account_id}_8]" value="8" />
+ <input type="checkbox"
name="values[right][{account_id}_8]" value="8"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -382,26 +387,26 @@
<xsl:when test="type = 'users'">
<xsl:choose>
<xsl:when
test="manage_right = 'checked'">
- <input
type="checkbox" name="values[right][{account_id}_16]" value="16"
checked="checked" />
+ <input
type="checkbox" name="values[right][{account_id}_16]" value="16"
checked="checked"/>
</xsl:when>
<xsl:when
test="manage_right = 'from_group'">
- <input
type="checkbox" name="" checked="checked" disabled="disabled" />
+ <input
type="checkbox" name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <input
type="checkbox" name="values[right][{account_id}_16]" value="16" />
+ <input
type="checkbox" name="values[right][{account_id}_16]" value="16"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when
test="manage_right = 'checked'">
- <input
type="checkbox" name="values[right][{account_id}_16]" value="16"
checked="checked" />
+ <input
type="checkbox" name="values[right][{account_id}_16]" value="16"
checked="checked"/>
</xsl:when>
<xsl:when
test="manage_right = 'from_group'">
- <input
type="checkbox" name="values[right][{account_id}_16]" value="16"
checked="checked" />
+ <input
type="checkbox" name="values[right][{account_id}_16]" value="16"
checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <input
type="checkbox" name="values[right][{account_id}_16]" value="16" />
+ <input
type="checkbox" name="values[right][{account_id}_16]" value="16"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -409,42 +414,41 @@
</td>
</xsl:when>
</xsl:choose>
-
<xsl:choose>
<xsl:when test="//location='.invoice' and //permission=
1 and type= 'users'">
<td align="center">
<xsl:choose>
<xsl:when test="janitor_right =
'checked'">
- <INPUT type="checkbox"
name="values[right][{account_id}_32]" value="32" checked="checked"></INPUT>
+ <INPUT type="checkbox"
name="values[right][{account_id}_32]" value="32" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox"
name="values[right][{account_id}_32]" value="32"></INPUT>
+ <INPUT type="checkbox"
name="values[right][{account_id}_32]" value="32"/>
</xsl:otherwise>
</xsl:choose>
</td>
<td align="center">
<xsl:choose>
<xsl:when
test="supervisor_right = 'checked'">
- <INPUT type="checkbox"
name="values[right][{account_id}_64]" value="64" checked="checked"></INPUT>
+ <INPUT type="checkbox"
name="values[right][{account_id}_64]" value="64" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox"
name="values[right][{account_id}_64]" value="64"></INPUT>
+ <INPUT type="checkbox"
name="values[right][{account_id}_64]" value="64"/>
</xsl:otherwise>
</xsl:choose>
</td>
<td align="center">
<xsl:choose>
<xsl:when
test="budget_responsible_right = 'checked'">
- <INPUT type="checkbox"
name="values[right][{account_id}_128]" value="128" checked="checked"></INPUT>
+ <INPUT type="checkbox"
name="values[right][{account_id}_128]" value="128" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox"
name="values[right][{account_id}_128]" value="128"></INPUT>
+ <INPUT type="checkbox"
name="values[right][{account_id}_128]" value="128"/>
</xsl:otherwise>
</xsl:choose>
</td>
<td align="center">
- <INPUT type="text" size="4"
name="initials[{account_id}]" value="{initials}"></INPUT>
- </td>
+ <INPUT type="text" size="4"
name="initials[{account_id}]" value="{initials}"/>
+ </td>
</xsl:when>
<xsl:otherwise>
<td>
@@ -454,11 +458,12 @@
<td>
</td>
<td>
- </td>
+ </td>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
+ <!-- New template-->
<xsl:template name="mask">
<td align="left">
<xsl:value-of select="lang_mask"/>
@@ -468,26 +473,26 @@
<xsl:when test="type = 'users'">
<xsl:choose>
<xsl:when test="read_mask =
'checked'">
- <input type="checkbox"
name="values[mask][{account_id}_1]" value="1" checked="checked" />
+ <input type="checkbox"
name="values[mask][{account_id}_1]" value="1" checked="checked"/>
</xsl:when>
<xsl:when test="read_mask =
'from_group'">
- <input type="checkbox"
name="" checked="checked" disabled="disabled" />
+ <input type="checkbox"
name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[mask][{account_id}_1]" value="1" />
+ <input type="checkbox"
name="values[mask][{account_id}_1]" value="1"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when test="read_mask =
'checked'">
- <input type="checkbox"
name="values[mask][{account_id}_1]" value="1" checked="checked" />
+ <input type="checkbox"
name="values[mask][{account_id}_1]" value="1" checked="checked"/>
</xsl:when>
<xsl:when test="read_mask =
'from_group'">
- <input type="checkbox"
name="values[mask][{account_id}_1]" value="1" checked="checked" />
+ <input type="checkbox"
name="values[mask][{account_id}_1]" value="1" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[mask][{account_id}_1]" value="1" />
+ <input type="checkbox"
name="values[mask][{account_id}_1]" value="1"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -498,26 +503,26 @@
<xsl:when test="type = 'users'">
<xsl:choose>
<xsl:when test="add_mask =
'checked'">
- <input type="checkbox"
name="values[mask][{account_id}_2]" value="2" checked="checked" />
+ <input type="checkbox"
name="values[mask][{account_id}_2]" value="2" checked="checked"/>
</xsl:when>
<xsl:when test="add_mask =
'from_group'">
- <input type="checkbox"
name="" checked="checked" disabled="disabled" />
+ <input type="checkbox"
name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[mask][{account_id}_2]" value="2" />
+ <input type="checkbox"
name="values[mask][{account_id}_2]" value="2"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when test="add_mask =
'checked'">
- <input type="checkbox"
name="values[mask][{account_id}_2]" value="2" checked="checked" />
+ <input type="checkbox"
name="values[mask][{account_id}_2]" value="2" checked="checked"/>
</xsl:when>
<xsl:when test="add_mask =
'from_group'">
- <input type="checkbox"
name="values[mask][{account_id}_2]" value="2" checked="checked" />
+ <input type="checkbox"
name="values[mask][{account_id}_2]" value="2" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[mask][{account_id}_2]" value="2" />
+ <input type="checkbox"
name="values[mask][{account_id}_2]" value="2"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -528,26 +533,26 @@
<xsl:when test="type = 'users'">
<xsl:choose>
<xsl:when test="edit_mask =
'checked'">
- <input type="checkbox"
name="values[mask][{account_id}_4]" value="4" checked="checked" />
+ <input type="checkbox"
name="values[mask][{account_id}_4]" value="4" checked="checked"/>
</xsl:when>
<xsl:when test="edit_mask =
'from_group'">
- <input type="checkbox"
name="" checked="checked" disabled="disabled" />
+ <input type="checkbox"
name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[mask][{account_id}_4]" value="4" />
+ <input type="checkbox"
name="values[mask][{account_id}_4]" value="4"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when test="edit_mask =
'checked'">
- <input type="checkbox"
name="values[mask][{account_id}_4]" value="4" checked="checked" />
+ <input type="checkbox"
name="values[mask][{account_id}_4]" value="4" checked="checked"/>
</xsl:when>
<xsl:when test="edit_mask =
'from_group'">
- <input type="checkbox"
name="values[mask][{account_id}_4]" value="4" checked="checked" />
+ <input type="checkbox"
name="values[mask][{account_id}_4]" value="4" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[mask][{account_id}_4]" value="4" />
+ <input type="checkbox"
name="values[mask][{account_id}_4]" value="4"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -558,26 +563,26 @@
<xsl:when test="type = 'users'">
<xsl:choose>
<xsl:when test="delete_mask =
'checked'">
- <input type="checkbox"
name="values[mask][{account_id}_8]" value="8" checked="checked" />
+ <input type="checkbox"
name="values[mask][{account_id}_8]" value="8" checked="checked"/>
</xsl:when>
<xsl:when test="delete_mask =
'from_group'">
- <input type="checkbox"
name="" checked="checked" disabled="disabled" />
+ <input type="checkbox"
name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[mask][{account_id}_8]" value="8" />
+ <input type="checkbox"
name="values[mask][{account_id}_8]" value="8"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when test="delete_mask =
'checked'">
- <input type="checkbox"
name="values[mask][{account_id}_8]" value="8" checked="checked" />
+ <input type="checkbox"
name="values[mask][{account_id}_8]" value="8" checked="checked"/>
</xsl:when>
<xsl:when test="delete_mask =
'from_group'">
- <input type="checkbox"
name="values[mask][{account_id}_8]" value="8" checked="checked" />
+ <input type="checkbox"
name="values[mask][{account_id}_8]" value="8" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <input type="checkbox"
name="values[mask][{account_id}_8]" value="8" />
+ <input type="checkbox"
name="values[mask][{account_id}_8]" value="8"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -590,26 +595,26 @@
<xsl:when test="type = 'users'">
<xsl:choose>
<xsl:when
test="manage_mask = 'checked'">
- <input
type="checkbox" name="values[mask][{account_id}_16]" value="16"
checked="checked" />
+ <input
type="checkbox" name="values[mask][{account_id}_16]" value="16"
checked="checked"/>
</xsl:when>
<xsl:when
test="manage_mask = 'from_group'">
- <input
type="checkbox" name="" checked="checked" disabled="disabled" />
+ <input
type="checkbox" name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <input
type="checkbox" name="values[mask][{account_id}_16]" value="16" />
+ <input
type="checkbox" name="values[mask][{account_id}_16]" value="16"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when
test="manage_mask = 'checked'">
- <input
type="checkbox" name="values[mask][{account_id}_16]" value="16"
checked="checked" />
+ <input
type="checkbox" name="values[mask][{account_id}_16]" value="16"
checked="checked"/>
</xsl:when>
<xsl:when
test="manage_mask = 'from_group'">
- <input
type="checkbox" name="values[mask][{account_id}_16]" value="16"
checked="checked" />
+ <input
type="checkbox" name="values[mask][{account_id}_16]" value="16"
checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <input
type="checkbox" name="values[mask][{account_id}_16]" value="16" />
+ <input
type="checkbox" name="values[mask][{account_id}_16]" value="16"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -622,39 +627,40 @@
<td align="center">
<xsl:choose>
<xsl:when test="janitor_mask =
'checked'">
- <INPUT type="checkbox"
name="values[mask][{account_id}_32]" value="32" checked="checked"></INPUT>
+ <INPUT type="checkbox"
name="values[mask][{account_id}_32]" value="32" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox"
name="values[mask][{account_id}_32]" value="32"></INPUT>
+ <INPUT type="checkbox"
name="values[mask][{account_id}_32]" value="32"/>
</xsl:otherwise>
</xsl:choose>
</td>
<td align="center">
<xsl:choose>
<xsl:when test="supervisor_mask
= 'checked'">
- <INPUT type="checkbox"
name="values[mask][{account_id}_64]" value="64" checked="checked"></INPUT>
+ <INPUT type="checkbox"
name="values[mask][{account_id}_64]" value="64" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox"
name="values[mask][{account_id}_64]" value="64"></INPUT>
+ <INPUT type="checkbox"
name="values[mask][{account_id}_64]" value="64"/>
</xsl:otherwise>
</xsl:choose>
</td>
<td align="center">
<xsl:choose>
<xsl:when
test="budget_responsible_mask = 'checked'">
- <INPUT type="checkbox"
name="values[mask][{account_id}_128]" value="128" checked="checked"></INPUT>
+ <INPUT type="checkbox"
name="values[mask][{account_id}_128]" value="128" checked="checked"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox"
name="values[mask][{account_id}_128]" value="128"></INPUT>
+ <INPUT type="checkbox"
name="values[mask][{account_id}_128]" value="128"/>
</xsl:otherwise>
</xsl:choose>
</td>
<td>
- </td>
+ </td>
</xsl:when>
</xsl:choose>
</xsl:template>
+ <!-- New template-->
<xsl:template name="result">
<td align="left">
<xsl:value-of select="lang_result"/>
@@ -662,40 +668,40 @@
<td align="center">
<xsl:choose>
<xsl:when test="read_result = 'checked'">
- <INPUT type="checkbox" name=""
checked="checked" disabled="disabled"></INPUT>
+ <INPUT type="checkbox" name=""
checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox" name=""
disabled="disabled"></INPUT>
+ <INPUT type="checkbox" name=""
disabled="disabled"/>
</xsl:otherwise>
</xsl:choose>
</td>
<td align="center">
<xsl:choose>
<xsl:when test="add_result = 'checked'">
- <INPUT type="checkbox" name=""
checked="checked" disabled="disabled"></INPUT>
+ <INPUT type="checkbox" name=""
checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox" name=""
disabled="disabled"></INPUT>
+ <INPUT type="checkbox" name=""
disabled="disabled"/>
</xsl:otherwise>
</xsl:choose>
</td>
<td align="center">
<xsl:choose>
<xsl:when test="edit_result = 'checked'">
- <INPUT type="checkbox" name=""
checked="checked" disabled="disabled"></INPUT>
+ <INPUT type="checkbox" name=""
checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox" name=""
disabled="disabled"></INPUT>
+ <INPUT type="checkbox" name=""
disabled="disabled"/>
</xsl:otherwise>
</xsl:choose>
</td>
<td align="center">
<xsl:choose>
<xsl:when test="delete_result = 'checked'">
- <INPUT type="checkbox" name=""
checked="checked" disabled="disabled"></INPUT>
+ <INPUT type="checkbox" name=""
checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox" name=""
disabled="disabled"></INPUT>
+ <INPUT type="checkbox" name=""
disabled="disabled"/>
</xsl:otherwise>
</xsl:choose>
</td>
@@ -704,10 +710,10 @@
<td align="center">
<xsl:choose>
<xsl:when test="manage_result =
'checked'">
- <INPUT type="checkbox"
name="" checked="checked" disabled="disabled"></INPUT>
+ <INPUT type="checkbox"
name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox"
name="" disabled="disabled"></INPUT>
+ <INPUT type="checkbox"
name="" disabled="disabled"/>
</xsl:otherwise>
</xsl:choose>
</td>
@@ -718,46 +724,53 @@
<td align="center">
<xsl:choose>
<xsl:when test="janitor_result
= 'checked'">
- <INPUT type="checkbox"
name="" checked="checked" disabled="disabled"></INPUT>
+ <INPUT type="checkbox"
name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox"
name="" disabled="disabled"></INPUT>
+ <INPUT type="checkbox"
name="" disabled="disabled"/>
</xsl:otherwise>
</xsl:choose>
</td>
<td align="center">
<xsl:choose>
<xsl:when
test="supervisor_result = 'checked'">
- <INPUT type="checkbox"
name="" checked="checked" disabled="disabled"></INPUT>
+ <INPUT type="checkbox"
name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox"
name="" disabled="disabled"></INPUT>
+ <INPUT type="checkbox"
name="" disabled="disabled"/>
</xsl:otherwise>
</xsl:choose>
</td>
<td align="center">
<xsl:choose>
<xsl:when
test="budget_responsible_result = 'checked'">
- <INPUT type="checkbox"
name="" checked="checked" disabled="disabled"></INPUT>
+ <INPUT type="checkbox"
name="" checked="checked" disabled="disabled"/>
</xsl:when>
<xsl:otherwise>
- <INPUT type="checkbox"
name="" disabled="disabled"></INPUT>
+ <INPUT type="checkbox"
name="" disabled="disabled"/>
</xsl:otherwise>
</xsl:choose>
</td>
<td>
- </td>
+ </td>
</xsl:when>
</xsl:choose>
</xsl:template>
-<!-- edit_id -->
-
- <xsl:template match="id_values" xmlns:php="http://php.net/xsl";>
- <xsl:variable name="value"><xsl:value-of
select="value"/></xsl:variable>
- <xsl:variable name="key_id"><xsl:value-of
select="key_id"/></xsl:variable>
- <xsl:variable name="descr"><xsl:value-of
select="descr"/></xsl:variable>
- <xsl:variable name="name"><xsl:value-of
select="name"/></xsl:variable>
+ <!-- edit_id -->
+ <xsl:template xmlns:php="http://php.net/xsl"; match="id_values">
+ <xsl:variable name="value">
+ <xsl:value-of select="value"/>
+ </xsl:variable>
+ <xsl:variable name="key_id">
+ <xsl:value-of select="key_id"/>
+ </xsl:variable>
+ <xsl:variable name="descr">
+ <xsl:value-of select="descr"/>
+ </xsl:variable>
+ <xsl:variable name="name">
+ <xsl:value-of select="name"/>
+ </xsl:variable>
<tr>
<xsl:attribute name="class">
<xsl:choose>
@@ -772,7 +785,6 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
-
<td align="center">
<INPUT type="checkbox" name="values[select][]"
value="{$name}">
<xsl:if test="old = '1'">
@@ -786,44 +798,46 @@
<xsl:value-of select="descr"/>
</td>
<td>
- <INPUT type="text" name="values[{$name}]"
value="{$value}" ></INPUT>
+ <INPUT type="text" name="values[{$name}]"
value="{$value}"/>
</td>
<td>
- <xsl:choose>
- <xsl:when test="old != '1'">
- <input type="text" id="date_{$name}"
name="values[start_date][{$name}]" size="10" value="{start_date}"
readonly="readonly">
- <xsl:attribute name="title">
- <xsl:value-of
select="lang_date_statustext"/>
- </xsl:attribute>
- </input>
- <img id="date_{$name}-trigger"
src="{//img_cal}" alt="{//lang_datetitle}" title="{//lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="start_date"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="old != '1'">
+ <input type="text"
id="date_{$name}" name="values[start_date][{$name}]" size="10"
value="{start_date}" readonly="readonly">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="lang_date_statustext"/>
+ </xsl:attribute>
+ </input>
+ <img id="date_{$name}-trigger"
src="{//img_cal}" alt="{//lang_datetitle}" title="{//lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="start_date"/>
+ </xsl:otherwise>
+ </xsl:choose>
</td>
</tr>
</xsl:template>
- <xsl:template name="id_table_header" xmlns:php="http://php.net/xsl";>
+ <!-- New template-->
+ <xsl:template xmlns:php="http://php.net/xsl"; name="id_table_header">
<tr class="th">
<td class="th_text" width="10%" align="center">
- <xsl:value-of select="php:function('lang',
'select')" />
+ <xsl:value-of select="php:function('lang',
'select')"/>
</td>
<td class="th_text" width="40%" align="left">
- <xsl:value-of select="php:function('lang',
'descr')" />
+ <xsl:value-of select="php:function('lang',
'descr')"/>
</td>
<td class="th_text" width="30%">
- <xsl:value-of select="php:function('lang',
'value')" />
+ <xsl:value-of select="php:function('lang',
'value')"/>
</td>
<td class="th_text" width="20%" align="center">
- <xsl:value-of select="php:function('lang',
'date')" />
+ <xsl:value-of select="php:function('lang',
'date')"/>
</td>
</tr>
</xsl:template>
- <xsl:template match="edit_id" xmlns:php="http://php.net/xsl";>
+ <!-- New template-->
+ <xsl:template xmlns:php="http://php.net/xsl"; match="edit_id">
<table cellpadding="2" cellspacing="2" width="90%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -834,13 +848,17 @@
</tr>
</xsl:when>
</xsl:choose>
- <xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
<form method="post" action="{$form_action}">
- <xsl:call-template name="id_table_header"/>
- <xsl:apply-templates select="id_values"/>
+ <xsl:call-template name="id_table_header"/>
+ <xsl:apply-templates select="id_values"/>
<tr height="50">
<td>
- <xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+ <xsl:variable name="lang_save">
+ <xsl:value-of
select="lang_save"/>
+ </xsl:variable>
<input type="submit"
name="values[save]" value="{$lang_save}">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_save_statustext"/>
@@ -851,8 +869,12 @@
</form>
<tr>
<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>
+ <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"
name="done" value="{$lang_done}">
<xsl:attribute
name="title">
@@ -865,7 +887,7 @@
</table>
</xsl:template>
-
+ <!-- New template-->
<xsl:template match="contact_info">
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
@@ -886,16 +908,18 @@
<xsl:call-template
name="user_id_filter"/>
</td>
</tr>
- <xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
<form method="post" name="form"
action="{$form_action}">
<tr>
<td valign="top">
<xsl:value-of
select="lang_email"/>
</td>
<td>
- <input type="hidden"
name="user_id" value="{value_user_id}"></input>
- <input type="hidden"
name="values[old_email]" value="{value_old_email}"></input>
- <input type="text" size
= "30" name="values[email]" value="{value_email}"
onMouseout="window.status='';return true;">
+ <input type="hidden"
name="user_id" value="{value_user_id}"/>
+ <input type="hidden"
name="values[old_email]" value="{value_old_email}"/>
+ <input type="text"
size="30" name="values[email]" value="{value_email}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="lang_email_statustext"/>
@@ -909,8 +933,8 @@
<xsl:value-of
select="lang_phone"/>
</td>
<td>
- <input type="hidden"
name="values[old_phone]" value="{value_old_phone}"></input>
- <input type="text" size
= "30" name="values[phone]" value="{value_phone}"
onMouseout="window.status='';return true;">
+ <input type="hidden"
name="values[old_phone]" value="{value_old_phone}"/>
+ <input type="text"
size="30" name="values[phone]" value="{value_phone}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="lang_phone_statustext"/>
@@ -924,10 +948,14 @@
<xsl:value-of
select="lang_approval_from"/>
</td>
<td align="left">
- <input type="hidden"
name="values[old_approval_from]" value="{value_old_approval_from}"></input>
- <xsl:variable
name="lang_approval_from_statustext"><xsl:value-of
select="lang_approval_from_statustext"/></xsl:variable>
+ <input type="hidden"
name="values[old_approval_from]" value="{value_old_approval_from}"/>
+ <xsl:variable
name="lang_approval_from_statustext">
+ <xsl:value-of
select="lang_approval_from_statustext"/>
+ </xsl:variable>
<select
name="values[approval_from]" class="forms"
onMouseover="window.status='{$lang_approval_from_statustext}'; return true;"
onMouseout="window.status='';return true;">
- <option
value=""><xsl:value-of select="lang_no_user"/></option>
+ <option
value="">
+
<xsl:value-of select="lang_no_user"/>
+ </option>
<xsl:apply-templates select="approval_from"/>
</select>
</td>
@@ -937,10 +965,14 @@
<xsl:value-of
select="lang_default_vendor_category"/>
</td>
<td align="left">
- <input type="hidden"
name="values[old_default_vendor_category]"
value="{value_old_default_vendor_category}"></input>
- <xsl:variable
name="lang_default_vendor_category_statustext"><xsl:value-of
select="lang_default_vendor_category_statustext"/></xsl:variable>
+ <input type="hidden"
name="values[old_default_vendor_category]"
value="{value_old_default_vendor_category}"/>
+ <xsl:variable
name="lang_default_vendor_category_statustext">
+ <xsl:value-of
select="lang_default_vendor_category_statustext"/>
+ </xsl:variable>
<select
name="values[default_vendor_category]" class="forms"
onMouseover="window.status='{$lang_default_vendor_category_statustext}'; return
true;" onMouseout="window.status='';return true;">
- <option
value=""><xsl:value-of select="lang_no_cat"/></option>
+ <option
value="">
+
<xsl:value-of select="lang_no_cat"/>
+ </option>
<xsl:apply-templates select="vendor_category"/>
</select>
</td>
@@ -950,9 +982,11 @@
<xsl:value-of
select="lang_default_tts_category"/>
</td>
<td align="left">
- <input type="hidden"
name="values[old_default_tts_category]"
value="{value_old_default_tts_category}"></input>
+ <input type="hidden"
name="values[old_default_tts_category]"
value="{value_old_default_tts_category}"/>
<select
name="values[default_tts_category]" class="forms"
title="{lang_default_tts_category_statustext}">
- <option
value=""><xsl:value-of select="lang_no_cat"/></option>
+ <option
value="">
+
<xsl:value-of select="lang_no_cat"/>
+ </option>
<xsl:apply-templates select="tts_category"/>
</select>
</td>
@@ -962,9 +996,11 @@
<xsl:value-of
select="lang_account_select"/>
</td>
<td align="left">
- <input type="hidden"
name="values[old_assigntodefault]" value="{value_old_assigntodefault}"></input>
+ <input type="hidden"
name="values[old_assigntodefault]" value="{value_old_assigntodefault}"/>
<select
name="values[assigntodefault]" class="forms">
- <option
value=""><xsl:value-of select="lang_no_assigntodefault"/></option>
+ <option
value="">
+
<xsl:value-of select="lang_no_assigntodefault"/>
+ </option>
<xsl:apply-templates select="account_list_tts"/>
</select>
</td>
@@ -974,17 +1010,21 @@
<xsl:value-of
select="lang_group_select"/>
</td>
<td align="left">
- <input type="hidden"
name="values[old_groupdefault]" value="{value_old_groupdefault}"></input>
+ <input type="hidden"
name="values[old_groupdefault]" value="{value_old_groupdefault}"/>
<select
name="values[groupdefault]" class="forms">
- <option
value=""><xsl:value-of select="lang_no_groupdefault"/></option>
+ <option
value="">
+
<xsl:value-of select="lang_no_groupdefault"/>
+ </option>
<xsl:apply-templates select="group_list_tts"/>
</select>
</td>
</tr>
<tr height="50">
<td>
- <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: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"/>
@@ -993,12 +1033,15 @@
</input>
</td>
</tr>
-
</form>
<tr>
<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>
+ <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"
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
@@ -1014,60 +1057,88 @@
</div>
</xsl:template>
+ <!-- New template-->
<xsl:template match="approval_from">
- <xsl:variable name="user_id"><xsl:value-of
select="user_id"/></xsl:variable>
+ <xsl:variable name="user_id">
+ <xsl:value-of select="user_id"/>
+ </xsl:variable>
<xsl:choose>
<xsl:when test="selected">
- <option value="{$user_id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
+ <option value="{$user_id}" selected="selected">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:when>
<xsl:otherwise>
- <option value="{$user_id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
+ <option value="{$user_id}">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
+ <!-- New template-->
<xsl:template match="vendor_category">
- <xsl:variable name="cat_id"><xsl:value-of
select="cat_id"/></xsl:variable>
+ <xsl:variable name="cat_id">
+ <xsl:value-of select="cat_id"/>
+ </xsl:variable>
<xsl:choose>
<xsl:when test="selected='selected'">
- <option value="{$cat_id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
+ <option value="{$cat_id}" selected="selected">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:when>
<xsl:otherwise>
- <option value="{$cat_id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
+ <option value="{$cat_id}">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
+ <!-- New template-->
<xsl:template match="tts_category">
<xsl:choose>
<xsl:when test="selected='selected'">
- <option value="{cat_id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
+ <option value="{cat_id}" selected="selected">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:when>
<xsl:otherwise>
- <option value="{cat_id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
+ <option value="{cat_id}">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
+ <!-- New template-->
<xsl:template match="group_list_tts">
<xsl:choose>
<xsl:when test="selected='1'">
- <option value="{id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
+ <option value="{id}" selected="selected">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:when>
<xsl:otherwise>
- <option value="{id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
+ <option value="{id}">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
+ <!-- New template-->
<xsl:template match="account_list_tts">
<xsl:choose>
<xsl:when test="selected='1'">
- <option value="{id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
+ <option value="{id}" selected="selected">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:when>
<xsl:otherwise>
- <option value="{id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
+ <option value="{id}">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
-
Modified: branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
2011-12-27 11:47:27 UTC (rev 8440)
+++ branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
2011-12-27 11:55:56 UTC (rev 8441)
@@ -1,5 +1,4 @@
-<!-- $Id$ -->
-
+ <!-- $Id$ -->
<xsl:template name="app_data">
<xsl:choose>
<xsl:when test="edit">
@@ -38,9 +37,9 @@
</xsl:choose>
</xsl:template>
-
- <xsl:template match="list">
- <xsl:apply-templates select="menu"/>
+ <!-- New template-->
+ <xsl:template match="list">
+ <xsl:apply-templates select="menu"/>
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
<tr>
<td align="right">
@@ -60,15 +59,24 @@
</table>
</xsl:template>
+ <!-- New template-->
<xsl:template match="table_header">
- <xsl:variable name="sort_id"><xsl:value-of
select="sort_id"/></xsl:variable>
- <xsl:variable name="sort_name"><xsl:value-of
select="sort_name"/></xsl:variable>
+ <xsl:variable name="sort_id">
+ <xsl:value-of select="sort_id"/>
+ </xsl:variable>
+ <xsl:variable name="sort_name">
+ <xsl:value-of select="sort_name"/>
+ </xsl:variable>
<tr class="th">
<td class="th_text" width="10%" align="right">
- <a href="{$sort_id}"><xsl:value-of
select="lang_id"/></a>
+ <a href="{$sort_id}">
+ <xsl:value-of select="lang_id"/>
+ </a>
</td>
<td class="th_text" width="10%" align="center">
- <a href="{$sort_name}"><xsl:value-of
select="lang_name"/></a>
+ <a href="{$sort_name}">
+ <xsl:value-of select="lang_name"/>
+ </a>
</td>
<td class="th_text" width="20%" align="center">
<xsl:value-of select="lang_descr"/>
@@ -85,10 +93,17 @@
</tr>
</xsl:template>
- <xsl:template match="values">
- <xsl:variable name="lang_attribute_standardtext"><xsl:value-of
select="lang_delete_standardtext"/></xsl:variable>
- <xsl:variable name="lang_edit_standardtext"><xsl:value-of
select="lang_edit_standardtext"/></xsl:variable>
- <xsl:variable name="lang_delete_standardtext"><xsl:value-of
select="lang_delete_standardtext"/></xsl:variable>
+ <!-- New template-->
+ <xsl:template match="values">
+ <xsl:variable name="lang_attribute_standardtext">
+ <xsl:value-of select="lang_delete_standardtext"/>
+ </xsl:variable>
+ <xsl:variable name="lang_edit_standardtext">
+ <xsl:value-of select="lang_edit_standardtext"/>
+ </xsl:variable>
+ <xsl:variable name="lang_delete_standardtext">
+ <xsl:value-of select="lang_delete_standardtext"/>
+ </xsl:variable>
<tr>
<xsl:attribute name="class">
<xsl:choose>
@@ -103,7 +118,6 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
-
<td align="right">
<xsl:value-of select="id"/>
</td>
@@ -114,22 +128,35 @@
<xsl:value-of select="descr"/>
</td>
<td align="center">
- <xsl:variable
name="link_categories"><xsl:value-of select="link_categories"/></xsl:variable>
- <a href="{$link_categories}"
onMouseover="window.status='{lang_category_text}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_categories"/></a>
+ <xsl:variable name="link_categories">
+ <xsl:value-of select="link_categories"/>
+ </xsl:variable>
+ <a href="{$link_categories}"
onMouseover="window.status='{lang_category_text}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of select="text_categories"/>
+ </a>
</td>
<td align="center">
- <xsl:variable name="link_edit"><xsl:value-of
select="link_edit"/></xsl:variable>
- <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_standardtext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_edit"/></a>
+ <xsl:variable name="link_edit">
+ <xsl:value-of select="link_edit"/>
+ </xsl:variable>
+ <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_standardtext}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of select="text_edit"/>
+ </a>
</td>
<td align="center">
- <xsl:variable name="link_delete"><xsl:value-of
select="link_delete"/></xsl:variable>
- <a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_standardtext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_delete"/></a>
+ <xsl:variable name="link_delete">
+ <xsl:value-of select="link_delete"/>
+ </xsl:variable>
+ <a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_standardtext}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of select="text_delete"/>
+ </a>
</td>
</tr>
</xsl:template>
- <xsl:template match="list_category">
- <xsl:apply-templates select="menu"/>
+ <!-- New template-->
+ <xsl:template match="list_category">
+ <xsl:apply-templates select="menu"/>
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
<tr>
<td align="right">
@@ -156,15 +183,24 @@
</table>
</xsl:template>
+ <!-- New template-->
<xsl:template match="table_header_category">
- <xsl:variable name="sort_id"><xsl:value-of
select="sort_id"/></xsl:variable>
- <xsl:variable name="sort_name"><xsl:value-of
select="sort_name"/></xsl:variable>
+ <xsl:variable name="sort_id">
+ <xsl:value-of select="sort_id"/>
+ </xsl:variable>
+ <xsl:variable name="sort_name">
+ <xsl:value-of select="sort_name"/>
+ </xsl:variable>
<tr class="th">
<td class="th_text" width="5%" align="right">
- <a href="{$sort_id}"><xsl:value-of
select="lang_id"/></a>
+ <a href="{$sort_id}">
+ <xsl:value-of select="lang_id"/>
+ </a>
</td>
<td class="th_text" width="10%" align="center">
- <a href="{$sort_name}"><xsl:value-of
select="lang_name"/></a>
+ <a href="{$sort_name}">
+ <xsl:value-of select="lang_name"/>
+ </a>
</td>
<td class="th_text" width="20%" align="center">
<xsl:value-of select="lang_descr"/>
@@ -190,11 +226,20 @@
</tr>
</xsl:template>
- <xsl:template match="values_category">
- <xsl:variable name="lang_attribute_standardtext"><xsl:value-of
select="lang_attribute_standardtext"/></xsl:variable>
- <xsl:variable
name="lang_custom_function_standardtext"><xsl:value-of
select="lang_custom_function_standardtext"/></xsl:variable>
- <xsl:variable name="lang_edit_standardtext"><xsl:value-of
select="lang_edit_standardtext"/></xsl:variable>
- <xsl:variable name="lang_delete_standardtext"><xsl:value-of
select="lang_delete_standardtext"/></xsl:variable>
+ <!-- New template-->
+ <xsl:template match="values_category">
+ <xsl:variable name="lang_attribute_standardtext">
+ <xsl:value-of select="lang_attribute_standardtext"/>
+ </xsl:variable>
+ <xsl:variable name="lang_custom_function_standardtext">
+ <xsl:value-of
select="lang_custom_function_standardtext"/>
+ </xsl:variable>
+ <xsl:variable name="lang_edit_standardtext">
+ <xsl:value-of select="lang_edit_standardtext"/>
+ </xsl:variable>
+ <xsl:variable name="lang_delete_standardtext">
+ <xsl:value-of select="lang_delete_standardtext"/>
+ </xsl:variable>
<tr>
<xsl:attribute name="class">
<xsl:choose>
@@ -209,7 +254,6 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
-
<td align="right">
<xsl:value-of select="id"/>
</td>
@@ -223,31 +267,51 @@
<xsl:value-of select="prefix"/>
</td>
<td align="center">
- <xsl:variable
name="link_attribute_group"><xsl:value-of
select="link_attribute_group"/></xsl:variable>
- <a href="{$link_attribute_group}"
onMouseover="window.status='';return true;" onMouseout="window.status='';return
true;"><xsl:value-of select="text_attribute_group"/></a>
+ <xsl:variable name="link_attribute_group">
+ <xsl:value-of
select="link_attribute_group"/>
+ </xsl:variable>
+ <a href="{$link_attribute_group}"
onMouseover="window.status='';return true;" onMouseout="window.status='';return
true;">
+ <xsl:value-of
select="text_attribute_group"/>
+ </a>
</td>
<td align="center">
- <xsl:variable
name="link_attribute"><xsl:value-of select="link_attribute"/></xsl:variable>
- <a href="{$link_attribute}"
onMouseover="window.status='{$lang_attribute_standardtext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_attribute"/></a>
+ <xsl:variable name="link_attribute">
+ <xsl:value-of select="link_attribute"/>
+ </xsl:variable>
+ <a href="{$link_attribute}"
onMouseover="window.status='{$lang_attribute_standardtext}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of select="text_attribute"/>
+ </a>
</td>
<td align="center">
- <xsl:variable
name="link_custom_function"><xsl:value-of
select="link_custom_function"/></xsl:variable>
- <a href="{$link_custom_function}"
onMouseover="window.status='{$lang_custom_function_standardtext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_custom_function"/></a>
+ <xsl:variable name="link_custom_function">
+ <xsl:value-of
select="link_custom_function"/>
+ </xsl:variable>
+ <a href="{$link_custom_function}"
onMouseover="window.status='{$lang_custom_function_standardtext}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of
select="text_custom_function"/>
+ </a>
</td>
<td align="center">
- <xsl:variable name="link_edit"><xsl:value-of
select="link_edit"/></xsl:variable>
- <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_standardtext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_edit"/></a>
+ <xsl:variable name="link_edit">
+ <xsl:value-of select="link_edit"/>
+ </xsl:variable>
+ <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_standardtext}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of select="text_edit"/>
+ </a>
</td>
<td align="center">
- <xsl:variable name="link_delete"><xsl:value-of
select="link_delete"/></xsl:variable>
- <a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_standardtext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_delete"/></a>
+ <xsl:variable name="link_delete">
+ <xsl:value-of select="link_delete"/>
+ </xsl:variable>
+ <a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_standardtext}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of select="text_delete"/>
+ </a>
</td>
</tr>
</xsl:template>
-
- <xsl:template match="list_config">
- <xsl:apply-templates select="menu"/>
+ <!-- New template-->
+ <xsl:template match="list_config">
+ <xsl:apply-templates select="menu"/>
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
<tr>
<td align="right">
@@ -266,15 +330,24 @@
</table>
</xsl:template>
+ <!-- New template-->
<xsl:template match="table_header_list_config">
- <xsl:variable name="sort_column_name"><xsl:value-of
select="sort_column_name"/></xsl:variable>
- <xsl:variable name="sort_name"><xsl:value-of
select="sort_name"/></xsl:variable>
+ <xsl:variable name="sort_column_name">
+ <xsl:value-of select="sort_column_name"/>
+ </xsl:variable>
+ <xsl:variable name="sort_name">
+ <xsl:value-of select="sort_name"/>
+ </xsl:variable>
<tr class="th">
<td class="th_text" width="10%" align="center">
- <a href="{$sort_column_name}"><xsl:value-of
select="lang_column_name"/></a>
+ <a href="{$sort_column_name}">
+ <xsl:value-of
select="lang_column_name"/>
+ </a>
</td>
<td class="th_text" width="10%" align="center">
- <a href="{$sort_name}"><xsl:value-of
select="lang_name"/></a>
+ <a href="{$sort_name}">
+ <xsl:value-of select="lang_name"/>
+ </a>
</td>
<td class="th_text" width="5%" align="center">
<xsl:value-of select="lang_edit"/>
@@ -282,8 +355,11 @@
</tr>
</xsl:template>
- <xsl:template match="values_list_config">
- <xsl:variable name="lang_edit_standardtext"><xsl:value-of
select="lang_edit_standardtext"/></xsl:variable>
+ <!-- New template-->
+ <xsl:template match="values_list_config">
+ <xsl:variable name="lang_edit_standardtext">
+ <xsl:value-of select="lang_edit_standardtext"/>
+ </xsl:variable>
<tr>
<xsl:attribute name="class">
<xsl:choose>
@@ -298,7 +374,6 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
-
<td align="left">
<xsl:value-of select="column_name"/>
</td>
@@ -306,18 +381,26 @@
<xsl:value-of select="name"/>
</td>
<td align="center">
- <xsl:variable name="link_edit"><xsl:value-of
select="link_edit"/></xsl:variable>
- <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_standardtext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_edit"/></a>
+ <xsl:variable name="link_edit">
+ <xsl:value-of select="link_edit"/>
+ </xsl:variable>
+ <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_standardtext}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of select="text_edit"/>
+ </a>
</td>
</tr>
</xsl:template>
-
+ <!-- New template-->
<xsl:template match="table_add">
<tr>
<td height="50">
- <xsl:variable name="add_action"><xsl:value-of
select="add_action"/></xsl:variable>
- <xsl:variable name="lang_add"><xsl:value-of
select="lang_add"/></xsl:variable>
+ <xsl:variable name="add_action">
+ <xsl:value-of select="add_action"/>
+ </xsl:variable>
+ <xsl:variable name="lang_add">
+ <xsl:value-of select="lang_add"/>
+ </xsl:variable>
<form method="post" action="{$add_action}">
<input type="submit" name="add"
value="{$lang_add}" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
@@ -329,8 +412,12 @@
</form>
</td>
<td height="50">
- <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>
+ <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" name="add"
value="{$lang_done}" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
@@ -344,10 +431,9 @@
</tr>
</xsl:template>
-<!-- add / edit -->
- <xsl:template match="edit" xmlns:php="http://php.net/xsl";>
+ <!-- add / edit -->
+ <xsl:template xmlns:php="http://php.net/xsl"; match="edit">
<div align="left">
-
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -358,8 +444,10 @@
</tr>
</xsl:when>
</xsl:choose>
- <xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
- <form name="form" method="post"
action="{$form_action}">
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
+ <form name="form" method="post"
action="{$form_action}">
<tr>
<td class="th_text"
align="left">
<xsl:value-of
select="lang_entity"/>
@@ -372,11 +460,13 @@
<xsl:when test="parent_list !=
''">
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'parent')" />
+
<xsl:value-of select="php:function('lang', 'parent')"/>
</td>
<td
valign="top">
<select
id="parent_id" name="values[parent_id]">
-
<option value=""><xsl:value-of select="php:function('lang', 'select parent')"
/></option>
+
<option value="">
+
<xsl:value-of select="php:function('lang', 'select parent')"/>
+
</option>
<xsl:apply-templates select="parent_list"/>
</select>
</td>
@@ -387,7 +477,7 @@
<xsl:when test="value_id != ''">
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'category')" />
+
<xsl:value-of select="php:function('lang', 'category')"/>
</td>
<td>
<xsl:value-of select="value_id"/>
@@ -397,7 +487,7 @@
</xsl:choose>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'name')" />
+ <xsl:value-of
select="php:function('lang', 'name')"/>
</td>
<td>
<input type="text"
name="values[name]" value="{value_name}" onMouseout="window.status='';return
true;">
@@ -411,7 +501,7 @@
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'descr')" />
+ <xsl:value-of
select="php:function('lang', 'descr')"/>
</td>
<td>
<textarea cols="60"
rows="10" name="values[descr]" onMouseout="window.status='';return true;">
@@ -420,7 +510,7 @@
<xsl:value-of select="lang_descr_standardtext"/>
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
- <xsl:value-of
select="value_descr"/>
+ <xsl:value-of
select="value_descr"/>
</textarea>
</td>
</tr>
@@ -486,7 +576,6 @@
</tr>
</xsl:when>
</xsl:choose>
-
<xsl:choose>
<xsl:when
test="value_location_form = 1">
<tr>
@@ -515,13 +604,11 @@
</tr>
</xsl:when>
</xsl:choose>
-
-
<xsl:choose>
<xsl:when test="edit_prefix !=
''">
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'prefix')" />
+
<xsl:value-of select="php:function('lang', 'prefix')"/>
</td>
<td>
<input
type="text" name="values[prefix]" value="{value_prefix}"
onMouseout="window.status='';return true;">
@@ -535,17 +622,16 @@
</tr>
</xsl:when>
</xsl:choose>
-
<xsl:choose>
<xsl:when test="lookup_tenant
!= ''">
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'lookup tenant')" />
+
<xsl:value-of select="php:function('lang', 'lookup tenant')"/>
</td>
<td>
<input
type="checkbox" name="values[lookup_tenant]" value="1">
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'If this entity type is to
look up tenants')" />
+
<xsl:value-of select="php:function('lang', 'If this entity type is to
look up tenants')"/>
</xsl:attribute>
<xsl:if test="value_lookup_tenant = '1'">
<xsl:attribute name="checked">
@@ -561,12 +647,12 @@
<xsl:when test="tracking != ''">
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'tracking helpdesk')" />
+
<xsl:value-of select="php:function('lang', 'tracking helpdesk')"/>
</td>
<td>
<input
type="checkbox" name="values[tracking]" value="1">
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'acivate tracking of dates
in helpdesk main list')" />
+
<xsl:value-of select="php:function('lang', 'acivate tracking of dates
in helpdesk main list')"/>
</xsl:attribute>
<xsl:if test="value_tracking = '1'">
<xsl:attribute name="checked">
@@ -627,7 +713,7 @@
<xsl:value-of select="php:function('lang', 'Link from location')"/>
</td>
<td>
- <input
type="checkbox" name="values[loc_link]" value="1" >
+ <input
type="checkbox" name="values[loc_link]" value="1">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'Enable link from location
detail')"/>
</xsl:attribute>
@@ -700,7 +786,6 @@
<xsl:text>disabled</xsl:text>
</xsl:attribute>
</xsl:if>
-
</input>
<xsl:choose>
<xsl:when test="value_is_eav = '1'">
@@ -711,7 +796,6 @@
</tr>
</xsl:when>
</xsl:choose>
-
<xsl:choose>
<xsl:when
test="lang_location_level != ''">
<tr>
@@ -719,10 +803,14 @@
<xsl:value-of select="lang_location_level"/>
</td>
<td
valign="top">
-
<xsl:variable name="lang_location_level_statustext"><xsl:value-of
select="lang_location_level_statustext"/></xsl:variable>
+
<xsl:variable name="lang_location_level_statustext">
+
<xsl:value-of select="lang_location_level_statustext"/>
+
</xsl:variable>
<select
name="values[location_level]" class="forms"
onMouseover="window.status='{$lang_location_level_statustext}'; return true;"
onMouseout="window.status='';return true;">
-
<option value=""><xsl:value-of select="lang_no_location_level"/></option>
-
<xsl:apply-templates select="location_level_list/options"/>
+
<option value="">
+
<xsl:value-of select="lang_no_location_level"/>
+
</option>
+
<xsl:apply-templates select="location_level_list/options"/>
</select>
</td>
</tr>
@@ -731,48 +819,51 @@
<xsl:value-of select="lang_location_link_level"/>
</td>
<td
valign="top">
-
<xsl:variable name="lang_location_link_level_statustext"><xsl:value-of
select="lang_location_link_level_statustext"/></xsl:variable>
+
<xsl:variable name="lang_location_link_level_statustext">
+
<xsl:value-of select="lang_location_link_level_statustext"/>
+
</xsl:variable>
<select
name="values[location_link_level]"
title="{$lang_location_link_level_statustext}">
-
<option value=""><xsl:value-of select="lang_no_location_link_level"/></option>
-
<xsl:apply-templates select="location_link_level_list/options"/>
+
<option value="">
+
<xsl:value-of select="lang_no_location_link_level"/>
+
</option>
+
<xsl:apply-templates select="location_link_level_list/options"/>
</select>
</td>
</tr>
</xsl:when>
</xsl:choose>
-
<xsl:choose>
<xsl:when test="category_list
!= '' and value_id = ''">
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'template')" />
+
<xsl:value-of select="php:function('lang', 'template')"/>
</td>
<td
valign="top">
<select
id="category_template" name="values[category_template]"
onChange="get_template_attributes()">
-
<option value=""><xsl:value-of select="php:function('lang', 'select template')"
/></option>
+
<option value="">
+
<xsl:value-of select="php:function('lang', 'select template')"/>
+
</option>
<xsl:apply-templates select="category_list"/>
</select>
</td>
</tr>
-
<tr>
<td width="19%"
align="left" valign="top">
-
<xsl:value-of select="php:function('lang', 'attributes')" />
+
<xsl:value-of select="php:function('lang', 'attributes')"/>
</td>
<td>
- <div
id="paging_0"></div><div id="datatable-container_0"></div>
- <input
type="hidden" name="template_attrib" value=""></input>
+ <div
id="paging_0"/>
+ <div
id="datatable-container_0"/>
+ <input
type="hidden" name="template_attrib" value=""/>
</td>
</tr>
-
</xsl:when>
</xsl:choose>
-
<tr height="50">
<td>
<input type="submit"
name="values[save]" value="{lang_save}" onClick="onActionsClick()">
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'save')" />
+
<xsl:value-of select="php:function('lang', 'save')"/>
</xsl:attribute>
</input>
</td>
@@ -780,8 +871,12 @@
</form>
<tr>
<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>
+ <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"
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
@@ -795,25 +890,24 @@
</tr>
</table>
</div>
-
<!-- DATATABLE DEFINITIONS-->
<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 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();
var myButtons = new Array();
- var td_count = <xsl:value-of select="td_count" />;
+ var td_count = <xsl:value-of select="td_count"/>;
<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"/>,
- <!-- permission :
<xsl:value-of select="permission"/>, -->
- footer : <xsl:value-of
select="footer"/>
- }
+ {
+ values:<xsl:value-of
select="values"/>,
+ total_records: <xsl:value-of
select="total_records"/>,
+ is_paginator: <xsl:value-of
select="is_paginator"/>,
+ <!--permission:<xsl:value-of
select="permission"/>, -->
+ footer:<xsl:value-of
select="footer"/>
+ }
]
</xsl:for-each>
<xsl:for-each select="myColumnDefs">
@@ -825,10 +919,8 @@
</script>
</xsl:template>
-<!-- list attribute -->
-
+ <!-- list attribute -->
<xsl:template match="list_attribute">
-
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
<tr>
<td align="right">
@@ -861,12 +953,20 @@
<xsl:apply-templates select="table_add"/>
</table>
</xsl:template>
+
+ <!-- New template-->
<xsl:template match="table_header_attrib">
- <xsl:variable name="sort_sorting"><xsl:value-of
select="sort_sorting"/></xsl:variable>
- <xsl:variable name="sort_name"><xsl:value-of
select="sort_name"/></xsl:variable>
+ <xsl:variable name="sort_sorting">
+ <xsl:value-of select="sort_sorting"/>
+ </xsl:variable>
+ <xsl:variable name="sort_name">
+ <xsl:value-of select="sort_name"/>
+ </xsl:variable>
<tr class="th">
<td class="th_text" width="10%" align="left">
- <a href="{$sort_name}"><xsl:value-of
select="lang_name"/></a>
+ <a href="{$sort_name}">
+ <xsl:value-of select="lang_name"/>
+ </a>
</td>
<td class="th_text" width="20%" align="left">
<xsl:value-of select="lang_descr"/>
@@ -878,7 +978,9 @@
<xsl:value-of select="lang_attrib_group"/>
</td>
<td class="th_text" width="5%" align="center">
- <a href="{$sort_sorting}"><xsl:value-of
select="lang_sorting"/></a>
+ <a href="{$sort_sorting}">
+ <xsl:value-of select="lang_sorting"/>
+ </a>
</td>
<td class="th_text" width="1%" align="center">
<xsl:value-of select="lang_search"/>
@@ -892,11 +994,20 @@
</tr>
</xsl:template>
- <xsl:template match="values_attrib">
- <xsl:variable name="lang_up_text"><xsl:value-of
select="lang_up_text"/></xsl:variable>
- <xsl:variable name="lang_down_text"><xsl:value-of
select="lang_down_text"/></xsl:variable>
- <xsl:variable name="lang_edit_text"><xsl:value-of
select="lang_edit_text"/></xsl:variable>
- <xsl:variable name="lang_delete_text"><xsl:value-of
select="lang_delete_text"/></xsl:variable>
+ <!-- New template-->
+ <xsl:template match="values_attrib">
+ <xsl:variable name="lang_up_text">
+ <xsl:value-of select="lang_up_text"/>
+ </xsl:variable>
+ <xsl:variable name="lang_down_text">
+ <xsl:value-of select="lang_down_text"/>
+ </xsl:variable>
+ <xsl:variable name="lang_edit_text">
+ <xsl:value-of select="lang_edit_text"/>
+ </xsl:variable>
+ <xsl:variable name="lang_delete_text">
+ <xsl:value-of select="lang_delete_text"/>
+ </xsl:variable>
<tr>
<xsl:attribute name="class">
<xsl:choose>
@@ -929,15 +1040,21 @@
<td>
<xsl:value-of
select="sorting"/>
</td>
-
<td align="left">
- <xsl:variable
name="link_up"><xsl:value-of select="link_up"/></xsl:variable>
- <a href="{$link_up}"
onMouseover="window.status='{$lang_up_text}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="text_up"/></a>
+ <xsl:variable
name="link_up">
+ <xsl:value-of
select="link_up"/>
+ </xsl:variable>
+ <a href="{$link_up}"
onMouseover="window.status='{$lang_up_text}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of
select="text_up"/>
+ </a>
<xsl:text> | </xsl:text>
- <xsl:variable
name="link_down"><xsl:value-of select="link_down"/></xsl:variable>
- <a href="{$link_down}"
onMouseover="window.status='{$lang_down_text}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_down"/></a>
+ <xsl:variable
name="link_down">
+ <xsl:value-of
select="link_down"/>
+ </xsl:variable>
+ <a href="{$link_down}"
onMouseover="window.status='{$lang_down_text}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of
select="text_down"/>
+ </a>
</td>
-
</tr>
</table>
</td>
@@ -945,21 +1062,27 @@
<xsl:value-of select="search"/>
</td>
<td align="center">
- <xsl:variable name="link_edit"><xsl:value-of
select="link_edit"/></xsl:variable>
- <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_text}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_edit"/></a>
+ <xsl:variable name="link_edit">
+ <xsl:value-of select="link_edit"/>
+ </xsl:variable>
+ <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_text}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of select="text_edit"/>
+ </a>
</td>
<td align="center">
- <xsl:variable name="link_delete"><xsl:value-of
select="link_delete"/></xsl:variable>
- <a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_text}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_delete"/></a>
+ <xsl:variable name="link_delete">
+ <xsl:value-of select="link_delete"/>
+ </xsl:variable>
+ <a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_text}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of select="text_delete"/>
+ </a>
</td>
</tr>
</xsl:template>
-
-<!-- list attribute_group -->
-
+ <!-- New template-->
+ <!-- list attribute_group -->
<xsl:template match="list_attribute_group">
-
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
<tr>
<td align="right">
@@ -993,18 +1116,27 @@
</table>
</xsl:template>
+ <!-- New template-->
<xsl:template match="table_header_attrib_group">
- <xsl:variable name="sort_sorting"><xsl:value-of
select="sort_sorting"/></xsl:variable>
- <xsl:variable name="sort_name"><xsl:value-of
select="sort_name"/></xsl:variable>
+ <xsl:variable name="sort_sorting">
+ <xsl:value-of select="sort_sorting"/>
+ </xsl:variable>
+ <xsl:variable name="sort_name">
+ <xsl:value-of select="sort_name"/>
+ </xsl:variable>
<tr class="th">
<td class="th_text" width="10%" align="left">
- <a href="{$sort_name}"><xsl:value-of
select="lang_name"/></a>
+ <a href="{$sort_name}">
+ <xsl:value-of select="lang_name"/>
+ </a>
</td>
<td class="th_text" width="20%" align="left">
<xsl:value-of select="lang_descr"/>
</td>
<td class="th_text" width="5%" align="center">
- <a href="{$sort_sorting}"><xsl:value-of
select="lang_sorting"/></a>
+ <a href="{$sort_sorting}">
+ <xsl:value-of select="lang_sorting"/>
+ </a>
</td>
<td class="th_text" width="5%" align="center">
<xsl:value-of select="lang_edit"/>
@@ -1015,11 +1147,20 @@
</tr>
</xsl:template>
- <xsl:template match="values_attrib_group">
- <xsl:variable name="lang_up_text"><xsl:value-of
select="lang_up_text"/></xsl:variable>
- <xsl:variable name="lang_down_text"><xsl:value-of
select="lang_down_text"/></xsl:variable>
- <xsl:variable name="lang_edit_text"><xsl:value-of
select="lang_edit_text"/></xsl:variable>
- <xsl:variable name="lang_delete_text"><xsl:value-of
select="lang_delete_text"/></xsl:variable>
+ <!-- New template-->
+ <xsl:template match="values_attrib_group">
+ <xsl:variable name="lang_up_text">
+ <xsl:value-of select="lang_up_text"/>
+ </xsl:variable>
+ <xsl:variable name="lang_down_text">
+ <xsl:value-of select="lang_down_text"/>
+ </xsl:variable>
+ <xsl:variable name="lang_edit_text">
+ <xsl:value-of select="lang_edit_text"/>
+ </xsl:variable>
+ <xsl:variable name="lang_delete_text">
+ <xsl:value-of select="lang_delete_text"/>
+ </xsl:variable>
<tr>
<xsl:attribute name="class">
<xsl:choose>
@@ -1046,35 +1187,46 @@
<td>
<xsl:value-of
select="sorting"/>
</td>
-
<td align="left">
- <xsl:variable
name="link_up"><xsl:value-of select="link_up"/></xsl:variable>
- <a href="{$link_up}"
onMouseover="window.status='{$lang_up_text}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="text_up"/></a>
+ <xsl:variable
name="link_up">
+ <xsl:value-of
select="link_up"/>
+ </xsl:variable>
+ <a href="{$link_up}"
onMouseover="window.status='{$lang_up_text}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of
select="text_up"/>
+ </a>
<xsl:text> | </xsl:text>
- <xsl:variable
name="link_down"><xsl:value-of select="link_down"/></xsl:variable>
- <a href="{$link_down}"
onMouseover="window.status='{$lang_down_text}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_down"/></a>
+ <xsl:variable
name="link_down">
+ <xsl:value-of
select="link_down"/>
+ </xsl:variable>
+ <a href="{$link_down}"
onMouseover="window.status='{$lang_down_text}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of
select="text_down"/>
+ </a>
</td>
-
</tr>
</table>
</td>
<td align="center">
- <xsl:variable name="link_edit"><xsl:value-of
select="link_edit"/></xsl:variable>
- <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_text}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_edit"/></a>
+ <xsl:variable name="link_edit">
+ <xsl:value-of select="link_edit"/>
+ </xsl:variable>
+ <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_text}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of select="text_edit"/>
+ </a>
</td>
<td align="center">
- <xsl:variable name="link_delete"><xsl:value-of
select="link_delete"/></xsl:variable>
- <a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_text}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_delete"/></a>
+ <xsl:variable name="link_delete">
+ <xsl:value-of select="link_delete"/>
+ </xsl:variable>
+ <a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_text}';return true;"
onMouseout="window.status='';return true;">
+ <xsl:value-of select="text_delete"/>
+ </a>
</td>
</tr>
</xsl:template>
-
-<!-- add attribute group / edit attribute group -->
-
+ <!-- add attribute group / edit attribute group -->
<xsl:template match="edit_attrib_group">
<div align="left">
-
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -1085,10 +1237,10 @@
</tr>
</xsl:when>
</xsl:choose>
-
- <xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
<form method="post" action="{$form_action}">
-
<tr>
<td class="th_text"
align="left">
<xsl:value-of
select="lang_entity"/>
@@ -1136,7 +1288,7 @@
<xsl:value-of
select="lang_descr"/>
</td>
<td>
- <input type="text"
name="values[descr]" value="{value_descr}" size ="60" maxlength="50"
onMouseout="window.status='';return true;">
+ <input type="text"
name="values[descr]" value="{value_descr}" size="60" maxlength="50"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="lang_descr_statustext"/>
@@ -1156,13 +1308,15 @@
<xsl:value-of select="lang_remark_statustext"/>
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
- <xsl:value-of
select="value_remark"/>
+ <xsl:value-of
select="value_remark"/>
</textarea>
</td>
</tr>
<tr height="50">
<td>
- <xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+ <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>
@@ -1172,12 +1326,15 @@
</input>
</td>
</tr>
-
</form>
<tr>
<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>
+ <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"
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
@@ -1192,11 +1349,10 @@
</table>
</div>
</xsl:template>
-<!-- add attribute / edit attribute -->
- <xsl:template match="edit_attrib" xmlns:php="http://php.net/xsl";>
+ <!-- add attribute / edit attribute -->
+ <xsl:template xmlns:php="http://php.net/xsl"; match="edit_attrib">
<div align="left">
-
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -1207,13 +1363,13 @@
</tr>
</xsl:when>
</xsl:choose>
-
- <xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
<form method="post" action="{$form_action}">
-
<tr>
<td class="th_text"
align="left">
- <xsl:value-of
select="php:function('lang', 'entity')" />
+ <xsl:value-of
select="php:function('lang', 'entity')"/>
</td>
<td class="th_text"
align="left">
<xsl:value-of
select="entity_name"/>
@@ -1221,7 +1377,7 @@
</tr>
<tr>
<td class="th_text"
align="left">
- <xsl:value-of
select="php:function('lang', 'category')" />
+ <xsl:value-of
select="php:function('lang', 'category')"/>
</td>
<td class="th_text"
align="left">
<xsl:value-of
select="category_name"/>
@@ -1231,7 +1387,7 @@
<xsl:when test="value_id != ''">
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'attribute id')" />
+
<xsl:value-of select="php:function('lang', 'attribute id')"/>
</td>
<td>
<xsl:value-of select="value_id"/>
@@ -1241,53 +1397,52 @@
</xsl:choose>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'column name')" />
+ <xsl:value-of
select="php:function('lang', 'column name')"/>
</td>
<td>
<input type="text"
name="values[column_name]" value="{value_column_name}" maxlength="50">
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'enter the name for the column')" />
+
<xsl:value-of select="php:function('lang', 'enter the name for the column')"/>
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'input text')" />
+ <xsl:value-of
select="php:function('lang', 'input text')"/>
</td>
<td>
- <input type="text"
name="values[input_text]" value="{value_input_text}" size ="60" maxlength="50">
+ <input type="text"
name="values[input_text]" value="{value_input_text}" size="60" maxlength="50">
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'enter the input text for records')"
/>
+
<xsl:value-of select="php:function('lang', 'enter the input text for
records')"/>
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'statustext')" />
+ <xsl:value-of
select="php:function('lang', 'statustext')"/>
</td>
<td>
<textarea cols="60"
rows="10" name="values[statustext]">
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'enter a statustext for the
inputfield in forms')" />
+
<xsl:value-of select="php:function('lang', 'enter a statustext for the
inputfield in forms')"/>
</xsl:attribute>
- <xsl:value-of
select="value_statustext"/>
+ <xsl:value-of
select="value_statustext"/>
</textarea>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'group')" />
+ <xsl:value-of
select="php:function('lang', 'group')"/>
</td>
<td valign="top">
<select
name="values[group_id]" class="forms">
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'select a group')" />
+
<xsl:value-of select="php:function('lang', 'select a group')"/>
</xsl:attribute>
-
<option
value="">
-
<xsl:value-of select="php:function('lang', 'no group')" />
+
<xsl:value-of select="php:function('lang', 'no group')"/>
</option>
<xsl:apply-templates select="attrib_group_list"/>
</select>
@@ -1295,15 +1450,15 @@
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'datatype')" />
+ <xsl:value-of
select="php:function('lang', 'datatype')"/>
</td>
<td valign="top">
<select
name="values[column_info][type]" class="forms">
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'select a datatype')" />
+
<xsl:value-of select="php:function('lang', 'select a datatype')"/>
</xsl:attribute>
<option
value="">
-
<xsl:value-of select="php:function('lang', 'no datatype')" />
+
<xsl:value-of select="php:function('lang', 'no datatype')"/>
</option>
<xsl:apply-templates select="datatype_list"/>
</select>
@@ -1311,52 +1466,51 @@
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'precision')" />
+ <xsl:value-of
select="php:function('lang', 'precision')"/>
</td>
<td>
<input type="text"
name="values[column_info][precision]" value="{value_precision}">
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'enter the record length')" />
+
<xsl:value-of select="php:function('lang', 'enter the record length')"/>
</xsl:attribute>
</input>
</td>
</tr>
-
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'scale')" />
+ <xsl:value-of
select="php:function('lang', 'scale')"/>
</td>
<td>
<input type="text"
name="values[column_info][scale]" value="{value_scale}">
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'enter the scale if type is
decimal')" />
+
<xsl:value-of select="php:function('lang', 'enter the scale if type is
decimal')"/>
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'default')" />
+ <xsl:value-of
select="php:function('lang', 'default')"/>
</td>
<td>
<input type="text"
name="values[column_info][default]" value="{value_default}">
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'enter the default value')" />
+
<xsl:value-of select="php:function('lang', 'enter the default value')"/>
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'nullable')" />
+ <xsl:value-of
select="php:function('lang', 'nullable')"/>
</td>
<td valign="top">
<select
name="values[column_info][nullable]">
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'chose if this column is nullable')"
/>
+
<xsl:value-of select="php:function('lang', 'chose if this column is
nullable')"/>
</xsl:attribute>
<option
value="">
-
<xsl:value-of select="php:function('lang', 'select nullable')" />
+
<xsl:value-of select="php:function('lang', 'select nullable')"/>
</option>
<xsl:apply-templates select="nullable_list"/>
</select>
@@ -1364,7 +1518,7 @@
</tr>
<tr>
<td>
- <xsl:value-of
select="php:function('lang', 'show in list')" />
+ <xsl:value-of
select="php:function('lang', 'show in list')"/>
</td>
<td>
<input type="checkbox"
name="values[list]" value="1">
@@ -1374,14 +1528,14 @@
</xsl:attribute>
</xsl:if>
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'check to show this attribute in
entity list')" />
+
<xsl:value-of select="php:function('lang', 'check to show this attribute in
entity list')"/>
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td>
- <xsl:value-of
select="php:function('lang', 'include in search')" />
+ <xsl:value-of
select="php:function('lang', 'include in search')"/>
</td>
<td>
<input type="checkbox"
name="values[search]" value="1">
@@ -1391,14 +1545,14 @@
</xsl:attribute>
</xsl:if>
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'check to show this attribute in
location list')" />
+
<xsl:value-of select="php:function('lang', 'check to show this attribute in
location list')"/>
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td>
- <xsl:value-of
select="php:function('lang', 'history')" />
+ <xsl:value-of
select="php:function('lang', 'history')"/>
</td>
<td>
<input type="checkbox"
name="values[history]" value="1">
@@ -1408,14 +1562,14 @@
</xsl:attribute>
</xsl:if>
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'enable history for this
attribute')" />
+
<xsl:value-of select="php:function('lang', 'enable history for this
attribute')"/>
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td>
- <xsl:value-of
select="php:function('lang', 'disabled')" />
+ <xsl:value-of
select="php:function('lang', 'disabled')"/>
</td>
<td>
<input type="checkbox"
name="values[disabled]" value="1">
@@ -1425,30 +1579,29 @@
</xsl:attribute>
</xsl:if>
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'this attribute turn up as disabled
in the form')" />
+
<xsl:value-of select="php:function('lang', 'this attribute turn up as disabled
in the form')"/>
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'help message')" />
+ <xsl:value-of
select="php:function('lang', 'help message')"/>
</td>
<td>
<textarea cols="60"
rows="10" name="values[helpmsg]">
<xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'enables help message for this
attribute')" />
+
<xsl:value-of select="php:function('lang', 'enables help message for this
attribute')"/>
</xsl:attribute>
- <xsl:value-of
select="value_helpmsg"/>
+ <xsl:value-of
select="value_helpmsg"/>
</textarea>
</td>
</tr>
-
<xsl:choose>
<xsl:when test="multiple_choice
= 1">
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'choice')" />
+
<xsl:value-of select="php:function('lang', 'choice')"/>
</td>
<td
align="right">
<xsl:call-template name="choice"/>
@@ -1460,10 +1613,10 @@
<xsl:when test="custom_get_list
= 1">
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'custom get list function')" />
+
<xsl:value-of select="php:function('lang', 'custom get list function')"/>
</td>
<td>
- <input
type="text" name="values[get_list_function]" value="{value_get_list_function}"
size='60'>
+ <input
type="text" name="values[get_list_function]" value="{value_get_list_function}"
size="60">
<xsl:attribute name="title">
<xsl:text><app>.<class>.<function></xsl:text>
</xsl:attribute>
@@ -1472,14 +1625,14 @@
</tr>
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'get list function input')" />
+
<xsl:value-of select="php:function('lang', 'get list function input')"/>
</td>
<td>
<textarea cols="60" rows="10" name="values[get_list_function_input]">
<xsl:attribute name="title">
<xsl:text>parameter1 = value1, parameter2 = value2...</xsl:text>
</xsl:attribute>
-
<xsl:value-of select="value_get_list_function_input"/>
+
<xsl:value-of select="value_get_list_function_input"/>
</textarea>
</td>
</tr>
@@ -1489,10 +1642,10 @@
<xsl:when
test="custom_get_single = 1">
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'custom get single function')" />
+
<xsl:value-of select="php:function('lang', 'custom get single function')"/>
</td>
<td>
- <input
type="text" name="values[get_single_function]"
value="{value_get_single_function}" size='60'>
+ <input
type="text" name="values[get_single_function]"
value="{value_get_single_function}" size="60">
<xsl:attribute name="title">
<xsl:text><app>.<class>.<function></xsl:text>
</xsl:attribute>
@@ -1501,26 +1654,27 @@
</tr>
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'get single function input')" />
+
<xsl:value-of select="php:function('lang', 'get single function input')"/>
</td>
<td>
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8441] Merge 8433:8440 from trunk,
Sigurd Nes <=