[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14758] Merge 14754:14757 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14758] Merge 14754:14757 from trunk |
Date: |
Sun, 21 Feb 2016 00:32:54 +0000 |
Revision: 14758
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14758
Author: sigurdne
Date: 2016-02-21 00:31:53 +0000 (Sun, 21 Feb 2016)
Log Message:
-----------
Merge 14754:14757 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/inc/class.common.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.xslttemplates.inc.php
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/head.tpl
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.tpl
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
branches/Version-2_0-branch/phpgwapi/templates/portico/head.tpl
branches/Version-2_0-branch/phpgwapi/templates/pure/head.tpl
branches/Version-2_0-branch/property/inc/class.sotts.inc.php
branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
branches/Version-2_0-branch/property/inc/class.uiinvoice.inc.php
branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-2_0-branch/property/templates/base/condition_survey_import.xsl
branches/Version-2_0-branch/property/templates/base/wo_hour.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.common.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.common.inc.php
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.common.inc.php
2016-02-21 00:31:53 UTC (rev 14758)
@@ -509,13 +509,7 @@
}
}
- $html = phpgwapi_jquery::tabview_generate($tabs,
$selection);
- $output = <<<HTML
-
- {$html}
-
-HTML;
- return $output;
+ return phpgwapi_jquery::tabview_generate($tabs,
$selection);
}
/**
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.xslttemplates.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.xslttemplates.inc.php
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.xslttemplates.inc.php
2016-02-21 00:31:53 UTC (rev 14758)
@@ -104,7 +104,7 @@
$this->output = $output;
break;
default:
- $this->output = 'html';
+ $this->output = 'html5';
}
}
@@ -267,6 +267,7 @@
>
XSLT;
+
switch ( $this->output )
{
case 'wml':
@@ -274,7 +275,7 @@
break;
case 'html5':
- $this->xsldata .= '<xsl:output
method="xml" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes"
/>'."\n";
+ $this->xsldata .= '<xsl:output
method="html" doctype-system="about:legacy-compat" encoding="UTF-8"
indent="yes" />'."\n";
break;
case 'html':
Modified:
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/head.tpl
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/head.tpl
2016-02-21 00:31:53 UTC (rev 14758)
@@ -1,8 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/loose.dtd">
+<!doctype html>
<!-- BEGIN head -->
<html class="no-js" lang="no">
<head>
- <meta http-equiv="Content-Type" content="text/html;
charset=UTF-8">
+ <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
<meta name="author" content="phpGroupWare
http://www.phpgroupware.org">
<meta name="description" content="phpGroupWare">
Modified:
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2016-02-21 00:31:53 UTC (rev 14758)
@@ -30,7 +30,7 @@
<xsl:template name="datatable">
<script type="text/javascript">
var number_of_toolbar_items = 0;
- var filter_selects = [];
+ var filter_selects = {};
</script>
<xsl:call-template name="jquery_phpgw_i18n"/>
<xsl:apply-templates select="form" />
@@ -87,6 +87,7 @@
content: "\2212";
}
</style>
+ <div id="active_filters"></div>
<input class="toggle-box" id="header1" type="checkbox" />
<label for="header1">
@@ -96,7 +97,7 @@
<div id="toolbar">
<!--xsl:if test="item/text and normalize-space(item/text)"-->
<xsl:if test="item">
- <table id="toolbar_table" class="pure-table">
+ <table id="toolbar_table" class="pure-table
pure-table-horizontal">
<thead>
<tr>
<th>
@@ -214,9 +215,9 @@
<xsl:value-of select="name"/>
</xsl:variable>
<script type="text/javascript">
-
filter_selects.push('<xsl:value-of select="$name"/>');
+
filter_selects['<xsl:value-of select="text"/>'] = '<xsl:value-of
select="$name"/>';
</script>
-
<select id="{$name}" name="{$name}">
+
<select id="{$name}" name="{$name}" width="250" style="width: 250px">
<xsl:for-each select="list">
<xsl:variable name="id">
<xsl:value-of select="id"/>
@@ -922,14 +923,26 @@
aoData.columns[column] =
column_to_keep;
}
+ active_filters_html = [];
var select = null;
- for (var i = 0; i <
filter_selects.length; i++)
+ for (var i in filter_selects)
{
select = $("#" +
filter_selects[i]);
var select_name =
select.prop("name");
var select_value =
select.val();
aoData[select_name] =
select_value;
+
+ if(select_value &&
select_value !=0 )
+ {
+
active_filters_html.push(i);
+ }
+
}
+
+ if(active_filters_html.length > 0)
+ {
+
$('#active_filters').html("Aktive filter: " + active_filters_html.join(', '));
+ }
},
fnCreatedRow : function( nRow, aData,
iDataIndex ){
Modified: branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.tpl
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.tpl
2016-02-21 00:31:53 UTC (rev 14758)
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
<!-- BEGIN head -->
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html;
charset=utf-8">
+ <meta charset="utf-8">
{metainfo_author}
{metainfo_description}
{metainfo_keywords}
Modified: branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
2016-02-21 00:31:53 UTC (rev 14758)
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
<!-- BEGIN head -->
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html;
charset=utf-8">
+ <meta charset="utf-8">
<meta name="author" content="phpGroupWare
http://www.phpgroupware.org">
<meta name="description" content="phpGroupWare">
<meta name="keywords" content="phpGroupWare">
Modified: branches/Version-2_0-branch/phpgwapi/templates/portico/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/portico/head.tpl
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/phpgwapi/templates/portico/head.tpl
2016-02-21 00:31:53 UTC (rev 14758)
@@ -1,8 +1,8 @@
-<!doctype html>
+<!DOCTYPE html>
<!-- BEGIN head -->
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html;
charset=utf-8">
+ <meta charset="utf-8">
<meta name="author" content="phpGroupWare
http://www.phpgroupware.org">
<meta name="description" content="phpGroupWare">
<meta name="keywords" content="phpGroupWare">
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/head.tpl
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/head.tpl
2016-02-21 00:31:53 UTC (rev 14758)
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE HTML>
<!-- BEGIN head -->
<html>
<head>
Modified: branches/Version-2_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sotts.inc.php
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/property/inc/class.sotts.inc.php
2016-02-21 00:31:53 UTC (rev 14758)
@@ -1751,6 +1751,8 @@
$this->db->query("DELETE FROM phpgw_interlink WHERE
location1_id = {$location_id} AND location1_item_id = {$id}", __LINE__,
__FILE__);
$this->db->query("DELETE FROM phpgw_interlink WHERE
location2_id = {$location_id} AND location2_item_id = {$id}", __LINE__,
__FILE__);
$this->db->query("DELETE FROM fm_tts_history WHERE
history_record_id = {$id}", __LINE__, __FILE__);
+ $this->db->query("DELETE FROM fm_tts_payments WHERE
ticket_id = {$id}", __LINE__, __FILE__);
+ $this->db->query("DELETE FROM fm_tts_budget WHERE
ticket_id = {$id}", __LINE__, __FILE__);
$this->db->query("DELETE FROM fm_tts_views WHERE id =
{$id}", __LINE__, __FILE__);
$this->db->query("DELETE FROM fm_tts_tickets WHERE id =
{$id}", __LINE__, __FILE__);
Modified:
branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
2016-02-21 00:31:53 UTC (rev 14758)
@@ -865,6 +865,7 @@
{
throw new
Exception('uicondition_survey::_handle_import() - missing id');
}
+ phpgwapi_jquery::formvalidator_generate(array('file'));
$step = phpgw::get_var('step', 'int', 'REQUEST');
$sheet_id = phpgw::get_var('sheet_id', 'int',
'REQUEST');
@@ -948,9 +949,9 @@
$active_tab = 'step_1';
$lang_submit = lang('continue');
$tabs['step_1'] = array('label' =>
lang('choose file'), 'link' => '#step_1');
- $tabs['step_2'] = array('label' =>
lang('choose sheet'), 'link' => null);
- $tabs['step_3'] = array('label' =>
lang('choose start line'), 'link' => null);
- $tabs['step_4'] = array('label' =>
lang('choose columns'), 'link' => null);
+ $tabs['step_2'] = array('label' =>
lang('choose sheet'), 'link' => null, 'disable' => true);
+ $tabs['step_3'] = array('label' =>
lang('choose start line'), 'link' => null, 'disable' => true);
+ $tabs['step_4'] = array('label' =>
lang('choose columns'), 'link' => null, 'disable' => true);
break;
case 1:
$active_tab = 'step_2';
@@ -959,8 +960,8 @@
'menuaction' =>
'property.uicondition_survey.import', 'id' => $id, 'step' => 0,
'sheet_id' =>
$sheet_id, 'start_line' => $start_line)));
$tabs['step_2'] = array('label' =>
lang('choose sheet'), 'link' => '#step_2');
- $tabs['step_3'] = array('label' =>
lang('choose start line'), 'link' => null);
- $tabs['step_4'] = array('label' =>
lang('choose columns'), 'link' => null);
+ $tabs['step_3'] = array('label' =>
lang('choose start line'), 'link' => null, 'disable' => true);
+ $tabs['step_4'] = array('label' =>
lang('choose columns'), 'link' => null, 'disable' => true);
break;
case 2:
$active_tab = 'step_3';
@@ -972,7 +973,7 @@
'menuaction' =>
'property.uicondition_survey.import', 'id' => $id, 'step' => 1,
'sheet_id' =>
$sheet_id, 'start_line' => $start_line)));
$tabs['step_3'] = array('label' =>
lang('choose start line'), 'link' => '#step_3');
- $tabs['step_4'] = array('label' =>
lang('choose columns'), 'link' => null);
+ $tabs['step_4'] = array('label' =>
lang('choose columns'), 'link' => null, 'disable' => true);
break;
case 3:
$active_tab = 'step_4';
@@ -1026,6 +1027,9 @@
}
$objPHPExcel->setActiveSheetIndex((int)$sheet_id);
+ $rows =
$objPHPExcel->getActiveSheet()->getHighestDataRow();
+ $highestColumm =
$objPHPExcel->getActiveSheet()->getHighestDataColumn();
+ $highestColumnIndex =
PHPExcel_Cell::columnIndexFromString($highestColumm);
}
catch (Exception $e)
{
@@ -1040,12 +1044,8 @@
$survey = $this->bo->read_single(array('id' => $id,
'view' => $mode == 'view'));
- $rows =
$objPHPExcel->getActiveSheet()->getHighestDataRow();
- $highestColumm =
$objPHPExcel->getActiveSheet()->getHighestDataColumn();
- $highestColumnIndex =
PHPExcel_Cell::columnIndexFromString($highestColumm);
-
$i = 0;
- $html_table = '<table border="1">';
+ $html_table = '<table class="pure-table
pure-table-bordered">';
if ($rows > 1 && $step == 2)
{
@@ -1055,7 +1055,7 @@
$cols[] = $this->getexcelcolumnname($j);
}
- $html_table .= "<tr><th align = 'center'>" .
lang('start') . "</th><th align='center'>" . implode("</th><th
align='center'>", $cols) . '</th></tr>';
+ $html_table .= "<thead><tr><th align =
'center'>" . lang('select') . "</th><th align = 'center'>" . lang('row') .
"</th><th align='center'>" . implode("</th><th align='center'>", $cols) .
'</th></tr></thead>';
foreach
($objPHPExcel->getActiveSheet()->getRowIterator() as $row)
{
if ($i > 20)
@@ -1071,7 +1071,7 @@
$_checked = 'checked="checked"';
}
- $_radio = "[{$row_key}]<input
id=\"start_line\" type =\"radio\" {$_checked} name=\"start_line\"
value=\"{$row_key}\">";
+ $_radio = "<input id=\"start_line\"
type =\"radio\" {$_checked} name=\"start_line\" value=\"{$row_key}\">";
$cellIterator = $row->getCellIterator();
$cellIterator->setIterateOnlyExistingCells(false);
@@ -1084,7 +1084,7 @@
$row_values[] =
$cell->getCalculatedValue();
}
}
- $html_table .=
"<tr><td><pre>{$_radio}</pre></td><td>" . implode('</td><td>', $row_values) .
'</td></tr>';
+ $html_table .=
"<tr><td>{$_radio}</td><td>{$row_key}</td><td>" . implode('</td><td>',
$row_values) . '</td></tr>';
}
echo '</table>';
}
Modified: branches/Version-2_0-branch/property/inc/class.uiinvoice.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiinvoice.inc.php
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/property/inc/class.uiinvoice.inc.php
2016-02-21 00:31:53 UTC (rev 14758)
@@ -3405,6 +3405,7 @@
$this->bo->export_deposition();
}
}
+ return;
}
$msgbox_data = $this->bocommon->msgbox_data($receipt);
Modified: branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2016-02-21 00:31:53 UTC (rev 14758)
@@ -1338,12 +1338,12 @@
$email_data['use_yui_table'] = true;
+ $this->create_html->set_output();
$this->create_html->xsl_parse();
$this->create_html->xml_parse();
$xml = new DOMDocument;
$xml->loadXML($this->create_html->xmldata);
-
$xsl = new DOMDocument;
$xsl->loadXML($this->create_html->xsldata);
@@ -1351,20 +1351,31 @@
$proc = new XSLTProcessor;
$proc->registerPHPFunctions(); // enable php
functions
$proc->importStyleSheet($xsl); // attach the
xsl rules
+ $css = file_get_contents( PHPGW_SERVER_ROOT
. "/phpgwapi/templates/pure/css/pure-min.css");
+ $css .= file_get_contents( PHPGW_SERVER_ROOT
. "/phpgwapi/templates/pure/css/pure-extension.css");
$header = <<<HTML
+<!DOCTYPE HTML>
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html;
charset=utf-8">
+ <meta charset="utf-8">
+ <style TYPE="text/css">
+ <!--{$css}-->
+ </style>
+ </head>
<body>
+ <div class="pure-form pure-form-aligned">
HTML;
$footer = <<<HTML
+ </div>
</body>
</html>
HTML;
- $html = $proc->transformToXML($xml);
+ $html = trim($proc->transformToXML($xml));
+ $html = preg_replace('/<\?xml
version([^>])+>/', '', $html);
+ $html = preg_replace('/<!DOCTYPE([^>])+>/', '',
$html);
if ($print)
{
Modified:
branches/Version-2_0-branch/property/templates/base/condition_survey_import.xsl
===================================================================
---
branches/Version-2_0-branch/property/templates/base/condition_survey_import.xsl
2016-02-20 14:26:19 UTC (rev 14757)
+++
branches/Version-2_0-branch/property/templates/base/condition_survey_import.xsl
2016-02-21 00:31:53 UTC (rev 14758)
@@ -2,224 +2,212 @@
<!-- import -->
<xsl:template match="data" xmlns:formvalidator="http://www.w3.org/TR/html4/"
xmlns:php="http://php.net/xsl">
-
- <div class="yui-navset yui-navset-top" id="survey_edit_tabview">
- <h1>
- <xsl:value-of select="php:function('lang', 'condition
survey import')" />
- </h1>
+ <h2>
+ <xsl:value-of select="php:function('lang', 'condition survey
import')" />
+ </h2>
+ <div class="pure-control-group" >
+ <label>
+ <xsl:value-of select="php:function('lang', 'id')" />
+ </label>
+ <xsl:value-of select="survey/id"/>
+ </div>
- <xsl:variable name="action_url">
- <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.import')" />
- </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="location_data2!=''">
+ <xsl:call-template name="location_view2"/>
+ </xsl:when>
+ </xsl:choose>
- <form name="form" id="form" action="{$action_url}"
method="post" ENCTYPE="multipart/form-data">
- <dl>
- <dt>
- <label>
- <xsl:value-of
select="php:function('lang', 'id')" />
- </label>
- </dt>
- <dd>
- <xsl:value-of
select="survey/id"/>
- <input type="hidden" name="id"
value="{survey/id}"/>
- <input type="hidden"
name="step" value="{step}"/>
- <input type="hidden"
name="selected_sheet_id" value="{sheet_id}"/>
- <input type="hidden"
name="start_line" value="{start_line}"/>
- </dd>
+ <div class="pure-control-group" >
+ <label for="name">
+ <xsl:value-of select="php:function('lang', 'name')" />
+ </label>
+ <xsl:value-of select="survey/title" />
+ </div>
- <xsl:choose>
- <xsl:when
test="location_data2!=''">
- <xsl:call-template
name="location_view2"/>
- </xsl:when>
- </xsl:choose>
-
- <dt>
- <label for="name">
- <xsl:value-of
select="php:function('lang', 'name')" />
- </label>
- </dt>
- <dd>
- <xsl:value-of
select="survey/title" />
- </dd>
-
- <dt>
- <label>
- <xsl:value-of
select="php:function('lang', 'date')" />
- </label>
- </dt>
- <dd>
- <xsl:value-of
select="survey/report_date"/>
- </dd>
- </dl>
- <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
- <div class="yui-content">
- <xsl:choose>
- <xsl:when test="step=1">
- <xsl:call-template
name="import_step_1"/>
- </xsl:when>
- <xsl:when test="step=2">
- <xsl:call-template
name="import_step_2"/>
- </xsl:when>
- <xsl:when test="step=3">
- <xsl:call-template
name="import_step_3"/>
- </xsl:when>
- <xsl:when test="step=4">
- <xsl:call-template
name="import_step_4"/>
- </xsl:when>
- <xsl:otherwise>
- <dl
class="proplist-col">
- <dt>
- <label>
-
<xsl:value-of select="php:function('lang', 'finished')" />
- </label>
- </dt>
- </dl>
- </xsl:otherwise>
- </xsl:choose>
- </div>
-
- <dl class="proplist-col">
- <div class="form-buttons">
- <xsl:variable name="lang_submit">
- <xsl:value-of
select="lang_submit"/>
- </xsl:variable>
- <xsl:variable name="lang_cancel">
- <xsl:value-of
select="php:function('lang', 'cancel')" />
- </xsl:variable>
- <xsl:choose>
- <xsl:when
test="$lang_submit != ''">
- <input
type="submit" name="submit_step" value="{$lang_submit}" title =
"{$lang_submit}" />
- </xsl:when>
- </xsl:choose>
- <input class="button"
type="button" name="cancelButton" id ='cancelButton' value="{$lang_cancel}"
title = "{$lang_cancel}" onClick="document.cancel_form.submit();"/>
- </div>
- </dl>
- </form>
+ <div class="pure-control-group" >
+ <label>
+ <xsl:value-of select="php:function('lang', 'date')" />
+ </label>
+ <xsl:value-of select="survey/report_date"/>
+ </div>
+ <xsl:variable name="action_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.import')" />
+ </xsl:variable>
+ <form name="form" id="form" action="{$action_url}" method="post"
ENCTYPE="multipart/form-data" class="pure-form pure-form-aligned">
+ <input type="hidden" name="id" value="{survey/id}"/>
+ <input type="hidden" name="step" value="{step}"/>
+ <input type="hidden" name="selected_sheet_id"
value="{sheet_id}"/>
+ <input type="hidden" name="start_line" value="{start_line}"/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
+ <xsl:choose>
+ <xsl:when test="step=1">
+ <xsl:call-template
name="import_step_1"/>
+ </xsl:when>
+ <xsl:when test="step=2">
+ <xsl:call-template
name="import_step_2"/>
+ </xsl:when>
+ <xsl:when test="step=3">
+ <xsl:call-template
name="import_step_3"/>
+ </xsl:when>
+ <xsl:when test="step=4">
+ <xsl:call-template
name="import_step_4"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <dl class="proplist-col">
+ <dt>
+ <label>
+ <xsl:value-of
select="php:function('lang', 'finished')" />
+ </label>
+ </dt>
+ </dl>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
- <xsl:variable name="cancel_params">
- <xsl:text>menuaction:property.uicondition_survey.view,
id:</xsl:text>
- <xsl:value-of select="survey/id" />
- </xsl:variable>
- <xsl:variable name="cancel_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $cancel_params )" />
- </xsl:variable>
+ <dl class="proplist-col">
+ <div class="form-buttons">
+ <xsl:variable name="lang_submit">
+ <xsl:value-of select="lang_submit"/>
+ </xsl:variable>
+ <xsl:variable name="lang_cancel">
+ <xsl:value-of
select="php:function('lang', 'cancel')" />
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="$lang_submit != ''">
+ <input type="submit"
name="submit_step" value="{$lang_submit}" title = "{$lang_submit}" />
+ </xsl:when>
+ </xsl:choose>
+ <input class="button" type="button"
name="cancelButton" id ='cancelButton' value="{$lang_cancel}" title =
"{$lang_cancel}" onClick="document.cancel_form.submit();"/>
+ </div>
+ </dl>
+ </form>
- <form name="cancel_form" id="cancel_form"
action="{$cancel_url}" method="post">
- </form>
- <xsl:variable name="new_url">
- <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.add')" />
- </xsl:variable>
- <form name="new_form" id="new_form" action="{$new_url}"
method="post">
- </form>
+ <xsl:variable name="cancel_params">
+ <xsl:text>menuaction:property.uicondition_survey.view,
id:</xsl:text>
+ <xsl:value-of select="survey/id" />
+ </xsl:variable>
+ <xsl:variable name="cancel_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', $cancel_params )" />
+ </xsl:variable>
- <xsl:variable name="edit_params">
-
<xsl:text>menuaction:property.uicondition_survey.import, id:</xsl:text>
- <xsl:value-of select="survey/id" />
- </xsl:variable>
- <xsl:variable name="edit_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $edit_params )" />
- </xsl:variable>
+ <form name="cancel_form" id="cancel_form" action="{$cancel_url}"
method="post">
+ </form>
+ <xsl:variable name="new_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.add')" />
+ </xsl:variable>
+ <form name="new_form" id="new_form" action="{$new_url}" method="post">
+ </form>
- <form name="load_edit_form" id="load_edit_form"
action="{$edit_url}" method="post">
- </form>
+ <xsl:variable name="edit_params">
+ <xsl:text>menuaction:property.uicondition_survey.import,
id:</xsl:text>
+ <xsl:value-of select="survey/id" />
+ </xsl:variable>
+ <xsl:variable name="edit_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', $edit_params )" />
+ </xsl:variable>
+ <form name="load_edit_form" id="load_edit_form" action="{$edit_url}"
method="post">
+ </form>
+
</xsl:template>
<xsl:template name="import_step_1"
xmlns:formvalidator="http://www.w3.org/TR/html4/"
xmlns:php="http://php.net/xsl">
- <dl class="proplist-col">
- <dt>
- <label>
+ <div id="step_1">
+ <div class="pure-control-group" >
+ <label for="name">
<xsl:value-of select="php:function('lang',
'upload file')"/>
</label>
- </dt>
- <dd>
<input type="file" name="import_file" size="40">
<xsl:attribute name="title">
<xsl:value-of
select="php:function('lang', 'Select file to upload')"/>
</xsl:attribute>
+ <xsl:attribute name="data-validation">
+ <xsl:text>required extension</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation-allowing">
+ <xsl:text>xls xlsx</xsl:text>
+ </xsl:attribute>
</input>
- </dd>
- </dl>
+ </div>
+ </div>
+ <div id="step_2"></div>
+ <div id="step_3"></div>
+ <div id="step_4"></div>
</xsl:template>
<xsl:template name="import_step_2"
xmlns:formvalidator="http://www.w3.org/TR/html4/"
xmlns:php="http://php.net/xsl">
- <dl class="proplist-col">
- <dt>
- <label for="status">
+ <div id="step_1"></div>
+ <div id="step_2">
+ <div class="pure-control-group" >
+ <label>
<xsl:value-of select="php:function('lang',
'sheet')" />
</label>
- </dt>
- <dd>
- <select id="sheet_id" name="sheet_id">
+ <select id="sheet_id" name="sheet_id">
<xsl:apply-templates select="sheets/options"/>
</select>
- </dd>
- </dl>
+ </div>
+ </div>
+ <div id="step_3"></div>
+ <div id="step_4"></div>
+
</xsl:template>
<xsl:template name="import_step_3" xmlns:php="http://php.net/xsl">
- <dl class="proplist-col">
+ <div id="step_1"></div>
+ <div id="step_2"></div>
+ <div id="step_3">
+ <div class="pure-control-group" >
- <dt>
<label for="status">
<xsl:value-of select="php:function('lang',
'sheet')" />
</label>
- </dt>
- <dd>
<xsl:for-each select="sheets/options">
<xsl:if test="selected = 'selected' or selected
= 1">
<xsl:value-of
disable-output-escaping="yes" select="name"/>
</xsl:if>
</xsl:for-each>
- </dd>
-
- <dt>
- <label for="status">
- <xsl:value-of select="php:function('lang',
'table')" />
- </label>
- </dt>
- <dd>
+ </div>
+ <div class="pure-control-group" >
<xsl:value-of disable-output-escaping="yes"
select="html_table"/>
- </dd>
- </dl>
+ </div>
+ </div>
+ <div id="step_4"></div>
</xsl:template>
<xsl:template name="import_step_4" xmlns:php="http://php.net/xsl">
- <dl class="proplist-col">
- <dt>
- <label>
- <xsl:value-of select="php:function('lang',
'sheet')" />
- </label>
- </dt>
- <dd>
- <xsl:for-each select="sheets/options">
- <xsl:if test="selected = 'selected' or selected
= 1">
- <xsl:value-of
disable-output-escaping="yes" select="name"/>
- </xsl:if>
- </xsl:for-each>
- </dd>
- <dt>
- <label>
- <xsl:value-of select="php:function('lang',
'line')" />
- </label>
- </dt>
- <dd>
- <xsl:value-of select="start_line"/>
- </dd>
- <dt>
- <label>
- <xsl:value-of select="php:function('lang',
'columns')" />
- </label>
- </dt>
- <dd>
- <xsl:value-of disable-output-escaping="yes"
select="html_table"/>
- </dd>
- </dl>
+ <div id="step_1"></div>
+ <div id="step_2"></div>
+ <div id="step_3"></div>
+ <div id="step_4">
+ <div class="pure-control-group" >
+ <label>
+ <xsl:value-of
select="php:function('lang', 'sheet')" />
+ </label>
+ <xsl:for-each select="sheets/options">
+ <xsl:if test="selected = 'selected' or
selected = 1">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+ <div class="pure-control-group" >
+ <label>
+ <xsl:value-of
select="php:function('lang', 'line')" />
+ </label>
+ <xsl:value-of select="start_line"/>
+ </div>
+ <div class="pure-control-group" >
+ <label>
+ <xsl:value-of
select="php:function('lang', 'columns')" />
+ </label>
+ <xsl:value-of disable-output-escaping="yes"
select="html_table"/>
+ </div>
+ </div>
</xsl:template>
@@ -234,21 +222,21 @@
</xsl:template>
<xsl:template xmlns:php="http://php.net/xsl" name="file_upload">
- <dt>
+ <dt>
<label>
<xsl:value-of select="php:function('lang', 'upload
file')"/>
</label>
- </dt>
- <dd>
- <input type="file" name="file" size="40">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'Select file to upload')"/>
- </xsl:attribute>
- </input>
- </dd>
- <xsl:choose>
- <xsl:when test="multiple_uploader!=''">
- <dt>
+ </dt>
+ <dd>
+ <input type="file" name="file" size="40">
+ <xsl:attribute name="title">
+ <xsl:value-of select="php:function('lang',
'Select file to upload')"/>
+ </xsl:attribute>
+ </input>
+ </dd>
+ <xsl:choose>
+ <xsl:when test="multiple_uploader!=''">
+ <dt>
<label>
<a href="javascript:fileuploader()">
<xsl:attribute name="title">
@@ -257,8 +245,8 @@
<xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
</a>
</label>
- </dt>
- </xsl:when>
- </xsl:choose>
+ </dt>
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
Modified: branches/Version-2_0-branch/property/templates/base/wo_hour.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/wo_hour.xsl
2016-02-20 14:26:19 UTC (rev 14757)
+++ branches/Version-2_0-branch/property/templates/base/wo_hour.xsl
2016-02-21 00:31:53 UTC (rev 14758)
@@ -1,41 +1,41 @@
<!-- $Id$ -->
<xsl:template match="data">
- <xsl:choose>
- <xsl:when test="edit_hour">
- <xsl:apply-templates select="edit_hour"/>
- </xsl:when>
- <xsl:when test="list_template">
- <xsl:apply-templates select="list_template"/>
- </xsl:when>
- <xsl:when test="list_template_hour">
- <xsl:apply-templates
select="list_template_hour"/>
- </xsl:when>
- <xsl:when test="add_template">
- <xsl:apply-templates select="add_template"/>
- </xsl:when>
- <xsl:when test="email_data">
- <xsl:apply-templates select="email_data"/>
- </xsl:when>
- <xsl:when test="view">
- <xsl:apply-templates select="view"/>
- </xsl:when>
- <xsl:when test="prizebook">
- <xsl:apply-templates select="prizebook"/>
- </xsl:when>
- <xsl:when test="list_deviation">
- <xsl:apply-templates select="list_deviation"/>
- </xsl:when>
- <xsl:when test="edit_deviation">
- <xsl:apply-templates select="edit_deviation"/>
- </xsl:when>
- <xsl:when test="import_calculation">
- <xsl:apply-templates
select="import_calculation"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="list_hour"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="edit_hour">
+ <xsl:apply-templates select="edit_hour"/>
+ </xsl:when>
+ <xsl:when test="list_template">
+ <xsl:apply-templates select="list_template"/>
+ </xsl:when>
+ <xsl:when test="list_template_hour">
+ <xsl:apply-templates select="list_template_hour"/>
+ </xsl:when>
+ <xsl:when test="add_template">
+ <xsl:apply-templates select="add_template"/>
+ </xsl:when>
+ <xsl:when test="email_data">
+ <xsl:apply-templates select="email_data"/>
+ </xsl:when>
+ <xsl:when test="view">
+ <xsl:apply-templates select="view"/>
+ </xsl:when>
+ <xsl:when test="prizebook">
+ <xsl:apply-templates select="prizebook"/>
+ </xsl:when>
+ <xsl:when test="list_deviation">
+ <xsl:apply-templates select="list_deviation"/>
+ </xsl:when>
+ <xsl:when test="edit_deviation">
+ <xsl:apply-templates select="edit_deviation"/>
+ </xsl:when>
+ <xsl:when test="import_calculation">
+ <xsl:apply-templates select="import_calculation"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="list_hour"/>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<!-- New template-->
@@ -63,11 +63,11 @@
</xsl:for-each>
<div class="proplist-col">
- <xsl:variable name="add_action">
- <xsl:value-of
select="add_action"/>
- </xsl:variable>
+ <xsl:variable name="add_action">
+ <xsl:value-of select="add_action"/>
+ </xsl:variable>
<a class="pure-button pure-button-primary" href="{$add_action}">
- <xsl:value-of
select="lang_add"/>
+ <xsl:value-of select="lang_add"/>
<!--
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
@@ -76,11 +76,11 @@
</xsl:attribute>
-->
</a>
- <xsl:variable name="done_action">
- <xsl:value-of
select="done_action"/>
- </xsl:variable>
+ <xsl:variable name="done_action">
+ <xsl:value-of select="done_action"/>
+ </xsl:variable>
<a class="pure-button pure-button-primary"
href="{$done_action}">
- <xsl:value-of
select="lang_done"/>
+ <xsl:value-of select="lang_done"/>
<!--
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
@@ -94,96 +94,96 @@
<!-- New template-->
<xsl:template match="table_header_deviation">
- <tr class="th">
- <td class="th_text" width="1%" align="right">
- <xsl:value-of select="lang_id"/>
- </td>
- <td class="th_text" width="6%" align="right">
- <xsl:value-of select="lang_amount"/>
- </td>
- <td class="th_text" width="80%">
- <xsl:value-of select="lang_descr"/>
- </td>
- <td class="th_text" width="80%">
- <xsl:value-of select="lang_date"/>
- </td>
- <td class="th_text" width="5%" align="left">
- <xsl:value-of select="lang_edit"/>
- </td>
- <td class="th_text" width="5%" align="left">
- <xsl:value-of select="lang_delete"/>
- </td>
- </tr>
+ <tr class="th">
+ <td class="th_text" width="1%" align="right">
+ <xsl:value-of select="lang_id"/>
+ </td>
+ <td class="th_text" width="6%" align="right">
+ <xsl:value-of select="lang_amount"/>
+ </td>
+ <td class="th_text" width="80%">
+ <xsl:value-of select="lang_descr"/>
+ </td>
+ <td class="th_text" width="80%">
+ <xsl:value-of select="lang_date"/>
+ </td>
+ <td class="th_text" width="5%" align="left">
+ <xsl:value-of select="lang_edit"/>
+ </td>
+ <td class="th_text" width="5%" align="left">
+ <xsl:value-of select="lang_delete"/>
+ </td>
+ </tr>
</xsl:template>
<!-- New template-->
<xsl:template match="values_deviation">
- <xsl:variable name="lang_edit_statustext">
- <xsl:value-of select="lang_edit_statustext"/>
- </xsl:variable>
- <xsl:variable name="link_edit">
- <xsl:value-of select="link_edit"/>
- </xsl:variable>
- <xsl:variable name="lang_delete_statustext">
- <xsl:value-of select="lang_delete_statustext"/>
- </xsl:variable>
- <xsl:variable name="link_delete">
- <xsl:value-of select="link_delete"/>
- </xsl:variable>
- <tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod 2 = 0">
- <xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td class="small_text" align="right">
- <xsl:value-of select="id"/>
- </td>
- <td class="small_text" align="right">
- <xsl:value-of select="amount"/>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="descr"/>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="entry_date"/>
- </td>
- <td class="small_text" align="center">
- <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>
- <td class="small_text" align="center">
- <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>
- </tr>
+ <xsl:variable name="lang_edit_statustext">
+ <xsl:value-of select="lang_edit_statustext"/>
+ </xsl:variable>
+ <xsl:variable name="link_edit">
+ <xsl:value-of select="link_edit"/>
+ </xsl:variable>
+ <xsl:variable name="lang_delete_statustext">
+ <xsl:value-of select="lang_delete_statustext"/>
+ </xsl:variable>
+ <xsl:variable name="link_delete">
+ <xsl:value-of select="link_delete"/>
+ </xsl:variable>
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="@class">
+ <xsl:value-of select="@class"/>
+ </xsl:when>
+ <xsl:when test="position() mod 2 = 0">
+ <xsl:text>row_off</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>row_on</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <td class="small_text" align="right">
+ <xsl:value-of select="id"/>
+ </td>
+ <td class="small_text" align="right">
+ <xsl:value-of select="amount"/>
+ </td>
+ <td class="small_text" align="left">
+ <xsl:value-of select="descr"/>
+ </td>
+ <td class="small_text" align="left">
+ <xsl:value-of select="entry_date"/>
+ </td>
+ <td class="small_text" align="center">
+ <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>
+ <td class="small_text" align="center">
+ <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>
+ </tr>
</xsl:template>
<!-- New template-->
<xsl:template match="add_template">
- <xsl:choose>
- <xsl:when test="msgbox_data != ''">
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
<dl>
<dt>
-
<xsl:call-template name="msgbox"/>
+ <xsl:call-template name="msgbox"/>
</dt>
</dl>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div>
- <xsl:variable name="add_action">
- <xsl:value-of select="add_action"/>
- </xsl:variable>
+ <xsl:variable name="add_action">
+ <xsl:value-of select="add_action"/>
+ </xsl:variable>
<form id="form" name="form" method="post"
action="{$add_action}" class="pure-form pure-form-aligned">
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="tabs"/>
@@ -192,32 +192,32 @@
<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 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>
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
<xsl:attribute
name="data-validation-error-msg">
<xsl:value-of
select="php:function('lang', 'Please - enter a template name!')"/>
</xsl:attribute>
- </input>
+ </input>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="lang_descr"/>
</label>
- <textarea cols="60"
rows="4" 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>
+ <textarea cols="60" rows="4"
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>
</div>
@@ -227,29 +227,29 @@
<xsl:value-of select="lang_add"/>
</xsl:variable>
<input type="submit" class="pure-button
pure-button-primary" name="values[save]" value="{$lang_add}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <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>
- <xsl:variable name="lang_done">
- <xsl:value-of
select="lang_done"/>
- </xsl:variable>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ <xsl:variable name="lang_done">
+ <xsl:value-of select="lang_done"/>
+ </xsl:variable>
<input type="button" class="pure-button
pure-button-primary" name="done" value="{$lang_done}"
onMouseout="window.status='';return true;" onClick="document.done.submit();">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_done_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- </input>
+ <xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_done_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
</div>
- </form>
+ </form>
<xsl:variable name="done_action">
<xsl:value-of select="done_action"/>
</xsl:variable>
<form name="done" id="done" action="{$done_action}"
method="post"></form>
- </div>
+ </div>
<xsl:apply-templates select="workorder_data"/>
<xsl:for-each select="//datatable_def">
<xsl:if test="container = 'datatable-container_0'">
@@ -262,71 +262,71 @@
<xsl:with-param name="config" select ='config'
/>
</xsl:call-template>
</xsl:if>
- </xsl:for-each>
+ </xsl:for-each>
</xsl:template>
<!-- New template-->
<xsl:template match="list_hour">
- <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>
- </table>
- <xsl:apply-templates select="workorder_data"/>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <tr>
- <td class="th_text" colspan="3" align="right">
- <xsl:value-of
select="lang_total_records"/>
- <xsl:text> : </xsl:text>
- </td>
- <td class="th_text" colspan="5" align="left">
- <xsl:value-of
select="total_hours_records"/>
- </td>
- </tr>
- <xsl:apply-templates select="table_header_hour"/>
- <xsl:apply-templates select="values_hour"/>
- <xsl:apply-templates select="table_sum"/>
- </table>
- <xsl:apply-templates select="table_add"/>
+ <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>
+ </table>
+ <xsl:apply-templates select="workorder_data"/>
+ <table width="100%" cellpadding="2" cellspacing="2" align="center">
+ <tr>
+ <td class="th_text" colspan="3" align="right">
+ <xsl:value-of select="lang_total_records"/>
+ <xsl:text> : </xsl:text>
+ </td>
+ <td class="th_text" colspan="5" align="left">
+ <xsl:value-of select="total_hours_records"/>
+ </td>
+ </tr>
+ <xsl:apply-templates select="table_header_hour"/>
+ <xsl:apply-templates select="values_hour"/>
+ <xsl:apply-templates select="table_sum"/>
+ </table>
+ <xsl:apply-templates select="table_add"/>
</xsl:template>
<!-- New template-->
<xsl:template match="email_list">
- <xsl:variable name="email">
- <xsl:value-of select="email"/>
- </xsl:variable>
- <xsl:choose>
- <xsl:when test="selected != 0">
- <option value="{$email}" selected="selected">
- <xsl:value-of
disable-output-escaping="yes" select="email"/>
- </option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$email}">
- <xsl:value-of
disable-output-escaping="yes" select="email"/>
- </option>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:variable name="email">
+ <xsl:value-of select="email"/>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="selected != 0">
+ <option value="{$email}" selected="selected">
+ <xsl:value-of disable-output-escaping="yes"
select="email"/>
+ </option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option value="{$email}">
+ <xsl:value-of disable-output-escaping="yes"
select="email"/>
+ </option>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<!-- New template-->
<xsl:template xmlns:php="http://php.net/xsl" match="view">
-
<xsl:choose>
-
<xsl:when test="msgbox_data != ''">
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
<dl>
<dt>
-
<xsl:call-template name="msgbox"/>
+ <xsl:call-template name="msgbox"/>
</dt>
</dl>
-
</xsl:when>
-
</xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<xsl:variable name="send_order_action">
<xsl:value-of select="send_order_action"/>
</xsl:variable>
@@ -335,126 +335,126 @@
<xsl:when test="no_email =''">
<div class="pure-control-group">
<label>
-
<a href="{print_action}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'preview
html')"/>
-
</xsl:attribute>
-
<xsl:value-of select="php:function('lang', 'html')"/>
-
</a>
+ <a href="{print_action}">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'preview html')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'html')"/>
+ </a>
</label>
</div>
<div class="pure-control-group">
<label>
-
<a href="{pdf_action}" target="_blank">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'preview
pdf')"/>
-
</xsl:attribute>
-
<xsl:value-of select="php:function('lang', 'pdf')"/>
-
</a>
+ <a href="{pdf_action}"
target="_blank">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'preview pdf')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'pdf')"/>
+ </a>
</label>
</div>
-
<xsl:choose>
-
<xsl:when test="table_send !=''">
+ <xsl:choose>
+ <xsl:when test="table_send !=''">
<div class="pure-control-group">
<input type="submit"
class="pure-button pure-button-primary" name="send_order"
value="{table_send/lang_send_order}">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="table_send/lang_send_order_statustext"/>
-
</xsl:attribute>
-
</input>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="table_send/lang_send_order_statustext"/>
+ </xsl:attribute>
+ </input>
<input type="submit"
class="pure-button pure-button-primary" name="done"
value="{table_done/lang_done}">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="table_done/lang_done_statustext"/>
-
</xsl:attribute>
-
</input>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="table_done/lang_done_statustext"/>
+ </xsl:attribute>
+ </input>
</div>
-
</xsl:when>
-
</xsl:choose>
-
<xsl:choose>
-
<xsl:when test="mail_recipients !=''">
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="mail_recipients !=''">
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_mail"/>
+ <xsl:value-of
select="lang_mail"/>
</label>
-
<xsl:value-of select="mail_recipients"/>
+ <xsl:value-of
select="mail_recipients"/>
</div>
-
</xsl:when>
-
<xsl:otherwise>
+ </xsl:when>
+ <xsl:otherwise>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_mail"/>
+ <xsl:value-of
select="lang_mail"/>
</label>
-
<input type="text" name="to_email" value="{to_email}">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="lang_to_email_address_statustext"/>
-
</xsl:attribute>
-
</input>
+ <input type="text"
name="to_email" value="{to_email}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="lang_to_email_address_statustext"/>
+ </xsl:attribute>
+ </input>
</div>
-
</xsl:otherwise>
-
</xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'request an email
receipt')"/>
+ <xsl:value-of
select="php:function('lang', 'request an email receipt')"/>
</label>
-
<input type="checkbox" name="email_receipt" value="true">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'request a
confirmation email when your email is opened by the recipient')"/>
-
</xsl:attribute>
-
<xsl:if test="requst_email_receipt != 0">
-
<xsl:attribute name="checked" value="checked"/>
-
</xsl:if>
-
</input>
+ <input type="checkbox"
name="email_receipt" value="true">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'request a confirmation email when your email is
opened by the recipient')"/>
+ </xsl:attribute>
+ <xsl:if
test="requst_email_receipt != 0">
+ <xsl:attribute
name="checked" value="checked"/>
+ </xsl:if>
+ </input>
</div>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'send as pdf')"/>
+ <xsl:value-of
select="php:function('lang', 'send as pdf')"/>
</label>
-
<input type="checkbox" name="send_as_pdf" value="true">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'Send pdf as
attachment to email')"/>
-
</xsl:attribute>
-
</input>
+ <input type="checkbox"
name="send_as_pdf" value="true">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'Send pdf as attachment to email')"/>
+ </xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'notify client by sms')"/>
+ <xsl:value-of
select="php:function('lang', 'notify client by sms')"/>
</label>
-
<input type="checkbox"
name="notify_client_by_sms" value="true">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="value_sms_client_order_notice"/>
-
</xsl:attribute>
-
</input>
-
<input type="text" name="to_sms_phone"
value="{value_sms_phone}">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="value_sms_client_order_notice"/>
-
</xsl:attribute>
-
</input>
+ <input type="checkbox"
name="notify_client_by_sms" value="true">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="value_sms_client_order_notice"/>
+ </xsl:attribute>
+ </input>
+ <input type="text" name="to_sms_phone"
value="{value_sms_phone}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="value_sms_client_order_notice"/>
+ </xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'show calculated cost')"/>
+ <xsl:value-of
select="php:function('lang', 'show calculated cost')"/>
</label>
-
<input type="checkbox" name="show_cost" value="true">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'warning:
show cost estimate')"/>
-
</xsl:attribute>
-
<xsl:if test="value_show_cost = '1'">
-
<xsl:attribute name="checked">
-
<xsl:text>checked</xsl:text>
-
</xsl:attribute>
-
</xsl:if>
-
</input>
+ <input type="checkbox" name="show_cost"
value="true">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'warning: show cost estimate')"/>
+ </xsl:attribute>
+ <xsl:if test="value_show_cost =
'1'">
+ <xsl:attribute
name="checked">
+
<xsl:text>checked</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div class="pure-control-group">
- <hr noshade="noshade"
width="100%" align="center" size="1"/>
+ <hr noshade="noshade" width="100%" align="center"
size="1"/>
</div>
- <xsl:apply-templates
select="email_data"/>
+ <xsl:apply-templates select="email_data"/>
<div class="pure-control-group">
- <hr noshade="noshade"
width="100%" align="center" size="1"/>
+ <hr noshade="noshade" width="100%" align="center"
size="1"/>
</div>
- <xsl:choose>
- <xsl:when test="files!=''">
+ <xsl:choose>
+ <xsl:when test="files!=''">
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'files')"/>
@@ -474,18 +474,18 @@
</xsl:for-each>
</div>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div class="pure-control-group">
- <xsl:choose>
- <xsl:when
test="workorder_history=''">
+ <xsl:choose>
+ <xsl:when test="workorder_history=''">
<label>
-
<xsl:value-of select="lang_no_history"/>
+ <xsl:value-of
select="lang_no_history"/>
</label>
- </xsl:when>
- <xsl:otherwise>
+ </xsl:when>
+ <xsl:otherwise>
<label>
-
<xsl:value-of select="lang_history"/>
+ <xsl:value-of
select="lang_history"/>
</label>
<div>
<xsl:for-each
select="//datatable_def">
@@ -501,75 +501,75 @@
</xsl:if>
</xsl:for-each>
</div>
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
- <xsl:choose>
- <xsl:when test="table_send !=''">
+ <xsl:choose>
+ <xsl:when test="table_send !=''">
<div class="pure-control-group">
<input type="submit" class="pure-button
pure-button-primary" name="send_order" value="{table_send/lang_send_order}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="table_send/lang_send_order_statustext"/>
-
</xsl:attribute>
- </input>
+ <xsl:attribute name="title">
+ <xsl:value-of
select="table_send/lang_send_order_statustext"/>
+ </xsl:attribute>
+ </input>
<input type="submit" class="pure-button
pure-button-primary" name="done" value="{table_done/lang_done}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="table_done/lang_done_statustext"/>
-
</xsl:attribute>
- </input>
+ <xsl:attribute name="title">
+ <xsl:value-of
select="table_done/lang_done_statustext"/>
+ </xsl:attribute>
+ </input>
</div>
- </xsl:when>
- </xsl:choose>
- </form>
+ </xsl:when>
+ </xsl:choose>
+ </form>
</xsl:template>
<!-- New template-->
<xsl:template match="table_header_history">
- <tr class="th">
- <td class="th_text" width="20%" align="left">
- <xsl:value-of select="lang_date"/>
- </td>
- <td class="th_text" width="10%" align="left">
- <xsl:value-of select="lang_user"/>
- </td>
- <td class="th_text" width="30%" align="left">
- <xsl:value-of select="lang_action"/>
- </td>
- <td class="th_text" width="10%" align="left">
- <xsl:value-of select="lang_new_value"/>
- </td>
- </tr>
+ <tr class="th">
+ <td class="th_text" width="20%" align="left">
+ <xsl:value-of select="lang_date"/>
+ </td>
+ <td class="th_text" width="10%" align="left">
+ <xsl:value-of select="lang_user"/>
+ </td>
+ <td class="th_text" width="30%" align="left">
+ <xsl:value-of select="lang_action"/>
+ </td>
+ <td class="th_text" width="10%" align="left">
+ <xsl:value-of select="lang_new_value"/>
+ </td>
+ </tr>
</xsl:template>
<!-- New template-->
<xsl:template match="workorder_history">
- <tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod 2 = 0">
- <xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td align="left">
- <xsl:value-of select="value_date"/>
- </td>
- <td align="left">
- <xsl:value-of select="value_user"/>
- </td>
- <td align="left">
- <xsl:value-of select="value_action"/>
- </td>
- <td align="left">
- <xsl:value-of select="value_new_value"/>
- </td>
- </tr>
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="@class">
+ <xsl:value-of select="@class"/>
+ </xsl:when>
+ <xsl:when test="position() mod 2 = 0">
+ <xsl:text>row_off</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>row_on</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <td align="left">
+ <xsl:value-of select="value_date"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="value_user"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="value_action"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="value_new_value"/>
+ </td>
+ </tr>
</xsl:template>
<!-- New template-->
@@ -577,223 +577,223 @@
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_date"/>
+ <xsl:value-of select="lang_date"/>
</label>
-
<xsl:value-of select="date"/>
+ <xsl:value-of select="date"/>
</div>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_workorder"/>
+ <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>
+ <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"/>
+ <xsl:value-of select="lang_to"/>
</label>
-
<xsl:value-of select="to_name"/>
+ <xsl:value-of select="to_name"/>
</div>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_from"/>
+ <xsl:value-of select="lang_from"/>
</label>
<div class="pure-custom">
<div>
-
<xsl:value-of select="from_name"/>
+ <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>
+ <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"/>
+ <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"/>
+ <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 !=''">
+ <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
+ Gnr/Bnr/Feste/Seksjon
</label>
-
<xsl:value-of select="formatted_gab_id"/>
+ <xsl:value-of select="formatted_gab_id"/>
</div>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when
test="contact_phone !=''">
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="contact_phone !=''">
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_contact_phone"/>
+ <xsl:value-of
select="lang_contact_phone"/>
</label>
-
<xsl:value-of select="contact_phone"/>
+ <xsl:value-of select="contact_phone"/>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_title"/>
+ <xsl:value-of select="lang_title"/>
</label>
-
<xsl:value-of select="title"/>
+ <xsl:value-of select="title"/>
</div>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_descr"/>
+ <xsl:value-of select="lang_descr"/>
</label>
<div class="pure-custom">
- <table
border="1" width="100%" bordercolor="#000000" cellspacing="0" cellpadding="0">
-
<tr>
-
<td width="100%">
-
<xsl:value-of select="descr"/>
-
</td>
-
</tr>
- </table>
+ <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"/>
+ <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"/>
+ <xsl:value-of select="budget_account"/>
+ <xsl:value-of select="lang_cost_tax"/>
</div>
</div>
- <xsl:choose>
- <xsl:when
test="sum_calculation!=''">
+ <xsl:choose>
+ <xsl:when test="sum_calculation!=''">
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_sum_calculation"/>
+ <xsl:value-of
select="lang_sum_calculation"/>
</label>
-
<xsl:value-of select="sum_calculation"/>
+ <xsl:value-of select="sum_calculation"/>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_start_date"/>
+ <xsl:value-of select="lang_start_date"/>
</label>
<div class="pure-custom">
-
<xsl:value-of select="start_date"/>
-
<xsl:value-of select="lang_materials"/>
+ <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"/>
+ <xsl:value-of select="lang_end_date"/>
</label>
<div class="pure-custom">
-
<xsl:value-of select="end_date"/>
-
<xsl:value-of select="lang_work"/>
+ <xsl:value-of select="end_date"/>
+ <xsl:value-of select="lang_work"/>
</div>
</div>
- <xsl:choose>
- <xsl:when
test="branch_list/selected">
+ <xsl:choose>
+ <xsl:when test="branch_list/selected">
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_branch"/>
+ <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>
+ <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">
+ </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"/>
+ <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>
+ <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">
+ </xsl:when>
+ </xsl:choose>
+ <xsl:if test="key_fetch_list/selected">
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_key_fetch"/>
+ <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">
+ <xsl:for-each select="key_fetch_list">
+ <xsl:choose>
+ <xsl:when test="selected">
<div>
-
<xsl:value-of select="name"/>
+ <xsl:value-of
select="name"/>
</div>
-
</xsl:when>
-
</xsl:choose>
-
</xsl:for-each>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
</div>
</div>
- </xsl:if>
- <xsl:if
test="key_deliver_list/selected">
+ </xsl:if>
+ <xsl:if test="key_deliver_list/selected">
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_key_deliver"/>
+ <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">
+ <xsl:for-each select="key_deliver_list">
+ <xsl:choose>
+ <xsl:when test="selected">
<div>
-
<xsl:value-of select="name"/>
+ <xsl:value-of
select="name"/>
</div>
-
</xsl:when>
-
</xsl:choose>
-
</xsl:for-each>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
</div>
</div>
- </xsl:if>
+ </xsl:if>
+ <xsl:choose>
+ <xsl:when test="values_view_order!=''">
+ <div class="pure-control-group">
<xsl:choose>
- <xsl:when test="values_view_order!=''">
- <div class="pure-control-group">
-
<xsl:choose>
-
<xsl:when test="use_yui_table='1'">
+ <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">
@@ -806,51 +806,51 @@
</xsl:call-template>
</xsl:if>
</xsl:for-each>
-
</xsl:when>
-
<xsl:otherwise>
- <table border="1"
style="width:100%">
-
<xsl:apply-templates select="table_header_view_order"/>
-
<xsl:apply-templates select="values_view_order"/>
+ </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>
+ </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!=''">
+ </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>
+ <h4>
+ <xsl:value-of
select="order_footer_header"/>
+ </h4>
</div>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="order_footer!=''">
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="order_footer!=''">
<div class="pure-control-group">
- <xsl:value-of
select="order_footer"/>
+ <xsl:value-of select="order_footer"/>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
<!-- New template-->
<xsl:template match="table_header_view_order">
- <xsl:variable name="sort_activity_num">
- <xsl:value-of select="sort_activity_num"/>
- </xsl:variable>
- <xsl:variable name="sort_descr">
- <xsl:value-of select="sort_descr"/>
- </xsl:variable>
- <xsl:variable name="sort_quantity">
- <xsl:value-of select="sort_quantity"/>
- </xsl:variable>
+ <xsl:variable name="sort_activity_num">
+ <xsl:value-of select="sort_activity_num"/>
+ </xsl:variable>
+ <xsl:variable name="sort_descr">
+ <xsl:value-of select="sort_descr"/>
+ </xsl:variable>
+ <xsl:variable name="sort_quantity">
+ <xsl:value-of select="sort_quantity"/>
+ </xsl:variable>
<thead>
<tr class="th">
<td class="th_text" width="5%" align="right">
@@ -880,524 +880,524 @@
<!-- New template-->
<xsl:template match="values_view_order">
- <xsl:choose>
- <xsl:when test="new_grouping=1">
- <tr>
+ <xsl:choose>
+ <xsl:when test="new_grouping=1">
+ <tr>
<td align="left" colspan="8" width="100%">
- <xsl:value-of
select="grouping_descr"/>
- </td>
- </tr>
- </xsl:when>
- </xsl:choose>
+ <xsl:value-of select="grouping_descr"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <tr>
+ <td align="right">
+ <xsl:value-of select="post"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="code"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="hours_descr"/>
+ <br/>
+ <xsl:value-of select="remark"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="unit_name"/>
+ </td>
+ <td align="right">
+ <xsl:value-of select="quantity"/>
+ </td>
+ <td align="right">
+ <xsl:value-of select="billperae"/>
+ </td>
+ <td align="right">
+ <xsl:value-of select="cost"/>
+ </td>
+ </tr>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template match="list_template">
+ <xsl:apply-templates select="menu"/>
+ <xsl:apply-templates select="workorder_data"/>
+ <table width="100%" cellpadding="2" cellspacing="2" align="center">
<tr>
- <td align="right">
- <xsl:value-of select="post"/>
+ <td>
+ <xsl:call-template name="chapter_filter"/>
</td>
- <td align="left">
- <xsl:value-of select="code"/>
- </td>
- <td align="left">
- <xsl:value-of select="hours_descr"/>
- <br/>
- <xsl:value-of select="remark"/>
- </td>
- <td align="left">
- <xsl:value-of select="unit_name"/>
- </td>
<td align="right">
- <xsl:value-of select="quantity"/>
+ <xsl:call-template name="search_field"/>
</td>
- <td align="right">
- <xsl:value-of select="billperae"/>
+ </tr>
+ <tr>
+ <td colspan="3" width="100%">
+ <xsl:call-template name="nextmatchs"/>
</td>
- <td align="right">
- <xsl:value-of select="cost"/>
- </td>
</tr>
+ </table>
+ <table width="100%" cellpadding="2" cellspacing="2" align="center">
+ <xsl:apply-templates select="table_header_template"/>
+ <xsl:choose>
+ <xsl:when test="values_template[template_id]!=''">
+ <xsl:apply-templates select="values_template"/>
+ </xsl:when>
+ </xsl:choose>
+ </table>
+ <xsl:apply-templates select="table_done"/>
</xsl:template>
<!-- New template-->
-<xsl:template match="list_template">
- <xsl:apply-templates select="menu"/>
- <xsl:apply-templates select="workorder_data"/>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <tr>
- <td>
- <xsl:call-template
name="chapter_filter"/>
- </td>
- <td align="right">
- <xsl:call-template name="search_field"/>
- </td>
- </tr>
- <tr>
- <td colspan="3" width="100%">
- <xsl:call-template name="nextmatchs"/>
- </td>
- </tr>
- </table>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <xsl:apply-templates select="table_header_template"/>
+<xsl:template match="table_header_template">
+ <xsl:variable name="sort_name">
+ <xsl:value-of select="sort_name"/>
+ </xsl:variable>
+ <xsl:variable name="sort_template_id">
+ <xsl:value-of select="sort_template_id"/>
+ </xsl:variable>
+ <tr class="th">
+ <td class="th_text" width="10%" align="right">
+ <a href="{$sort_template_id}">
+ <xsl:value-of select="lang_template_id"/>
+ </a>
+ </td>
+ <td class="th_text" width="10%" align="right">
+ <a href="{$sort_name}">
+ <xsl:value-of select="lang_name"/>
+ </a>
+ </td>
+ <td class="th_text" width="30%" align="left">
+ <xsl:value-of select="lang_descr"/>
+ </td>
+ <td class="th_text" width="20%" align="left">
+ <xsl:value-of select="lang_chapter"/>
+ </td>
+ <td class="th_text" width="5%" align="right">
+ <xsl:value-of select="lang_owner"/>
+ </td>
+ <td class="th_text" width="10%" align="right">
+ <xsl:value-of select="lang_entry_date"/>
+ </td>
+ <td class="th_text" width="5%" align="center">
+ <xsl:value-of select="lang_select"/>
+ </td>
+ </tr>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template match="values_template">
+ <xsl:variable name="lang_edit_statustext">
+ <xsl:value-of select="lang_edit_statustext"/>
+ </xsl:variable>
+ <xsl:variable name="lang_prizing_statustext">
+ <xsl:value-of select="lang_prizing_statustext"/>
+ </xsl:variable>
+ <tr>
+ <xsl:attribute name="class">
<xsl:choose>
- <xsl:when
test="values_template[template_id]!=''">
- <xsl:apply-templates
select="values_template"/>
+ <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>
- </table>
- <xsl:apply-templates select="table_done"/>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template match="table_header_template">
- <xsl:variable name="sort_name">
- <xsl:value-of select="sort_name"/>
+ </xsl:attribute>
+ <td align="right">
+ <xsl:value-of select="template_id"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="name"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="descr"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="chapter"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="owner"/>
+ </td>
+ <td align="right">
+ <xsl:value-of select="entry_date"/>
+ </td>
+ <xsl:variable name="form_action_select">
+ <xsl:value-of select="form_action_select"/>
</xsl:variable>
- <xsl:variable name="sort_template_id">
- <xsl:value-of select="sort_template_id"/>
- </xsl:variable>
- <tr class="th">
- <td class="th_text" width="10%" align="right">
- <a href="{$sort_template_id}">
- <xsl:value-of
select="lang_template_id"/>
- </a>
+ <form method="post" action="{$form_action_select}">
+ <td valign="top">
+ <input type="hidden" name="template_id"
value="{template_id}"/>
+ <input type="hidden" name="workorder_id"
value="{workorder_id}"/>
+ <xsl:variable name="lang_select">
+ <xsl:value-of select="lang_select"/>
+ </xsl:variable>
+ <input type="submit" name="select"
value="{$lang_select}" 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>
- <td class="th_text" width="10%" align="right">
- <a href="{$sort_name}">
- <xsl:value-of select="lang_name"/>
- </a>
- </td>
- <td class="th_text" width="30%" align="left">
- <xsl:value-of select="lang_descr"/>
- </td>
- <td class="th_text" width="20%" align="left">
- <xsl:value-of select="lang_chapter"/>
- </td>
- <td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_owner"/>
- </td>
- <td class="th_text" width="10%" align="right">
- <xsl:value-of select="lang_entry_date"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_select"/>
- </td>
- </tr>
+ </form>
+ </tr>
</xsl:template>
<!-- New template-->
-<xsl:template match="values_template">
- <xsl:variable name="lang_edit_statustext">
- <xsl:value-of select="lang_edit_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_prizing_statustext">
- <xsl:value-of select="lang_prizing_statustext"/>
- </xsl:variable>
+<xsl:template match="list_template_hour">
+ <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>
+ </table>
+ <table width="100%" cellpadding="2" cellspacing="2" align="center">
<tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod 2 = 0">
- <xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td align="right">
- <xsl:value-of select="template_id"/>
+ <td>
+ <xsl:apply-templates select="workorder_data"/>
</td>
- <td align="left">
- <xsl:value-of select="name"/>
- </td>
- <td align="left">
- <xsl:value-of select="descr"/>
- </td>
- <td align="left">
- <xsl:value-of select="chapter"/>
- </td>
- <td align="left">
- <xsl:value-of select="owner"/>
- </td>
- <td align="right">
- <xsl:value-of select="entry_date"/>
- </td>
- <xsl:variable name="form_action_select">
- <xsl:value-of select="form_action_select"/>
- </xsl:variable>
- <form method="post" action="{$form_action_select}">
- <td valign="top">
- <input type="hidden" name="template_id"
value="{template_id}"/>
- <input type="hidden"
name="workorder_id" value="{workorder_id}"/>
- <xsl:variable name="lang_select">
- <xsl:value-of
select="lang_select"/>
- </xsl:variable>
- <input type="submit" name="select"
value="{$lang_select}" 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>
- </form>
</tr>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template match="list_template_hour">
- <xsl:apply-templates select="menu"/>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <xsl:choose>
- <xsl:when test="msgbox_data != ''">
+ <tr>
+ <td>
+ <table width="100%" cellpadding="2"
cellspacing="2" align="center">
<tr>
- <td align="left" colspan="3">
- <xsl:call-template
name="msgbox"/>
+ <td align="right">
+ <xsl:call-template
name="search_field"/>
</td>
</tr>
- </xsl:when>
- </xsl:choose>
- </table>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <tr>
- <td>
- <xsl:apply-templates
select="workorder_data"/>
- </td>
- </tr>
- <tr>
- <td>
+ <tr>
+ <td colspan="3" width="100%">
+ <xsl:call-template
name="nextmatchs"/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
+ <tr>
+ <td>
+ <form method="post" name="form"
action="{$form_action}">
<table width="100%" cellpadding="2"
cellspacing="2" align="center">
- <tr>
- <td align="right">
-
<xsl:call-template name="search_field"/>
- </td>
- </tr>
- <tr>
- <td colspan="3"
width="100%">
-
<xsl:call-template name="nextmatchs"/>
- </td>
- </tr>
+ <xsl:apply-templates
select="table_header_template_hour"/>
+ <xsl:choose>
+ <xsl:when
test="values_template_hour[counter]!=''">
+
<xsl:apply-templates select="values_template_hour"/>
+ <tr>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
+ <td
align="center">
+
<xsl:variable name="img_check">
+
<xsl:value-of select="img_check"/>
+
</xsl:variable>
+
<a href="javascript:check_all_checkbox('values[select]')">
+
<img src="{$img_check}" border="0" height="16" width="21"
alt="{lang_select_all}"/>
+
</a>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
</table>
- </td>
- </tr>
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
- <tr>
- <td>
- <form method="post" name="form"
action="{$form_action}">
- <table width="100%"
cellpadding="2" cellspacing="2" align="center">
- <xsl:apply-templates
select="table_header_template_hour"/>
- <xsl:choose>
- <xsl:when
test="values_template_hour[counter]!=''">
-
<xsl:apply-templates select="values_template_hour"/>
- <tr>
-
<td/>
-
<td/>
-
<td/>
-
<td/>
-
<td/>
-
<td/>
-
<td align="center">
-
<xsl:variable name="img_check">
-
<xsl:value-of select="img_check"/>
-
</xsl:variable>
-
<a href="javascript:check_all_checkbox('values[select]')">
-
<img src="{$img_check}" border="0" height="16" width="21"
alt="{lang_select_all}"/>
-
</a>
-
</td>
- </tr>
- </xsl:when>
- </xsl:choose>
- </table>
- <table align="left">
- <tr height="50">
- <td>
-
<xsl:variable name="lang_add">
-
<xsl:value-of select="lang_add"/>
-
</xsl:variable>
- <input
type="submit" name="values[add]" value="{$lang_add}"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_add_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </td>
- </tr>
- </table>
- </form>
- </td>
- </tr>
- <tr>
- <td>
- <table width="100%" cellpadding="2"
cellspacing="2" align="left">
- <hr noshade="noshade"
width="100%" align="center" size="1"/>
- <tr>
- <td class="th_text"
colspan="3" align="right">
- <xsl:value-of
select="lang_total_records"/>
- <xsl:text> :
</xsl:text>
+ <table align="left">
+ <tr height="50">
+ <td>
+ <xsl:variable
name="lang_add">
+
<xsl:value-of select="lang_add"/>
+ </xsl:variable>
+ <input
type="submit" name="values[add]" value="{$lang_add}"
onMouseout="window.status='';return true;">
+
<xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="lang_add_statustext"/>
+
<xsl:text>'; return true;</xsl:text>
+
</xsl:attribute>
+ </input>
</td>
- <td class="th_text"
colspan="5" align="left">
- <xsl:value-of
select="total_hours_records"/>
- </td>
</tr>
- <xsl:apply-templates
select="table_header_hour"/>
- <xsl:apply-templates
select="values_hour"/>
- <xsl:apply-templates
select="table_sum"/>
</table>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:apply-templates
select="table_done"/>
- </td>
- </tr>
- </table>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template match="table_header_template_hour">
- <xsl:variable name="sort_billperae">
- <xsl:value-of select="sort_billperae"/>
- </xsl:variable>
- <xsl:variable name="sort_building_part">
- <xsl:value-of select="sort_building_part"/>
- </xsl:variable>
- <tr class="th">
- <td class="th_text" width="10%" align="right">
- <a href="{$sort_building_part}">
- <xsl:value-of
select="lang_building_part"/>
- </a>
+ </form>
</td>
- <td class="th_text" width="10%" align="right">
- <xsl:value-of select="lang_code"/>
+ </tr>
+ <tr>
+ <td>
+ <table width="100%" cellpadding="2"
cellspacing="2" align="left">
+ <hr noshade="noshade" width="100%"
align="center" size="1"/>
+ <tr>
+ <td class="th_text" colspan="3"
align="right">
+ <xsl:value-of
select="lang_total_records"/>
+ <xsl:text> : </xsl:text>
+ </td>
+ <td class="th_text" colspan="5"
align="left">
+ <xsl:value-of
select="total_hours_records"/>
+ </td>
+ </tr>
+ <xsl:apply-templates
select="table_header_hour"/>
+ <xsl:apply-templates
select="values_hour"/>
+ <xsl:apply-templates
select="table_sum"/>
+ </table>
</td>
- <td class="th_text" width="30%" align="left">
- <xsl:value-of select="lang_descr"/>
+ </tr>
+ <tr>
+ <td>
+ <xsl:apply-templates select="table_done"/>
</td>
- <td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_unit"/>
- </td>
- <td class="th_text" width="10%" align="right">
- <a href="{$sort_billperae}">
- <xsl:value-of select="lang_billperae"/>
- </a>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_quantity"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_select"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_category"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_per_cent"/>
- </td>
</tr>
+ </table>
</xsl:template>
<!-- New template-->
+<xsl:template match="table_header_template_hour">
+ <xsl:variable name="sort_billperae">
+ <xsl:value-of select="sort_billperae"/>
+ </xsl:variable>
+ <xsl:variable name="sort_building_part">
+ <xsl:value-of select="sort_building_part"/>
+ </xsl:variable>
+ <tr class="th">
+ <td class="th_text" width="10%" align="right">
+ <a href="{$sort_building_part}">
+ <xsl:value-of select="lang_building_part"/>
+ </a>
+ </td>
+ <td class="th_text" width="10%" align="right">
+ <xsl:value-of select="lang_code"/>
+ </td>
+ <td class="th_text" width="30%" align="left">
+ <xsl:value-of select="lang_descr"/>
+ </td>
+ <td class="th_text" width="5%" align="right">
+ <xsl:value-of select="lang_unit"/>
+ </td>
+ <td class="th_text" width="10%" align="right">
+ <a href="{$sort_billperae}">
+ <xsl:value-of select="lang_billperae"/>
+ </a>
+ </td>
+ <td class="th_text" width="5%" align="center">
+ <xsl:value-of select="lang_quantity"/>
+ </td>
+ <td class="th_text" width="5%" align="center">
+ <xsl:value-of select="lang_select"/>
+ </td>
+ <td class="th_text" width="5%" align="center">
+ <xsl:value-of select="lang_category"/>
+ </td>
+ <td class="th_text" width="5%" align="center">
+ <xsl:value-of select="lang_per_cent"/>
+ </td>
+ </tr>
+</xsl:template>
+
+<!-- New template-->
<xsl:template match="values_template_hour">
- <xsl:variable name="lang_edit_statustext">
- <xsl:value-of select="lang_edit_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_prizing_statustext">
- <xsl:value-of select="lang_prizing_statustext"/>
- </xsl:variable>
+ <xsl:variable name="lang_edit_statustext">
+ <xsl:value-of select="lang_edit_statustext"/>
+ </xsl:variable>
+ <xsl:variable name="lang_prizing_statustext">
+ <xsl:value-of select="lang_prizing_statustext"/>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="new_grouping=1">
+ <tr>
+ <td class="th_text" align="center" colspan="10"
width="100%">
+ <xsl:value-of select="grouping_descr"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="@class">
+ <xsl:value-of select="@class"/>
+ </xsl:when>
+ <xsl:when test="position() mod 2 = 0">
+ <xsl:text>row_off</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>row_on</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <td align="right">
+ <xsl:value-of select="building_part"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="code"/>
+ <input type="hidden"
name="values[chapter_id][{counter}]" value="{chapter_id}"/>
+ <input type="hidden"
name="values[grouping_descr][{counter}]" value="{grouping_descr}"/>
+ <input type="hidden"
name="values[activity_id][{counter}]" value="{activity_id}"/>
+ <input type="hidden"
name="values[activity_num][{counter}]" value="{activity_num}"/>
+ <input type="hidden" name="values[unit][{counter}]"
value="{unit}"/>
+ <input type="hidden" name="values[dim_d][{counter}]"
value="{dim_d}"/>
+ <input type="hidden"
name="values[ns3420_id][{counter}]" value="{ns3420_id}"/>
+ <input type="hidden"
name="values[tolerance][{counter}]" value="{tolerance}"/>
+ <input type="hidden"
name="values[building_part][{counter}]" value="{building_part}"/>
+ <input type="hidden"
name="values[hours_descr][{counter}]" value="{hours_descr}"/>
+ <input type="hidden" name="values[remark][{counter}]"
value="{remark}"/>
+ <input type="hidden"
name="values[billperae][{counter}]" value="{billperae}"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="hours_descr"/>
+ <br/>
+ <xsl:value-of select="remark"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="unit_name"/>
+ </td>
+ <td align="right">
+ <xsl:choose>
+ <xsl:when test="billperae!=0">
+ <xsl:value-of select="billperae"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="text" size="6"
name="values[billperae][{counter}]"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
+ <td>
+ <input type="text" size="6"
name="values[quantity][{counter}]"/>
+ </td>
+ <td align="center">
+ <input type="checkbox" name="values[select][{counter}]"
value="{counter}" 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>
+ <td>
+ <select name="values[wo_hour_cat][{counter}]"
class="forms" title="{lang_wo_hour_cat_statustext}">
+ <option value="">
+ <xsl:value-of
select="//lang_no_wo_hour_cat"/>
+ </option>
+ <xsl:for-each select="//wo_hour_cat_list">
+ <xsl:variable name="id">
+ <xsl:value-of select="id"/>
+ </xsl:variable>
+ <option value="{$id}">
+ <xsl:value-of select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </td>
+ <td>
+ <input type="text" size="3" maxlength="3"
name="values[cat_per_cent][{counter}]"/>
+ </td>
+ </tr>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template match="prizebook">
+ <xsl:apply-templates select="menu"/>
+ <table width="100%" cellpadding="2" cellspacing="2" align="center">
<xsl:choose>
- <xsl:when test="new_grouping=1">
+ <xsl:when test="msgbox_data != ''">
<tr>
- <td class="th_text" align="center"
colspan="10" width="100%">
- <xsl:value-of
select="grouping_descr"/>
+ <td align="left" colspan="3">
+ <xsl:call-template
name="msgbox"/>
</td>
</tr>
</xsl:when>
</xsl:choose>
+ </table>
+ <table width="100%" cellpadding="2" cellspacing="2" align="center">
<tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod 2 = 0">
- <xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td align="right">
- <xsl:value-of select="building_part"/>
- </td>
- <td align="left">
- <xsl:value-of select="code"/>
- <input type="hidden"
name="values[chapter_id][{counter}]" value="{chapter_id}"/>
- <input type="hidden"
name="values[grouping_descr][{counter}]" value="{grouping_descr}"/>
- <input type="hidden"
name="values[activity_id][{counter}]" value="{activity_id}"/>
- <input type="hidden"
name="values[activity_num][{counter}]" value="{activity_num}"/>
- <input type="hidden"
name="values[unit][{counter}]" value="{unit}"/>
- <input type="hidden"
name="values[dim_d][{counter}]" value="{dim_d}"/>
- <input type="hidden"
name="values[ns3420_id][{counter}]" value="{ns3420_id}"/>
- <input type="hidden"
name="values[tolerance][{counter}]" value="{tolerance}"/>
- <input type="hidden"
name="values[building_part][{counter}]" value="{building_part}"/>
- <input type="hidden"
name="values[hours_descr][{counter}]" value="{hours_descr}"/>
- <input type="hidden"
name="values[remark][{counter}]" value="{remark}"/>
- <input type="hidden"
name="values[billperae][{counter}]" value="{billperae}"/>
- </td>
- <td align="left">
- <xsl:value-of select="hours_descr"/>
- <br/>
- <xsl:value-of select="remark"/>
- </td>
- <td align="left">
- <xsl:value-of select="unit_name"/>
- </td>
- <td align="right">
- <xsl:choose>
- <xsl:when test="billperae!=0">
- <xsl:value-of
select="billperae"/>
- </xsl:when>
- <xsl:otherwise>
- <input type="text" size="6"
name="values[billperae][{counter}]"/>
- </xsl:otherwise>
- </xsl:choose>
- </td>
<td>
- <input type="text" size="6"
name="values[quantity][{counter}]"/>
+ <xsl:apply-templates select="workorder_data"/>
</td>
- <td align="center">
- <input type="checkbox"
name="values[select][{counter}]" value="{counter}"
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>
- <td>
- <select name="values[wo_hour_cat][{counter}]"
class="forms" title="{lang_wo_hour_cat_statustext}">
- <option value="">
- <xsl:value-of
select="//lang_no_wo_hour_cat"/>
- </option>
- <xsl:for-each
select="//wo_hour_cat_list">
- <xsl:variable name="id">
- <xsl:value-of
select="id"/>
+ </tr>
+ <xsl:choose>
+ <xsl:when test="values_prizebook[activity_id]!=''">
+ <tr>
+ <td>
+ <table width="100%"
cellpadding="2" cellspacing="2" align="center">
+ <tr>
+ <td
align="right">
+
<xsl:call-template name="search_field"/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3"
width="100%">
+
<xsl:call-template name="nextmatchs"/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <xsl:variable
name="form_action">
+ <xsl:value-of
select="form_action"/>
</xsl:variable>
- <option value="{$id}">
- <xsl:value-of
select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </td>
+ <form method="post" name="form"
action="{$form_action}">
+ <table width="100%"
cellpadding="2" cellspacing="2" align="center">
+
<xsl:apply-templates select="table_header_prizebook"/>
+
<xsl:apply-templates select="values_prizebook"/>
+ </table>
+ <table align="left">
+ <tr height="50">
+ <td>
+
<xsl:variable name="lang_add">
+
<xsl:value-of select="lang_add"/>
+
</xsl:variable>
+
<input type="submit" name="values[add]" value="{$lang_add}"
onMouseout="window.status='';return true;">
+
<xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="lang_add_statustext"/>
+
<xsl:text>'; return true;</xsl:text>
+
</xsl:attribute>
+
</input>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <tr>
<td>
- <input type="text" size="3" maxlength="3"
name="values[cat_per_cent][{counter}]"/>
+ <hr noshade="noshade" width="100%"
align="center" size="1"/>
</td>
</tr>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template match="prizebook">
- <xsl:apply-templates select="menu"/>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <xsl:choose>
- <xsl:when test="msgbox_data != ''">
+ <tr>
+ <td>
+ <table width="100%" cellpadding="2"
cellspacing="2" align="left">
<tr>
- <td align="left" colspan="3">
- <xsl:call-template
name="msgbox"/>
+ <td class="th_text" colspan="3"
align="right">
+ <xsl:value-of
select="lang_total_records"/>
+ <xsl:text> : </xsl:text>
</td>
- </tr>
- </xsl:when>
- </xsl:choose>
- </table>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <tr>
- <td>
- <xsl:apply-templates
select="workorder_data"/>
- </td>
- </tr>
- <xsl:choose>
- <xsl:when
test="values_prizebook[activity_id]!=''">
- <tr>
- <td>
- <table width="100%"
cellpadding="2" cellspacing="2" align="center">
- <tr>
- <td
align="right">
-
<xsl:call-template name="search_field"/>
- </td>
- </tr>
- <tr>
- <td
colspan="3" width="100%">
-
<xsl:call-template name="nextmatchs"/>
- </td>
- </tr>
- </table>
+ <td class="th_text" colspan="5"
align="left">
+ <xsl:value-of
select="total_hours_records"/>
</td>
</tr>
- <tr>
- <td>
- <xsl:variable
name="form_action">
- <xsl:value-of
select="form_action"/>
- </xsl:variable>
- <form method="post"
name="form" action="{$form_action}">
- <table
width="100%" cellpadding="2" cellspacing="2" align="center">
-
<xsl:apply-templates select="table_header_prizebook"/>
-
<xsl:apply-templates select="values_prizebook"/>
- </table>
- <table
align="left">
- <tr
height="50">
-
<td>
-
<xsl:variable name="lang_add">
-
<xsl:value-of select="lang_add"/>
-
</xsl:variable>
-
<input type="submit" name="values[add]" value="{$lang_add}"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_add_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
</td>
- </tr>
- </table>
- </form>
- </td>
- </tr>
- </xsl:when>
- </xsl:choose>
- <tr>
- <td>
- <hr noshade="noshade" width="100%"
align="center" size="1"/>
- </td>
- </tr>
- <tr>
- <td>
- <table width="100%" cellpadding="2"
cellspacing="2" align="left">
- <tr>
- <td class="th_text"
colspan="3" align="right">
- <xsl:value-of
select="lang_total_records"/>
- <xsl:text> :
</xsl:text>
- </td>
- <td class="th_text"
colspan="5" align="left">
- <xsl:value-of
select="total_hours_records"/>
- </td>
- </tr>
- <xsl:apply-templates
select="table_header_hour"/>
- <xsl:apply-templates
select="values_hour"/>
- <xsl:apply-templates
select="table_sum"/>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:apply-templates
select="table_done"/>
- </td>
- </tr>
- </table>
+ <xsl:apply-templates
select="table_header_hour"/>
+ <xsl:apply-templates
select="values_hour"/>
+ <xsl:apply-templates
select="table_sum"/>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <xsl:apply-templates select="table_done"/>
+ </td>
+ </tr>
+ </table>
</xsl:template>
<!-- New template-->
@@ -1407,16 +1407,16 @@
<xsl:value-of select="link_project"/>
</xsl:variable>
<xsl:value-of select="lang_project_id"/>:<a
href='{$link_project}'>
- <xsl:value-of
select="project_id"/>
- </a>
+ <xsl:value-of select="project_id"/>
+ </a>
</div>
<div>
<xsl:variable name="link_workorder">
<xsl:value-of select="link_workorder"/>
</xsl:variable>
<xsl:value-of select="lang_workorder_id"/>:<a
href='{$link_workorder}'>
- <xsl:value-of
select="workorder_id"/>
- </a>
+ <xsl:value-of select="workorder_id"/>
+ </a>
</div>
<div>
<xsl:value-of select="lang_workorder_title"/>:<xsl:value-of
select="workorder_title"/>
@@ -1428,616 +1428,616 @@
<!-- New template-->
<xsl:template match="table_sum">
- <tr>
- <td>
- </td>
- <td class="th_text" align="left">
- <xsl:value-of select="lang_sum_calculation"/>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td class="th_text" align="right">
- <xsl:value-of select="value_sum_calculation"/>
- </td>
- <td class="th_text" align="right">
- <xsl:value-of select="sum_deviation"/>
- </td>
- <td class="th_text" align="right">
- <xsl:value-of select="sum_result"/>
- </td>
- </tr>
- <tr>
- <td>
- </td>
- <td class="th_text" align="left">
- <xsl:value-of select="lang_addition_rs"/>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td class="th_text" align="right">
- <xsl:value-of select="value_addition_rs"/>
- </td>
- </tr>
- <tr>
- <td>
- </td>
- <td class="th_text" align="left">
- <xsl:value-of
select="lang_addition_percentage"/>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td class="th_text" align="right">
- <xsl:value-of
select="value_addition_percentage"/>
- </td>
- </tr>
- <tr>
- <td>
- </td>
- <td class="th_text" align="left">
- <xsl:value-of select="lang_sum_tax"/>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td class="th_text" align="right">
- <xsl:value-of select="value_sum_tax"/>
- </td>
- </tr>
- <tr>
- <td>
- </td>
- <td class="th_text" align="left">
- <xsl:value-of select="lang_total_sum"/>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td class="th_text" align="right">
- <xsl:value-of select="value_total_sum"/>
- </td>
- </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_sum_calculation"/>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td class="th_text" align="right">
+ <xsl:value-of select="value_sum_calculation"/>
+ </td>
+ <td class="th_text" align="right">
+ <xsl:value-of select="sum_deviation"/>
+ </td>
+ <td class="th_text" align="right">
+ <xsl:value-of select="sum_result"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_addition_rs"/>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td class="th_text" align="right">
+ <xsl:value-of select="value_addition_rs"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_addition_percentage"/>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td class="th_text" align="right">
+ <xsl:value-of select="value_addition_percentage"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_sum_tax"/>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td class="th_text" align="right">
+ <xsl:value-of select="value_sum_tax"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td class="th_text" align="left">
+ <xsl:value-of select="lang_total_sum"/>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td class="th_text" align="right">
+ <xsl:value-of select="value_total_sum"/>
+ </td>
+ </tr>
</xsl:template>
<!-- New template-->
<xsl:template match="table_header_prizebook">
- <xsl:variable name="sort_num">
- <xsl:value-of select="sort_num"/>
- </xsl:variable>
- <xsl:variable name="sort_total_cost">
- <xsl:value-of select="sort_total_cost"/>
- </xsl:variable>
- <tr class="th">
- <td class="th_text" width="10%" align="right">
- <a href="{$sort_num}">
- <xsl:value-of select="lang_num"/>
- </a>
- </td>
- <td class="th_text" width="30%" align="left">
- <xsl:value-of select="lang_descr"/>
- </td>
- <td class="th_text" width="20%" align="left">
- <xsl:value-of select="lang_base_descr"/>
- </td>
- <td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_unit"/>
- </td>
- <td class="th_text" width="10%" align="right">
- <xsl:value-of select="lang_w_cost"/>
- </td>
- <td class="th_text" width="10%" align="right">
- <xsl:value-of select="lang_m_cost"/>
- </td>
- <td class="th_text" width="10%" align="right">
- <a href="{$sort_total_cost}">
- <xsl:value-of select="lang_total_cost"/>
- </a>
- </td>
- <td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_quantity"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_category"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_per_cent"/>
- </td>
- </tr>
+ <xsl:variable name="sort_num">
+ <xsl:value-of select="sort_num"/>
+ </xsl:variable>
+ <xsl:variable name="sort_total_cost">
+ <xsl:value-of select="sort_total_cost"/>
+ </xsl:variable>
+ <tr class="th">
+ <td class="th_text" width="10%" align="right">
+ <a href="{$sort_num}">
+ <xsl:value-of select="lang_num"/>
+ </a>
+ </td>
+ <td class="th_text" width="30%" align="left">
+ <xsl:value-of select="lang_descr"/>
+ </td>
+ <td class="th_text" width="20%" align="left">
+ <xsl:value-of select="lang_base_descr"/>
+ </td>
+ <td class="th_text" width="5%" align="right">
+ <xsl:value-of select="lang_unit"/>
+ </td>
+ <td class="th_text" width="10%" align="right">
+ <xsl:value-of select="lang_w_cost"/>
+ </td>
+ <td class="th_text" width="10%" align="right">
+ <xsl:value-of select="lang_m_cost"/>
+ </td>
+ <td class="th_text" width="10%" align="right">
+ <a href="{$sort_total_cost}">
+ <xsl:value-of select="lang_total_cost"/>
+ </a>
+ </td>
+ <td class="th_text" width="5%" align="right">
+ <xsl:value-of select="lang_quantity"/>
+ </td>
+ <td class="th_text" width="5%" align="center">
+ <xsl:value-of select="lang_category"/>
+ </td>
+ <td class="th_text" width="5%" align="center">
+ <xsl:value-of select="lang_per_cent"/>
+ </td>
+ </tr>
</xsl:template>
<!-- New template-->
<xsl:template match="values_prizebook">
- <xsl:variable name="lang_edit_statustext">
- <xsl:value-of select="lang_edit_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_prizing_statustext">
- <xsl:value-of select="lang_prizing_statustext"/>
- </xsl:variable>
- <tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod 2 = 0">
- <xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td align="left">
- <xsl:value-of select="num"/>
- <input type="hidden"
name="values[activity_id][{counter}]" value="{activity_id}"/>
- <input type="hidden"
name="values[activity_num][{counter}]" value="{num}"/>
- <input type="hidden"
name="values[unit][{counter}]" value="{unit}"/>
- <input type="hidden"
name="values[dim_d][{counter}]" value="{dim_d}"/>
- <input type="hidden"
name="values[ns3420_id][{counter}]" value="{ns3420_id}"/>
- <input type="hidden"
name="values[descr][{counter}]" value="{descr}"/>
- <input type="hidden"
name="values[total_cost][{counter}]" value="{total_cost}"/>
- </td>
- <td align="left">
- <xsl:value-of select="descr"/>
- </td>
- <td align="left">
- <xsl:value-of select="base_descr"/>
- </td>
- <td align="left">
- <xsl:value-of select="unit_name"/>
- </td>
- <td align="right">
- <xsl:value-of select="w_cost"/>
- </td>
- <td align="right">
- <xsl:value-of select="m_cost"/>
- </td>
- <td align="right">
- <xsl:choose>
- <xsl:when test="total_cost!=0">
- <xsl:value-of
select="total_cost"/>
- </xsl:when>
- <xsl:otherwise>
- <input type="text" size="6"
name="values[total_cost][{counter}]"/>
- </xsl:otherwise>
- </xsl:choose>
- </td>
- <td>
- <input type="text" size="6"
name="values[quantity][{counter}]"/>
- </td>
- <td>
- <select name="values[wo_hour_cat][{counter}]"
class="forms" title="{lang_wo_hour_cat_statustext}">
- <option value="">
- <xsl:value-of
select="//lang_no_wo_hour_cat"/>
+ <xsl:variable name="lang_edit_statustext">
+ <xsl:value-of select="lang_edit_statustext"/>
+ </xsl:variable>
+ <xsl:variable name="lang_prizing_statustext">
+ <xsl:value-of select="lang_prizing_statustext"/>
+ </xsl:variable>
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="@class">
+ <xsl:value-of select="@class"/>
+ </xsl:when>
+ <xsl:when test="position() mod 2 = 0">
+ <xsl:text>row_off</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>row_on</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <td align="left">
+ <xsl:value-of select="num"/>
+ <input type="hidden"
name="values[activity_id][{counter}]" value="{activity_id}"/>
+ <input type="hidden"
name="values[activity_num][{counter}]" value="{num}"/>
+ <input type="hidden" name="values[unit][{counter}]"
value="{unit}"/>
+ <input type="hidden" name="values[dim_d][{counter}]"
value="{dim_d}"/>
+ <input type="hidden"
name="values[ns3420_id][{counter}]" value="{ns3420_id}"/>
+ <input type="hidden" name="values[descr][{counter}]"
value="{descr}"/>
+ <input type="hidden"
name="values[total_cost][{counter}]" value="{total_cost}"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="descr"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="base_descr"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="unit_name"/>
+ </td>
+ <td align="right">
+ <xsl:value-of select="w_cost"/>
+ </td>
+ <td align="right">
+ <xsl:value-of select="m_cost"/>
+ </td>
+ <td align="right">
+ <xsl:choose>
+ <xsl:when test="total_cost!=0">
+ <xsl:value-of select="total_cost"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="text" size="6"
name="values[total_cost][{counter}]"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
+ <td>
+ <input type="text" size="6"
name="values[quantity][{counter}]"/>
+ </td>
+ <td>
+ <select name="values[wo_hour_cat][{counter}]"
class="forms" title="{lang_wo_hour_cat_statustext}">
+ <option value="">
+ <xsl:value-of
select="//lang_no_wo_hour_cat"/>
+ </option>
+ <xsl:for-each select="//wo_hour_cat_list">
+ <xsl:variable name="id">
+ <xsl:value-of select="id"/>
+ </xsl:variable>
+ <option value="{$id}">
+ <xsl:value-of select="name"/>
</option>
- <xsl:for-each
select="//wo_hour_cat_list">
- <xsl:variable name="id">
- <xsl:value-of
select="id"/>
- </xsl:variable>
- <option value="{$id}">
- <xsl:value-of
select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </td>
- <td>
- <input type="text" size="3" maxlength="3"
name="values[cat_per_cent][{counter}]"/>
- </td>
- </tr>
+ </xsl:for-each>
+ </select>
+ </td>
+ <td>
+ <input type="text" size="3" maxlength="3"
name="values[cat_per_cent][{counter}]"/>
+ </td>
+ </tr>
</xsl:template>
<!-- New template-->
<xsl:template match="table_header_hour">
- <xsl:variable name="sort_activity_num">
- <xsl:value-of select="sort_activity_num"/>
- </xsl:variable>
- <xsl:variable name="sort_descr">
- <xsl:value-of select="sort_descr"/>
- </xsl:variable>
- <xsl:variable name="sort_quantity">
- <xsl:value-of select="sort_quantity"/>
- </xsl:variable>
- <tr class="th">
- <td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_post"/>
- </td>
- <td class="th_text" width="15%" align="left">
- <xsl:value-of select="lang_code"/>
- </td>
- <td class="th_text" width="40%" align="left">
- <xsl:value-of select="lang_descr"/>
- </td>
- <td class="th_text" width="4%" align="left">
- <xsl:value-of select="lang_unit"/>
- </td>
- <td class="th_text" width="2%" align="right">
- <xsl:value-of select="lang_quantity"/>
- </td>
- <td class="th_text" width="5%" align="right">
- <xsl:value-of select="lang_billperae"/>
- </td>
- <td class="th_text" width="15%" align="right">
- <xsl:value-of select="lang_cost"/>
- </td>
- <td class="th_text" width="15%" align="right">
- <xsl:value-of select="lang_deviation"/>
- </td>
- <td class="th_text" width="15%" align="right">
- <xsl:value-of select="lang_result"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_category"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_per_cent"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_edit"/>
- </td>
- <td class="th_text" width="5%" align="center">
- <xsl:value-of select="lang_delete"/>
- </td>
- </tr>
+ <xsl:variable name="sort_activity_num">
+ <xsl:value-of select="sort_activity_num"/>
+ </xsl:variable>
+ <xsl:variable name="sort_descr">
+ <xsl:value-of select="sort_descr"/>
+ </xsl:variable>
+ <xsl:variable name="sort_quantity">
+ <xsl:value-of select="sort_quantity"/>
+ </xsl:variable>
+ <tr class="th">
+ <td class="th_text" width="5%" align="right">
+ <xsl:value-of select="lang_post"/>
+ </td>
+ <td class="th_text" width="15%" align="left">
+ <xsl:value-of select="lang_code"/>
+ </td>
+ <td class="th_text" width="40%" align="left">
+ <xsl:value-of select="lang_descr"/>
+ </td>
+ <td class="th_text" width="4%" align="left">
+ <xsl:value-of select="lang_unit"/>
+ </td>
+ <td class="th_text" width="2%" align="right">
+ <xsl:value-of select="lang_quantity"/>
+ </td>
+ <td class="th_text" width="5%" align="right">
+ <xsl:value-of select="lang_billperae"/>
+ </td>
+ <td class="th_text" width="15%" align="right">
+ <xsl:value-of select="lang_cost"/>
+ </td>
+ <td class="th_text" width="15%" align="right">
+ <xsl:value-of select="lang_deviation"/>
+ </td>
+ <td class="th_text" width="15%" align="right">
+ <xsl:value-of select="lang_result"/>
+ </td>
+ <td class="th_text" width="5%" align="center">
+ <xsl:value-of select="lang_category"/>
+ </td>
+ <td class="th_text" width="5%" align="center">
+ <xsl:value-of select="lang_per_cent"/>
+ </td>
+ <td class="th_text" width="5%" align="center">
+ <xsl:value-of select="lang_edit"/>
+ </td>
+ <td class="th_text" width="5%" align="center">
+ <xsl:value-of select="lang_delete"/>
+ </td>
+ </tr>
</xsl:template>
<!-- New template-->
<xsl:template match="values_hour">
- <xsl:variable name="lang_view_statustext">
- <xsl:value-of select="lang_view_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_edit_statustext">
- <xsl:value-of select="lang_edit_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_delete_statustext">
- <xsl:value-of select="lang_delete_statustext"/>
- </xsl:variable>
- <xsl:choose>
- <xsl:when test="new_grouping=1">
- <tr>
- <td class="th_text" align="center"
colspan="10" width="100%">
- <xsl:value-of
select="grouping_descr"/>
- </td>
- </tr>
- </xsl:when>
- </xsl:choose>
- <tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod 2 = 0">
- <xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td align="right">
- <xsl:value-of select="post"/>
- </td>
- <td align="left">
- <xsl:value-of select="code"/>
- </td>
- <td align="left">
- <xsl:value-of select="hours_descr"/>
- <br/>
- <xsl:value-of select="remark"/>
- </td>
- <td align="left">
- <xsl:value-of select="unit_name"/>
- </td>
- <td align="right">
- <xsl:value-of select="quantity"/>
- </td>
- <td align="right">
- <xsl:value-of select="billperae"/>
- </td>
- <td align="right">
- <xsl:value-of select="cost"/>
- </td>
- <td align="right">
+ <xsl:variable name="lang_view_statustext">
+ <xsl:value-of select="lang_view_statustext"/>
+ </xsl:variable>
+ <xsl:variable name="lang_edit_statustext">
+ <xsl:value-of select="lang_edit_statustext"/>
+ </xsl:variable>
+ <xsl:variable name="lang_delete_statustext">
+ <xsl:value-of select="lang_delete_statustext"/>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="new_grouping=1">
+ <tr>
+ <td class="th_text" align="center" colspan="10"
width="100%">
+ <xsl:value-of select="grouping_descr"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="@class">
+ <xsl:value-of select="@class"/>
+ </xsl:when>
+ <xsl:when test="position() mod 2 = 0">
+ <xsl:text>row_off</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>row_on</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <td align="right">
+ <xsl:value-of select="post"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="code"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="hours_descr"/>
+ <br/>
+ <xsl:value-of select="remark"/>
+ </td>
+ <td align="left">
+ <xsl:value-of select="unit_name"/>
+ </td>
+ <td align="right">
+ <xsl:value-of select="quantity"/>
+ </td>
+ <td align="right">
+ <xsl:value-of select="billperae"/>
+ </td>
+ <td align="right">
+ <xsl:value-of select="cost"/>
+ </td>
+ <td align="right">
<xsl:variable name="link_deviation">
<xsl:value-of
select="link_deviation"/>&from=<xsl:value-of select="//function"/>
</xsl:variable>
- <a href="{$link_deviation}"
onMouseover="window.status='';return true;" onMouseout="window.status='';return
true;">
- <xsl:value-of select="deviation"/>
- </a>
- </td>
- <td align="right">
- <xsl:value-of select="result"/>
- </td>
- <td align="right">
- <xsl:value-of select="wo_hour_category"/>
- </td>
- <td align="right">
- <xsl:value-of select="cat_per_cent"/>
- </td>
- <td align="center">
+ <a href="{$link_deviation}"
onMouseover="window.status='';return true;" onMouseout="window.status='';return
true;">
+ <xsl:value-of select="deviation"/>
+ </a>
+ </td>
+ <td align="right">
+ <xsl:value-of select="result"/>
+ </td>
+ <td align="right">
+ <xsl:value-of select="wo_hour_category"/>
+ </td>
+ <td align="right">
+ <xsl:value-of select="cat_per_cent"/>
+ </td>
+ <td align="center">
<xsl:variable name="link_edit">
<xsl:value-of
select="link_edit"/>&from=<xsl:value-of
select="//function"/>&template_id=<xsl:value-of select="//template_id"/>
</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>
- <td align="center">
+ <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>
+ <td align="center">
<xsl:variable name="link_delete">
<xsl:value-of
select="//link_delete"/>&hour_id=<xsl:value-of
select="hour_id"/>&template_id=<xsl:value-of select="//template_id"/>
</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>
- </tr>
+ <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>
+ </tr>
</xsl:template>
<!-- New template-->
<xsl:template match="table_add">
- <table width="80%">
- <tr>
- <td align="left" height="50">
- <xsl:variable
name="add_prizebook_action">
- <xsl:value-of
select="add_prizebook_action"/>
- </xsl:variable>
- <xsl:variable name="lang_add_prizebook">
- <xsl:value-of
select="lang_add_prizebook"/>
- </xsl:variable>
- <form method="post"
action="{$add_prizebook_action}">
- <input type="submit"
name="add_prizebook" value="{$lang_add_prizebook}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_add_prizebook_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </form>
- </td>
- <td align="left" height="50">
- <xsl:variable
name="add_template_action">
- <xsl:value-of
select="add_template_action"/>
- </xsl:variable>
- <xsl:variable name="lang_add_template">
- <xsl:value-of
select="lang_add_template"/>
- </xsl:variable>
- <form method="post"
action="{$add_template_action}">
- <input type="submit"
name="add_template" value="{$lang_add_template}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_add_template_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </form>
- </td>
- <td align="left" height="50">
- <xsl:variable name="add_custom_action">
- <xsl:value-of
select="add_custom_action"/>
- </xsl:variable>
- <xsl:variable name="lang_add_custom">
- <xsl:value-of
select="lang_add_custom"/>
- </xsl:variable>
- <form method="post"
action="{$add_custom_action}">
- <input type="submit"
name="add_custom" value="{$lang_add_custom}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_add_custom_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </form>
- </td>
- <td align="left" height="50">
- <xsl:variable
name="save_template_action">
- <xsl:value-of
select="save_template_action"/>
- </xsl:variable>
- <xsl:variable name="lang_save_template">
- <xsl:value-of
select="lang_save_template"/>
- </xsl:variable>
- <form method="post"
action="{$save_template_action}">
- <input type="submit"
name="save_template" value="{$lang_save_template}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_save_template_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </form>
- </td>
- </tr>
- <tr>
- <xsl:variable name="print_view_action">
- <xsl:value-of
select="print_view_action"/>
+ <table width="80%">
+ <tr>
+ <td align="left" height="50">
+ <xsl:variable name="add_prizebook_action">
+ <xsl:value-of
select="add_prizebook_action"/>
</xsl:variable>
- <xsl:variable name="lang_print_view">
- <xsl:value-of select="lang_print_view"/>
+ <xsl:variable name="lang_add_prizebook">
+ <xsl:value-of
select="lang_add_prizebook"/>
</xsl:variable>
- <form method="post"
action="{$print_view_action}">
- <td align="left" height="50">
- <input type="submit"
name="print_view" value="{$lang_print_view}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_print_view_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- <td>
- <xsl:value-of
select="lang_show_details"/>
- <input type="checkbox"
name="show_details" value="True" checked="checked"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_show_details_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- <td>
- <xsl:value-of
select="lang_show_cost"/>
- <input type="checkbox"
name="show_cost" value="True" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_show_cost_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
+ <form method="post"
action="{$add_prizebook_action}">
+ <input type="submit"
name="add_prizebook" value="{$lang_add_prizebook}"
onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_add_prizebook_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
</form>
- </tr>
- <tr>
- <xsl:variable name="view_tender_action">
- <xsl:value-of
select="view_tender_action"/>
+ </td>
+ <td align="left" height="50">
+ <xsl:variable name="add_template_action">
+ <xsl:value-of
select="add_template_action"/>
</xsl:variable>
- <xsl:variable name="lang_view_tender">
- <xsl:value-of
select="lang_view_tender"/>
+ <xsl:variable name="lang_add_template">
+ <xsl:value-of
select="lang_add_template"/>
</xsl:variable>
- <form method="post"
action="{$view_tender_action}" target="_new">
- <td align="left" height="50">
- <input type="submit"
name="view_tender" value="{$lang_view_tender}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_view_tender_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- <td>
- <xsl:value-of
select="lang_show_cost"/>
- <input type="checkbox"
name="show_cost" value="True" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_show_cost_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- <td>
- <xsl:value-of
select="lang_mark_draft"/>
- <input type="checkbox"
name="mark_draft" value="True" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_mark_draft_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
+ <form method="post"
action="{$add_template_action}">
+ <input type="submit"
name="add_template" value="{$lang_add_template}"
onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_add_template_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
</form>
- </tr>
- <tr>
+ </td>
+ <td align="left" height="50">
+ <xsl:variable name="add_custom_action">
+ <xsl:value-of
select="add_custom_action"/>
+ </xsl:variable>
+ <xsl:variable name="lang_add_custom">
+ <xsl:value-of select="lang_add_custom"/>
+ </xsl:variable>
+ <form method="post"
action="{$add_custom_action}">
+ <input type="submit" name="add_custom"
value="{$lang_add_custom}" onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_add_custom_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </form>
+ </td>
+ <td align="left" height="50">
+ <xsl:variable name="save_template_action">
+ <xsl:value-of
select="save_template_action"/>
+ </xsl:variable>
+ <xsl:variable name="lang_save_template">
+ <xsl:value-of
select="lang_save_template"/>
+ </xsl:variable>
+ <form method="post"
action="{$save_template_action}">
+ <input type="submit"
name="save_template" value="{$lang_save_template}"
onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_save_template_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </form>
+ </td>
+ </tr>
+ <tr>
+ <xsl:variable name="print_view_action">
+ <xsl:value-of select="print_view_action"/>
+ </xsl:variable>
+ <xsl:variable name="lang_print_view">
+ <xsl:value-of select="lang_print_view"/>
+ </xsl:variable>
+ <form method="post" action="{$print_view_action}">
<td align="left" height="50">
- <form method="post"
action="{done_action}">
- <input type="submit"
name="save_done" value="{lang_done}">
- </input>
- </form>
+ <input type="submit" name="print_view"
value="{$lang_print_view}" onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_print_view_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
</td>
- </tr>
- </table>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template match="table_done">
- <table width="100%" align="left">
- <tr>
- <td height="50" align="left">
- <xsl:variable name="done_action">
- <xsl:value-of
select="done_action"/>
- </xsl:variable>
- <xsl:variable name="lang_done">
- <xsl:value-of
select="lang_done"/>
- </xsl:variable>
- <form method="post"
action="{$done_action}">
- <input type="submit"
name="done" value="{$lang_done}">
- <xsl:attribute
name="title">
- <xsl:value-of
select="lang_done_statustext"/>
- </xsl:attribute>
- </input>
- </form>
+ <td>
+ <xsl:value-of
select="lang_show_details"/>
+ <input type="checkbox"
name="show_details" value="True" checked="checked"
onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_show_details_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
</td>
- </tr>
- </table>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template match="table_send">
- <table width="80%">
- <tr>
+ <td>
+ <xsl:value-of select="lang_show_cost"/>
+ <input type="checkbox" name="show_cost"
value="True" onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_show_cost_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ </form>
+ </tr>
+ <tr>
+ <xsl:variable name="view_tender_action">
+ <xsl:value-of select="view_tender_action"/>
+ </xsl:variable>
+ <xsl:variable name="lang_view_tender">
+ <xsl:value-of select="lang_view_tender"/>
+ </xsl:variable>
+ <form method="post" action="{$view_tender_action}"
target="_new">
<td align="left" height="50">
- <xsl:variable name="lang_send_order">
- <xsl:value-of
select="lang_send_order"/>
- </xsl:variable>
- <input type="submit" name="send_order"
value="{$lang_send_order}" onMouseout="window.status='';return true;">
+ <input type="submit" name="view_tender"
value="{$lang_view_tender}" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_send_order_statustext"/>
+ <xsl:value-of
select="lang_view_tender_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
</td>
- </tr>
- </table>
+ <td>
+ <xsl:value-of select="lang_show_cost"/>
+ <input type="checkbox" name="show_cost"
value="True" onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_show_cost_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ <td>
+ <xsl:value-of select="lang_mark_draft"/>
+ <input type="checkbox"
name="mark_draft" value="True" onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_mark_draft_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ </form>
+ </tr>
+ <tr>
+ <td align="left" height="50">
+ <form method="post" action="{done_action}">
+ <input type="submit" name="save_done"
value="{lang_done}">
+ </input>
+ </form>
+ </td>
+ </tr>
+ </table>
</xsl:template>
+<!-- New template-->
+<xsl:template match="table_done">
+ <table width="100%" align="left">
+ <tr>
+ <td height="50" align="left">
+ <xsl:variable name="done_action">
+ <xsl:value-of select="done_action"/>
+ </xsl:variable>
+ <xsl:variable name="lang_done">
+ <xsl:value-of select="lang_done"/>
+ </xsl:variable>
+ <form method="post" action="{$done_action}">
+ <input type="submit" name="done"
value="{$lang_done}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_done_statustext"/>
+ </xsl:attribute>
+ </input>
+ </form>
+ </td>
+ </tr>
+ </table>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template match="table_send">
+ <table width="80%">
+ <tr>
+ <td align="left" height="50">
+ <xsl:variable name="lang_send_order">
+ <xsl:value-of select="lang_send_order"/>
+ </xsl:variable>
+ <input type="submit" name="send_order"
value="{$lang_send_order}" onMouseout="window.status='';return true;">
+ <xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_send_order_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </table>
+</xsl:template>
+
<!-- add / edit -->
<xsl:template xmlns:php="http://php.net/xsl" match="edit_hour">
- <script type="text/javascript">
- function ns3420_lookup()
- {
+ <script type="text/javascript">
+ function ns3420_lookup()
+ {
TINY.box.show({iframe:'<xsl:value-of select="ns3420_link"/>',
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});
- }
- </script>
- <xsl:choose>
- <xsl:when test="msgbox_data != ''">
+ }
+ </script>
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
<dl>
<dt>
-
<xsl:call-template name="msgbox"/>
+ <xsl:call-template name="msgbox"/>
</dt>
</dl>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div id="wo_hour_edit_tabview">
<xsl:variable name="form_action">
<xsl:value-of select="form_action"/>
@@ -2054,13 +2054,13 @@
<label>
<xsl:value-of select="lang_copy_hour"/>
</label>
-
<input type="checkbox" name="values[copy_hour]" value="True"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_copy_hour_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
+
<input type="checkbox" name="values[copy_hour]" value="True"
onMouseout="window.status='';return true;">
+
<xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="lang_copy_hour_statustext"/>
+
<xsl:text>'; return true;</xsl:text>
+
</xsl:attribute>
+
</input>
</div>
</xsl:when>
</xsl:choose>
@@ -2068,7 +2068,7 @@
<label>
<xsl:value-of select="lang_hour_id"/>
</label>
-
<xsl:value-of select="value_hour_id"/>
+ <xsl:value-of
select="value_hour_id"/>
</div>
</xsl:when>
</xsl:choose>
@@ -2078,7 +2078,7 @@
<label>
<xsl:value-of select="lang_activity_num"/>
</label>
-
<xsl:value-of select="value_activity_num"/>
+ <xsl:value-of
select="value_activity_num"/>
</div>
</xsl:when>
</xsl:choose>
@@ -2086,19 +2086,19 @@
<label>
<xsl:value-of
select="lang_workorder"/>
</label>
- <xsl:value-of
select="value_workorder_title"/>
- <xsl:text> [ </xsl:text>
- <xsl:value-of
select="value_workorder_id"/>
- <xsl:text> ]</xsl:text>
+ <xsl:value-of
select="value_workorder_title"/>
+ <xsl:text> [ </xsl:text>
+ <xsl:value-of
select="value_workorder_id"/>
+ <xsl:text> ]</xsl:text>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="lang_vendor"/>
</label>
- <xsl:value-of
select="value_vendor_name"/>
- <xsl:text> [ </xsl:text>
- <xsl:value-of
select="value_vendor_id"/>
- <xsl:text> ]</xsl:text>
+ <xsl:value-of
select="value_vendor_name"/>
+ <xsl:text> [ </xsl:text>
+ <xsl:value-of
select="value_vendor_id"/>
+ <xsl:text> ]</xsl:text>
</div>
<xsl:choose>
<xsl:when
test="value_activity_num=''">
@@ -2106,25 +2106,25 @@
<label>
<xsl:value-of select="lang_chapter"/>
</label>
-
<xsl:call-template name="chapter_select"/>
+
<xsl:call-template name="chapter_select"/>
</div>
<div
class="pure-control-group">
<label>
<xsl:value-of select="lang_grouping"/>
</label>
-
<xsl:call-template name="grouping_select"/>
+
<xsl:call-template name="grouping_select"/>
</div>
<div
class="pure-control-group">
<label>
<xsl:value-of select="lang_new_grouping"/>
</label>
- <input
type="text" name="values[new_grouping]" value="{value_new_grouping}"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_new_grouping_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
+ <input
type="text" name="values[new_grouping]" value="{value_new_grouping}"
onMouseout="window.status='';return true;">
+
<xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="lang_new_grouping_statustext"/>
+
<xsl:text>'; return true;</xsl:text>
+
</xsl:attribute>
+ </input>
</div>
</xsl:when>
</xsl:choose>
@@ -2132,15 +2132,15 @@
<label>
<xsl:value-of
select="php:function('lang', 'building part')"/>
</label>
- <select
name="values[building_part_id]">
- <xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'select building part')"/>
- </xsl:attribute>
- <option
value="0">
-
<xsl:value-of select="php:function('lang', 'select building part')"/>
- </option>
-
<xsl:apply-templates select="building_part_list/options"/>
- </select>
+ <select
name="values[building_part_id]">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'select building part')"/>
+ </xsl:attribute>
+ <option value="0">
+ <xsl:value-of
select="php:function('lang', 'select building part')"/>
+ </option>
+ <xsl:apply-templates
select="building_part_list/options"/>
+ </select>
</div>
<xsl:choose>
<xsl:when
test="value_activity_num !=''">
@@ -2148,21 +2148,21 @@
<label>
<xsl:value-of select="lang_ns3420"/>
</label>
-
<xsl:value-of select="value_ns3420_id"/>
- <input
type="hidden" name="ns3420_id" value="{value_ns3420_id}"/>
+ <xsl:value-of
select="value_ns3420_id"/>
+ <input
type="hidden" name="ns3420_id" value="{value_ns3420_id}"/>
</div>
<div
class="pure-control-group">
<label>
<xsl:value-of select="lang_descr"/>
</label>
-
<textarea cols="60" rows="4" 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>
+ <textarea
cols="60" rows="4" 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>
</xsl:when>
<xsl:otherwise>
@@ -2172,30 +2172,30 @@
<xsl:value-of select="lang_ns3420"/>
</a>
</label>
- <input
type="text" name="ns3420_id" value="{value_ns3420_id}"
onClick="ns3420_lookup();" readonly="readonly">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_ns3420_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
+ <input
type="text" name="ns3420_id" value="{value_ns3420_id}"
onClick="ns3420_lookup();" readonly="readonly">
+
<xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="lang_ns3420_statustext"/>
+
<xsl:text>'; return true;</xsl:text>
+
</xsl:attribute>
+ </input>
</div>
<div
class="pure-control-group">
<label></label>
-
<textarea cols="40" rows="4" name="ns3420_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>
+ <textarea
cols="40" rows="4" name="ns3420_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_tolerance"/>
</label>
-
<xsl:call-template name="tolerance_select"/>
+
<xsl:call-template name="tolerance_select"/>
</div>
</xsl:otherwise>
</xsl:choose>
@@ -2203,47 +2203,47 @@
<label>
<xsl:value-of
select="lang_unit"/>
</label>
- <xsl:call-template
name="unit_select"/>
+ <xsl:call-template
name="unit_select"/>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="lang_dim_d"/>
</label>
- <xsl:call-template
name="dim_d_select"/>
+ <xsl:call-template
name="dim_d_select"/>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="lang_wo_hour_category"/>
</label>
- <xsl:variable
name="lang_wo_hour_cat_statustext">
- <xsl:value-of
select="lang_to_email_address_statustext"/>
- </xsl:variable>
- <select
name="values[wo_hour_cat]" class="forms"
onMouseover="window.status='{$lang_wo_hour_cat_statustext}'; return true;"
onMouseout="window.status='';return true;">
- <option
value="">
-
<xsl:value-of select="lang_select_wo_hour_category"/>
- </option>
-
<xsl:apply-templates select="wo_hour_cat_list"/>
- </select>
- <xsl:value-of
select="lang_per_cent"/>
- <input type="text"
size="3" maxlength="3" name="values[cat_per_cent]" value="{value_cat_per_cent}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_cat_per_cent_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- </input>
+ <xsl:variable
name="lang_wo_hour_cat_statustext">
+ <xsl:value-of
select="lang_to_email_address_statustext"/>
+ </xsl:variable>
+ <select
name="values[wo_hour_cat]" class="forms"
onMouseover="window.status='{$lang_wo_hour_cat_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <option value="">
+ <xsl:value-of
select="lang_select_wo_hour_category"/>
+ </option>
+ <xsl:apply-templates
select="wo_hour_cat_list"/>
+ </select>
+ <xsl:value-of
select="lang_per_cent"/>
+ <input type="text" size="3"
maxlength="3" name="values[cat_per_cent]" value="{value_cat_per_cent}"
onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_cat_per_cent_statustext"/>
+ <xsl:text>';
return true;</xsl:text>
+ </xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="lang_quantity"/>
</label>
- <input type="text"
name="values[quantity]" value="{value_quantity}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_quantity_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- </input>
+ <input type="text"
name="values[quantity]" value="{value_quantity}"
onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_quantity_statustext"/>
+ <xsl:text>';
return true;</xsl:text>
+ </xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>
@@ -2269,59 +2269,59 @@
<label>
<xsl:value-of
select="lang_remark"/>
</label>
- <textarea cols="60"
rows="4" name="values[remark]" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_remark_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- <xsl:value-of
select="value_remark"/>
- </textarea>
+ <textarea cols="60" rows="4"
name="values[remark]" onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_remark_statustext"/>
+ <xsl:text>';
return true;</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of
select="value_remark"/>
+ </textarea>
</div>
</div>
</div>
<div class="proplist-col">
- <xsl:variable
name="lang_save">
- <xsl:value-of
select="lang_save"/>
- </xsl:variable>
+ <xsl:variable name="lang_save">
+ <xsl:value-of select="lang_save"/>
+ </xsl:variable>
<input type="submit" 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>
- <xsl:variable name="lang_done">
- <xsl:value-of
select="lang_done"/>
- </xsl:variable>
+ <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>
+ <xsl:variable name="lang_done">
+ <xsl:value-of select="lang_done"/>
+ </xsl:variable>
<input type="button" class="pure-button
pure-button-primary" name="done" value="{$lang_done}"
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_done_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- </input>
+ <xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_done_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
</div>
- </form>
+ </form>
<xsl:variable name="done_action">
<xsl:value-of select="done_action"/>
</xsl:variable>
<form name="cancel_form" id="cancel_form"
action="{$done_action}" method="post"></form>
- </div>
+ </div>
</xsl:template>
<!-- add_deviation / edit_deviation -->
<xsl:template match="edit_deviation">
- <div align="left">
- <xsl:choose>
- <xsl:when test="msgbox_data != ''">
+ <div align="left">
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
<dl>
<dt>
-
<xsl:call-template name="msgbox"/>
+ <xsl:call-template
name="msgbox"/>
</dt>
</dl>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<xsl:variable name="form_action">
<xsl:value-of select="form_action"/>
</xsl:variable>
@@ -2333,15 +2333,15 @@
<label>
<xsl:value-of
select="lang_workorder"/>
</label>
- <xsl:value-of
select="value_workorder_id"/>
- <input type="hidden"
name="workorder_id" value="{value_workorder_id}"/>
- <input type="hidden"
name="hour_id" value="{value_hour_id}"/>
+ <xsl:value-of
select="value_workorder_id"/>
+ <input type="hidden"
name="workorder_id" value="{value_workorder_id}"/>
+ <input type="hidden"
name="hour_id" value="{value_hour_id}"/>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="lang_hour_id"/>
</label>
- <xsl:value-of
select="value_hour_id"/>
+ <xsl:value-of
select="value_hour_id"/>
</div>
<xsl:choose>
<xsl:when test="value_id != ''">
@@ -2349,14 +2349,14 @@
<label>
<xsl:value-of select="lang_id"/>
</label>
-
<xsl:value-of select="value_id"/>
- <input
type="hidden" name="values[id]" value="{value_id}"/>
+ <xsl:value-of
select="value_id"/>
+ <input
type="hidden" name="values[id]" value="{value_id}"/>
</div>
<div
class="pure-control-group">
<label>
<xsl:value-of select="lang_date"/>
</label>
-
<xsl:value-of select="entry_date"/>
+ <xsl:value-of
select="entry_date"/>
</div>
</xsl:when>
</xsl:choose>
@@ -2364,83 +2364,85 @@
<label>
<xsl:value-of
select="lang_amount"/>
</label>
- <input type="text"
name="values[amount]" value="{value_amount}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_amount_standardtext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- </input>
+ <input type="text"
name="values[amount]" value="{value_amount}"
onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_amount_standardtext"/>
+ <xsl:text>';
return true;</xsl:text>
+ </xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="lang_descr"/>
</label>
- <textarea cols="60"
rows="10" name="values[descr]" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_descr_standardtext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- <xsl:value-of
select="value_descr"/>
- </textarea>
+ <textarea cols="60" rows="10"
name="values[descr]" onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_descr_standardtext"/>
+ <xsl:text>';
return true;</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of
select="value_descr"/>
+ </textarea>
</div>
</div>
</div>
<div class="proplist-col">
- <xsl:variable
name="lang_save">
- <xsl:value-of
select="lang_save"/>
- </xsl:variable>
+ <xsl:variable name="lang_save">
+ <xsl:value-of select="lang_save"/>
+ </xsl:variable>
<input type="submit" 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_standardtext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- </input>
- <xsl:variable name="lang_done">
- <xsl:value-of
select="lang_done"/>
- </xsl:variable>
+ <xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_save_standardtext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ <xsl:variable name="lang_done">
+ <xsl:value-of select="lang_done"/>
+ </xsl:variable>
<input type="button" class="pure-button
pure-button-primary" name="done" value="{$lang_done}"
onMouseout="window.status='';return true;"
onClick="document.cancel_form.submit();">
- <xsl:attribute
name="onMouseover">
@@ Diff output truncated at 153600 characters. @@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14758] Merge 14754:14757 from trunk,
Sigurd Nes <=