|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [14861] property: clean up agreement |
| Date: | Fri, 25 Mar 2016 12:37:53 +0000 |
Revision: 14861
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14861
Author: sigurdne
Date: 2016-03-25 12:37:53 +0000 (Fri, 25 Mar 2016)
Log Message:
-----------
property: clean up agreement
Modified Paths:
--------------
trunk/property/inc/class.uiagreement.inc.php
trunk/property/templates/base/admin.xsl
trunk/property/templates/base/admin_entity.xsl
trunk/property/templates/base/admin_location.xsl
trunk/property/templates/base/agreement.xsl
trunk/property/templates/base/budget.xsl
trunk/property/templates/base/cat_filter.xsl
trunk/property/templates/base/cat_select.xsl
trunk/property/templates/base/document.xsl
trunk/property/templates/base/filter_member_of.xsl
trunk/property/templates/base/invoice.xsl
trunk/property/templates/base/s_agreement.xsl
trunk/property/templates/base/tenant_claim.xsl
trunk/property/templates/base/wo_hour.xsl
trunk/property/templates/base/workorder.xsl
Modified: trunk/property/inc/class.uiagreement.inc.php
===================================================================
--- trunk/property/inc/class.uiagreement.inc.php 2016-03-25 12:37:00 UTC
(rev 14860)
+++ trunk/property/inc/class.uiagreement.inc.php 2016-03-25 12:37:53 UTC
(rev 14861)
@@ -695,7 +695,6 @@
$id = phpgw::get_var('id', 'int');
$values = phpgw::get_var('values');
- $values_attribute = phpgw::get_var('values_attribute');
if ((isset($values['save']) && $values['save']) ||
(isset($values['apply']) && $values['apply']))
{
@@ -703,10 +702,47 @@
$values['vendor_id'] =
phpgw::get_var('vendor_id', 'int', 'POST');
$values['vendor_name'] =
phpgw::get_var('vendor_name', 'string', 'POST');
+ $values_attribute =
phpgw::get_var('values_attribute');
+
+ $insert_record_agreement =
$GLOBALS['phpgw']->session->appsession('insert_record_values.agreement',
'property');
+ if (isset($insert_record_agreement) &&
is_array($insert_record_agreement))
+ {
+ for ($j = 0; $j <
count($insert_record_agreement); $j++)
+ {
+
$insert_record['extra'][$insert_record_agreement[$j]] =
$insert_record_agreement[$j];
+ }
+ }
+ if (isset($insert_record['extra']) &&
is_array($insert_record['extra']))
+ {
+ foreach ($insert_record['extra'] as
$key => $column)
+ {
+ if ($_POST[$key])
+ {
+
$values['extra'][$column] = phpgw::get_var($key, 'string', 'POST');
+ }
+ }
+ }
+
if (!$values['cat_id'])
{
$receipt['error'][] = array('msg' =>
lang('Please select a category !'));
}
+ if (!$values['name'])
+ {
+ $receipt['error'][] = array('msg' =>
lang('please enter a name !'));
+ }
+ if (!$values['descr'])
+ {
+ $receipt['error'][] = array('msg' =>
lang('please enter a description!'));
+ }
+ if (!$values['start_date'])
+ {
+ $receipt['error'][] = array('msg' =>
lang('please enter a start date!'));
+ }
+ if (!$values['end_date'])
+ {
+ $receipt['error'][] = array('msg' =>
lang('please enter a end date!'));
+ }
if ($id)
{
@@ -780,14 +816,18 @@
}
}
- $message =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
-
phpgwapi_cache::message_set($message[0]['msgbox_text'], 'message');
+ self::message_set($receipt);
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'property.uiagreement.edit',
'id' => $id));
}
else
{
- $this->edit();
+ self::message_set($receipt);
+ if (isset($receipt['error']) &&
(isset($values_attribute) && is_array($values_attribute)))
+ {
+ $values =
$this->bocommon->preserve_attribute_values($values, $values_attribute);
+ }
+ $this->edit($values);
}
}
else
@@ -996,71 +1036,27 @@
}
$id = isset($values['id']) && $values['id'] ?
$values['id'] : phpgw::get_var('id', 'int');
- $values = phpgw::get_var('values');
- $delete_item = phpgw::get_var('delete_item', 'bool');
- $activity_id = phpgw::get_var('activity_id', 'int');
- $active_tab = phpgw::get_var('tab', 'string',
'REQUEST', 'general');
-
$config = CreateObject('phpgwapi.config', 'property');
- $boalarm = CreateObject('property.boalarm');
- $receipt = array();
$get_items = false;
- $values_attribute = phpgw::get_var('values_attribute');
- $insert_record_agreement =
$GLOBALS['phpgw']->session->appsession('insert_record_values.agreement',
'property');
$tabs = array();
$tabs['general'] = array('label' => lang('general'),
'link' => '#general');
$active_tab = 'general';
$tabs['items'] = array('label' => lang('items'), 'link'
=> "#items");
- if (isset($insert_record_agreement) &&
is_array($insert_record_agreement))
- {
- for ($j = 0; $j <
count($insert_record_agreement); $j++)
- {
-
$insert_record['extra'][$insert_record_agreement[$j]] =
$insert_record_agreement[$j];
- }
- }
-
- $receipt = array();
- if (is_array($values))
- {
- if (isset($insert_record['extra']) &&
is_array($insert_record['extra']))
- {
- foreach ($insert_record['extra'] as
$key => $column)
- // while
(is_array($insert_record['extra']) && list($key,$column) =
each($insert_record['extra']))
- {
- if ($_POST[$key])
- {
-
$values['extra'][$column] = phpgw::get_var($key, 'string', 'POST');
- }
- }
- }
- if ((!isset($values['save']) ||
!$values['save']) && (!isset($values['apply']) || !$values['apply']) &&
(!isset($values['update']) || !$values['update']))
- {
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'property.uiagreement.index',
- 'role' => $this->role));
- }
- }
-
-
- $agreement =
$this->bo->read_single(array('agreement_id' => $id));
-
- /* Preserve attribute values from post */
- if (isset($receipt['error']) &&
(isset($values_attribute) && is_array($values_attribute)))
- {
- $agreement =
$this->bocommon->preserve_attribute_values($agreement, $values_attribute);
- }
-
$GLOBALS['phpgw']->jqcal->add_listener('values_start_date');
$GLOBALS['phpgw']->jqcal->add_listener('values_end_date');
$GLOBALS['phpgw']->jqcal->add_listener('values_termination_date');
if ($id)
{
- $this->cat_id = ($agreement['cat_id'] ?
$agreement['cat_id'] : $this->cat_id);
- $this->member_id = ($agreement['member_of'] ?
$agreement['member_of'] : $this->member_id);
+ $agreement =
$this->bo->read_single(array('agreement_id' => $id));
+ if($values)
+ {
+ $agreement = array_merge($agreement,
$values);
+ }
$list = $this->bo->read_details($id);
$content = $list;
@@ -1090,6 +1086,12 @@
);
}
}
+ else
+ {
+ $agreement = $values;
+ }
+ $this->cat_id = ($agreement['cat_id'] ?
$agreement['cat_id'] : $this->cat_id);
+ $this->member_id = ($agreement['member_of'] ?
$agreement['member_of'] : $this->member_id);
$link_data = array
(
@@ -1108,7 +1110,10 @@
$vendor_data =
$this->bocommon->initiate_ui_vendorlookup(array(
'vendor_id' => $agreement['vendor_id'],
- 'vendor_name' =>
isset($agreement['vendor_name']) ? $agreement['vendor_name'] : ''));
+ 'vendor_name' =>
isset($agreement['vendor_name']) ? $agreement['vendor_name'] : '',
+ 'required' => true
+ )
+ );
if ($agreement['vendor_id'])
{
@@ -1128,8 +1133,6 @@
'account_id' => isset($account_id) ?
$account_id : ''
));
- $msgbox_data = $this->bocommon->msgbox_data($receipt);
-
$table_add[] = array
(
'lang_add' => lang('add detail'),
@@ -1191,32 +1194,6 @@
unset($agreement['attributes']);
}
- //------JSON code-------------------
- //-- ALARMS ---
- else if (phpgw::get_var('phpgw_return_as') == 'json' &&
!$get_items)
- {
- $alarm_data =
$this->bocommon->initiate_ui_alarm(array(
- 'acl_location' => $this->acl_location,
- 'alarm_type' => 'agreement',
- 'type' => 'form',
- 'text' => 'Email notification',
- 'times' => isset($times) ? $times : '',
- 'id' => $id,
- 'method' => isset($method) ? $method :
'',
- 'data' => isset($data) ? $data : '',
- 'account_id' => isset($account_id) ?
$account_id : ''
- ));
- //$alarm_data['values'] = array();
- if (count($alarm_data['values']))
- {
- return
json_encode($alarm_data['values']);
- }
- else
- {
- return "";
- }
- }
-
//---datatable0
settings---------------------------------------------------
$requestUrl_Alarm = json_encode(self::link(array(
'menuaction' =>
'property.uiagreement.get_contentalarm',
@@ -1508,7 +1485,6 @@
'lang_file_action_statustext' => lang('Check to
delete file'),
'lang_upload_file' => lang('Upload file'),
'lang_file_statustext' => lang('Select file to
upload'),
- 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'edit_url' =>
$GLOBALS['phpgw']->link('/index.php', $link_data),
'cancel_url' =>
$GLOBALS['phpgw']->link('/index.php', $link_data_cancel),
'lang_id' => lang('ID'),
@@ -1564,6 +1540,7 @@
'lang_status' => lang('Status'),
'status_list' =>
$this->bo->select_status_list('select', $agreement['status']),
'status_name' => 'values[status]',
+ 'status_required' => true,
'lang_no_status' => lang('Select status'),
'textareacols' =>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] : 40,
'textarearows' =>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] : 6,
Modified: trunk/property/templates/base/admin.xsl
===================================================================
--- trunk/property/templates/base/admin.xsl 2016-03-25 12:37:00 UTC (rev
14860)
+++ trunk/property/templates/base/admin.xsl 2016-03-25 12:37:53 UTC (rev
14861)
@@ -1076,7 +1076,7 @@
<xsl:value-of select="cat_id"/>
</xsl:variable>
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<option value="{$cat_id}" selected="selected">
<xsl:value-of
disable-output-escaping="yes" select="name"/>
</option>
@@ -1092,7 +1092,7 @@
<!-- New template-->
<xsl:template match="tts_category">
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<option value="{cat_id}" selected="selected">
<xsl:value-of
disable-output-escaping="yes" select="name"/>
</option>
Modified: trunk/property/templates/base/admin_entity.xsl
===================================================================
--- trunk/property/templates/base/admin_entity.xsl 2016-03-25 12:37:00 UTC
(rev 14860)
+++ trunk/property/templates/base/admin_entity.xsl 2016-03-25 12:37:53 UTC
(rev 14861)
@@ -2263,7 +2263,7 @@
</td>
<td align="center">
<xsl:choose>
- <xsl:when
test="selected='selected'">
+ <xsl:when
test="selected='selected' or selected = 1>
<input
type="checkbox" name="values[lookup_entity][]" value="{id}" checked="checked"
onMouseout="window.status='';return true;">
<xsl:attribute name="onMouseover">
<xsl:text>window.status='</xsl:text>
@@ -2319,7 +2319,7 @@
</td>
<td align="center">
<xsl:choose>
- <xsl:when
test="selected='selected'">
+ <xsl:when
test="selected='selected' or selected = 1">
<input
type="checkbox" name="values[include_entity_for][]" value="{id}"
checked="checked" onMouseout="window.status='';return true;">
<xsl:attribute name="onMouseover">
<xsl:text>window.status='</xsl:text>
@@ -2375,7 +2375,7 @@
</td>
<td align="center">
<xsl:choose>
- <xsl:when
test="selected='selected'">
+ <xsl:when
test="selected='selected' or selected = 1">
<input
type="checkbox" name="values[start_entity_from][]" value="{id}"
checked="checked" onMouseout="window.status='';return true;">
</input>
</xsl:when>
Modified: trunk/property/templates/base/admin_location.xsl
===================================================================
--- trunk/property/templates/base/admin_location.xsl 2016-03-25 12:37:00 UTC
(rev 14860)
+++ trunk/property/templates/base/admin_location.xsl 2016-03-25 12:37:53 UTC
(rev 14861)
@@ -282,7 +282,7 @@
</td>
<td align="left">
<xsl:choose>
-
<xsl:when test="selected='selected'">
+
<xsl:when test="selected='selected' or selected = 1">
<input type="radio" name="values[{//column_name}]" value="{id}"
checked="checked" onMouseout="window.status='';return true;">
<xsl:attribute name="title">
<xsl:value-of select="//lang_config_statustext"/>
@@ -1106,7 +1106,7 @@
</td>
<td align="center">
<xsl:choose>
- <xsl:when
test="selected='selected'">
+ <xsl:when
test="selected='selected' or selected = 1">
<input
type="checkbox" name="values[list_info][{id}]" value="{id}" checked="checked"
onMouseout="window.status='';return true;">
<xsl:attribute name="title">
<xsl:value-of select="//lang_list_type_statustext"/>
Modified: trunk/property/templates/base/agreement.xsl
===================================================================
--- trunk/property/templates/base/agreement.xsl 2016-03-25 12:37:00 UTC (rev
14860)
+++ trunk/property/templates/base/agreement.xsl 2016-03-25 12:37:53 UTC (rev
14861)
@@ -22,146 +22,69 @@
<xsl:when test="add_activity">
<xsl:apply-templates select="add_activity"/>
</xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="list"/>
- </xsl:otherwise>
</xsl:choose>
</xsl:template>
<!-- New template-->
- <xsl:template match="list">
- <xsl:apply-templates select="menu"/>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <xsl:choose>
- <xsl:when test="msgbox_data != ''">
- <tr>
- <td align="left" colspan="3">
- <xsl:call-template
name="msgbox"/>
- </td>
- </tr>
- </xsl:when>
- </xsl:choose>
- <tr>
- <xsl:choose>
- <xsl:when test="member_of_list != ''">
- <td align="left">
- <xsl:call-template
name="filter_member_of"/>
- </td>
- </xsl:when>
- </xsl:choose>
- <td align="left">
- <xsl:call-template name="cat_filter"/>
- </td>
- <td align="left">
- <xsl:call-template
name="filter_vendor"/>
- </td>
- <td align="right">
- <xsl:call-template name="search_field"/>
- </td>
- <td valign="top">
- <table>
- <tr>
- <td class="small_text"
valign="top" align="left">
- <xsl:variable
name="link_columns">
-
<xsl:value-of select="link_columns"/>
- </xsl:variable>
- <xsl:variable
name="lang_columns_help">
-
<xsl:value-of select="lang_columns_help"/>
- </xsl:variable>
- <xsl:variable
name="lang_columns">
-
<xsl:value-of select="lang_columns"/>
- </xsl:variable>
- <a
href="javascript:var
w=window.open('{$link_columns}','','left=50,top=100,width=300,height=600')"
onMouseOver="overlib('{$lang_columns_help}', CAPTION, '{$lang_columns}')"
onMouseOut="nd()">
-
<xsl:value-of select="lang_columns"/>
- </a>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="8" width="100%">
- <xsl:call-template name="nextmatchs"/>
- </td>
- </tr>
- </table>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <xsl:call-template name="table_header"/>
- <xsl:call-template name="values"/>
- <xsl:choose>
- <xsl:when test="table_add!=''">
- <xsl:apply-templates
select="table_add"/>
- </xsl:when>
- </xsl:choose>
- </table>
- </xsl:template>
- <!-- New template-->
-
<xsl:template match="add_activity">
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes" select="tabs"/>
- <div id="general">
- <form class="pure-form pure-form-aligned">
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_id"/>
- </label>
- <xsl:value-of
select="value_agreement_id"/>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_name"/>
- </label>
- <input type="text" disabled="disabled"
name="values[name]" value="{value_name}" onMouseout="window.status='';return
true;">
- <xsl:attribute name="title">
- <xsl:value-of
select="lang_name_statustext"/>
- </xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_descr"/>
- </label>
- <textarea cols="60" disabled="disabled"
rows="6" name="values[descr]" onMouseout="window.status='';return true;">
- <xsl:attribute name="title">
- <xsl:value-of
select="lang_descr_statustext"/>
- </xsl:attribute>
- <xsl:value-of
select="value_descr"/>
- </textarea>
- </div>
- </form>
- <xsl:variable name="add_action">
- <xsl:value-of select="add_action"/>
- </xsl:variable>
- <form name="form2" method="post" class="pure-form
pure-form-aligned" action="{$add_action}" >
- <div class="pure-control-group">
- <div class="pure-custom"
style="display:inherit !important;">
- <xsl:for-each
select="datatable_def">
- <xsl:if
test="container = 'datatable-container_0'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="tabletools" select ='tabletools' />
-
<xsl:with-param name="data" select ='data' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
- </xsl:if>
- </xsl:for-each>
- </div>
- </div>
- <!--xsl:call-template name="table_header"/>
- <xsl:choose>
- <xsl:when test="values != ''">
- <xsl:call-template
name="values4"/>
- </xsl:when>
- </xsl:choose-->
- <div class="pure-control-group">
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
+ <div id="general">
+ <form class="pure-form pure-form-aligned">
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="lang_id"/>
+ </label>
+ <xsl:value-of
select="value_agreement_id"/>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="lang_name"/>
+ </label>
+ <input type="text"
disabled="disabled" name="values[name]" value="{value_name}">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="lang_name_statustext"/>
+ </xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="lang_descr"/>
+ </label>
+ <textarea cols="60"
disabled="disabled" rows="6" name="values[descr]">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="lang_descr_statustext"/>
+ </xsl:attribute>
+ <xsl:value-of
select="value_descr"/>
+ </textarea>
+ </div>
+ </form>
+ <xsl:variable name="add_action">
+ <xsl:value-of select="add_action"/>
+ </xsl:variable>
+ <form name="form2" method="post"
class="pure-form pure-form-aligned" action="{$add_action}" >
+ <div class="pure-control-group">
+ <div class="pure-custom"
style="display:inherit !important;">
+ <xsl:for-each
select="datatable_def">
+ <xsl:if
test="container = 'datatable-container_0'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl' />
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="config" select ='config' />
+
</xsl:call-template>
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+ </div>
+ <div class="pure-control-group">
<xsl:variable name="lang_save">
<xsl:value-of
select="lang_save"/>
</xsl:variable>
- <input type="submit"
class="pure-button pure-button-primary" name="values[save]"
value="{$lang_save}" onMouseout="window.status='';return true;">
+ <input type="submit"
class="pure-button pure-button-primary" name="values[save]"
value="{$lang_save}">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_save_statustext"/>
</xsl:attribute>
@@ -169,7 +92,7 @@
<xsl:variable name="lang_apply">
<xsl:value-of
select="lang_apply"/>
</xsl:variable>
- <input type="submit"
class="pure-button pure-button-primary" name="values[apply]"
value="{$lang_apply}" onMouseout="window.status='';return true;">
+ <input type="submit"
class="pure-button pure-button-primary" name="values[apply]"
value="{$lang_apply}">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_apply_statustext"/>
</xsl:attribute>
@@ -177,309 +100,34 @@
<xsl:variable
name="lang_cancel">
<xsl:value-of
select="lang_cancel"/>
</xsl:variable>
- <input type="submit"
class="pure-button pure-button-primary" name="values[cancel]"
value="{$lang_cancel}" onMouseout="window.status='';return true;">
+ <input type="submit"
class="pure-button pure-button-primary" name="values[cancel]"
value="{$lang_cancel}">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_cancel_statustext"/>
</xsl:attribute>
</input>
- </div>
- </form>
- </div>
- </div>
+ </div>
+ </form>
+ </div>
+ </div>
</xsl:template>
<!-- New template-->
- <xsl:template name="table_header">
- <tr class="th">
- <xsl:for-each select="table_header">
- <td class="th_text" width="{with}"
align="{align}">
- <xsl:choose>
- <xsl:when test="sort_link!=''">
- <a href="{sort}"
onMouseover="window.status='{header}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of
select="header"/>
- </a>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="header"/>
- </xsl:otherwise>
- </xsl:choose>
- </td>
- </xsl:for-each>
- </tr>
- </xsl:template>
-
- <!-- New template-->
- <xsl:template name="values">
- <xsl:for-each select="values">
- <tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of
select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod
2 = 0">
-
<xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:for-each select="row">
- <xsl:choose>
- <xsl:when test="link">
- <td class="small_text"
align="center">
- <a
href="{link}" onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return true;">
-
<xsl:value-of select="text"/>
- </a>
- </td>
- </xsl:when>
- <xsl:otherwise>
- <td class="small_text"
align="left">
- <xsl:value-of
select="value"/>
- </td>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- <xsl:choose>
- <xsl:when test="//acl_manage != '' and
total_cost!=''">
- <td align="center">
- <input type="hidden"
name="values[activity_id][{activity_id}]" value="{activity_id}"/>
- <input type="hidden"
name="values[id][{activity_id}]" value="{index_count}"/>
- <input type="checkbox"
name="values[select][{activity_id}]" value="{cost}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_select_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- </xsl:when>
- </xsl:choose>
- </tr>
- </xsl:for-each>
- </xsl:template>
-
- <!-- New template-->
- <xsl:template name="values2">
- <xsl:for-each select="values">
- <tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of
select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod
2 = 0">
-
<xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:for-each select="row">
- <xsl:choose>
- <xsl:when test="link">
- <td class="small_text"
align="center">
- <a
href="{link}" onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return true;">
-
<xsl:value-of select="text"/>
- </a>
- </td>
- </xsl:when>
- <xsl:otherwise>
- <td class="small_text"
align="left">
- <xsl:value-of
select="value"/>
- </td>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- <xsl:choose>
- <xsl:when test="//acl_manage != '' and
total_cost!=''">
- <input type="hidden"
name="values[id][{activity_id}]" value="{index_count}"/>
- <input type="hidden"
name="values[m_cost][{activity_id}]" value="{m_cost}"/>
- <input type="hidden"
name="values[w_cost][{activity_id}]" value="{w_cost}"/>
- <input type="hidden"
name="values[total_cost][{activity_id}]" value="{total_cost}"/>
- <input type="hidden"
name="values[select][0]" value="{activity_id}"/>
- </xsl:when>
- </xsl:choose>
- </tr>
- </xsl:for-each>
- </xsl:template>
-
- <!-- New template-->
- <xsl:template name="values3">
- <xsl:for-each select="values">
- <tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of
select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod
2 = 0">
-
<xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td class="small_text" align="left">
- <xsl:value-of select="activity_id"/>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="num"/>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="descr"/>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="unit"/>
- </td>
- <td class="small_text" align="right">
- <xsl:value-of select="m_cost"/>
- </td>
- <td class="small_text" align="right">
- <xsl:value-of select="w_cost"/>
- </td>
- <td class="small_text" align="right">
- <xsl:value-of select="total_cost"/>
- </td>
- <td class="small_text" align="right">
- <xsl:value-of select="this_index"/>
- </td>
- <td class="small_text" align="center">
- <xsl:value-of select="index_count"/>
- </td>
- <td class="small_text" align="center">
- <xsl:value-of select="index_date"/>
- </td>
- <xsl:choose>
- <xsl:when test="acl_read != ''">
- <td align="center">
- <xsl:variable
name="link_view">
- <xsl:value-of
select="link_view"/>
- </xsl:variable>
- <xsl:variable
name="lang_view_statustext">
- <xsl:value-of
select="lang_view_statustext"/>
- </xsl:variable>
- <a href="{$link_view}"
onMouseover="window.status='{$lang_view_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of
select="text_view"/>
- </a>
- </td>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="acl_edit != ''">
- <td align="center">
- <xsl:variable
name="link_edit">
- <xsl:value-of
select="link_edit"/>
- </xsl:variable>
- <xsl:variable
name="lang_edit_statustext">
- <xsl:value-of
select="lang_edit_statustext"/>
- </xsl:variable>
- <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of
select="text_edit"/>
- </a>
- </td>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="acl_delete != ''">
- <td align="center">
- <xsl:variable
name="link_delete">
- <xsl:value-of
select="link_delete"/>
- </xsl:variable>
- <xsl:variable
name="lang_delete_statustext">
- <xsl:value-of
select="lang_delete_statustext"/>
- </xsl:variable>
- <a
href="{$link_delete}"
onMouseover="window.status='{$lang_delete_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of
select="text_delete"/>
- </a>
- </td>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="acl_manage != '' and
total_cost!=''">
- <td align="center">
- <input type="hidden"
name="values[id][{activity_id}]" value="{index_count}"/>
- <input type="hidden"
name="values[m_cost][{activity_id}]" value="{m_cost}"/>
- <input type="hidden"
name="values[w_cost][{activity_id}]" value="{w_cost}"/>
- <input type="hidden"
name="values[total_cost][{activity_id}]" value="{total_cost}"/>
- <input type="checkbox"
name="values[select][]" value="{activity_id}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="title">
-
<xsl:value-of select="lang_select_statustext"/>
- </xsl:attribute>
- </input>
- </td>
- </xsl:when>
- </xsl:choose>
- </tr>
- </xsl:for-each>
- </xsl:template>
-
- <!-- New template-->
- <xsl:template name="values4">
- <xsl:for-each select="values">
- <tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of
select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod
2 = 0">
-
<xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td class="small_text" align="left">
- <xsl:value-of select="id"/>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="num"/>
- </td>
- <td class="small_text" align="right">
- <xsl:value-of select="base_descr"/>
- </td>
- <td class="small_text" align="right">
- <xsl:value-of select="descr"/>
- </td>
- <td class="small_text" align="right">
- <xsl:value-of select="unit"/>
- </td>
- <td class="small_text" align="right">
- <xsl:value-of select="ns3420"/>
- </td>
- <td align="center">
- <input type="checkbox"
name="values[select][]" value="{id}" onMouseout="window.status='';return true;">
- <xsl:attribute name="title">
- <xsl:value-of
select="lang_select_statustext"/>
- </xsl:attribute>
- </input>
- </td>
- </tr>
- </xsl:for-each>
- </xsl:template>
-
- <!-- New template-->
<xsl:template match="table_add">
<div class="pure-control-group">
-
- <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 class="pure-button
pure-button-primary" type="submit" name="add" value="{$lang_add}"
onMouseout="window.status='';return true;">
- <xsl:attribute name="title">
- <xsl:value-of
select="lang_add_statustext"/>
- </xsl:attribute>
- </input>
- </form>
+
+ <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 class="pure-button pure-button-primary"
type="submit" name="add" value="{$lang_add}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_add_statustext"/>
+ </xsl:attribute>
+ </input>
+ </form>
</div>
</xsl:template>
@@ -491,423 +139,363 @@
</script>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="tabs"/>
- <div id="general">
- <xsl:variable name="edit_url">
- <xsl:value-of
select="edit_url"/>
- </xsl:variable>
- <div class="pure-control-group">
- <form
ENCTYPE="multipart/form-data" class="pure-form pure-form-aligned" id="form"
method="post" name="form" action="{$edit_url}">
-
<fieldset>
-
<dl>
-
<xsl:choose>
-
<xsl:when test="msgbox_data != ''">
-
<dt>
-
<xsl:call-template name="msgbox"/>
-
</dt>
-
</xsl:when>
-
</xsl:choose>
-
</dl>
-
<xsl:choose>
-
<xsl:when test="value_agreement_id!=''">
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="lang_id"/>
-
</label>
-
<xsl:value-of select="value_agreement_id"/>
-
</div>
-
</xsl:when>
-
</xsl:choose>
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="lang_name"/>
-
</label>
-
-
<input type="text" name="values[name]" value="{value_name}"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_name_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
-
</div>
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="lang_status"/>
-
</label>
-
-
<xsl:call-template name="status_select"/>
-
-
</div>
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="lang_descr"/>
-
</label>
-
-
<textarea cols="60" rows="6" name="values[descr]"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_descr_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
<xsl:value-of select="value_descr"/>
-
</textarea>
-
-
</div>
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="lang_category"/>
-
</label>
-
-
<xsl:call-template name="cat_select"/>
-
-
</div>
-
<xsl:call-template name="vendor_form"/>
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="lang_agreement_group"/>
-
</label>
-
-
<xsl:variable name="lang_agreement_group_statustext">
-
<xsl:value-of select="lang_agreement_group_statustext"/>
-
</xsl:variable>
-
<select name="values[group_id]" class="forms"
onMouseover="window.status='{$lang_agreement_group_statustext}'; return true;"
onMouseout="window.status='';return true;">
-
<option value="">
-
<xsl:value-of select="lang_no_agreement_group"/>
-
</option>
-
<xsl:apply-templates select="agreement_group_list"/>
-
</select>
-
-
</div>
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="lang_start_date"/>
-
</label>
-
-
<input type="text" id="values_start_date"
name="values[start_date]" size="10" value="{value_start_date}"
readonly="readonly" onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of
select="lang_start_date_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
-
</div>
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="lang_end_date"/>
-
</label>
-
-
<input type="text" id="values_end_date" name="values[end_date]"
size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of
select="lang_end_date_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
-
</div>
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="lang_termination_date"/>
-
</label>
-
-
<input type="text" id="values_termination_date"
name="values[termination_date]" size="10" value="{value_termination_date}"
readonly="readonly" onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of
select="lang_termination_date_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
-
</div>
-
<xsl:choose>
-
<xsl:when test="files!=''">
-
<!-- <xsl:call-template name="file_list"/> -->
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="//lang_files"/>
-
</label>
-
-
<!-- DataTable 2 EDIT-->
-
<!--div id="datatable-container_2"/-->
-
<div class="pure-custom">
-
<xsl:for-each select="datatable_def">
-
<xsl:if test="container =
'datatable-container_2'">
-
<xsl:call-template
name="table_setup">
-
<xsl:with-param
name="container" select ='container'/>
-
<xsl:with-param
name="requestUrl" select ='requestUrl' />
-
<xsl:with-param
name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param
name="tabletools" select ='tabletools' />
-
<xsl:with-param
name="data" select ='data' />
-
<xsl:with-param
name="config" select ='config' />
-
</xsl:call-template>
-
</xsl:if>
-
</xsl:for-each>
-
</div>
-
</div>
-
</xsl:when>
-
</xsl:choose>
-
<xsl:choose>
-
<xsl:when test="fileupload = 1">
-
<xsl:call-template name="file_upload"/>
-
</xsl:when>
-
</xsl:choose>
-
<xsl:choose>
-
<xsl:when test="member_of_list != ''">
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="lang_member_of"/>
-
</label>
-
-
<xsl:variable name="lang_member_of_statustext">
-
<xsl:value-of
select="lang_member_of_statustext"/>
-
</xsl:variable>
-
<select name="values[member_of][]"
disabled="disabled" class="forms" multiple="multiple"
onMouseover="window.status='{$lang_member_of_statustext}'; return true;"
onMouseout="window.status='';return true;">
-
<xsl:apply-templates
select="member_of_list"/>
-
</select>
-
-
</div>
-
</xsl:when>
-
</xsl:choose>
-
<xsl:choose>
-
<xsl:when test="attributes_group != ''">
-
<xsl:call-template name="attributes_values"/>
-
</xsl:when>
-
</xsl:choose>
-
<div class="pure-control-group">
-
-
<xsl:variable name="lang_save">
-
<xsl:value-of select="lang_save"/>
-
</xsl:variable>
-
<input type="submit" class="pure-button pure-button-primary"
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return
true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_save_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
<!-- </td><td valign="bottom"> -->
-
<xsl:variable name="lang_apply">
-
<xsl:value-of select="lang_apply"/>
-
</xsl:variable>
-
<input type="submit" class="pure-button pure-button-primary"
name="values[apply]" value="{$lang_apply}" onMouseout="window.status='';return
true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_apply_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
<!-- </td><td align="right" valign="bottom">-->
-
<xsl:variable name="lang_cancel">
-
<xsl:value-of select="lang_cancel"/>
-
</xsl:variable>
-
<input type="button" class="pure-button pure-button-primary"
name="values[cancel]" value="{$lang_cancel}"
onMouseout="window.status='';return true;"
onClick="document.cancel_form.submit();">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_cancel_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
-
</div>
-
</fieldset>
- </form>
- <xsl:variable
name="cancel_url">
-
<xsl:value-of select="cancel_url"/>
- </xsl:variable>
- <form
name="cancel_form" id="cancel_form" method="post" action="{$cancel_url}"></form>
- </div>
+ <div id="general">
+ <xsl:variable name="edit_url">
+ <xsl:value-of select="edit_url"/>
+ </xsl:variable>
+ <div class="pure-control-group">
+ <form ENCTYPE="multipart/form-data"
class="pure-form pure-form-aligned" id="form" method="post" name="form"
action="{$edit_url}">
+ <fieldset>
+ <xsl:choose>
+ <xsl:when
test="value_agreement_id!=''">
+ <div
class="pure-control-group">
+
<label>
+
<xsl:value-of select="lang_id"/>
+
</label>
+
<xsl:value-of select="value_agreement_id"/>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="lang_name"/>
+ </label>
- <div class="pure-control-group">
- <form
method="post" name="alarm" action="{$edit_url}">
- <input
type="hidden" name="values[entity_id]" value="{value_agreement_id}"/>
-
<fieldset>
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="lang_alarm"/>
-
</label>
-
</div>
-
<!-- DataTable 0 EDIT-->
-
<div class="pure-control-group">
-
-
<!--div id="datatable-container_0"/-->
-
<div class="pure-custom">
-
<xsl:for-each select="datatable_def">
-
<xsl:if test="container = 'datatable-container_0'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container"
select ='container'/>
-
<xsl:with-param name="requestUrl"
select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs"
select ='ColumnDefs' />
-
<xsl:with-param name="tabletools"
select ='tabletools' />
-
<xsl:with-param name="data" select
='data' />
-
<xsl:with-param name="config"
select ='config' />
-
</xsl:call-template>
-
</xsl:if>
-
</xsl:for-each>
-
</div>
-
</div>
-
<!--tr>
-
<td class="center" align="right" colspan="10">
-
<div id="datatable-buttons_0"/>
-
</td>
-
</tr-->
-
<div class="pure-control-group">
-
-
<xsl:value-of select="alarm_data/add_alarm/lang_add_alarm"/>
-
<xsl:text> : </xsl:text>
-
<xsl:value-of
select="alarm_data/add_alarm/lang_day_statustext"/>
-
<xsl:value-of
select="alarm_data/add_alarm/lang_hour_statustext"/>
-
<xsl:value-of
select="alarm_data/add_alarm/lang_minute_statustext"/>
-
<xsl:value-of select="alarm_data/add_alarm/lang_user"/>
-
-
</div>
-
<div class="pure-control-group">
-
-
<!--div id="datatable-buttons_1"/-->
-
<select name="values[alarm_data/add_alarm/day_list]"
class="form" title="{lang_days_statustext}" id="day_list">
-
<xsl:apply-templates
select="alarm_data/add_alarm/day_list"/>
-
</select>
+ <input
type="text" name="values[name]" value="{value_name}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_name_statustext"/>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+ </input>
+ </div>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="lang_status"/>
+ </label>
+
<xsl:call-template name="status_select"/>
+ </div>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="lang_descr"/>
+ </label>
+ <textarea
cols="60" rows="6" name="values[descr]">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_descr_statustext"/>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:value-of select="value_descr"/>
+ </textarea>
+ </div>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="lang_category"/>
+ </label>
+
<xsl:call-template name="cat_select"/>
+ </div>
+ <xsl:call-template
name="vendor_form"/>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="lang_agreement_group"/>
+ </label>
-
<select name="values[alarm_data/add_alarm/hour_list]"
class="form" title="{alarm_data/add_alarm/lang_hour_statustext}" id="hour_list">
-
<xsl:apply-templates
select="alarm_data/add_alarm/hour_list"/>
-
</select>
+ <xsl:variable
name="lang_agreement_group_statustext">
+
<xsl:value-of select="lang_agreement_group_statustext"/>
+ </xsl:variable>
+ <select
name="values[group_id]" class="forms"
title="{$lang_agreement_group_statustext}">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+ <option
value="">
+
<xsl:value-of select="lang_no_agreement_group"/>
+
</option>
+
<xsl:apply-templates select="agreement_group_list"/>
+ </select>
+ </div>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="lang_start_date"/>
+ </label>
+ <input
type="text" id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_start_date_statustext"/>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+ </input>
+ </div>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="lang_end_date"/>
+ </label>
-
<select name="values[alarm_data/add_alarm/minute_list]"
class="form" title="{alarm_data/add_alarm/lang_minute_statustext}"
id="minute_list">
-
<xsl:apply-templates
select="alarm_data/add_alarm/minute_list"/>
-
</select>
+ <input
type="text" id="values_end_date" name="values[end_date]" size="10"
value="{value_end_date}" readonly="readonly">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_end_date_statustext"/>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+ </input>
+ </div>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="lang_termination_date"/>
+ </label>
-
<select name="values[alarm_data/add_alarm/user_list]"
class="form" title="{alarm_data/add_alarm/lang_user}" id="user_list">
-
<xsl:apply-templates
select="alarm_data/add_alarm/user_list"/>
-
</select>
-
<input type="hidden" id="agreementid" name="agreementid"
value="{value_agreement_id}" />
-
<input type="button" name="" value="Add"
id="values[add_alarm]" onClick="onAddClick_Alarm('add_alarm');"/>
-
-
</div>
-
<!-- <xsl:call-template name="alarm_form"/> -->
-
</fieldset>
- </form>
- </div>
- </div>
- <div id="items">
- <xsl:choose>
- <xsl:when
test="table_update!=''">
- <xsl:variable
name="update_action">
- <xsl:value-of
select="update_action"/>
- </xsl:variable>
- <form method="post"
name="form2" action="{$update_action}">
- <input
type="hidden" name="values[agreement_id]" value="{value_agreement_id}"/>
+ <input
type="text" id="values_termination_date" name="values[termination_date]"
size="10" value="{value_termination_date}" readonly="readonly">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_termination_date_statustext"/>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+ </input>
+ </div>
+ <xsl:choose>
+ <xsl:when
test="files!=''">
<div
class="pure-control-group">
-
<xsl:for-each select="set_column">
-
-
</xsl:for-each>
-
<xsl:variable name="link_download">
-
<xsl:value-of select="link_download"/>
-
</xsl:variable>
-
<xsl:variable name="lang_download_help">
-
<xsl:value-of select="lang_download_help"/>
-
</xsl:variable>
-
<xsl:variable name="lang_download">
-
<xsl:value-of select="lang_download"/>
-
</xsl:variable>
-
<a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
-
<xsl:value-of select="lang_download"/>
-
</a>
+
<label>
+
<xsl:value-of select="//lang_files"/>
+
</label>
+
<!-- DataTable 2 EDIT-->
+
<!--div id="datatable-container_2"/-->
+
<div class="pure-custom">
+
<xsl:for-each select="datatable_def">
+
<xsl:if test="container = 'datatable-container_2'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select
='container'/>
+
<xsl:with-param name="requestUrl" select
='requestUrl' />
+
<xsl:with-param name="ColumnDefs" select
='ColumnDefs' />
+
<xsl:with-param name="tabletools" select
='tabletools' />
+
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="config" select ='config'
/>
+
</xsl:call-template>
+
</xsl:if>
+
</xsl:for-each>
+
</div>
</div>
- <!--
DataTable 1 EDIT_ITEMS-->
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="fileupload = 1">
+
<xsl:call-template name="file_upload"/>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="member_of_list != ''">
<div
class="pure-control-group">
-
-
<div id="paging_1"> </div>
-
<!--div id="datatable-container_1"/-->
-
<div class="pure-custom">
-
<xsl:for-each select="datatable_def">
-
<xsl:if test="container = 'datatable-container_1'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select
='container'/>
-
<xsl:with-param name="requestUrl" select
='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select
='ColumnDefs' />
-
<xsl:with-param name="tabletools" select
='tabletools' />
-
<xsl:with-param name="data" select ='data'
/>
-
<xsl:with-param name="config" select
='config' />
-
</xsl:call-template>
-
</xsl:if>
-
</xsl:for-each>
-
</div>
-
<div id="contextmenu_1"/>
- </div>
- <br/>
- <div
class="pure-control-group">
- <!--
Buttons 2 -->
- <div
id="datatable-buttons_2" class="div-buttons">
-
<input class="mybottonsUpdates calendar-opt" type="text" id="values_date"
name="values[date]" size="10" value="{date}" readonly="readonly"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_date_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
<div style="width:25px;height:15px;position:relative;float:left;"></div>
-
<input id="new_index" class="mybottonsUpdates" type="inputText"
name="values[new_index]" size="12"/>
-
<input id="hd_values[update]" class="" type="hidden" name="values[update]"
value="Update"/>
-
<input type="button" name="" value="Update" id="values[update]"
onClick="onUpdateClickAlarm('update');"/>
+
<label>
+
<xsl:value-of select="lang_member_of"/>
+
</label>
+
<xsl:variable name="lang_member_of_statustext">
+
<xsl:value-of select="lang_member_of_statustext"/>
+
</xsl:variable>
+
<select name="values[member_of][]" disabled="disabled" class="forms"
multiple="multiple" title="window.status='{$lang_member_of_statustext}'; return
true;">
+
<xsl:apply-templates select="member_of_list"/>
+
</select>
</div>
- </div>
<!-- <xsl:apply-templates select="table_update"/> -->
- </form>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when
test="value_agreement_id!=''">
- <!--table width="100%"
cellpadding="2" cellspacing="2" align="center"-->
-
<xsl:apply-templates select="table_add"/>
- <!--/table-->
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="attributes_group != ''">
+
<xsl:call-template name="attributes_values"/>
+ </xsl:when>
+ </xsl:choose>
+ <div
class="pure-control-group">
+ <xsl:variable
name="lang_save">
+
<xsl:value-of select="lang_save"/>
+ </xsl:variable>
+ <input
type="submit" class="pure-button pure-button-primary" name="values[save]"
value="{$lang_save}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_save_statustext"/>
+
</xsl:attribute>
+ </input>
+ <!-- </td><td
valign="bottom"> -->
+ <xsl:variable
name="lang_apply">
+
<xsl:value-of select="lang_apply"/>
+ </xsl:variable>
+ <input
type="submit" class="pure-button pure-button-primary" name="values[apply]"
value="{$lang_apply}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_apply_statustext"/>
+
</xsl:attribute>
+ </input>
+ <!-- </td><td
align="right" valign="bottom">-->
+ <xsl:variable
name="lang_cancel">
+
<xsl:value-of select="lang_cancel"/>
+ </xsl:variable>
+ <input
type="button" class="pure-button pure-button-primary" name="values[cancel]"
value="{$lang_cancel}" onClick="document.cancel_form.submit();">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_cancel_statustext"/>
+
</xsl:attribute>
+ </input>
+ </div>
+ </fieldset>
+ </form>
+ <xsl:variable name="cancel_url">
+ <xsl:value-of
select="cancel_url"/>
+ </xsl:variable>
+ <form name="cancel_form"
id="cancel_form" method="post" action="{$cancel_url}"></form>
</div>
+ <div class="pure-control-group">
+ <form method="post" name="alarm"
action="{$edit_url}">
+ <input type="hidden"
name="values[entity_id]" value="{value_agreement_id}"/>
+ <fieldset>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="lang_alarm"/>
+ </label>
+ </div>
+ <!-- DataTable 0
EDIT-->
+ <div
class="pure-control-group">
+
+ <!--div
id="datatable-container_0"/-->
+ <div
class="pure-custom">
+
<xsl:for-each select="datatable_def">
+
<xsl:if test="container = 'datatable-container_0'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl' />
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="config" select ='config' />
+
</xsl:call-template>
+
</xsl:if>
+
</xsl:for-each>
+ </div>
+ </div>
+ <div
class="pure-control-group">
+ <xsl:value-of
select="alarm_data/add_alarm/lang_add_alarm"/>
+ <xsl:text> :
</xsl:text>
+ <xsl:value-of
select="alarm_data/add_alarm/lang_day_statustext"/>
+ <xsl:value-of
select="alarm_data/add_alarm/lang_hour_statustext"/>
+ <xsl:value-of
select="alarm_data/add_alarm/lang_minute_statustext"/>
+ <xsl:value-of
select="alarm_data/add_alarm/lang_user"/>
+ </div>
+ <div
class="pure-control-group">
+
+ <!--div
id="datatable-buttons_1"/-->
+ <select
name="values[alarm_data/add_alarm/day_list]" class="form"
title="{lang_days_statustext}" id="day_list">
+
<xsl:apply-templates select="alarm_data/add_alarm/day_list"/>
+ </select>
+
+ <select
name="values[alarm_data/add_alarm/hour_list]" class="form"
title="{alarm_data/add_alarm/lang_hour_statustext}" id="hour_list">
+
<xsl:apply-templates select="alarm_data/add_alarm/hour_list"/>
+ </select>
+
+ <select
name="values[alarm_data/add_alarm/minute_list]" class="form"
title="{alarm_data/add_alarm/lang_minute_statustext}" id="minute_list">
+
<xsl:apply-templates select="alarm_data/add_alarm/minute_list"/>
+ </select>
+
+ <select
name="values[alarm_data/add_alarm/user_list]" class="form"
title="{alarm_data/add_alarm/lang_user}" id="user_list">
+
<xsl:apply-templates select="alarm_data/add_alarm/user_list"/>
+ </select>
+ <input
type="hidden" id="agreementid" name="agreementid" value="{value_agreement_id}"
/>
+ <input
type="button" name="" value="Add" id="values[add_alarm]"
onClick="onAddClick_Alarm('add_alarm');"/>
+ </div>
+ <!-- <xsl:call-template
name="alarm_form"/> -->
+ </fieldset>
+ </form>
+ </div>
</div>
+ <div id="items">
+ <xsl:choose>
+ <xsl:when test="table_update!=''">
+ <xsl:variable
name="update_action">
+ <xsl:value-of
select="update_action"/>
+ </xsl:variable>
+ <form method="post"
name="form2" action="{$update_action}">
+ <input type="hidden"
name="values[agreement_id]" value="{value_agreement_id}"/>
+ <div
class="pure-control-group">
+ <xsl:for-each
select="set_column">
+
+ </xsl:for-each>
+ <xsl:variable
name="link_download">
+
<xsl:value-of select="link_download"/>
+ </xsl:variable>
+ <xsl:variable
name="lang_download_help">
+
<xsl:value-of select="lang_download_help"/>
+ </xsl:variable>
+ <xsl:variable
name="lang_download">
+
<xsl:value-of select="lang_download"/>
+ </xsl:variable>
+ <a
href="javascript:var w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
+
<xsl:value-of select="lang_download"/>
+ </a>
+ </div>
+ <!-- DataTable 1
EDIT_ITEMS-->
+ <div
class="pure-control-group">
+
+ <div
id="paging_1"> </div>
+ <!--div
id="datatable-container_1"/-->
+ <div
class="pure-custom">
+
<xsl:for-each select="datatable_def">
+
<xsl:if test="container = 'datatable-container_1'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl' />
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="config" select ='config' />
+
</xsl:call-template>
+
</xsl:if>
+
</xsl:for-each>
+ </div>
+ <div
id="contextmenu_1"/>
+ </div>
+ <br/>
+ <div
class="pure-control-group">
+ <!-- Buttons 2
-->
+ <div
id="datatable-buttons_2" class="div-buttons">
+ <input
class="mybottonsUpdates calendar-opt" type="text" id="values_date"
name="values[date]" size="10" value="{date}" readonly="readonly">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_date_statustext"/>
+
</xsl:attribute>
+ </input>
+ <div
style="width:25px;height:15px;position:relative;float:left;"></div>
+ <input
id="new_index" class="mybottonsUpdates" type="inputText"
name="values[new_index]" size="12"/>
+ <input
id="hd_values[update]" class="" type="hidden" name="values[update]"
value="Update"/>
+ <input
type="button" name="" value="Update" id="values[update]"
onClick="onUpdateClickAlarm('update');"/>
+ </div>
+ </div> <!--
<xsl:apply-templates select="table_update"/> -->
+ </form>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="value_agreement_id!=''">
+ <!--table width="100%"
cellpadding="2" cellspacing="2" align="center"-->
+ <xsl:apply-templates
select="table_add"/>
+ <!--/table-->
+ </xsl:when>
+ </xsl:choose>
+ </div>
+ </div>
<!-- DATATABLE DEFINITIONS-->
<style type="text/css">
.calendar-opt
{
- position:relative;
- float:left;
+ position:relative;
+ float:left;
}
.index-opt
{
- position:relative;
- float:left;
- margin-top:2px;
+ position:relative;
+ float:left;
+ margin-top:2px;
}
.div-buttons
{
- height:50px;
+ height:50px;
}
</style>
<script type="text/javascript">
- var property_js = <xsl:value-of select="property_js"/>;
var base_java_url = <xsl:value-of
select="base_java_url"/>;
- var datatable = new Array();
- var myColumnDefs = new Array();
- var myButtons = new Array();
-
- <xsl:for-each select="datatable">
- datatable[<xsl:value-of select="name"/>] = [
- {
- values:<xsl:value-of
select="values"/>,
- total_records: <xsl:value-of
select="total_records"/>,
- permission:<xsl:value-of
select="permission"/>,
- is_paginator: <xsl:value-of
select="is_paginator"/>,
- footer:<xsl:value-of
select="footer"/>
- }
- ]
- </xsl:for-each>
-
- <xsl:for-each select="myColumnDefs">
- myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
-
- <xsl:for-each select="myButtons">
- myButtons[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
</script>
</xsl:template>
@@ -916,279 +504,216 @@
<script type="text/javascript">
self.name="first_Window";
<xsl:value-of select="lookup_functions"/>
- </script>
- <!-- 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 datatable = new Array();
- var myColumnDefs = new Array();
- var myButtons = new Array();
-
- <xsl:for-each select="datatable">
- datatable[<xsl:value-of select="name"/>] = [
- {
- values:<xsl:value-of
select="values"/>,
- total_records: <xsl:value-of
select="total_records"/>,
- is_paginator: <xsl:value-of
select="is_paginator"/>,
- footer:<xsl:value-of
select="footer"/>
- }
- ]
- </xsl:for-each>
-
- <xsl:for-each select="myColumnDefs">
- myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
-
- <xsl:for-each select="myButtons">
- myButtons[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
</script>
<xsl:variable name="edit_url">
<xsl:value-of select="edit_url"/>
</xsl:variable>
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes" select="tabs"/>
- <div id="general">
- <div align="left">
- <form name="form" class="pure-form
pure-form-aligned" method="post" action="{$edit_url}">
- <dl>
- <xsl:choose>
- <xsl:when test="msgbox_data !=
''">
- <dt>
-
<xsl:call-template name="msgbox"/>
- </dt>
- </xsl:when>
- </xsl:choose>
- </dl>
- <xsl:choose>
- <xsl:when
test="value_agreement_id!=''">
- <div
class="pure-control-group">
- <label>
-
<xsl:value-of select="lang_agreement"/>
- </label>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
+ <div id="general">
+ <div align="left">
+ <form name="form" class="pure-form
pure-form-aligned" method="post" action="{$edit_url}">
+ <dl>
+ <xsl:choose>
+ <xsl:when
test="msgbox_data != ''">
+ <dt>
+
<xsl:call-template name="msgbox"/>
+ </dt>
+ </xsl:when>
+ </xsl:choose>
+ </dl>
+ <xsl:choose>
+ <xsl:when
test="value_agreement_id!=''">
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="lang_agreement"/>
+ </label>
<xsl:value-of select="value_agreement_id"/>
<xsl:text> [</xsl:text>
<xsl:value-of select="agreement_name"/>
<xsl:text>] </xsl:text>
- </div>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="value_id!=''">
- <div
class="pure-control-group">
- <label>
-
<xsl:value-of select="lang_id"/>
- </label>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="value_id!=''">
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="lang_id"/>
+ </label>
<xsl:value-of select="value_id"/>
<xsl:text> [</xsl:text>
<xsl:value-of select="value_num"/>
<xsl:text>] </xsl:text>
- </div>
- <div
class="pure-control-group">
- <label>
-
<xsl:value-of select="lang_descr"/>
- </label>
+ </div>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="lang_descr"/>
+ </label>
<xsl:value-of select="activity_descr"/>
- </div>
- </xsl:when>
- </xsl:choose>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="lang_m_cost"/>
- </label>
- <input type="text"
name="values[m_cost]" value="{value_m_cost}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="lang_m_cost"/>
+ </label>
+ <input type="text"
name="values[m_cost]" value="{value_m_cost}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_m_cost_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="lang_w_cost"/>
- </label>
- <input type="text"
name="values[w_cost]" value="{value_w_cost}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="lang_w_cost"/>
+ </label>
+ <input type="text"
name="values[w_cost]" value="{value_w_cost}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_w_cost_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="lang_total_cost"/>
- </label>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="lang_total_cost"/>
+ </label>
<xsl:value-of
select="value_total_cost"/>
- </div>
- <xsl:choose>
- <xsl:when
test="attributes_values != ''">
- <div
class="pure-control-group">
-
+ </div>
+ <xsl:choose>
+ <xsl:when
test="attributes_values != ''">
+ <div
class="pure-control-group">
<xsl:call-template name="attributes_form"/>
-
- </div>
- </xsl:when>
- </xsl:choose>
- <div class="pure-control-group">
+ </div>
+ </xsl:when>
+ </xsl:choose>
+ <div class="pure-control-group">
<input type="hidden"
name="values[index_count]" value="{index_count}"/>
<xsl:variable
name="lang_save">
<xsl:value-of
select="lang_save"/>
</xsl:variable>
- <input
type="submit" class="pure-button pure-button-primary" name="values[save]"
value="{$lang_save}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit"
class="pure-button pure-button-primary" name="values[save]"
value="{$lang_save}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_save_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
-
<xsl:variable
name="lang_apply">
<xsl:value-of
select="lang_apply"/>
</xsl:variable>
- <input
type="submit" class="pure-button pure-button-primary" name="values[apply]"
value="{$lang_apply}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit"
class="pure-button pure-button-primary" name="values[apply]"
value="{$lang_apply}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_apply_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
-
<xsl:variable
name="lang_cancel">
<xsl:value-of
select="lang_cancel"/>
</xsl:variable>
- <input
type="submit" class="pure-button pure-button-primary" name="values[cancel]"
value="{$lang_cancel}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit"
class="pure-button pure-button-primary" name="values[cancel]"
value="{$lang_cancel}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_cancel_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
- </div>
- </form>
- <xsl:choose>
- <xsl:when test="values != ''">
- <xsl:variable name="update_action">
- <xsl:value-of
select="update_action"/>
- </xsl:variable>
- <form method="post" name="form2"
action="{$update_action}">
- <input type="hidden"
name="values[agreement_id]" value="{value_agreement_id}"/>
- <style type="text/css">
- .calendar-opt
- {
-
position:relative;
- float:left;
- }
- .index-opt
- {
-
position:relative;
- float:left;
- margin-top:2px;
- }
- .div-buttons
- {
-
position:relative;
- float:left;
- width:750px;
- height:100px;
- }
- </style>
- <fieldset>
- <div
class="pure-control-group">
- <label>
- <br/>
- </label>
- </div>
- <!-- DataTable 0
EDIT_ITEM-->
- <div
class="pure-control-group">
-
<!--div id="datatable-container_0"></div-->
-
<div class="pure-custom">
-
<xsl:for-each select="datatable_def">
-
<xsl:if test="container = 'datatable-container_0'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl'
/>
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'
/>
-
<xsl:with-param name="tabletools" select ='tabletools'
/>
-
<xsl:with-param name="data" select ='data' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
-
</xsl:if>
-
</xsl:for-each>
-
</div>
- </div>
- <div
class="pure-control-group">
- <label>
- <br/>
- </label>
- </div>
- <div
class="pure-control-group">
- <div
id="datatable-buttons_0" class="div-buttons">
-
<input type="text" id="values_date" class="calendar-opt" name="values[date]"
size="10" value="{date}" readonly="readonly"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_date_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
<div style="width:25px;height:15px;position:relative;float:left;"></div>
-
<input type="hidden" id="agreementid" name="agreementid"
value="{value_agreement_id}" />
-
<input id="new_index" class="mybottonsUpdates" type="inputText"
name="values[new_index]" size="12"/>
-
<input id="hd_values[update]" class="" type="hidden" name="values[update]"
value="Update"/>
-
<input type="button" name="" value="Update" id="values[update]"
onClick="onUpdateClickItems('update_item');"/>
-
<input type="button" name="" value="delete las index" id="values[delete]"
onClick="onActionsClickDeleteLastIndex('delete_item');"/>
+ </div>
+ </form>
+ <xsl:choose>
+ <xsl:when test="values != ''">
+ <xsl:variable
name="update_action">
+ <xsl:value-of
select="update_action"/>
+ </xsl:variable>
+ <form method="post"
name="form2" action="{$update_action}">
+ <input
type="hidden" name="values[agreement_id]" value="{value_agreement_id}"/>
+ <style
type="text/css">
+
.calendar-opt
+ {
+
position:relative;
+
float:left;
+ }
+
.index-opt
+ {
+
position:relative;
+
float:left;
+
margin-top:2px;
+ }
+
.div-buttons
+ {
+
position:relative;
+
float:left;
+
width:750px;
+
height:100px;
+ }
+ </style>
+ <fieldset>
+ <div
class="pure-control-group">
+
<label>
+
<br/>
+
</label>
</div>
- </div>
- </fieldset>
- <!--
- <table width="100%" cellpadding="2" cellspacing="2" align="center">
- <xsl:call-template name="table_header"/>
- <xsl:call-template name="values2"/>
- </table>
- <table width="70%" cellpadding="2" cellspacing="2" align="center">
- <xsl:choose>
- <xsl:when test="table_update!=''">
- <xsl:apply-templates select="table_update"/>
- </xsl:when>
- </xsl:choose>
- <tr>
- <td></td><td></td>
- <td class="small_text" align="left">
- <a href="{delete_action}"
onMouseover="window.status='{lang_delete_last_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_delete_last"/></a>
- </td>
- </tr>
+ <!--
DataTable 0 EDIT_ITEM-->
+ <div
class="pure-control-group">
+
<!--div id="datatable-container_0"></div-->
+
<div class="pure-custom">
+
<xsl:for-each select="datatable_def">
+
<xsl:if test="container = 'datatable-container_0'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select
='container'/>
+
<xsl:with-param name="requestUrl" select
='requestUrl' />
+
<xsl:with-param name="ColumnDefs" select
='ColumnDefs' />
+
<xsl:with-param name="tabletools" select
='tabletools' />
+
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="config" select ='config'
/>
+
</xsl:call-template>
+
</xsl:if>
+
</xsl:for-each>
+
</div>
+ </div>
+ <div
class="pure-control-group">
+
<label>
+
<br/>
+
</label>
+ </div>
+ <div
class="pure-control-group">
+
<div id="datatable-buttons_0" class="div-buttons">
+
<input type="text" id="values_date" class="calendar-opt"
name="values[date]" size="10" value="{date}" readonly="readonly">
+
<xsl:attribute name="title">
- </table>
- -->
- </form>
- </xsl:when>
- </xsl:choose>
+
<xsl:value-of select="lang_date_statustext"/>
+
+
</xsl:attribute>
+
</input>
+
<div style="width:25px;height:15px;position:relative;float:left;"></div>
+
<input type="hidden" id="agreementid" name="agreementid"
value="{value_agreement_id}" />
+
<input id="new_index" class="mybottonsUpdates" type="inputText"
name="values[new_index]" size="12"/>
+
<input id="hd_values[update]" class="" type="hidden"
name="values[update]" value="Update"/>
+
<input type="button" name="" value="Update" id="values[update]"
onClick="onUpdateClickItems('update_item');"/>
+
<input type="button" name="" value="delete las index"
id="values[delete]" onClick="onActionsClickDeleteLastIndex('delete_item');"/>
+
</div>
+ </div>
+ </fieldset>
+
+ </form>
+ </xsl:when>
+ </xsl:choose>
+ </div>
+ </div>
</div>
- </div>
- </div>
-</xsl:template>
+ </xsl:template>
<!-- New template-->
-<xsl:template match="table_update">
+ <xsl:template match="table_update">
<tr>
<td>
<xsl:value-of select="lang_new_index"/>
- <input type="text" name="values[new_index]"
size="12" onMouseout="window.status='';return true;">
- <xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text" name="values[new_index]"
size="12">
+ <xsl:attribute name="title">
<xsl:value-of
select="lang_new_index_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
</td>
<td>
- <input type="text" id="values_date"
name="values[date]" size="10" value="{date}" readonly="readonly"
onMouseout="window.status='';return true;">
- <xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text" id="values_date"
name="values[date]" size="10" value="{date}" readonly="readonly">
+ <xsl:attribute name="title">
<xsl:value-of
select="lang_date_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -1196,206 +721,187 @@
<xsl:variable name="lang_update">
<xsl:value-of select="lang_update"/>
</xsl:variable>
- <input type="submit" name="values[update]"
value="{$lang_update}" onMouseout="window.status='';return true;">
- <xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit" name="values[update]"
value="{$lang_update}">
+ <xsl:attribute name="title">
<xsl:value-of
select="lang_update_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
</td>
</tr>
-</xsl:template>
+ </xsl:template>
<!-- view -->
-<xsl:template match="view">
- <script type="text/javascript">
- self.name="first_Window";
- <xsl:value-of select="lookup_functions"/>
- </script>
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes" select="tabs"/>
- <div class="yui-content">
- <div id="general">
- <div class="pure-control-group">
- <form ENCTYPE="multipart/form-data"
class="pure-form pure-form-aligned" id="form" method="post" name="form"
action="">
- <div class="pure-control-group">
- <label>
+ <xsl:template match="view">
+ <script type="text/javascript">
+ self.name="first_Window";
+ <xsl:value-of select="lookup_functions"/>
+ </script>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
+ <div class="yui-content">
+ <div id="general">
+ <div class="pure-control-group">
+ <form
ENCTYPE="multipart/form-data" class="pure-form pure-form-aligned" id="form"
method="post" name="form" action="">
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="lang_id"/>
- </label>
-
-
<xsl:value-of select="value_agreement_id"/>
-
- </div>
- <div class="pure-control-group">
- <label>
+ </label>
+ <xsl:value-of
select="value_agreement_id"/>
+ </div>
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="lang_name"/>
- </label>
-
-
<xsl:value-of select="value_name"/>
-
- </div>
- <div class="pure-control-group">
- <label>
+ </label>
+ <xsl:value-of
select="value_name"/>
+ </div>
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="lang_status"/>
- </label>
+ </label>
<xsl:for-each
select="status_list">
<xsl:choose>
-
<xsl:when test="selected='selected'">
-
<xsl:value-of select="name"/>
+
<xsl:when test="selected='selected' or selected = 1">
+
<xsl:value-of select="name"/>
</xsl:when>
</xsl:choose>
</xsl:for-each>
- </div>
- <div class="pure-control-group">
- <label>
+ </div>
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="lang_descr"/>
- </label>
-
<textarea disabled="disabled" cols="60" rows="6" name="values[descr]"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_descr_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
<xsl:value-of select="value_descr"/>
-
</textarea>
- </div>
- <div class="pure-control-group">
- <label>
+ </label>
+ <textarea
disabled="disabled" cols="60" rows="6" name="values[descr]">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_descr_statustext"/>
+
</xsl:attribute>
+
<xsl:value-of select="value_descr"/>
+ </textarea>
+ </div>
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="lang_category"/>
- </label>
+ </label>
<xsl:for-each
select="cat_list">
<xsl:choose>
-
<xsl:when test="selected='selected'">
-
<xsl:value-of select="name"/>
+
<xsl:when test="selected='selected' or selected = 1">
+
<xsl:value-of select="name"/>
</xsl:when>
</xsl:choose>
</xsl:for-each>
- </div>
+ </div>
<xsl:call-template
name="vendor_view"/>
- <div class="pure-control-group">
- <label>
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="lang_agreement_group"/>
- </label>
+ </label>
<xsl:for-each
select="agreement_group_list">
<xsl:choose>
-
<xsl:when test="selected='selected'">
-
<xsl:value-of select="name"/>
+
<xsl:when test="selected='selected' or selected = 1">
+
<xsl:value-of select="name"/>
</xsl:when>
</xsl:choose>
</xsl:for-each>
- </div>
- <div class="pure-control-group">
- <label>
+ </div>
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="lang_start_date"/>
- </label>
- <input
type="text" id="start_date" name="start_date" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;"/>
- </div>
- <div class="pure-control-group">
- <label>
+ </label>
+ <input
type="text" id="start_date" name="start_date" size="10"
value="{value_start_date}" readonly="readonly"/>
+ </div>
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="lang_end_date"/>
- </label>
- <input
type="text" id="end_date" name="end_date" size="10" value="{value_end_date}"
readonly="readonly" onMouseout="window.status='';return true;"/>
- </div>
- <div class="pure-control-group">
- <label>
+ </label>
+ <input
type="text" id="end_date" name="end_date" size="10" value="{value_end_date}"
readonly="readonly"/>
+ </div>
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="lang_termination_date"/>
- </label>
-
- <input
type="text" id="termination_date" name="termination_date" size="10"
value="{value_termination_date}" readonly="readonly"
onMouseout="window.status='';return true;"/>
-
- </div>
+ </label>
+ <input
type="text" id="termination_date" name="termination_date" size="10"
value="{value_termination_date}" readonly="readonly"/>
+ </div>
<xsl:choose>
<xsl:when
test="files!=''">
<!--
<xsl:call-template name="file_list_view"/> -->
- <div
class="pure-control-group">
- <label>
+ <div
class="pure-control-group">
+
<label>
<xsl:value-of select="//lang_files"/>
- </label>
-
-
<!-- DataTable 2 VIEW-->
- <!--div
id="datatable-container_2"></div-->
- <div
class="pure-custom">
-
<xsl:for-each select="datatable_def">
-
<xsl:if test="container = 'datatable-container_2'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl'
/>
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'
/>
-
<xsl:with-param name="tabletools" select ='tabletools'
/>
-
<xsl:with-param name="data" select ='data' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
-
</xsl:if>
-
</xsl:for-each>
+
</label>
+
+
<!-- DataTable 2 VIEW-->
+
<!--div id="datatable-container_2"></div-->
+
<div class="pure-custom">
+
<xsl:for-each select="datatable_def">
+
<xsl:if test="container = 'datatable-container_2'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select
='container'/>
+
<xsl:with-param name="requestUrl" select
='requestUrl' />
+
<xsl:with-param name="ColumnDefs" select
='ColumnDefs' />
+
<xsl:with-param name="tabletools" select
='tabletools' />
+
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="config" select ='config'
/>
+
</xsl:call-template>
+
</xsl:if>
+
</xsl:for-each>
+
</div>
</div>
-
- </div>
</xsl:when>
</xsl:choose>
<xsl:choose>
<xsl:when
test="attributes_view != ''">
- <div
class="pure-control-group">
- <!--td
colspan="2" width="50%" align="left"-->
-
<xsl:apply-templates select="attributes_view"/>
-
<!--/td-->
- </div>
+ <div
class="pure-control-group">
+
<xsl:apply-templates select="attributes_view"/>
+ </div>
</xsl:when>
</xsl:choose>
<xsl:choose>
<xsl:when
test="member_of_list != ''">
- <div
class="pure-control-group">
- <label>
+ <div
class="pure-control-group">
+
<label>
<xsl:value-of select="lang_member_of"/>
- </label>
-
-
<xsl:variable name="lang_member_of_statustext">
-
<xsl:value-of select="lang_member_of_statustext"/>
-
</xsl:variable>
-
<select disabled="disabled" name="values[member_of][]" class="forms"
multiple="multiple" onMouseover="window.status='{$lang_member_of_statustext}';
return true;" onMouseout="window.status='';return true;">
-
<xsl:apply-templates select="member_of_list"/>
-
</select>
-
- </div>
+
</label>
+
<xsl:variable name="lang_member_of_statustext">
+
<xsl:value-of select="lang_member_of_statustext"/>
+
</xsl:variable>
+
<select disabled="disabled" name="values[member_of][]" class="forms"
multiple="multiple" title="window.status='{$lang_member_of_statustext}'; return
true;">
+
<xsl:apply-templates select="member_of_list"/>
+
</select>
+ </div>
</xsl:when>
</xsl:choose>
- </form>
- </div>
- <div class="pure-control-group">
- <fieldset>
- <div class="pure-control-group">
- <label>
+ </form>
+ </div>
+ <div class="pure-control-group">
+ <fieldset>
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="lang_alarm"/>
- </label>
- </div>
- <div class="pure-control-group">
-
- <!--
DataTable 0 VIEW -->
- <!--div
id="datatable-container_0"></div-->
- <div
class="pure-custom">
- <xsl:for-each
select="datatable_def">
- <xsl:if
test="container = 'datatable-container_0'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="tabletools" select ='tabletools' />
-
<xsl:with-param name="data" select ='data' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
-
</xsl:if>
- </xsl:for-each>
+ </label>
</div>
-
- </div>
- </fieldset>
+ <div
class="pure-control-group">
+ <!-- DataTable
0 VIEW -->
+ <div
class="pure-custom">
+
<xsl:for-each select="datatable_def">
+
<xsl:if test="container = 'datatable-container_0'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl' />
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="config" select ='config' />
+
</xsl:call-template>
+
</xsl:if>
+
</xsl:for-each>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</div>
- </div>
- <div id="items">
- <xsl:choose>
- <xsl:when test="values!=''">
- <div class="pure-control-group">
-
+ <div id="items">
+ <xsl:choose>
+ <xsl:when test="values!=''">
+ <div
class="pure-control-group">
<xsl:variable
name="link_download">
<xsl:value-of select="link_download"/>
</xsl:variable>
@@ -1412,105 +918,60 @@
<xsl:value-of
select="lang_total_records"/>
<xsl:text>
</xsl:text>
<xsl:value-of
select="num_records"/>
-
- </div>
-
- <div class="pure-control-group">
- <div id="paging_1">
</div>
- <!--div
id="datatable-container_1"/-->
- <div
class="pure-custom">
- <xsl:for-each
select="datatable_def">
- <xsl:if
test="container = 'datatable-container_1'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="tabletools" select ='tabletools' />
-
<xsl:with-param name="data" select ='data' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
-
</xsl:if>
- </xsl:for-each>
</div>
- <div
id="contextmenu_1"/>
-
- </div>
- </xsl:when>
- </xsl:choose>
+ <div
class="pure-control-group">
+ <div
id="paging_1"> </div>
+ <!--div
id="datatable-container_1"/-->
+ <div
class="pure-custom">
+
<xsl:for-each select="datatable_def">
+
<xsl:if test="container = 'datatable-container_1'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl' />
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="config" select ='config' />
+
</xsl:call-template>
+
</xsl:if>
+
</xsl:for-each>
+ </div>
+ <div
id="contextmenu_1"/>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+ </div>
</div>
- <!--table width="80%" cellpadding="2" cellspacing="2"
align="center">
+ </div>
+ <div class="proplist-col">
+ <table cellpadding="2" cellspacing="2" align="left">
<xsl:variable name="edit_url">
<xsl:value-of select="edit_url"/>
</xsl:variable>
<form name="form" method="post"
action="{$edit_url}">
- <tr height="50">
+ <tr>
<td align="left"
valign="bottom">
<xsl:variable
name="lang_cancel">
<xsl:value-of
select="lang_cancel"/>
</xsl:variable>
- <input type="submit"
class="pure-button pure-button-primary" name="values[cancel]"
value="{$lang_cancel}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit"
class="pure-button pure-button-primary" name="values[cancel]"
value="{$lang_cancel}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_cancel_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
</tr>
</form>
- </table-->
- </div>
- </div>
- <div class="proplist-col">
- <table cellpadding="2" cellspacing="2" align="left">
- <xsl:variable name="edit_url">
- <xsl:value-of select="edit_url"/>
- </xsl:variable>
- <form name="form" method="post" action="{$edit_url}">
- <tr>
- <td align="left" valign="bottom">
- <xsl:variable
name="lang_cancel">
- <xsl:value-of
select="lang_cancel"/>
- </xsl:variable>
- <input type="submit"
class="pure-button pure-button-primary" name="values[cancel]"
value="{$lang_cancel}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_cancel_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- </tr>
- </form>
</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 datatable = new Array();
- var myColumnDefs = new Array();
-
- <xsl:for-each select="datatable">
- datatable[<xsl:value-of select="name"/>] = [
- {
- values:<xsl:value-of
select="values"/>,
- total_records: <xsl:value-of
select="total_records"/>,
- is_paginator: <xsl:value-of
select="is_paginator"/>,
- footer:<xsl:value-of
select="footer"/>
- }
- ]
- </xsl:for-each>
-
- <xsl:for-each select="myColumnDefs">
- myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
-
</script>
-</xsl:template>
+ </xsl:template>
<!-- view item -->
-<xsl:template match="view_item">
+ <xsl:template match="view_item">
<div align="left">
<table cellpadding="2" cellspacing="2" width="79%"
align="center">
<xsl:choose>
@@ -1603,21 +1064,21 @@
<tr>
<td colspan="2"
width="50%" align="left">
<br/>
- <!--div
id="datatable-container_0"></div-->
- <div
class="pure-custom">
- <xsl:for-each
select="datatable_def">
- <xsl:if
test="container = 'datatable-container_0'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="tabletools" select ='tabletools' />
-
<xsl:with-param name="data" select ='data' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
-
</xsl:if>
- </xsl:for-each>
- </div>
+ <!--div
id="datatable-container_0"></div-->
+ <div
class="pure-custom">
+
<xsl:for-each select="datatable_def">
+
<xsl:if test="container = 'datatable-container_0'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl' />
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="config" select ='config' />
+
</xsl:call-template>
+
</xsl:if>
+
</xsl:for-each>
+ </div>
</td>
</tr>
</xsl:when>
@@ -1633,11 +1094,9 @@
<xsl:variable
name="lang_cancel">
<xsl:value-of
select="lang_cancel"/>
</xsl:variable>
- <input type="submit"
name="cancel" class="pure-button pure-button-primary" value="{$lang_cancel}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit"
name="cancel" class="pure-button pure-button-primary" value="{$lang_cancel}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_cancel_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -1647,31 +1106,12 @@
</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 datatable = new Array();
- var myColumnDefs = new Array();
-
- <xsl:for-each select="datatable">
- datatable[<xsl:value-of select="name"/>] = [
- {
- values:<xsl:value-of
select="values"/>,
- total_records: <xsl:value-of
select="total_records"/>,
- is_paginator: <xsl:value-of
select="is_paginator"/>,
- footer:<xsl:value-of
select="footer"/>
- }
- ]
- </xsl:for-each>
-
- <xsl:for-each select="myColumnDefs">
- myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
-
</script>
-</xsl:template>
+ </xsl:template>
<!-- New template-->
-<xsl:template match="table_add2">
+ <xsl:template match="table_add2">
<tr>
<td height="50">
<xsl:variable name="add_action">
@@ -1681,11 +1121,9 @@
<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">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit" name="add"
value="{$lang_add}">
+ <xsl:attribute name="title">
<xsl:value-of
select="lang_add_standardtext"/>
- <xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
</form>
@@ -1698,20 +1136,18 @@
<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">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit" name="add"
value="{$lang_done}">
+ <xsl:attribute name="title">
<xsl:value-of
select="lang_add_standardtext"/>
- <xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
</form>
</td>
</tr>
-</xsl:template>
+ </xsl:template>
-<!-- list attribute -->
-<xsl:template match="list_attribute">
+ <!-- list attribute -->
+ <xsl:template match="list_attribute">
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
<tr>
<td align="right">
@@ -1729,10 +1165,10 @@
<xsl:apply-templates select="values_attrib"/>
<xsl:apply-templates select="table_add2"/>
</table>
-</xsl:template>
+ </xsl:template>
<!-- New template-->
-<xsl:template match="table_header_attrib">
+ <xsl:template match="table_header_attrib">
<xsl:variable name="sort_sorting">
<xsl:value-of select="sort_sorting"/>
</xsl:variable>
@@ -1769,10 +1205,10 @@
<xsl:value-of select="lang_delete"/>
</td>
</tr>
-</xsl:template>
+ </xsl:template>
<!-- New template-->
-<xsl:template match="values_attrib">
+ <xsl:template match="values_attrib">
<xsl:variable name="lang_up_text">
<xsl:value-of select="lang_up_text"/>
</xsl:variable>
@@ -1821,14 +1257,14 @@
<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;">
+ <a href="{$link_up}"
title="window.status='{$lang_up_text}';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;">
+ <a href="{$link_down}"
title="window.status='{$lang_down_text}';return true;">
<xsl:value-of
select="text_down"/>
</a>
</td>
@@ -1842,7 +1278,7 @@
<xsl:variable name="link_edit">
<xsl:value-of select="link_edit"/>
</xsl:variable>
- <a href="{$link_edit}"
onMouseover="window.status='{$lang_edit_attribtext}';return true;"
onMouseout="window.status='';return true;">
+ <a href="{$link_edit}"
title="window.status='{$lang_edit_attribtext}';return true;">
<xsl:value-of select="text_edit"/>
</a>
</td>
@@ -1850,15 +1286,15 @@
<xsl:variable name="link_delete">
<xsl:value-of select="link_delete"/>
</xsl:variable>
- <a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_attribtext}';return true;"
onMouseout="window.status='';return true;">
+ <a href="{$link_delete}"
title="window.status='{$lang_delete_attribtext}';return true;">
<xsl:value-of select="text_delete"/>
</a>
</td>
</tr>
-</xsl:template>
+ </xsl:template>
<!-- add attribute / edit attribute -->
-<xsl:template match="edit_attrib">
+ <xsl:template match="edit_attrib">
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
@@ -1899,11 +1335,9 @@
<xsl:value-of
select="lang_column_name"/>
</td>
<td>
- <input type="text"
name="values[column_name]" value="{value_column_name}" maxlength="20"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text"
name="values[column_name]" value="{value_column_name}" maxlength="20">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_column_name_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -1913,11 +1347,9 @@
<xsl:value-of
select="lang_input_text"/>
</td>
<td>
- <input type="text"
name="values[input_text]" value="{value_input_text}" size="60" maxlength="50"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text"
name="values[input_text]" value="{value_input_text}" size="60" maxlength="50">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_input_text_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -1927,11 +1359,9 @@
<xsl:value-of
select="lang_statustext"/>
</td>
<td>
- <textarea cols="60"
rows="10" name="values[statustext]" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <textarea cols="60"
rows="10" name="values[statustext]">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_statustext_attribtext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
<xsl:value-of
select="value_statustext"/>
</textarea>
@@ -1945,7 +1375,7 @@
<xsl:variable
name="lang_datatype_statustext">
<xsl:value-of
select="lang_datatype_statustext"/>
</xsl:variable>
- <select
name="values[column_info][type]" class="forms"
onMouseover="window.status='{$lang_datatype_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <select
name="values[column_info][type]" class="forms"
title="window.status='{$lang_datatype_statustext}'; return true;">
<option
value="">
<xsl:value-of select="lang_no_datatype"/>
</option>
@@ -1958,11 +1388,11 @@
<xsl:value-of
select="lang_precision"/>
</td>
<td>
- <input type="text"
name="values[column_info][precision]" value="{value_precision}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text"
name="values[column_info][precision]" value="{value_precision}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="lang_precision_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+
</xsl:attribute>
</input>
</td>
@@ -1972,11 +1402,9 @@
<xsl:value-of
select="lang_scale"/>
</td>
<td>
- <input type="text"
name="values[column_info][scale]" value="{value_scale}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text"
name="values[column_info][scale]" value="{value_scale}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_scale_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -1986,11 +1414,11 @@
<xsl:value-of
select="lang_default"/>
</td>
<td>
- <input type="text"
name="values[column_info][default]" value="{value_default}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text"
name="values[column_info][default]" value="{value_default}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="lang_default_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+
</xsl:attribute>
</input>
</td>
@@ -2003,7 +1431,7 @@
<xsl:variable
name="lang_nullable_statustext">
<xsl:value-of
select="lang_nullable_statustext"/>
</xsl:variable>
- <select
name="values[column_info][nullable]" class="forms"
onMouseover="window.status='{$lang_nullable_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <select
name="values[column_info][nullable]" class="forms"
title="window.status='{$lang_nullable_statustext}'; return true;">
<option
value="">
<xsl:value-of select="lang_select_nullable"/>
</option>
@@ -2018,20 +1446,16 @@
<td>
<xsl:choose>
<xsl:when
test="value_list = 1">
- <input
type="checkbox" name="values[list]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input
type="checkbox" name="values[list]" value="1" checked="checked">
+
<xsl:attribute name="title">
<xsl:value-of select="lang_list_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</xsl:when>
<xsl:otherwise>
- <input
type="checkbox" name="values[list]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input
type="checkbox" name="values[list]" value="1">
+
<xsl:attribute name="title">
<xsl:value-of select="lang_list_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</xsl:otherwise>
@@ -2045,20 +1469,16 @@
<td>
<xsl:choose>
<xsl:when
test="value_search = 1">
- <input
type="checkbox" name="values[search]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input
type="checkbox" name="values[search]" value="1" checked="checked">
+
<xsl:attribute name="title">
<xsl:value-of select="lang_include_search_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</xsl:when>
<xsl:otherwise>
- <input
type="checkbox" name="values[search]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input
type="checkbox" name="values[search]" value="1">
+
<xsl:attribute name="title">
<xsl:value-of select="lang_include_search_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</xsl:otherwise>
@@ -2082,11 +1502,9 @@
<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>
+ <input type="submit"
name="values[save]" value="{$lang_save}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_save_attribtext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -2101,11 +1519,11 @@
<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">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit"
name="done" value="{$lang_done}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="lang_done_attribtext"/>
-
<xsl:text>'; return true;</xsl:text>
+
</xsl:attribute>
</input>
</form>
@@ -2113,10 +1531,10 @@
</tr>
</table>
</div>
-</xsl:template>
+ </xsl:template>
<!-- datatype_list -->
-<xsl:template match="datatype_list">
+ <xsl:template match="datatype_list">
<xsl:variable name="id">
<xsl:value-of select="id"/>
</xsl:variable>
@@ -2132,10 +1550,10 @@
</option>
</xsl:otherwise>
</xsl:choose>
-</xsl:template>
+ </xsl:template>
<!-- nullable_list -->
-<xsl:template match="nullable_list">
+ <xsl:template match="nullable_list">
<xsl:variable name="id">
<xsl:value-of select="id"/>
</xsl:variable>
@@ -2151,15 +1569,15 @@
</option>
</xsl:otherwise>
</xsl:choose>
-</xsl:template>
+ </xsl:template>
-<!-- New template-->
-<xsl:template match="member_of_list">
+ <!-- New template-->
+ <xsl:template match="member_of_list">
<xsl:variable name="id">
<xsl:value-of select="cat_id"/>
</xsl:variable>
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<option value="{$id}" selected="selected">
<xsl:value-of
disable-output-escaping="yes" select="name"/>
</option>
@@ -2170,15 +1588,15 @@
</option>
</xsl:otherwise>
</xsl:choose>
-</xsl:template>
+ </xsl:template>
-<!-- New template-->
-<xsl:template match="agreement_group_list">
+ <!-- New template-->
+ <xsl:template match="agreement_group_list">
<xsl:variable name="id">
<xsl:value-of select="id"/>
</xsl:variable>
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected = 1">
<option value="{$id}" selected="selected">
<xsl:value-of
disable-output-escaping="yes" select="name"/>
</option>
@@ -2189,4 +1607,4 @@
</option>
</xsl:otherwise>
</xsl:choose>
-</xsl:template>
+ </xsl:template>
Modified: trunk/property/templates/base/budget.xsl
===================================================================
--- trunk/property/templates/base/budget.xsl 2016-03-25 12:37:00 UTC (rev
14860)
+++ trunk/property/templates/base/budget.xsl 2016-03-25 12:37:53 UTC (rev
14861)
@@ -949,7 +949,7 @@
<xsl:value-of select="id"/>
</xsl:variable>
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<option value="{$id}" selected="selected">
<xsl:value-of
disable-output-escaping="yes" select="id"/>
</option>
@@ -968,7 +968,7 @@
<xsl:value-of select="id"/>
</xsl:variable>
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<option value="{$id}" selected="selected">
<xsl:value-of
disable-output-escaping="yes" select="name"/>
</option>
@@ -987,7 +987,7 @@
<xsl:value-of select="id"/>
</xsl:variable>
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<option value="{$id}" selected="selected">
<xsl:value-of
disable-output-escaping="yes" select="name"/>
</option>
Modified: trunk/property/templates/base/cat_filter.xsl
===================================================================
--- trunk/property/templates/base/cat_filter.xsl 2016-03-25 12:37:00 UTC
(rev 14860)
+++ trunk/property/templates/base/cat_filter.xsl 2016-03-25 12:37:53 UTC
(rev 14861)
@@ -30,7 +30,7 @@
<!-- New template-->
<xsl:template match="cat_list">
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<option value="{id}{cat_id}"
selected="selected">
<xsl:value-of
disable-output-escaping="yes" select="name"/>
</option>
Modified: trunk/property/templates/base/cat_select.xsl
===================================================================
--- trunk/property/templates/base/cat_select.xsl 2016-03-25 12:37:00 UTC
(rev 14860)
+++ trunk/property/templates/base/cat_select.xsl 2016-03-25 12:37:53 UTC
(rev 14861)
@@ -45,7 +45,7 @@
<xsl:value-of select="id"/>
</xsl:variable>
<option value="{$id}{cat_id}">
- <xsl:if test="selected='1' or selected='selected'">
+ <xsl:if test="selected='selected' or selected = 1">
<xsl:attribute name="selected">
<xsl:text>selected</xsl:text>
</xsl:attribute>
Modified: trunk/property/templates/base/document.xsl
===================================================================
--- trunk/property/templates/base/document.xsl 2016-03-25 12:37:00 UTC (rev
14860)
+++ trunk/property/templates/base/document.xsl 2016-03-25 12:37:53 UTC (rev
14861)
@@ -694,7 +694,7 @@
</td>
<xsl:for-each select="cat_list">
<xsl:choose>
- <xsl:when
test="selected='selected'">
+ <xsl:when
test="selected='selected' or selected = 1">
<td>
<xsl:value-of
select="name"/>
</td>
Modified: trunk/property/templates/base/filter_member_of.xsl
===================================================================
--- trunk/property/templates/base/filter_member_of.xsl 2016-03-25 12:37:00 UTC
(rev 14860)
+++ trunk/property/templates/base/filter_member_of.xsl 2016-03-25 12:37:53 UTC
(rev 14861)
@@ -33,7 +33,7 @@
<xsl:value-of select="cat_id"/>
</xsl:variable>
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<option value="{$cat_id}" selected="selected">
<xsl:value-of
disable-output-escaping="yes" select="name"/>
</option>
Modified: trunk/property/templates/base/invoice.xsl
===================================================================
--- trunk/property/templates/base/invoice.xsl 2016-03-25 12:37:00 UTC (rev
14860)
+++ trunk/property/templates/base/invoice.xsl 2016-03-25 12:37:53 UTC (rev
14861)
@@ -1667,7 +1667,7 @@
<!-- New template-->
<xsl:template match="options_user">
<option value="{lid}">
- <xsl:if test="selected = 'selected'">
+ <xsl:if test="selected = 'selected' or selected = 1">
<xsl:attribute name="selected" value="selected"/>
</xsl:if>
<xsl:value-of disable-output-escaping="yes" select="lastname"/>
Modified: trunk/property/templates/base/s_agreement.xsl
===================================================================
--- trunk/property/templates/base/s_agreement.xsl 2016-03-25 12:37:00 UTC
(rev 14860)
+++ trunk/property/templates/base/s_agreement.xsl 2016-03-25 12:37:53 UTC
(rev 14861)
@@ -1814,7 +1814,7 @@
<xsl:value-of select="cat_id"/>
</xsl:variable>
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<option value="{$id}" selected="selected">
<xsl:value-of disable-output-escaping="yes"
select="name"/>
</option>
@@ -1833,7 +1833,7 @@
<xsl:value-of select="id"/>
</xsl:variable>
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<option value="{$id}" selected="selected">
<xsl:value-of disable-output-escaping="yes"
select="id"/>
</option>
Modified: trunk/property/templates/base/tenant_claim.xsl
===================================================================
--- trunk/property/templates/base/tenant_claim.xsl 2016-03-25 12:37:00 UTC
(rev 14860)
+++ trunk/property/templates/base/tenant_claim.xsl 2016-03-25 12:37:53 UTC
(rev 14861)
@@ -83,7 +83,7 @@
</label>
<xsl:for-each select="cat_list_project"
data-validation="required">
<xsl:choose>
-
<xsl:when test="selected='selected'">
+
<xsl:when test="selected='selected' or selected = 1">
<xsl:value-of select="name"/>
</xsl:when>
</xsl:choose>
@@ -411,7 +411,7 @@
</label>
<xsl:for-each select="cat_list_project">
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<xsl:value-of select="name"/>
</xsl:when>
</xsl:choose>
@@ -553,7 +553,7 @@
</label>
<xsl:for-each select="status_list">
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<xsl:value-of select="name"/>
</xsl:when>
</xsl:choose>
@@ -582,7 +582,7 @@
</label>
<xsl:for-each select="cat_list">
<xsl:choose>
- <xsl:when test="selected='selected'">
+ <xsl:when test="selected='selected' or selected = 1">
<xsl:value-of select="name"/>
</xsl:when>
</xsl:choose>
Modified: trunk/property/templates/base/wo_hour.xsl
===================================================================
--- trunk/property/templates/base/wo_hour.xsl 2016-03-25 12:37:00 UTC (rev
14860)
+++ trunk/property/templates/base/wo_hour.xsl 2016-03-25 12:37:53 UTC (rev
14861)
@@ -567,274 +567,6 @@
</xsl:template>
<!-- New template-->
-<!--xsl:template match="email_data">
-
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_date"/>
- </label>
- <xsl:value-of select="date"/>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_workorder"/>
- </label>
- <xsl:value-of select="workorder_id"/>
- <xsl:choose>
- <xsl:when test="lang_reminder !=''">
- <xsl:text> - </xsl:text>
- <b>
- <xsl:value-of select="lang_reminder"/>
- </b>
- </xsl:when>
- </xsl:choose>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_to"/>
- </label>
- <xsl:value-of select="to_name"/>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_from"/>
- </label>
- <div class="pure-custom">
- <div>
- <xsl:value-of select="from_name"/>
- </div>
- <div>
- <xsl:choose>
- <xsl:when test="ressursnr !=''">
- <xsl:text>RessursNr: </xsl:text>
- <xsl:value-of
select="ressursnr"/>
- </xsl:when>
- </xsl:choose>
- </div>
- <div>
- <xsl:value-of select="org_name"/>
- <xsl:value-of select="lang_district"/>
- <xsl:text> </xsl:text>
- <xsl:value-of select="district"/>
- </div>
- <div>
- <xsl:text> [ </xsl:text>
- <xsl:value-of select="from_phone"/>
- <xsl:text> ] </xsl:text>
- <xsl:value-of select="from_email"/>
- </div>
- </div>
- </div>
- <xsl:choose>
- <xsl:when test="contact_data/value_contact_name">
- <xsl:call-template name="contact_form"/>
- </xsl:when>
- </xsl:choose>
- <xsl:call-template name="location_view"/>
- <xsl:choose>
- <xsl:when test="formatted_gab_id !=''">
- <div class="pure-control-group">
- <label>
- Gnr/Bnr/Feste/Seksjon
- </label>
- <xsl:value-of select="formatted_gab_id"/>
- </div>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="contact_phone !=''">
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="lang_contact_phone"/>
- </label>
- <xsl:value-of select="contact_phone"/>
- </div>
- </xsl:when>
- </xsl:choose>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_title"/>
- </label>
- <xsl:value-of select="title"/>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_descr"/>
- </label>
- <div class="pure-custom">
- <table class="pure-table pure-table-bordered">
- <tr>
- <td width="90%" >
- <xsl:value-of select="descr"/>
- </td>
- </tr>
- </table>
- </div>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_budget_account"/>
- </label>
- <div class="pure-custom">
- <xsl:value-of select="budget_account"/>
- <xsl:value-of select="lang_cost_tax"/>
- </div>
- </div>
- <xsl:choose>
- <xsl:when test="sum_calculation!=''">
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="lang_sum_calculation"/>
- </label>
- <xsl:value-of select="sum_calculation"/>
- </div>
- </xsl:when>
- </xsl:choose>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_start_date"/>
- </label>
- <div class="pure-custom">
- <xsl:value-of select="start_date"/>
- <xsl:value-of select="lang_materials"/>
- </div>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_end_date"/>
- </label>
- <div class="pure-custom">
- <xsl:value-of select="end_date"/>
- <xsl:value-of select="lang_work"/>
- </div>
- </div>
- <xsl:choose>
- <xsl:when test="branch_list/selected">
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_branch"/>
- </label>
- <div class="pure-custom">
- <xsl:for-each
select="branch_list[selected='selected']">
- <xsl:value-of select="name"/>
- <xsl:if test="position() !=
last()">, </xsl:if>
- </xsl:for-each>
- <xsl:choose>
- <xsl:when
test="other_branch!=''">
- <xsl:text>, </xsl:text>
- <xsl:value-of
select="other_branch"/>
- </xsl:when>
- </xsl:choose>
- </div>
- </div>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="key_responsible_list/selected">
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="lang_key_responsible"/>
- </label>
- <div class="pure-custom">
- <xsl:for-each
select="key_responsible_list">
- <xsl:choose>
- <xsl:when
test="selected">
- <xsl:value-of
select="name"/>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </div>
- </div>
- </xsl:when>
- </xsl:choose>
- <xsl:if test="key_fetch_list/selected">
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_key_fetch"/>
- </label>
- <div class="pure-custom">
- <xsl:for-each select="key_fetch_list">
- <xsl:choose>
- <xsl:when test="selected">
- <div>
- <xsl:value-of
select="name"/>
- </div>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </div>
- </div>
- </xsl:if>
- <xsl:if test="key_deliver_list/selected">
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="lang_key_deliver"/>
- </label>
- <div class="pure-custom">
- <xsl:for-each select="key_deliver_list">
- <xsl:choose>
- <xsl:when test="selected">
- <div>
- <xsl:value-of
select="name"/>
- </div>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </div>
- </div>
- </xsl:if>
- <xsl:choose>
- <xsl:when test="values_view_order!=''">
- <div class="pure-control-group">
- <xsl:choose>
- <xsl:when test="use_yui_table='1'">
- <xsl:for-each
select="//datatable_def">
- <xsl:if test="container
= 'datatable-container_0'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="tabletools" select ='tabletools' />
-
<xsl:with-param name="data" select ='data' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
- </xsl:if>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <table class="pure-table
pure-table-bordered">
- <xsl:apply-templates
select="table_header_view_order"/>
- <xsl:apply-templates
select="values_view_order"/>
- </table>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="sms_data!=''">
- <xsl:apply-templates select="sms_data"/>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="order_footer_header!=''">
- <div class="pure-control-group">
- <h4>
- <xsl:value-of
select="order_footer_header"/>
- </h4>
- </div>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="order_footer!=''">
- <div class="pure-control-group">
- <xsl:value-of select="order_footer"/>
- </div>
- </xsl:when>
- </xsl:choose>
-</xsl:template-->
-
-<!-- New template-->
<xsl:template match="email_data">
<font size="-1">
<table align="left">
@@ -1002,7 +734,7 @@
<xsl:value-of select="lang_branch"/>
</td>
<td
align="left">
-
<xsl:for-each select="branch_list[selected='selected']">
+
<xsl:for-each select="branch_list[selected='selected' or selected = 1]">
<xsl:value-of select="name"/>
<xsl:if test="position() != last()">, </xsl:if>
</xsl:for-each>
Modified: trunk/property/templates/base/workorder.xsl
===================================================================
--- trunk/property/templates/base/workorder.xsl 2016-03-25 12:37:00 UTC (rev
14860)
+++ trunk/property/templates/base/workorder.xsl 2016-03-25 12:37:53 UTC (rev
14861)
@@ -269,7 +269,7 @@
<label for="name">
<xsl:value-of
select="lang_branch"/>
</label>
- <xsl:for-each
select="branch_list[selected='selected']">
+ <xsl:for-each
select="branch_list[selected='selected' or selected = 1]">
<xsl:value-of
select="name"/>
<xsl:if
test="position() != last()">, </xsl:if>
</xsl:for-each>
@@ -1271,7 +1271,7 @@
<!-- New template-->
<xsl:template match="options_lid">
<option value="{lid}">
- <xsl:if test="selected = 'selected'">
+ <xsl:if test="selected = 'selected' or selected = 1">
<xsl:attribute name="selected" value="selected"/>
</xsl:if>
<xsl:value-of disable-output-escaping="yes" select="lastname"/>
| [Prev in Thread] | Current Thread | [Next in Thread] |