|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [14771] tweaks |
| Date: | Tue, 23 Feb 2016 18:47:07 +0000 |
Revision: 14771
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14771
Author: sigurdne
Date: 2016-02-23 18:47:07 +0000 (Tue, 23 Feb 2016)
Log Message:
-----------
tweaks
Modified Paths:
--------------
trunk/property/inc/class.bolocation.inc.php
trunk/property/inc/class.soinvoice.inc.php
trunk/property/js/portico/project.edit.js
trunk/property/templates/base/invoice2.xsl
trunk/property/templates/base/project.xsl
Modified: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2016-02-23 13:02:27 UTC (rev
14770)
+++ trunk/property/inc/class.bolocation.inc.php 2016-02-23 18:47:07 UTC (rev
14771)
@@ -343,7 +343,7 @@
'filter_level' => $i,
'link' => $location_link .
',type_id:' . ($i + 1) . ',lookup_name:' . $i,
// 'action'
=>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1000,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
- 'action' =>
'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});'
+ 'action' =>
'TINY.box.show({iframe:strURL,
boxid:"frameless",width:1000,height:600,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});'
);
}
//_debug_array($data['no_link']);
@@ -355,7 +355,7 @@
$location['location'][$i]['lookup_link'] = false;
$lookup_functions[$i]['link'] =
$location_link . ',type_id:' . ($data['no_link'] - 1) . ',lookup_name:' .
($data['no_link'] - 2);
// $lookup_functions[$i]['action']
=
'Window1=window.open(strURL,"Search","left=50,top=100,width=1000,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
- $lookup_functions[$i]['action'] =
'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
+ $lookup_functions[$i]['action'] =
'TINY.box.show({iframe:strURL,
boxid:"frameless",width:1000,height:600,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
$location['location'][$i]['statustext']
= lang('click this link to select') . ' ' . $location_types[($data['no_link'] -
2)]['name'];
}
@@ -458,7 +458,7 @@
'filter_level' => $m,
'link' =>
$location_link . ',lookup_tenant:1,type_id:' . $config[$j]['location_type'] .
',lookup_name:' . $i,
// 'action'
=>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1600,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
- 'action' =>
'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});'
+ 'action' =>
'TINY.box.show({iframe:strURL,
boxid:"frameless",width:1000,height:600,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});'
);
$location['location'][$i]['lookup_link'] = $_lookup_link;
@@ -556,7 +556,7 @@
'name' => 'lookup_entity_' .
$entity['id'] . '()',
'link' =>
"menuaction:'property.uilookup.entity',location_type:{$data['type_id']},entity_id:{$entity['id']},cat_id:'{$p_cat_id}',location_code:'{$filter_location}',block_query:'{$block_query}'",
// 'action'
=>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1200,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
- 'action' =>
'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});'
+ 'action' =>
'TINY.box.show({iframe:strURL,
boxid:"frameless",width:1000,height:600,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});'
);
$location['location'][$i]['input_type']
= 'text';
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2016-02-23 13:02:27 UTC (rev
14770)
+++ trunk/property/inc/class.soinvoice.inc.php 2016-02-23 18:47:07 UTC (rev
14771)
@@ -2707,6 +2707,10 @@
$value_set['loc1'] = $order_info['loc1'];
$value_set['line_text'] = $order_info['title'];
$value_set['spbudact_code'] =
$order_info['spbudact_code'];
+ $value_set['oppsynsigndato'] = false;
+ $value_set['saksigndato'] = false;
+ $value_set['budsjettsigndato'] = false;
+ $value_set['utbetalingsigndato'] = false;
if (isset($order_info['janitor']) &&
$order_info['janitor'])
{
$value_set['oppsynsmannid'] =
$order_info['janitor'];
Modified: trunk/property/js/portico/project.edit.js
===================================================================
--- trunk/property/js/portico/project.edit.js 2016-02-23 13:02:27 UTC (rev
14770)
+++ trunk/property/js/portico/project.edit.js 2016-02-23 18:47:07 UTC (rev
14771)
@@ -1,4 +1,206 @@
+$(document).ready(function ()
+{
+ /*
+ Float Submit Button To Right Edge Of Window
+ Version 1.0
+ April 11, 2010
+
+ Will Bontrager
+ http://www.willmaster.com/
+ Copyright 2010 Bontrager Connection, LLC
+
+ Generated with customizations on February 23, 2016 at
+
http://www.willmaster.com/library/manage-forms/floating-submit-button.php
+
+ Bontrager Connection, LLC grants you
+ a royalty free license to use or modify
+ this software provided this notice appears
+ on all copies. This software is provided
+ "AS IS," without a warranty of any kind.
+ */
+
+//*****************************//
+
+ /** Five places to customize **/
+
+// Place 1:
+// The id value of the button.
+
+ var ButtonId = "submitform";
+
+
+// Place 2:
+// The width of the button.
+
+ var ButtonWidth = 60;
+
+
+// Place 3:
+// Left/Right location of button (specify "left" or "right").
+
+ var ButtonLocation = "right";
+
+
+// Place 4:
+// How much space (in pixels) between button and window left/right edge.
+
+ var SpaceBetweenButtonAndEdge = 30;
+
+
+// Place 5:
+// How much space (in pixels) between button and window top edge.
+
+ var SpaceBetweenButtonAndTop = 100;
+
+
+ /** No other customization required. **/
+
+//************************************//
+
+ TotalWidth = parseInt(ButtonWidth) +
parseInt(SpaceBetweenButtonAndEdge);
+ ButtonLocation = ButtonLocation.toLowerCase();
+ ButtonLocation = ButtonLocation.substr(0, 1);
+ var ButtonOnLeftEdge = (ButtonLocation == 'l') ? true : false;
+
+ function AddButtonPlacementEvents(f)
+ {
+ var cache = window.onload;
+ if (typeof window.onload != 'function')
+ {
+ window.onload = f;
+ }
+ else
+ {
+ window.onload = function ()
+ {
+ if (cache)
+ {
+ cache();
+ }
+ f();
+ };
+ }
+ cache = window.onresize;
+ if (typeof window.onresize != 'function')
+ {
+ window.onresize = f;
+ }
+ else
+ {
+ window.onresize = function ()
+ {
+ if (cache)
+ {
+ cache();
+ }
+ f();
+ };
+ }
+ }
+
+ function WindowHasScrollbar()
+ {
+ var ht = 0;
+ if (document.all)
+ {
+ if (document.documentElement)
+ {
+ ht = document.documentElement.clientHeight;
+ }
+ else
+ {
+ ht = document.body.clientHeight;
+ }
+ }
+ else
+ {
+ ht = window.innerHeight;
+ }
+ if (document.body.offsetHeight > ht)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ function GlueButton(ledge)
+ {
+ var test = document.getElementById('add_sub_entry');
+
+ var left_submit = 400;
+ var left_cancel = 800;
+ if(test != null )
+ {
+ $("#add_sub_entry").css({
+ top: SpaceBetweenButtonAndTop + "px",
+ left: (ledge - 80) + "px",
+ display : "block",
+ zIndex : "9999",
+ position:'fixed'
+ });
+
+ ledge -= 140;
+ }
+
+ $("#submitform").css({
+ top: SpaceBetweenButtonAndTop + "px",
+ width : ButtonWidth + "px",
+ left: (ledge - 100 )+ "px",
+ display : "block",
+ zIndex : "9999",
+ position:'fixed'
+ });
+
+ $("#cancelform").css({
+ top: SpaceBetweenButtonAndTop + "px",
+ width : ButtonWidth + "px",
+ left: (ledge -20)+ "px",
+ display : "block",
+ zIndex : "9999",
+ position:'fixed'
+ });
+
+
+ }
+
+ function PlaceTheButton()
+ {
+ if (ButtonOnLeftEdge)
+ {
+ GlueButton(SpaceBetweenButtonAndEdge);
+ return;
+ }
+ if (document.documentElement &&
document.documentElement.clientWidth)
+ {
+ GlueButton(document.documentElement.clientWidth -
TotalWidth);
+ }
+ else
+ {
+ if (navigator.userAgent.indexOf('MSIE') > 0)
+ {
+ GlueButton(document.body.clientWidth -
TotalWidth + 19);
+ }
+ else
+ {
+ var scroll = WindowHasScrollbar() ? 0 : 15;
+ if (typeof window.innerWidth == 'number')
+ {
+ GlueButton(window.innerWidth -
TotalWidth - 15 + scroll);
+ }
+ else
+ {
+ GlueButton(document.body.clientWidth -
TotalWidth + 15);
+ }
+ }
+ }
+ }
+
+ AddButtonPlacementEvents(PlaceTheButton);
+});
var sUrl_workorder = phpGWLink('index.php', {'menuaction':
'property.uiworkorder.edit'});
var sUrl_invoice = phpGWLink('index.php', {'menuaction':
'property.uiinvoice.index'});
Modified: trunk/property/templates/base/invoice2.xsl
===================================================================
--- trunk/property/templates/base/invoice2.xsl 2016-02-23 13:02:27 UTC (rev
14770)
+++ trunk/property/templates/base/invoice2.xsl 2016-02-23 18:47:07 UTC (rev
14771)
@@ -5,29 +5,29 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<style type="text/css">
- #box { width: 200px; height: 5px; background: blue; }
- //select { width: 200px; }
- #voucher_id_filter { width: 800px; }
- #dim_b { width: 200px; }
- #dim_e { width: 200px; }
- #period { width: 80px; }
- #periodization { width: 200px; }
- #periodization_start { width: 80px; }
- #process_code { width: 200px; }
- #tax_code { width: 200px; }
- #approve_as { width: 200px; }
- #_oppsynsmannid { width: 200px; }
- #_saksbehandlerid { width: 200px; }
- #_budsjettansvarligid { width: 200px; }
- .row_on,.th_bright
- {
+ #box { width: 200px; height: 5px; background: blue; }
+ //select { width: 200px; }
+ #voucher_id_filter { width: 800px; }
+ #dim_b { width: 200px; }
+ #dim_e { width: 200px; }
+ #period { width: 80px; }
+ #periodization { width: 200px; }
+ #periodization_start { width: 80px; }
+ #process_code { width: 200px; }
+ #tax_code { width: 200px; }
+ #approve_as { width: 200px; }
+ #_oppsynsmannid { width: 200px; }
+ #_saksbehandlerid { width: 200px; }
+ #_budsjettansvarligid { width: 200px; }
+ .row_on,.th_bright
+ {
background-color: #CCEEFF;
- }
+ }
- .row_off
- {
+ .row_off
+ {
background-color: #DDF0FF;
- }
+ }
</style>
<xsl:call-template name="invoice" />
@@ -39,28 +39,28 @@
$(document).ready(function(){
pageLayout.open("east");
pageLayout.sizePane("east", 400);
- // pageLayout.hide("west");
+ pageLayout.close("west");
// localStorage['pageLayout_west_closed'] = 1;
});
var lang = <xsl:value-of select="php:function('js_lang',
'edit')"/>;
</script>
- <script type="text/javascript">
+ <script type="text/javascript">
var email_base_url = <xsl:value-of select="//email_base_url"/>;
- </script>
- <xsl:choose>
- <xsl:when test="msgbox_data != ''">
- <xsl:call-template name="msgbox"/>
- </xsl:when>
- </xsl:choose>
- <div id="voucher_details">
- <table align = "center"
width="95%" border="0">
- <xsl:apply-templates
select="filter_form" />
- <xsl:apply-templates
select="filter_invoice" />
- </table>
- <form action="{update_action}"
name="voucher_form" id="voucher_form" method="post">
- <table align = "center"
width="95%">
- <tr>
- <td
colspan = '6'>
+ </script>
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
+ <xsl:call-template name="msgbox"/>
+ </xsl:when>
+ </xsl:choose>
+ <div id="voucher_details">
+ <table align = "center" width="95%" border="0">
+ <xsl:apply-templates select="filter_form" />
+ <xsl:apply-templates select="filter_invoice" />
+ </table>
+ <form action="{update_action}" name="voucher_form"
id="voucher_form" method="post">
+ <table align = "center" width="95%">
+ <tr>
+ <td colspan = '6'>
<xsl:for-each
select="datatable_def">
<xsl:if test="container
= 'datatable-container_1'">
<xsl:call-template name="table_setup">
@@ -73,33 +73,33 @@
</xsl:if>
</xsl:for-each>
<div id="receipt"></div>
- </td>
- </tr>
- <tr>
- <td
valign="top">
-
<div id = 'split_text'>
-
</div>
- </td>
- </tr>
- <tr>
- <td
colspan = '6'>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <div id = 'split_text'>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan = '6'>
<xsl:variable
name="label_submit">
<xsl:value-of
select="php:function('lang', 'save')" />
</xsl:variable>
<div class="row_on">
<input type="submit"
name="values[update_voucher]" id="frm_update_voucher" value="{$label_submit}"/>
</div>
- </td>
- </tr>
-
<xsl:call-template name="voucher_fields" />
-
<xsl:call-template name="approve"/>
- </table>
- </form>
- </div>
+ </td>
+ </tr>
+ <xsl:call-template name="voucher_fields" />
+ <xsl:call-template name="approve"/>
+ </table>
+ </form>
+ </div>
</xsl:template>
<xsl:template match="filter_form" xmlns:php="http://php.net/xsl";>
- <xsl:call-template name="filter_list"/>
+ <xsl:call-template name="filter_list"/>
</xsl:template>
<xsl:template name="filter_list" xmlns:php="http://php.net/xsl";>
@@ -133,27 +133,27 @@
</label>
</td>
</tr>
- <!--<tr id="filters">-->
- <tr>
+ <!--<tr id="filters">-->
+ <tr>
<td>
- <select id="janitor_lid"
name="janitor_lid">
- <xsl:apply-templates
select="janitor_list/options"/>
- </select>
+ <select id="janitor_lid"
name="janitor_lid">
+ <xsl:apply-templates
select="janitor_list/options"/>
+ </select>
</td>
<td>
- <select id="supervisor_lid"
name="supervisor_lid">
- <xsl:apply-templates
select="supervisor_list/options"/>
- </select>
+ <select id="supervisor_lid"
name="supervisor_lid">
+ <xsl:apply-templates
select="supervisor_list/options"/>
+ </select>
</td>
<td>
- <select id="budget_responsible_lid"
name="budget_responsible_lid">
- <xsl:apply-templates
select="budget_responsible_list/options"/>
- </select>
+ <select
id="budget_responsible_lid" name="budget_responsible_lid">
+ <xsl:apply-templates
select="budget_responsible_list/options"/>
+ </select>
</td>
<td>
- <select id="criteria" name="criteria">
- <xsl:apply-templates
select="criteria_list/options"/>
- </select>
+ <select id="criteria"
name="criteria">
+ <xsl:apply-templates
select="criteria_list/options"/>
+ </select>
</td>
<td>
<input type="text" name="query"
id="query"/>
@@ -165,9 +165,9 @@
<input type="button" id =
"search" name="search" value="{$lang_search}" title = "{$lang_search}" />
</td>
</tr>
- </table>
- </td>
- </tr>
+ </table>
+ </td>
+ </tr>
</xsl:template>
<xsl:template match="filter_invoice" xmlns:php="http://php.net/xsl";>
@@ -181,8 +181,8 @@
<xsl:attribute name="action">
<xsl:value-of
select="phpgw:conditional(not(action), '', action)"/>
</xsl:attribute>
- <!-- When janitor area is chosen, an
ajax request is executed. The operation fetches vouchers from db and populates
the voucher list.
- The ajax opearation is handled in
ajax_invoice.js -->
+ <!-- When janitor area is chosen, an ajax
request is executed. The operation fetches vouchers from db and populates the
voucher list.
+ The ajax opearation is handled in
ajax_invoice.js -->
<select id="voucher_id_filter"
name="voucher_id_filter">
<xsl:apply-templates
select="voucher_list/options"/>
</select>
@@ -194,328 +194,328 @@
</xsl:template>
<xsl:template name="voucher_fields" xmlns:php="http://php.net/xsl";>
- <tr class ='row_on'>
- <td>
- <xsl:value-of select="php:function('lang',
'voucher')" />
- </td>
- <td>
- <input type="hidden" name="voucher_id"
id="voucher_id" value="{voucher_info/voucher/voucher_id}"/>
- <input type="hidden" name="line_id"
id="line_id" value="{voucher_info/voucher/id}"/>
- <div id= 'voucher_id_text'>
- <xsl:value-of
select="voucher_info/voucher/voucher_id"/>
- </div>
- </td>
- </tr>
- <tr class ='row_on'>
- <td>
- <xsl:value-of select="php:function('lang',
'vendor')" />
- </td>
- <td>
- <div id="vendor">
- <xsl:value-of
select="voucher_info/voucher/vendor"/>
- </div>
- </td>
- </tr>
- <tr class ='row_on'>
- <td>
- <div id="invoice_id_text">
- <xsl:choose>
- <xsl:when
test="voucher_info/voucher/external_ref != ''">
- <xsl:value-of
disable-output-escaping="yes" select="voucher_info/voucher/external_ref"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="php:function('lang', 'invoice number')" />
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </td>
- <td>
- <div id="invoice_id">
- <xsl:value-of
select="voucher_info/voucher/invoice_id"/>
- </div>
+ <tr class ='row_on'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'voucher')"
/>
+ </td>
+ <td>
+ <input type="hidden" name="voucher_id" id="voucher_id"
value="{voucher_info/voucher/voucher_id}"/>
+ <input type="hidden" name="line_id" id="line_id"
value="{voucher_info/voucher/id}"/>
+ <div id= 'voucher_id_text'>
+ <xsl:value-of
select="voucher_info/voucher/voucher_id"/>
+ </div>
+ </td>
+ </tr>
+ <tr class ='row_on'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'vendor')" />
+ </td>
+ <td>
+ <div id="vendor">
+ <xsl:value-of
select="voucher_info/voucher/vendor"/>
+ </div>
+ </td>
+ </tr>
+ <tr class ='row_on'>
+ <td>
+ <div id="invoice_id_text">
+ <xsl:choose>
+ <xsl:when
test="voucher_info/voucher/external_ref != ''">
+ <xsl:value-of
disable-output-escaping="yes" select="voucher_info/voucher/external_ref"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="php:function('lang', 'invoice number')" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </td>
+ <td>
+ <div id="invoice_id">
+ <xsl:value-of
select="voucher_info/voucher/invoice_id"/>
+ </div>
- </td>
- </tr>
- <tr class ='row_on'>
- <td>
- <xsl:value-of select="php:function('lang', 'kid
nr')" />
- </td>
- <td>
- <div id="kid_nr">
- <xsl:value-of
select="voucher_info/voucher/kid_nr"/>
- </div>
- </td>
- </tr>
- <tr class ='row_on'>
- <td>
- <xsl:value-of select="php:function('lang',
'currency')" />
- </td>
- <td>
- <div id="currency">
- <xsl:value-of
select="voucher_info/voucher/currency"/>
- </div>
- </td>
- </tr>
- <tr class ='row_on'>
- <td>
- <xsl:value-of select="php:function('lang',
'invoice date')" />
- </td>
- <td>
- <div id="invoice_date">
- <xsl:value-of
select="voucher_info/voucher/invoice_date"/>
- </div>
+ </td>
+ </tr>
+ <tr class ='row_on'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'kid nr')" />
+ </td>
+ <td>
+ <div id="kid_nr">
+ <xsl:value-of
select="voucher_info/voucher/kid_nr"/>
+ </div>
+ </td>
+ </tr>
+ <tr class ='row_on'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'currency')"
/>
+ </td>
+ <td>
+ <div id="currency">
+ <xsl:value-of
select="voucher_info/voucher/currency"/>
+ </div>
+ </td>
+ </tr>
+ <tr class ='row_on'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'invoice
date')" />
+ </td>
+ <td>
+ <div id="invoice_date">
+ <xsl:value-of
select="voucher_info/voucher/invoice_date"/>
+ </div>
- </td>
- </tr>
- <tr class ='row_on'>
- <td>
- <xsl:value-of select="php:function('lang',
'payment date')" />
- </td>
- <td>
- <div id="payment_date">
- <xsl:value-of
select="voucher_info/voucher/payment_date"/>
- </div>
+ </td>
+ </tr>
+ <tr class ='row_on'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'payment
date')" />
+ </td>
+ <td>
+ <div id="payment_date">
+ <xsl:value-of
select="voucher_info/voucher/payment_date"/>
+ </div>
- </td>
- </tr>
- <tr class ='row_on'>
- <td>
- <xsl:value-of select="php:function('lang',
'park invoice')" />
- </td>
- <td>
- <div id="park_order">
- <input type="checkbox"
name="values[park_invoice]" value="1">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'park invoice')"/>
+ </td>
+ </tr>
+ <tr class ='row_on'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'park
invoice')" />
+ </td>
+ <td>
+ <div id="park_order">
+ <input type="checkbox"
name="values[park_invoice]" value="1">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'park invoice')"/>
+ </xsl:attribute>
+ <xsl:if
test="voucher_info/voucher/parked = '1'">
+ <xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
</xsl:attribute>
- <xsl:if
test="voucher_info/voucher/parked = '1'">
- <xsl:attribute
name="checked">
-
<xsl:text>checked</xsl:text>
- </xsl:attribute>
- </xsl:if>
- </input>
- <xsl:if
test="voucher_info/voucher/parked = '1'">
- <xsl:text> X</xsl:text>
</xsl:if>
- </div>
- </td>
- </tr>
- <tr class ='row_on'>
- <td colspan = "2">
- <table>
- <tr class ='row_on'>
- <td>
- <xsl:value-of
select="php:function('lang', 'period')" />
- </td>
- <td>
- <xsl:value-of
select="php:function('lang', 'periodization')" />
- </td>
- <td>
- <xsl:value-of
select="php:function('lang', 'periodization start')" />
- </td>
- </tr>
- <tr class ='row_on'>
- <td>
- <select id="period"
name="values[period]">
-
<xsl:apply-templates select="voucher_info/generic/period_list/options"/>
- </select>
- </td>
- <td>
- <select
id="periodization" name="values[periodization]">
-
<xsl:apply-templates select="voucher_info/generic/periodization_list/options"/>
- </select>
- </td>
- <td>
- <select
id="periodization_start" name="values[periodization_start]">
-
<xsl:apply-templates
select="voucher_info/generic/periodization_start_list/options"/>
- </select>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr class ='row_off'>
- <td>
- <div id = 'order_text'>
- <xsl:choose>
- <xsl:when
test="voucher_info/voucher/order_link != ''">
- <a
href="{voucher_info/voucher/order_link}" target="_blank"
title="{voucher_info/voucher/status}">
+ </input>
+ <xsl:if test="voucher_info/voucher/parked =
'1'">
+ <xsl:text> X</xsl:text>
+ </xsl:if>
+ </div>
+ </td>
+ </tr>
+ <tr class ='row_on'>
+ <td colspan = "2">
+ <table>
+ <tr class ='row_on'>
+ <td>
+ <xsl:value-of
select="php:function('lang', 'period')" />
+ </td>
+ <td>
+ <xsl:value-of
select="php:function('lang', 'periodization')" />
+ </td>
+ <td>
+ <xsl:value-of
select="php:function('lang', 'periodization start')" />
+ </td>
+ </tr>
+ <tr class ='row_on'>
+ <td>
+ <select id="period"
name="values[period]">
+ <xsl:apply-templates
select="voucher_info/generic/period_list/options"/>
+ </select>
+ </td>
+ <td>
+ <select id="periodization"
name="values[periodization]">
+ <xsl:apply-templates
select="voucher_info/generic/periodization_list/options"/>
+ </select>
+ </td>
+ <td>
+ <select
id="periodization_start" name="values[periodization_start]">
+ <xsl:apply-templates
select="voucher_info/generic/periodization_start_list/options"/>
+ </select>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td>
+ <div id = 'order_text'>
+ <xsl:choose>
+ <xsl:when
test="voucher_info/voucher/order_link != ''">
+ <a
href="{voucher_info/voucher/order_link}" target="_blank"
title="{voucher_info/voucher/status}">
<xsl:value-of
select="php:function('lang', 'order')" />
- </a>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="php:function('lang', 'order')" />
- </xsl:otherwise>
- </xsl:choose>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="php:function('lang', 'order')" />
+ </xsl:otherwise>
+ </xsl:choose>
- </div>
- </td>
- <td>
- <input type="text" name="values[order_id]"
id="order_id" value="{voucher_info/voucher/order_id}"/>
- <input type="hidden"
name="values[order_id_orig]" id="order_id_orig"
value="{voucher_info/voucher/order_id}"/>
- </td>
- </tr>
- <tr class ='row_off'>
- <td>
- <xsl:value-of select="php:function('lang',
'dime')" />
- </td>
- <td>
- <select id="dim_e" name="values[dim_e]">
- <xsl:apply-templates
select="voucher_info/generic/dime_list/options"/>
- </select>
- </td>
- </tr>
- <tr class ='row_off'>
- <td>
- <xsl:value-of select="php:function('lang',
'budget account')" />
- </td>
- <td>
- <input type="text" name="values[b_account_id]"
id="b_account_id" value="{voucher_info/voucher/b_account_id}"/>
- </td>
- </tr>
- <tr class ='row_off'>
- <td>
- <xsl:value-of select="php:function('lang', 'dim
b')" />
- </td>
- <td>
- <select id="dim_b" name="values[dim_b]">
- <xsl:apply-templates
select="voucher_info/generic/dimb_list/options"/>
- </select>
- </td>
- </tr>
- <tr class ='row_off'>
- <td>
- <xsl:value-of select="php:function('lang',
'invoice line text')" />
- </td>
- <td>
- <input type="text" name="values[line_text]"
id="line_text" value="{voucher_info/voucher/line_text}"/>
- </td>
- </tr>
- <tr class ='row_off'>
- <td>
- <xsl:value-of select="php:function('lang',
'close order')" />
- </td>
- <td>
- <input type="hidden" id ="close_order_orig"
name="values[close_order_orig]" value="{voucher_info/voucher/closed}"/>
+ </div>
+ </td>
+ <td>
+ <input type="text" name="values[order_id]"
id="order_id" value="{voucher_info/voucher/order_id}"/>
+ <input type="hidden" name="values[order_id_orig]"
id="order_id_orig" value="{voucher_info/voucher/order_id}"/>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'dime')" />
+ </td>
+ <td>
+ <select id="dim_e" name="values[dim_e]">
+ <xsl:apply-templates
select="voucher_info/generic/dime_list/options"/>
+ </select>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'budget
account')" />
+ </td>
+ <td>
+ <input type="text" name="values[b_account_id]"
id="b_account_id" value="{voucher_info/voucher/b_account_id}"/>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'dim b')" />
+ </td>
+ <td>
+ <select id="dim_b" name="values[dim_b]">
+ <xsl:apply-templates
select="voucher_info/generic/dimb_list/options"/>
+ </select>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'invoice
line text')" />
+ </td>
+ <td>
+ <input type="text" name="values[line_text]"
id="line_text" value="{voucher_info/voucher/line_text}"/>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'close
order')" />
+ </td>
+ <td>
+ <input type="hidden" id ="close_order_orig"
name="values[close_order_orig]" value="{voucher_info/voucher/closed}"/>
- <div id="close_order">
- <input type="checkbox"
name="values[close_order]" value="1">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'close order')"/>
+ <div id="close_order">
+ <input type="checkbox"
name="values[close_order]" value="1">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'close order')"/>
+ </xsl:attribute>
+ <xsl:if
test="voucher_info/voucher/pref_close_order = '1' or
voucher_info/voucher/closed = '1'">
+ <xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
</xsl:attribute>
- <xsl:if
test="voucher_info/voucher/pref_close_order = '1' or
voucher_info/voucher/closed = '1'">
- <xsl:attribute
name="checked">
-
<xsl:text>checked</xsl:text>
- </xsl:attribute>
- </xsl:if>
- </input>
- <xsl:text> </xsl:text>
- <xsl:value-of
select="voucher_info/voucher/status"/>
- </div>
- </td>
- </tr>
- <tr class ='row_off'>
- <td>
- <xsl:value-of
select="php:function('lang', 'dim a')" />
- </td>
- <td>
- <input type="text" name="values[dim_a]"
id="dim_a" value="{voucher_info/voucher/dim_a}"/>
- </td>
- </tr>
- <tr class ='row_off'>
- <td>
- <xsl:value-of select="php:function('lang', 'tax
code')" />
- </td>
- <td>
- <select id="tax_code" name="values[tax_code]">
- <xsl:apply-templates
select="voucher_info/generic/tax_code_list/options"/>
- </select>
- </td>
- </tr>
- <tr class ='row_off'>
- <td>
- <xsl:value-of select="php:function('lang',
'project group')" />
- </td>
- <td>
- <input type="text" name="values[project_group]"
id="project_group" value="{voucher_info/voucher/project_group}"/>
- </td>
- </tr>
+ </xsl:if>
+ </input>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="voucher_info/voucher/status"/>
+ </div>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'dim a')" />
+ </td>
+ <td>
+ <input type="text" name="values[dim_a]" id="dim_a"
value="{voucher_info/voucher/dim_a}"/>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'tax code')"
/>
+ </td>
+ <td>
+ <select id="tax_code" name="values[tax_code]">
+ <xsl:apply-templates
select="voucher_info/generic/tax_code_list/options"/>
+ </select>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'project
group')" />
+ </td>
+ <td>
+ <input type="text" name="values[project_group]"
id="project_group" value="{voucher_info/voucher/project_group}"/>
+ </td>
+ </tr>
</xsl:template>
<!-- approve voucher -->
<xsl:template xmlns:php="http://php.net/xsl"; name="approve">
- <xsl:apply-templates
select="voucher_info/generic/approved_list"/>
- <tr class ='row_off'>
+ <xsl:apply-templates select="voucher_info/generic/approved_list"/>
+ <tr class ='row_off'>
<td class="th_text" align="left" valign="top"
style="white-space: nowrap;">
<input id="sign_orig" type="hidden"
name="values[sign_orig]" value="{voucher_info/generic/sign_orig}"/>
<input id="my_initials" type="hidden"
name="values[my_initials]" value="{voucher_info/generic/my_initials}"/>
- <xsl:value-of select="php:function('lang',
'approve as')"/>
- </td>
- <td class="th_text" valign="top" align="left">
- <div id = "approve_as2"> </div>
- </td>
- </tr>
- <tr class ='row_off'>
- <td>
- </td>
- <td>
- <div id = 'email_link'></div>
- </td>
- </tr>
- <tr class ='row_off'>
- <td>
- <xsl:value-of select="php:function('lang',
'voucher process code')" />
- </td>
- <td>
- <select id="process_code"
name="values[process_code]">
- <xsl:apply-templates
select="voucher_info/generic/process_code_list/options"/>
- </select>
- </td>
- </tr>
- <tr class ='row_off'>
- <td class="th_text" align="left" valign="top"
style="white-space: nowrap;">
- <xsl:value-of select="php:function('lang',
'voucher process log')"/>
- </td>
- <td align="left">
- <textarea id="process_log" cols="60" rows="10"
name="values[process_log]" wrap="virtual">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'voucher process log')"/>
- </xsl:attribute>
- <!--xsl:value-of
select="voucher_info/generic/process_log"/-->
- </textarea>
- </td>
- </tr>
+ <xsl:value-of select="php:function('lang', 'approve
as')"/>
+ </td>
+ <td class="th_text" valign="top" align="left">
+ <div id = "approve_as2"> </div>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td>
+ </td>
+ <td>
+ <div id = 'email_link'></div>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td>
+ <xsl:value-of select="php:function('lang', 'voucher
process code')" />
+ </td>
+ <td>
+ <select id="process_code" name="values[process_code]">
+ <xsl:apply-templates
select="voucher_info/generic/process_code_list/options"/>
+ </select>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td class="th_text" align="left" valign="top"
style="white-space: nowrap;">
+ <xsl:value-of select="php:function('lang', 'voucher
process log')"/>
+ </td>
+ <td align="left">
+ <textarea id="process_log" cols="60" rows="10"
name="values[process_log]" wrap="virtual">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'voucher process log')"/>
+ </xsl:attribute>
+ <!--xsl:value-of
select="voucher_info/generic/process_log"/-->
+ </textarea>
+ </td>
+ </tr>
</xsl:template>
<!-- New template-->
<xsl:template match="approved_list" xmlns:php="http://php.net/xsl";>
- <tr class ='row_off'>
- <td align="left" style="white-space: nowrap;">
- <xsl:value-of select="role"/>
- </td>
- <td align="left" style="white-space: nowrap;">
- <div id = "{role_sign}">
- <xsl:choose>
- <xsl:when test="date != ''">
- <xsl:value-of
select="initials"/>
- <xsl:text>: </xsl:text>
- <xsl:value-of
select="date"/>
- </xsl:when>
- <xsl:otherwise>
- <select id
="_{role_sign}" name="values[forward][{role_sign}]">
-
<xsl:attribute name="title">
-
<xsl:value-of select="role"/>
-
</xsl:attribute>
-
<xsl:apply-templates select="user_list/options"/>
- </select>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </td>
- </tr>
+ <tr class ='row_off'>
+ <td align="left" style="white-space: nowrap;">
+ <xsl:value-of select="role"/>
+ </td>
+ <td align="left" style="white-space: nowrap;">
+ <div id = "{role_sign}">
+ <xsl:choose>
+ <xsl:when test="date != ''">
+ <xsl:value-of
select="initials"/>
+ <xsl:text>: </xsl:text>
+ <xsl:value-of select="date"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <select id ="_{role_sign}"
name="values[forward][{role_sign}]">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="role"/>
+ </xsl:attribute>
+ <xsl:apply-templates
select="user_list/options"/>
+ </select>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </td>
+ </tr>
</xsl:template>
<!-- options for use with select-->
Modified: trunk/property/templates/base/project.xsl
===================================================================
--- trunk/property/templates/base/project.xsl 2016-02-23 13:02:27 UTC (rev
14770)
+++ trunk/property/templates/base/project.xsl 2016-02-23 18:47:07 UTC (rev
14771)
@@ -27,15 +27,15 @@
var base_java_notify_url = <xsl:value-of
select="base_java_notify_url"/>;
var base_java_url = <xsl:value-of select="base_java_url"/>;
</script>
- <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>
<table cellpadding="2" cellspacing="2" align="center">
<xsl:choose>
<xsl:when test="value_project_id > 0 and
mode='edit'">
@@ -43,7 +43,7 @@
<xsl:variable name="lang_add_sub_entry">
<xsl:value-of
select="lang_add_sub_entry"/>
</xsl:variable>
- <input type="button" class="pure-button
pure-button-primary" name="add_sub_entry" value="{$lang_add_sub_entry}"
onClick="add_sub_entry()">
+ <input type="button" class="pure-button
pure-button-primary" id="add_sub_entry" name="add_sub_entry"
value="{$lang_add_sub_entry}" onClick="add_sub_entry()">
<xsl:attribute name="title">
<xsl:value-of
select="lang_add_sub_entry_statustext"/>
</xsl:attribute>
@@ -59,46 +59,46 @@
<input id="project_tab" type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="tabs"/>
- <div id="general">
+ <div id="general">
<fieldset>
- <xsl:choose>
- <xsl:when
test="value_project_id > 0">
- <xsl:choose>
-
<xsl:when test="mode='edit'">
+ <xsl:choose>
+ <xsl:when
test="value_project_id > 0">
+ <xsl:choose>
+ <xsl:when
test="mode='edit'">
<div
class="pure-control-group">
<label for="name" title="{lang_copy_project_statustext}">
-
<xsl:value-of select="lang_copy_project"/>
+
<xsl:value-of select="lang_copy_project"/>
</label>
-
<input type="checkbox" name="values[copy_project]" value="True">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="lang_copy_project_statustext"/>
-
</xsl:attribute>
-
</input>
+
<input type="checkbox" name="values[copy_project]" value="True">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_copy_project_statustext"/>
+
</xsl:attribute>
+
</input>
</div>
-
</xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div
class="pure-control-group">
<label
for="name">
-
<xsl:value-of select="lang_project_id"/>
+
<xsl:value-of select="lang_project_id"/>
</label>
<div
class="pure-custom">
-
<xsl:value-of select="value_project_id"/>
+
<xsl:value-of select="value_project_id"/>
</div>
</div>
- <xsl:choose>
-
<xsl:when test="mode='edit'">
+ <xsl:choose>
+ <xsl:when
test="mode='edit'">
<div
class="pure-control-group">
<label for="name">
-
<a href="{link_select_request}"
title="{lang_select_request_statustext}">
-
<xsl:value-of select="php:function('lang', 'select
request')"/>
-
</a>
+
<a href="{link_select_request}"
title="{lang_select_request_statustext}">
+
<xsl:value-of select="php:function('lang', 'select request')"/>
+
</a>
</label>
</div>
-
</xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div
class="pure-control-group">
<label
for="name">
-
<xsl:value-of select="php:function('lang', 'related')"/>
+
<xsl:value-of select="php:function('lang', 'related')"/>
</label>
<div
class="pure-custom">
<xsl:for-each select="datatable_def">
@@ -112,215 +112,215 @@
<xsl:with-param name="config" select ='config' />
</xsl:call-template>
</xsl:if>
- </xsl:for-each>
+
</xsl:for-each>
</div>
</div>
- </xsl:when>
- <xsl:otherwise>
- <xsl:for-each
select="value_origin">
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each
select="value_origin">
<div
class="pure-control-group">
<label
for="name">
-
<xsl:value-of select="descr"/>
+
<xsl:value-of select="descr"/>
</label>
<div
class="pure-custom">
-
<xsl:for-each select="data">
+
<xsl:for-each select="data">
<div>
-
<a href="{link}" title="{statustext}">
-
<xsl:value-of select="id"/>
-
</a>
-
<xsl:text> </xsl:text>
+
<a href="{link}" title="{statustext}">
+
<xsl:value-of select="id"/>
+
</a>
+
<xsl:text> </xsl:text>
</div>
-
</xsl:for-each>
+
</xsl:for-each>
</div>
</div>
- </xsl:for-each>
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
<div class="pure-control-group">
<label for="name">
+ <xsl:value-of
select="php:function('lang', 'project type')"/>
+ </label>
+ <select
name="values[project_type_id]">
+ <xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'project type')"/>
- </label>
- <select
name="values[project_type_id]">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'project type')"/>
-
</xsl:attribute>
+ </xsl:attribute>
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
- <option
value="0">
-
<xsl:value-of select="php:function('lang', 'select')"/>
-
</option>
-
<xsl:apply-templates select="project_types/options"/>
- </select>
+ <option value="0">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </option>
+ <xsl:apply-templates
select="project_types/options"/>
+ </select>
</div>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="lang_name"/>
+ <xsl:value-of
select="lang_name"/>
</label>
- <input
type="hidden" name="values[origin]" value="{value_origin_type}"/>
- <input
type="hidden" name="values[origin_id]" value="{value_origin_id}"/>
- <input
type="text" name="values[name]" value="{value_name}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_name_statustext"/>
-
</xsl:attribute>
+ <input type="hidden"
name="values[origin]" value="{value_origin_type}"/>
+ <input type="hidden"
name="values[origin_id]" value="{value_origin_id}"/>
+ <input type="text"
name="values[name]" value="{value_name}">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="lang_name_statustext"/>
+ </xsl:attribute>
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
<xsl:attribute
name="data-validation-error-msg">
<xsl:text>Please enter a project NAME !</xsl:text>
</xsl:attribute>
- </input>
+ </input>
</div>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="lang_descr"/>
+ <xsl:value-of
select="lang_descr"/>
</label>
- <textarea
cols="60" rows="6" name="values[descr]">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_descr_statustext"/>
-
</xsl:attribute>
-
<xsl:value-of select="value_descr"/>
- </textarea>
+ <textarea cols="60" rows="6"
name="values[descr]">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="lang_descr_statustext"/>
+ </xsl:attribute>
+ <xsl:value-of
select="value_descr"/>
+ </textarea>
</div>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="lang_coordinator"/>
+ <xsl:value-of
select="lang_coordinator"/>
</label>
-
<xsl:call-template name="user_id_select"/>
+ <xsl:call-template
name="user_id_select"/>
</div>
<!--xsl:call-template
name="contact_form"/-->
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="lang_category"/>
+ <xsl:value-of
select="lang_category"/>
</label>
-
<xsl:call-template name="categories"/>
+ <xsl:call-template
name="categories"/>
</div>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="lang_status"/>
+ <xsl:value-of
select="lang_status"/>
</label>
-
<xsl:call-template name="status_select"/>
+ <xsl:call-template
name="status_select"/>
</div>
- <xsl:choose>
- <xsl:when
test="value_project_id > 0 and mode='edit'">
+ <xsl:choose>
+ <xsl:when
test="value_project_id > 0 and mode='edit'">
<div
class="pure-control-group">
<label
for="name">
-
<xsl:value-of select="lang_confirm_status"/>
+
<xsl:value-of select="lang_confirm_status"/>
</label>
-
<input type="checkbox" name="values[confirm_status]" value="True">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_confirm_statustext"/>
-
</xsl:attribute>
-
</input>
+ <input
type="checkbox" name="values[confirm_status]" value="True">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_confirm_statustext"/>
+
</xsl:attribute>
+ </input>
</div>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when
test="need_approval='1' and mode='edit'">
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="need_approval='1' and mode='edit'">
<div
class="pure-control-group">
<label
for="name">
-
<xsl:value-of select="lang_ask_approval"/>
+
<xsl:value-of select="lang_ask_approval"/>
</label>
<div
class="pure-custom">
-
<xsl:for-each select="value_approval_mail_address">
+
<xsl:for-each select="value_approval_mail_address">
<div>
-
<input type="checkbox"
name="values[approval][{id}]" value="True">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="//lang_ask_approval_statustext"/>
-
</xsl:attribute>
-
</input>
-
<input type="text"
name="values[mail_address][{id}]" value="{address}">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="//lang_ask_approval_statustext"/>
-
</xsl:attribute>
-
</input>
-
<xsl:if test="default = '1'">
-
<xsl:text><=</xsl:text>
-
</xsl:if>
+
<input type="checkbox" name="values[approval][{id}]" value="True">
+
<xsl:attribute name="title">
+
<xsl:value-of select="//lang_ask_approval_statustext"/>
+
</xsl:attribute>
+
</input>
+
<input type="text" name="values[mail_address][{id}]" value="{address}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="//lang_ask_approval_statustext"/>
+
</xsl:attribute>
+
</input>
+
<xsl:if test="default = '1'">
+
<xsl:text><=</xsl:text>
+
</xsl:if>
</div>
-
</xsl:for-each>
+
</xsl:for-each>
</div>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="lang_remark"/>
+ <xsl:value-of
select="lang_remark"/>
</label>
- <textarea
cols="60" rows="6" name="values[remark]">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_remark_statustext"/>
-
</xsl:attribute>
-
<xsl:value-of select="value_remark"/>
- </textarea>
+ <textarea cols="60" rows="6"
name="values[remark]">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="lang_remark_statustext"/>
+ </xsl:attribute>
+ <xsl:value-of
select="value_remark"/>
+ </textarea>
</div>
- <xsl:apply-templates
select="custom_attributes/attributes"/>
+ <xsl:apply-templates
select="custom_attributes/attributes"/>
</fieldset>
- </div>
+ </div>
- <div id="location">
+ <div id="location">
<fieldset>
- <xsl:choose>
- <xsl:when
test="mode='edit'">
+ <xsl:choose>
+ <xsl:when test="mode='edit'">
<div
class="pure-control-group">
<label>
+
<xsl:value-of select="php:function('lang', 'inherit location')"/>
+ </label>
+ <input
type="checkbox" name="values[inherit_location]" value="1">
+ <xsl:if
test="inherit_location = 1">
+
<xsl:attribute name="checked" value="checked"/>
+
</xsl:if>
+
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'inherit location')"/>
- </label>
-
<input type="checkbox" name="values[inherit_location]" value="1">
-
<xsl:if test="inherit_location = 1">
-
<xsl:attribute name="checked" value="checked"/>
-
</xsl:if>
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'inherit
location')"/>
-
</xsl:attribute>
-
</input>
+
</xsl:attribute>
+ </input>
</div>
-
<xsl:call-template name="location_form"/>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:call-template name="location_view"/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:choose>
- <xsl:when
test="suppressmeter =''">
+ <xsl:call-template
name="location_form"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template
name="location_view"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="suppressmeter
=''">
<div
class="pure-control-group">
<label
for="name">
-
<xsl:value-of select="lang_power_meter"/>
+
<xsl:value-of select="lang_power_meter"/>
</label>
-
<input type="text" name="values[power_meter]" value="{value_power_meter}"
size="12" onMouseout="window.status='';return true;">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_power_meter_statustext"/>
-
</xsl:attribute>
-
</input>
+ <input
type="text" name="values[power_meter]" value="{value_power_meter}" size="12"
onMouseout="window.status='';return true;">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_power_meter_statustext"/>
+
</xsl:attribute>
+ </input>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
</fieldset>
- </div>
+ </div>
- <div id="budget">
+ <div id="budget">
<!--fieldset-->
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="lang_start_date"/>
+ <xsl:value-of
select="lang_start_date"/>
</label>
- <input
type="text" id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_start_date_statustext"/>
-
</xsl:attribute>
+ <input type="text"
id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_start_date_statustext"/>
+ </xsl:attribute>
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
- </input>
+ </input>
</div>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="lang_end_date"/>
+ <xsl:value-of
select="lang_end_date"/>
</label>
- <input
type="text" id="values_end_date" name="values[end_date]" size="10"
value="{value_end_date}" readonly="readonly">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_end_date_statustext"/>
-
</xsl:attribute>
+ <input type="text" id="values_end_date"
name="values[end_date]" size="10" value="{value_end_date}" readonly="readonly">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_end_date_statustext"/>
+ </xsl:attribute>
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -328,112 +328,112 @@
<xsl:value-of
select="php:function('lang', 'Please select an end date!')"/>
</xsl:attribute>
- </input>
+ </input>
</div>
- <xsl:call-template
name="project_group_form"/>
+ <xsl:call-template name="project_group_form"/>
+ <xsl:choose>
+ <xsl:when test="ecodimb_data!=''">
+ <xsl:call-template
name="ecodimb_form"/>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="b_account_data!=''">
<xsl:choose>
- <xsl:when
test="ecodimb_data!=''">
-
<xsl:call-template name="ecodimb_form"/>
+ <xsl:when
test="mode='edit'">
+
<xsl:call-template name="b_account_form"/>
</xsl:when>
+ <xsl:otherwise>
+
<xsl:call-template name="b_account_view"/>
+ </xsl:otherwise>
</xsl:choose>
- <xsl:choose>
- <xsl:when
test="b_account_data!=''">
- <xsl:choose>
-
<xsl:when test="mode='edit'">
-
<xsl:call-template name="b_account_form"/>
-
</xsl:when>
-
<xsl:otherwise>
-
<xsl:call-template name="b_account_view"/>
-
</xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<xsl:if test="value_project_id > 0 and
mode='edit'">
<div class="pure-control-group">
<label for="name">
-
<xsl:value-of select="php:function('lang', 'move')"/>
+ <xsl:value-of
select="php:function('lang', 'move')"/>
</label>
<input type="text"
data-validation="number" data-validation-allowing="float"
data-validation-decimal-separator="{$decimal_separator}"
name="values[new_project_id]" value="">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'move budget and
orders to another project')"/>
-
</xsl:attribute>
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'move budget and orders to another project')"/>
+ </xsl:attribute>
<xsl:attribute
name="data-validation-optional">
<xsl:text>true</xsl:text>
</xsl:attribute>
-
</input>
+ </input>
</div>
</xsl:if>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="php:function('lang', 'budget')"/>
+ <xsl:value-of
select="php:function('lang', 'budget')"/>
</label>
<div class="pure-custom">
<div>
<input
data-validation="number" data-validation-allowing="float"
data-validation-decimal-separator="{$decimal_separator}" type="text"
name="values[budget]" value="{value_budget}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'Enter the
budget')"/>
-
</xsl:attribute>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'Enter the budget')"/>
+ </xsl:attribute>
<xsl:if
test="not(value_project_id > 0) and mode='edit'">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
</xsl:if>
-
</input>
-
<xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
-
<select name="values[budget_year]">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'year')"/>
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of select="php:function('lang', 'year')"/>
-
</option>
-
<xsl:apply-templates select="year_list/options"/>
-
</select>
-
<xsl:choose>
-
<xsl:when test="project_type_id ='3'">
-
<input type="checkbox"
name="values[budget_reset_buffer]" value="1">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'delete')"/>
-
<xsl:text> </xsl:text>
-
<xsl:value-of
select="php:function('lang', 'buffer')"/>
-
<xsl:text> </xsl:text>
-
<xsl:value-of
select="php:function('lang', 'budget')"/>
-
</xsl:attribute>
-
</input>
-
</xsl:when>
-
</xsl:choose>
-
<xsl:choose>
-
<xsl:when test="project_type_id !='3'">
-
<select name="values[budget_periodization]">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'periodization')"/>
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of
select="php:function('lang', 'periodization')"/>
-
</option>
-
<xsl:apply-templates
select="periodization_list/options"/>
-
</select>
-
<input type="checkbox"
name="values[budget_periodization_all]" value="True">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'all')"/>
-
<xsl:text> </xsl:text>
-
<xsl:value-of
select="php:function('lang', 'periods')"/>
-
</xsl:attribute>
-
</input>
-
<input type="checkbox"
name="values[budget_periodization_activate]" value="1">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'activate')"/>
-
</xsl:attribute>
-
<xsl:attribute name="checked" value="checked"/>
-
</input>
-
</xsl:when>
-
</xsl:choose>
+ </input>
+ <xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
+ <select
name="values[budget_year]">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'year')"/>
+ </xsl:attribute>
+ <option
value="0">
+
<xsl:value-of select="php:function('lang', 'year')"/>
+ </option>
+
<xsl:apply-templates select="year_list/options"/>
+ </select>
+ <xsl:choose>
+ <xsl:when
test="project_type_id ='3'">
+ <input
type="checkbox" name="values[budget_reset_buffer]" value="1">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'delete')"/>
+
<xsl:text> </xsl:text>
+
<xsl:value-of select="php:function('lang', 'buffer')"/>
+
<xsl:text> </xsl:text>
+
<xsl:value-of select="php:function('lang', 'budget')"/>
+
</xsl:attribute>
+ </input>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="project_type_id !='3'">
+ <select
name="values[budget_periodization]">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'periodization')"/>
+
</xsl:attribute>
+
<option value="0">
+
<xsl:value-of select="php:function('lang', 'periodization')"/>
+
</option>
+
<xsl:apply-templates select="periodization_list/options"/>
+
</select>
+ <input
type="checkbox" name="values[budget_periodization_all]" value="True">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'all')"/>
+
<xsl:text> </xsl:text>
+
<xsl:value-of select="php:function('lang', 'periods')"/>
+
</xsl:attribute>
+ </input>
+ <input
type="checkbox" name="values[budget_periodization_activate]" value="1">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'activate')"/>
+
</xsl:attribute>
+
<xsl:attribute name="checked" value="checked"/>
+ </input>
+ </xsl:when>
+ </xsl:choose>
</div>
</div>
</div>
<!--div class="pure-control-group"-->
<label for="name">
- <xsl:value-of
select="php:function('lang', 'budget')"/>
+ <xsl:value-of
select="php:function('lang', 'budget')"/>
</label>
<!--div class="pure-custom">
<div-->
@@ -452,116 +452,116 @@
<!--/div>
</div-->
<!--div-->
- <xsl:choose>
- <xsl:when
test="value_project_id!='' and mode='edit'">
+ <xsl:choose>
+ <xsl:when test="value_project_id!=''
and mode='edit'">
<div class="pure-control-group">
<label for="name">
-
<xsl:value-of select="php:function('lang', 'transfer')"/>
+ <xsl:value-of
select="php:function('lang', 'transfer')"/>
</label>
<div
class="pure-custom">
-
<table>
-
<tr>
+ <table>
+ <tr>
<td>
-
<xsl:value-of select="php:function('lang', 'amount')"/>
-
</td>
+
<xsl:value-of select="php:function('lang', 'amount')"/>
+
</td>
<td>
-
<xsl:value-of select="php:function('lang', 'project')"/>
-
</td>
+
<xsl:value-of select="php:function('lang', 'project')"/>
+
</td>
<td>
+
<xsl:value-of select="php:function('lang', 'remark')"/>
+
</td>
+ </tr>
+ <tr>
+
<td>
+
<input type="text" name="values[transfer_amount]" value="">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'amount to
transfer')"/>
+
</xsl:attribute>
+
</input>
+
</td>
+
<td>
+
<input type="text" name="values[transfer_target]" value="">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'target
project')"/>
+
</xsl:attribute>
+
</input>
+
</td>
+
<td>
+
<input type="text" name="values[transfer_remark]" value="">
+
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'remark')"/>
-
</td>
-
</tr>
-
<tr>
-
<td>
-
<input type="text" name="values[transfer_amount]"
value="">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'amount to transfer')"/>
-
</xsl:attribute>
-
</input>
-
</td>
-
<td>
-
<input type="text" name="values[transfer_target]"
value="">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'target project')"/>
-
</xsl:attribute>
-
</input>
-
</td>
-
<td>
-
<input type="text" name="values[transfer_remark]"
value="">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'remark')"/>
-
</xsl:attribute>
-
</input>
-
</td>
-
</tr>
-
</table>
+
</xsl:attribute>
+
</input>
+
</td>
+ </tr>
+ </table>
</div>
</div>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when
test="project_type_id !='3'">
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="project_type_id !='3'">
<div class="pure-control-group">
<label for="name">
-
<xsl:value-of select="lang_reserve"/>
+ <xsl:value-of
select="lang_reserve"/>
</label>
<input
data-validation="number" data-validation-allowing="float"
data-validation-decimal-separator="{$decimal_separator}" type="text"
name="values[reserve]" value="{value_reserve}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_reserve_statustext"/>
-
</xsl:attribute>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="lang_reserve_statustext"/>
+ </xsl:attribute>
<xsl:attribute
name="data-validation-optional">
<xsl:text>true</xsl:text>
</xsl:attribute>
-
</input>
-
<xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
+ </input>
+ <xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
</div>
<div class="pure-control-group">
<label for="name">
-
<xsl:value-of select="lang_sum"/>
+ <xsl:value-of
select="lang_sum"/>
</label>
-
<xsl:value-of select="value_sum"/>
-
<xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
+ <xsl:value-of
select="value_sum"/>
+ <xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
</div>
<div class="pure-control-group">
<label for="name">
-
<xsl:value-of select="lang_remainder"/>
+ <xsl:value-of
select="lang_remainder"/>
</label>
-
<xsl:value-of select="value_remainder"/>
-
<xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
+ <xsl:value-of
select="value_remainder"/>
+ <xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
</div>
<div class="pure-control-group">
<label for="name">
-
<xsl:value-of select="lang_reserve_remainder"/>
+ <xsl:value-of
select="lang_reserve_remainder"/>
</label>
-
<xsl:value-of select="value_reserve_remainder"/>
-
<xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
-
<xsl:text> </xsl:text> ( <xsl:value-of
select="value_reserve_remainder_percent"/>
-
<xsl:text> % )</xsl:text>
+ <xsl:value-of
select="value_reserve_remainder"/>
+ <xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
+ <xsl:text> </xsl:text>
( <xsl:value-of select="value_reserve_remainder_percent"/>
+ <xsl:text> %
)</xsl:text>
</div>
- </xsl:when>
- <xsl:otherwise>
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ </xsl:otherwise>
+ </xsl:choose>
<!--div class="pure-control-group"-->
<label for="name">
- <xsl:value-of
select="lang_workorder_id"/>
+ <xsl:value-of
select="lang_workorder_id"/>
</label>
- <xsl:choose>
- <xsl:when
test="sum_workorder_budget=''">
-
<xsl:value-of select="lang_no_workorders"/>
- </xsl:when>
- <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when
test="sum_workorder_budget=''">
+ <xsl:value-of
select="lang_no_workorders"/>
+ </xsl:when>
+ <xsl:otherwise>
<!--div class="pure-custom">
<div-->
-
<select id = "order_time_span" name="order_time_span">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'select')"/>
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of select="php:function('lang', 'select')"/>
-
</option>
-
<xsl:apply-templates select="order_time_span/options"/>
-
</select>
+ <select id = "order_time_span"
name="order_time_span">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </xsl:attribute>
+ <option value="0">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </option>
+ <xsl:apply-templates
select="order_time_span/options"/>
+ </select>
<!--/div>
<div-->
<xsl:for-each
select="datatable_def">
@@ -578,12 +578,12 @@
</xsl:for-each>
<!--/div>
</div-->
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
<!--/div-->
<!--div class="pure-control-group"-->
<label for="name">
- <xsl:value-of
select="php:function('lang', 'invoice')"/>
+ <xsl:value-of
select="php:function('lang', 'invoice')"/>
</label>
<!--div class="pure-custom"-->
<xsl:for-each select="datatable_def">
@@ -596,29 +596,29 @@
<xsl:with-param
name="data" select ='data' />
<xsl:with-param
name="config" select ='config' />
</xsl:call-template>
- </xsl:if>
- </xsl:for-each>
+ </xsl:if>
+ </xsl:for-each>
<!--/div-->
<!--/div-->
<!--/fieldset-->
- </div>
+ </div>
- <div id="coordination">
+ <div id="coordination">
<fieldset>
- <xsl:variable
name="lang_contact_statustext">
- <xsl:value-of
select="php:function('lang', 'click this link to select')"/>
- </xsl:variable>
+ <xsl:variable
name="lang_contact_statustext">
+ <xsl:value-of
select="php:function('lang', 'click this link to select')"/>
+ </xsl:variable>
<div class="pure-control-group">
<label for="name">
- <a
href="javascript:notify_contact_lookup()" title="{$lang_contact_statustext}">
-
<xsl:value-of select="php:function('lang', 'contact')"/>
- </a>
+ <a
href="javascript:notify_contact_lookup()" title="{$lang_contact_statustext}">
+ <xsl:value-of
select="php:function('lang', 'contact')"/>
+ </a>
</label>
<input type="hidden"
id="notify_contact" name="notify_contact" value=""
title="{$lang_contact_statustext}"></input>
-
<input type="hidden" name="notify_contact_name" value=""
onClick="notify_contact_lookup();" readonly="readonly"
title="{$lang_contact_statustext}"/>
+ <input type="hidden"
name="notify_contact_name" value="" onClick="notify_contact_lookup();"
readonly="readonly" title="{$lang_contact_statustext}"/>
</div>
<label for="name">
- <xsl:value-of
select="php:function('lang', 'notify')"/>
+ <xsl:value-of
select="php:function('lang', 'notify')"/>
</label>
<xsl:for-each select="datatable_def">
<xsl:if test="container =
'datatable-container_3'">
@@ -632,82 +632,82 @@
</xsl:call-template>
</xsl:if>
</xsl:for-each>
- <xsl:choose>
- <xsl:when
test="suppresscoordination =''">
+ <xsl:choose>
+ <xsl:when
test="suppresscoordination =''">
<div
class="pure-control-group">
<label
for="name">
-
<xsl:value-of select="lang_branch"/>
+
<xsl:value-of select="lang_branch"/>
</label>
-
<xsl:variable name="lang_branch_statustext">
-
<xsl:value-of select="lang_branch_statustext"/>
-
</xsl:variable>
-
<select name="values[branch][]" class="forms" multiple="multiple"
title="{$lang_branch_statustext}">
-
<xsl:apply-templates select="branch_list"/>
-
</select>
+ <xsl:variable
name="lang_branch_statustext">
+
<xsl:value-of select="lang_branch_statustext"/>
+ </xsl:variable>
+ <select
name="values[branch][]" class="forms" multiple="multiple"
title="{$lang_branch_statustext}">
+
<xsl:apply-templates select="branch_list"/>
+ </select>
</div>
<div
class="pure-control-group">
<label
for="name">
-
<xsl:value-of select="lang_other_branch"/>
+
<xsl:value-of select="lang_other_branch"/>
</label>
-
<input type="text" name="values[other_branch]" value="{value_other_branch}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_other_branch_statustext"/>
-
</xsl:attribute>
-
</input>
+ <input
type="text" name="values[other_branch]" value="{value_other_branch}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_other_branch_statustext"/>
+
</xsl:attribute>
+ </input>
</div>
<div
class="pure-control-group">
<label
for="name">
-
<xsl:value-of select="lang_key_fetch"/>
+
<xsl:value-of select="lang_key_fetch"/>
</label>
-
<xsl:variable name="lang_key_fetch_statustext">
-
<xsl:value-of select="lang_key_fetch_statustext"/>
-
</xsl:variable>
-
<select name="values[key_fetch]" class="forms"
title="{$lang_key_fetch_statustext}">
-
<option value="">
-
<xsl:value-of select="lang_no_key_fetch"/>
-
</option>
-
<xsl:apply-templates select="key_fetch_list"/>
-
</select>
+ <xsl:variable
name="lang_key_fetch_statustext">
+
<xsl:value-of select="lang_key_fetch_statustext"/>
+ </xsl:variable>
+ <select
name="values[key_fetch]" class="forms" title="{$lang_key_fetch_statustext}">
+ <option
value="">
+
<xsl:value-of select="lang_no_key_fetch"/>
+
</option>
+
<xsl:apply-templates select="key_fetch_list"/>
+ </select>
</div>
<div
class="pure-control-group">
<label
for="name">
-
<xsl:value-of select="lang_key_deliver"/>
+
<xsl:value-of select="lang_key_deliver"/>
</label>
-
<xsl:variable name="lang_key_deliver_statustext">
-
<xsl:value-of select="lang_key_deliver_statustext"/>
-
</xsl:variable>
-
<select name="values[key_deliver]" class="forms"
onMouseover="window.status='{$lang_key_deliver_statustext}'; return true;"
onMouseout="window.status='';return true;">
-
<option value="">
-
<xsl:value-of select="lang_no_key_deliver"/>
-
</option>
-
<xsl:apply-templates select="key_deliver_list"/>
-
</select>
+ <xsl:variable
name="lang_key_deliver_statustext">
+
<xsl:value-of select="lang_key_deliver_statustext"/>
+ </xsl:variable>
+ <select
name="values[key_deliver]" class="forms"
onMouseover="window.status='{$lang_key_deliver_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <option
value="">
+
<xsl:value-of select="lang_no_key_deliver"/>
+
</option>
+
<xsl:apply-templates select="key_deliver_list"/>
+ </select>
</div>
<div
class="pure-control-group">
<label
for="name">
-
<xsl:value-of select="lang_key_responsible"/>
+
<xsl:value-of select="lang_key_responsible"/>
</label>
-
<xsl:variable name="lang_key_responsible_statustext">
-
<xsl:value-of select="lang_key_responsible_statustext"/>
-
</xsl:variable>
-
<select name="values[key_responsible]" class="forms"
onMouseover="window.status='{$lang_key_responsible_statustext}'; return true;"
onMouseout="window.status='';return true;">
-
<option value="">
-
<xsl:value-of select="lang_no_key_responsible"/>
-
</option>
-
<xsl:apply-templates select="key_responsible_list"/>
-
</select>
+ <xsl:variable
name="lang_key_responsible_statustext">
+
<xsl:value-of select="lang_key_responsible_statustext"/>
+ </xsl:variable>
+ <select
name="values[key_responsible]" class="forms"
onMouseover="window.status='{$lang_key_responsible_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <option
value="">
+
<xsl:value-of select="lang_no_key_responsible"/>
+
</option>
+
<xsl:apply-templates select="key_responsible_list"/>
+ </select>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
</fieldset>
- </div>
+ </div>
- <xsl:choose>
- <xsl:when test="value_project_id >
0">
- <div id="documents">
+ <xsl:choose>
+ <xsl:when test="value_project_id > 0">
+ <div id="documents">
<fieldset>
<label for="name">
-
<xsl:value-of select="php:function('lang', 'files')"/>
+ <xsl:value-of
select="php:function('lang', 'files')"/>
</label>
<div>
<xsl:for-each
select="datatable_def">
@@ -723,10 +723,10 @@
</xsl:if>
</xsl:for-each>
</div>
-
<xsl:call-template name="file_upload"/>
+ <xsl:call-template
name="file_upload"/>
</fieldset>
- </div>
- <div id="history">
+ </div>
+ <div id="history">
<fieldset>
<div>
<xsl:for-each
select="datatable_def">
@@ -743,56 +743,56 @@
</xsl:for-each>
</div>
</fieldset>
- </div>
- </xsl:when>
- </xsl:choose>
- <xsl:call-template name="attributes_values"/>
- </div>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:call-template name="attributes_values"/>
+ </div>
<!--/div-->
<div class="proplist-col">
- <xsl:choose>
- <xsl:when test="mode='edit'">
- <xsl:variable
name="lang_save">
- <xsl:value-of
select="lang_save"/>
- </xsl:variable>
- <input type="hidden"
name='save' value=""/>
- <input type="submit" class="pure-button
pure-button-primary" name="values[save]" value="{$lang_save}">
- <xsl:attribute
name="title">
-
<xsl:value-of select="lang_save_statustext"/>
- </xsl:attribute>
- </input>
- </xsl:when>
+ <xsl:choose>
+ <xsl:when test="mode='edit'">
+ <xsl:variable name="lang_save">
+ <xsl:value-of
select="lang_save"/>
+ </xsl:variable>
+ <input type="hidden" name='save'
value=""/>
+ <input type="submit" id="submitform"
class="pure-button pure-button-primary" name="values[save]"
value="{$lang_save}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_save_statustext"/>
+ </xsl:attribute>
+ </input>
+ </xsl:when>
<xsl:when test="mode='view'">
<xsl:variable name="lang_edit">
<xsl:value-of
select="lang_edit"/>
- </xsl:variable>
- <input type="button" class="pure-button
pure-button-primary" name="edit" value="{$lang_edit}"
onClick="document.edit_form.submit();">
+ </xsl:variable>
+ <input type="button" id="editform"
class="pure-button pure-button-primary" name="edit" value="{$lang_edit}"
onClick="document.edit_form.submit();">
<xsl:attribute name="title">
<xsl:value-of
select="lang_edit_statustext"/>
</xsl:attribute>
</input>
</xsl:when>
</xsl:choose>
- <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}"
onClick="document.done_form.submit();">
- <xsl:attribute name="title">
- <xsl:value-of
select="lang_done_statustext"/>
- </xsl:attribute>
- </input>
+ <xsl:variable name="lang_done">
+ <xsl:value-of select="lang_done"/>
+ </xsl:variable>
+ <input type="button" id="cancelform" class="pure-button
pure-button-primary" name="done" value="{$lang_done}"
onClick="document.done_form.submit();">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_done_statustext"/>
+ </xsl:attribute>
+ </input>
</div>
- </form>
+ </form>
<xsl:variable name="done_action">
<xsl:value-of select="done_action"/>
</xsl:variable>
<form name="done_form" id="done_form" method="post"
action="{$done_action}"></form>
- <xsl:variable
name="edit_action">
- <xsl:value-of
select="edit_action"/>
- </xsl:variable>
+ <xsl:variable name="edit_action">
+ <xsl:value-of select="edit_action"/>
+ </xsl:variable>
<form name="edit_form" id="edit_form" method="post"
action="{$edit_action}"></form>
<!-- AQUI VA EL SCRIPT -->
@@ -894,7 +894,7 @@
<fieldset>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="php:function('lang', 'start date')"/>
+ <xsl:value-of
select="php:function('lang', 'start date')"/>
</label>
<input type="text"
id="values_start_date" name="start_date" size="10" value="{start_date}"
readonly="readonly">
<xsl:attribute
name="title">
@@ -904,7 +904,7 @@
</div>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="php:function('lang', 'end date')"/>
+ <xsl:value-of
select="php:function('lang', 'end date')"/>
</label>
<input type="text"
id="values_end_date" name="end_date" size="10" value="{end_date}"
readonly="readonly">
<xsl:attribute
name="title">
@@ -914,7 +914,7 @@
</div>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="php:function('lang', 'dimb')"/>
+ <xsl:value-of
select="php:function('lang', 'dimb')"/>
</label>
<select name="ecodimb">
<xsl:attribute
name="title">
@@ -960,7 +960,7 @@
</div>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="php:function('lang', 'type')"/>
+ <xsl:value-of
select="php:function('lang', 'type')"/>
</label>
<select name="type"
onChange="this.form.submit();">
<xsl:attribute
name="title">
@@ -971,7 +971,7 @@
</div>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="php:function('lang', 'status filter')"/>
+ <xsl:value-of
select="php:function('lang', 'status filter')"/>
</label>
<select name="status_filter">
<xsl:attribute
name="title">
@@ -985,7 +985,7 @@
</div>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="php:function('lang', 'status new')"/>
+ <xsl:value-of
select="php:function('lang', 'status new')"/>
</label>
<select name="status_new">
<xsl:attribute
name="title">
@@ -999,7 +999,7 @@
</div>
<div class="pure-control-group">
<label for="name">
- <xsl:value-of
select="php:function('lang', 'transfer budget')"/>
+ <xsl:value-of
select="php:function('lang', 'transfer budget')"/>
</label>
<select name="transfer_budget">
<xsl:attribute
name="title">
@@ -1011,11 +1011,11 @@
<xsl:apply-templates
select="year_list/options"/>
</select>
</div>
- <xsl:choose>
- <xsl:when test="check_paid = 1">
+ <xsl:choose>
+ <xsl:when test="check_paid = 1">
<div
class="pure-control-group">
<label
for="name">
- <xsl:value-of
select="php:function('lang', 'paid')"/>
+
<xsl:value-of select="php:function('lang', 'paid')"/>
</label>
<input
type="checkbox" name="paid" value="True">
<xsl:if
test="paid = 1">
@@ -1026,13 +1026,13 @@
</xsl:attribute>
</input>
</div>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="check_closed_orders =
1">
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="check_closed_orders = 1">
<div
class="pure-control-group">
<label
for="name">
- <xsl:value-of
select="php:function('lang', 'closed')"/>
+
<xsl:value-of select="php:function('lang', 'closed')"/>
</label>
<input
type="checkbox" name="closed_orders" value="True">
<xsl:if
test="closed_orders = 1">
@@ -1043,8 +1043,8 @@
</xsl:attribute>
</input>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div class="pure-control-group">
<label for="name"></label>
<input type="submit"
class="pure-button pure-button-primary" name="get_list">
@@ -1063,7 +1063,7 @@
<xsl:value-of
select="php:function('lang', 'count')"/>
</label>
<xsl:value-of
select="total_records"/>
- </div>
+ </div>
<div class="pure-control-group">
<label for="name"></label>
<div class="pure-custom">
@@ -1078,7 +1078,7 @@
<xsl:with-param name="config" select ='config' />
</xsl:call-template>
</xsl:if>
- </xsl:for-each>
+ </xsl:for-each>
<input type="hidden"
id="id_to_update" name="id_to_update" value=""/>
<input type="hidden"
id="new_budget" name="new_budget" value=""/>
</div>
| [Prev in Thread] | Current Thread | [Next in Thread] |