|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [16390] table: Merge 16388:16389 from trunk |
| Date: | Tue, 28 Feb 2017 12:38:36 -0500 (EST) |
Revision: 16390
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16390
Author: sigurdne
Date: 2017-02-28 12:38:36 -0500 (Tue, 28 Feb 2017)
Log Message:
-----------
table: Merge 16388:16389 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.multiuploader.inc.php
branches/Version-2_0-branch/property/inc/import/class.import_component_files.inc.php
branches/Version-2_0-branch/property/templates/base/event.xsl
branches/Version-2_0-branch/property/templates/base/project.xsl
branches/Version-2_0-branch/property/templates/base/request.xsl
branches/Version-2_0-branch/property/templates/base/tts.xsl
branches/Version-2_0-branch/property/templates/base/workorder.xsl
branches/Version-2_0-branch/rental/inc/class.bofellesdata.inc.php
branches/Version-2_0-branch/rental/inc/class.uicomposite.inc.php
branches/Version-2_0-branch/rental/inc/model/class.composite.inc.php
branches/Version-2_0-branch/rental/js/rental/composite.edit.js
branches/Version-2_0-branch/rental/templates/base/composite.xsl
Added Paths:
-----------
branches/Version-2_0-branch/phpgwapi/templates/base/files.xsl
branches/Version-2_0-branch/phpgwapi/templates/base/multi_upload_file.xsl
Removed Paths:
-------------
branches/Version-2_0-branch/property/templates/base/files.xsl
branches/Version-2_0-branch/property/templates/base/multi_upload_file.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch 2017-02-28 17:38:36 UTC (rev 16390)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16300
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389
\ No newline at end of property
Copied: branches/Version-2_0-branch/phpgwapi/templates/base/files.xsl (from rev
16389, trunk/phpgwapi/templates/base/files.xsl)
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/files.xsl
(rev 0)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/files.xsl
2017-02-28 17:38:36 UTC (rev 16390)
@@ -0,0 +1,53 @@
+
+<!-- $Id: files.xsl 15892 2016-10-24 13:50:59Z sigurdne $ -->
+
+<xsl:template name="multi_upload">
+ <xsl:apply-templates select="multi_upload"/>
+</xsl:template>
+
+<xsl:template xmlns:php="http://php.net/xsl"; match="multi_upload">
+ <xsl:call-template name="multi_upload_file"/>
+</xsl:template>
+
+
+<!-- New template-->
+<xsl:template xmlns:php="http://php.net/xsl"; name="file_upload">
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'upload files')"/>
+ </label>
+ <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>
+ </div>
+ <xsl:choose>
+ <xsl:when test="multiple_uploader!=''">
+ <div class="pure-control-group">
+ <label>
+ <a
href="javascript:fileuploader()">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
+ </a>
+ </label>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template xmlns:php="http://php.net/xsl"; name="jasper_upload">
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'jasper upload')"/>
+ </label>
+ <input type="file" name="jasperfile" size="40">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'upload a jasper definition file')"/>
+ </xsl:attribute>
+ </input>
+ </div>
+</xsl:template>
Copied:
branches/Version-2_0-branch/phpgwapi/templates/base/multi_upload_file.xsl (from
rev 16389, trunk/phpgwapi/templates/base/multi_upload_file.xsl)
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/multi_upload_file.xsl
(rev 0)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/multi_upload_file.xsl
2017-02-28 17:38:36 UTC (rev 16390)
@@ -0,0 +1,146 @@
+
+<!-- $Id: multi_upload_file.xsl 14753 2016-02-18 18:23:21Z sigurdne $ -->
+
+<!-- New template-->
+<xsl:template xmlns:php="http://php.net/xsl"; name="multi_upload_file">
+ <xsl:variable name="action">
+ <xsl:value-of select="multi_upload_action"/>
+ </xsl:variable>
+ <form id="multi_upload_file" action="{$action}" method="POST"
enctype="multipart/form-data">
+ <!-- The fileupload-buttonbar contains buttons to add/delete
files and start/cancel the upload -->
+ <div class="fileupload-buttonbar">
+ <div class="fileupload-buttons">
+ <!-- The fileinput-button span is used to style
the file input field as button -->
+ <span class="fileinput-button pure-button">
+ <span><xsl:value-of
select="php:function('lang', 'Add files')"/>...</span>
+ <input type="file" id="files"
name="files[]" multiple=""/>
+ </span>
+ <button type="submit" class="start
pure-button"><xsl:value-of select="php:function('lang', 'Start
upload')"/></button>
+ <button type="reset" class="cancel
pure-button"><xsl:value-of select="php:function('lang', 'Cancel
upload')"/></button>
+ <button type="button" class="delete
pure-button"><xsl:value-of select="php:function('lang', 'Delete')"/></button>
+ <input type="checkbox" class="toggle"/>
+ <!-- The global file processing state -->
+ <span class="fileupload-process"></span>
+ </div>
+ <div class="fileupload-count">
+ <xsl:value-of select="php:function('lang',
'Number files')"/>: <span id="files-count"></span>
+ </div>
+ <div class="fileupload-progress fade"
style="display:none">
+ <!-- The global progress bar -->
+ <div class="progress" role="progressbar"
aria-valuemin="0" aria-valuemax="100"></div>
+ <!-- The extended global progress state -->
+ <div class="progress-extended"> </div>
+ </div>
+ </div>
+ <!-- The table listing the files available for upload/download
-->
+ <div class="content_upload_download">
+ <div class="presentation files" style="display:
inline-table;"></div>
+ </div>
+ </form>
+
+ <!-- The template to display files available for upload -->
+ <script id="template-upload" type="text/x-tmpl">
+<![CDATA[
+ {% for (var i=0, file; file=o.files[i]; i++) { %}
+ <div class="template-upload">
+ <div class="table-cell">
+ <div class="name">{%=file.name%}</div>
+ <div class="error"></div>
+ </div>
+ <div class="table-cell">
+ <div class="size">Processing...</div>
+ </div>
+ <div class="table-cell">
+ <div class="progress" style="width:
100px;"></div>
+ </div>
+ <div class="table-cell">
+ {% if (!i && !o.options.autoUpload) { %}
+ <button class="start pure-button"
disabled="">Start</button>
+ {% } %}
+ {% if (!i) { %}
+ <button class="cancel
pure-button">Cancel</button>
+ {% } %}
+ </div>
+ </div>
+ {% } %}
+]]>
+ </script>
+ <!-- The template to display files available for download -->
+ <script id="template-download" type="text/x-tmpl">
+<![CDATA[
+ {% for (var i=0, file; file=o.files[i]; i++) { %}
+ <div class="template-download">
+ <div class="table-cell">
+ <div class="name">
+ <!--<a href="{%=file.url%}"
title="{%=file.name%}" download="{%=file.name%}"
{%=file.thumbnailUrl?'data-gallery':''%}>{%=file.name%}</a>-->
+ {%=file.name%}
+ </div>
+ {% if (file.error) { %} <div
class="error">Error: {%=file.error%} </div>{% } %}
+ </div>
+ <div class="table-cell">
+ <div
class="size">{%=o.formatFileSize(file.size)%}</div>
+ </div>
+ <div class="table-cell">
+ <button class="delete pure-button"
data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if
(file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{%
} %}>Delete</button>
+ <input type="checkbox" name="delete" value="1"
class="toggle"/>
+ </div>
+ </div>
+ {% } %}
+]]>
+ </script>
+
+ <script>
+ $(function () {
+ 'use strict';
+
+ // Initialize the jQuery File Upload widget:
+ $('#multi_upload_file').fileupload({
+ // Uncomment the following to send cross-domain
cookies:
+ //xhrFields: {withCredentials: true},
+ url: '<xsl:value-of
select="multi_upload_action"/>',
+ limitConcurrentUploads: 4,
+ // maxChunkSize: 838855500
+ maxChunkSize: 8388000
+ //acceptFileTypes: /(\.|\/)(png|pdf)$/i
+ });
+
+ // Enable iframe cross-domain access via redirect
option:
+ $('#multi_upload_file').fileupload(
+ 'option',
+ 'redirect',
+ window.location.href.replace(
+ /\/[^\/]*$/,
+ '/cors/result.html?%s'
+ )
+ );
+
+ $('#multi_upload_file')
+ .bind('fileuploadcompleted', function (e, data)
{
+ $( "#files-count" ).html(data.result.num_files);
+ });
+
+ $('#multi_upload_file')
+ .bind('fileuploaddestroyed', function (e, data)
{
+ var n = 0;
+ $( ".template-download" ).each(function( i ) {
+ n ++;
+ });
+ $("#files-count").html(n);
+ });
+
+ // Load existing files:
+
$('#multi_upload_file').addClass('fileupload-processing');
+ $.ajax({
+ // Uncomment the following to send cross-domain
cookies:
+ //xhrFields: {withCredentials: true},
+ url:
$('#multi_upload_file').fileupload('option', 'url'),
+ dataType: 'json',
+ context: $('#multi_upload_file')[0]
+ }).always(function () {
+ $(this).removeClass('fileupload-processing');
+ }).done(function (result) {
+ $(this).fileupload('option', 'done').call(this,
$.Event('done'), {result: result});
+ });
+ });
+ </script>
+</xsl:template>
\ No newline at end of file
Modified: branches/Version-2_0-branch/property/inc/class.multiuploader.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.multiuploader.inc.php
2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/property/inc/class.multiuploader.inc.php
2017-02-28 17:38:36 UTC (rev 16390)
@@ -39,8 +39,10 @@
function __construct($options = null, $initialize = true,
$error_messages = null)
{
- $this->bofiles = CreateObject('property.bofiles',
'/property');
+ $fakebase = !empty($options['fakebase']) ?
$options['fakebase'] : '/property';
+ $this->bofiles = CreateObject('property.bofiles',
$fakebase);
+
parent::__construct($options, $initialize,
$error_messages);
}
Modified:
branches/Version-2_0-branch/property/inc/import/class.import_component_files.inc.php
===================================================================
---
branches/Version-2_0-branch/property/inc/import/class.import_component_files.inc.php
2017-02-28 17:35:22 UTC (rev 16389)
+++
branches/Version-2_0-branch/property/inc/import/class.import_component_files.inc.php
2017-02-28 17:38:36 UTC (rev 16390)
@@ -216,7 +216,7 @@
}
else
{
- $message['message'][] = array('msg' =>
lang('any relation has been saved'));
+ $message['message'][] = array('msg' => lang('no
relation has been saved'));
}
if ($count_relations_existing)
{
Modified: branches/Version-2_0-branch/property/templates/base/event.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/event.xsl
2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/property/templates/base/event.xsl
2017-02-28 17:38:36 UTC (rev 16390)
@@ -1,151 +1,151 @@
<!-- $Id$ -->
<xsl:template match="data">
- <xsl:choose>
- <xsl:when test="edit">
- <xsl:apply-templates select="edit"/>
- </xsl:when>
- <xsl:when test="schedule">
- <xsl:apply-templates select="schedule"/>
- </xsl:when>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="edit">
+ <xsl:apply-templates select="edit"/>
+ </xsl:when>
+ <xsl:when test="schedule">
+ <xsl:apply-templates select="schedule"/>
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
<!-- add / edit -->
<xsl:template xmlns:php="http://php.net/xsl"; match="edit">
- <xsl:choose>
- <xsl:when test="msgbox_data != ''">
- <xsl:call-template name="msgbox"/>
- </xsl:when>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
+ <xsl:call-template name="msgbox"/>
+ </xsl:when>
+ </xsl:choose>
<div id="event_edit_tabview">
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
<form method="post" action="{$form_action}" class= "pure-form
pure-form-aligned">
<input type="hidden" name="active_tab"
value="{active_tab}"/>
<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_id != ''">
+ <xsl:choose>
+ <xsl:when
test="value_id != ''">
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="lang_id"/>
+
<xsl:value-of select="lang_id"/>
</label>
<div
class="pure-custom">
-
<xsl:value-of select="value_id"/>
+
<xsl:value-of select="value_id"/>
</div>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<xsl:call-template
name="contact_form"/>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_descr"/>
+ <xsl:value-of
select="lang_descr"/>
</label>
-
<textarea cols="{textareacols}" rows="{textarearows}" name="values[descr]">
-
<xsl:value-of select="value_descr"/>
-
</textarea>
+ <textarea
class="pure-input-1-2" rows="{textarearows}" name="values[descr]">
+ <xsl:value-of
select="value_descr"/>
+ </textarea>
</div>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_action"/>
+ <xsl:value-of
select="lang_action"/>
</label>
-
<xsl:value-of disable-output-escaping="yes" select="action"/>
+ <xsl:value-of
disable-output-escaping="yes" select="action"/>
</div>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_enabled"/>
+ <xsl:value-of
select="lang_enabled"/>
</label>
-
<xsl:choose>
-
<xsl:when test="value_enabled = '1'">
-
<input type="checkbox" name="values[enabled]" value="1"
checked="checked" onMouseout="window.status='';return true;">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_enabled_on_statustext"/>
-
</xsl:attribute>
-
</input>
-
</xsl:when>
-
<xsl:otherwise>
-
<input type="checkbox" name="values[enabled]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_enabled_off_statustext"/>
-
</xsl:attribute>
-
</input>
-
</xsl:otherwise>
-
</xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="value_enabled = '1'">
+ <input
type="checkbox" name="values[enabled]" value="1" checked="checked"
onMouseout="window.status='';return true;">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_enabled_on_statustext"/>
+
</xsl:attribute>
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
+ <input
type="checkbox" name="values[enabled]" value="1"
onMouseout="window.status='';return true;">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_enabled_off_statustext"/>
+
</xsl:attribute>
+ </input>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
</fieldset>
- </div>
- <div id="repeat">
+ </div>
+ <div id="repeat">
<fieldset>
- <xsl:choose>
- <xsl:when
test="value_id != ''">
+ <xsl:choose>
+ <xsl:when
test="value_id != ''">
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="lang_next_run"/>
+
<xsl:value-of select="lang_next_run"/>
</label>
<div
class="pure-custom">
-
<xsl:value-of select="value_next_run"/>
+
<xsl:value-of select="value_next_run"/>
</div>
</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>
- <input
type="text" id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_start_date_statustext"/>
-
</xsl:attribute>
- </input>
+ <input type="text"
id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="lang_start_date_statustext"/>
+ </xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>
-
<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"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_end_date_statustext"/>
-
</xsl:attribute>
- </input>
+ <input type="text"
id="values_end_date" name="values[end_date]" size="10" value="{value_end_date}"
readonly="readonly" onMouseout="window.status='';return true;">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="lang_end_date_statustext"/>
+ </xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_repeat_type"/>
+ <xsl:value-of
select="lang_repeat_type"/>
</label>
-
<xsl:value-of disable-output-escaping="yes" select="repeat_type"/>
+ <xsl:value-of
disable-output-escaping="yes" select="repeat_type"/>
</div>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_repeat_day"/>
+ <xsl:value-of
select="lang_repeat_day"/>
</label>
<div
class="pure-custom">
-
<xsl:value-of disable-output-escaping="yes" select="repeat_day"/>
+ <xsl:value-of
disable-output-escaping="yes" select="repeat_day"/>
</div>
</div>
<div class="pure-control-group">
<label>
-
<xsl:value-of select="lang_repeat_interval"/>
+ <xsl:value-of
select="lang_repeat_interval"/>
</label>
- <input
type="text" id="values_repeat_interval" name="values[repeat_interval]" size="4"
value="{value_repeat_interval}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_repeat_interval_statustext"/>
-
</xsl:attribute>
- </input>
+ <input type="text"
id="values_repeat_interval" name="values[repeat_interval]" size="4"
value="{value_repeat_interval}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="lang_repeat_interval_statustext"/>
+ </xsl:attribute>
+ </input>
</div>
</fieldset>
- </div>
- <xsl:variable name="edit_url">
- <xsl:value-of
select="edit_url"/>
- </xsl:variable>
+ </div>
+ <xsl:variable name="edit_url">
+ <xsl:value-of select="edit_url"/>
+ </xsl:variable>
<xsl:if test="datatable_def">
<div id="plan">
<fieldset>
- <input type="hidden"
name="values[location_id]" value="{value_location_id}"/>
- <input type="hidden"
name="values[location_item_id]" value="{value_location_item_id}"/>
+ <input type="hidden"
name="values[location_id]" value="{value_location_id}"/>
+ <input type="hidden"
name="values[location_item_id]" value="{value_location_item_id}"/>
<div
class="pure-control-group">
<label
for="name">
<xsl:value-of select="php:function('lang', 'alarm')"/>
@@ -171,101 +171,101 @@
</div>
<div class="proplist-col">
<input type="submit" class="pure-button
pure-button-primary" name="values[apply]" value="{lang_apply}"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="title">
+ <xsl:attribute name="title">
<xsl:value-of
select="lang_apply_statustext"/>
-
</xsl:attribute>
- </input>
+ </xsl:attribute>
+ </input>
<input type="submit" class="pure-button
pure-button-primary" name="values[save]" value="{lang_save}"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="title">
+ <xsl:attribute name="title">
<xsl:value-of
select="lang_save_statustext"/>
-
</xsl:attribute>
- </input>
+ </xsl:attribute>
+ </input>
<xsl:choose>
<xsl:when test="lookup != '1'">
<input type="button"
class="pure-button pure-button-primary" name="values[cancel]"
value="{lang_cancel}" onClick="document.done_form.submit();">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_cancel_statustext"/>
-
</xsl:attribute>
- </input>
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="lang_cancel_statustext"/>
+ </xsl:attribute>
+ </input>
</xsl:when>
</xsl:choose>
- <xsl:choose>
- <xsl:when
test="value_id != ''">
+ <xsl:choose>
+ <xsl:when test="value_id != ''">
<input type="submit"
class="pure-button pure-button-primary" name="values[delete]"
value="{lang_delete}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_delete_statustext"/>
-
</xsl:attribute>
-
</input>
- </xsl:when>
- </xsl:choose>
- </div>
- </form>
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="lang_delete_statustext"/>
+ </xsl:attribute>
+ </input>
+ </xsl:when>
+ </xsl:choose>
+ </div>
+ </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>
- </div>
+ </div>
</xsl:template>
<!-- New template-->
<xsl:template xmlns:php="http://php.net/xsl"; match="schedule">
- <div class="yui-navset" id="edit_tabview">
- <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
- <div class="yui-content">
- <xsl:variable name="edit_url">
- <xsl:value-of select="edit_url"/>
- </xsl:variable>
- <div id="general">
- <form method="post" name="alarm"
action="{$edit_url}">
- <input type="hidden"
name="values[location_id]" value="{value_location_id}"/>
- <input type="hidden"
name="values[location_item_id]" value="{value_location_item_id}"/>
- <table cellpadding="2"
cellspacing="2" width="79%" align="center" border="0">
- <tr>
- <td width="79%"
class="center" align="left">
-
<xsl:value-of select="php:function('lang', 'alarm')"/>
- </td>
- </tr>
- <!-- DataTable 0 EDIT
-->
- <tr>
- <td
class="center" align="left" colspan="10">
- <div
id="datatable-container_0"/>
- </td>
- </tr>
- <tr>
- <td
class="center" align="center" colspan="10">
- <div
id="datatable-buttons_0"/>
- </td>
- </tr>
- <!-- <xsl:call-template
name="alarm_form"/> -->
- </table>
- </form>
- </div>
+ <div class="yui-navset" id="edit_tabview">
+ <xsl:value-of disable-output-escaping="yes" select="tabs"/>
+ <div class="yui-content">
+ <xsl:variable name="edit_url">
+ <xsl:value-of select="edit_url"/>
+ </xsl:variable>
+ <div id="general">
+ <form method="post" name="alarm"
action="{$edit_url}">
+ <input type="hidden"
name="values[location_id]" value="{value_location_id}"/>
+ <input type="hidden"
name="values[location_item_id]" value="{value_location_item_id}"/>
+ <table cellpadding="2" cellspacing="2"
width="79%" align="center" border="0">
+ <tr>
+ <td width="79%"
class="center" align="left">
+ <xsl:value-of
select="php:function('lang', 'alarm')"/>
+ </td>
+ </tr>
+ <!-- DataTable 0 EDIT -->
+ <tr>
+ <td class="center"
align="left" colspan="10">
+ <div
id="datatable-container_0"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="center"
align="center" colspan="10">
+ <div
id="datatable-buttons_0"/>
+ </td>
+ </tr>
+ <!-- <xsl:call-template
name="alarm_form"/> -->
+ </table>
+ </form>
</div>
</div>
- <script type="text/javascript">
- var property_js = <xsl:value-of select="property_js"/>;
- var base_java_url = <xsl:value-of
select="base_java_url"/>;
- var datatable = new Array();
- var myColumnDefs = new Array();
- var myButtons = new Array();
- var td_count = <xsl:value-of select="td_count"/>;
+ </div>
+ <script type="text/javascript">
+ var property_js = <xsl:value-of select="property_js"/>;
+ var base_java_url = <xsl:value-of select="base_java_url"/>;
+ var datatable = new Array();
+ var myColumnDefs = new Array();
+ var myButtons = new Array();
+ var td_count = <xsl:value-of select="td_count"/>;
- <xsl:for-each select="datatable">
- datatable[<xsl:value-of select="name"/>] = [
- {
- values:<xsl:value-of
select="values"/>,
- total_records: <xsl:value-of
select="total_records"/>,
- is_paginator: <xsl:value-of
select="is_paginator"/>,
- permission:<xsl:value-of
select="permission"/>,
- footer:<xsl:value-of
select="footer"/>
- }
- ]
- </xsl:for-each>
- <xsl:for-each select="myColumnDefs">
- myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
- <xsl:for-each select="myButtons">
- myButtons[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
- </script>
+ <xsl:for-each select="datatable">
+ datatable[<xsl:value-of select="name"/>] = [
+ {
+ values:<xsl:value-of select="values"/>,
+ total_records: <xsl:value-of select="total_records"/>,
+ is_paginator: <xsl:value-of select="is_paginator"/>,
+ permission:<xsl:value-of select="permission"/>,
+ footer:<xsl:value-of select="footer"/>
+ }
+ ]
+ </xsl:for-each>
+ <xsl:for-each select="myColumnDefs">
+ myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
+ </xsl:for-each>
+ <xsl:for-each select="myButtons">
+ myButtons[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
+ </xsl:for-each>
+ </script>
</xsl:template>
Deleted: branches/Version-2_0-branch/property/templates/base/files.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/files.xsl
2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/property/templates/base/files.xsl
2017-02-28 17:38:36 UTC (rev 16390)
@@ -1,53 +0,0 @@
-
-<!-- $Id$ -->
-
-<xsl:template name="multi_upload">
- <xsl:apply-templates select="multi_upload"/>
-</xsl:template>
-
-<xsl:template xmlns:php="http://php.net/xsl"; match="multi_upload">
- <xsl:call-template name="multi_upload_file"/>
-</xsl:template>
-
-
-<!-- New template-->
-<xsl:template xmlns:php="http://php.net/xsl"; name="file_upload">
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'upload files')"/>
- </label>
- <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>
- </div>
- <xsl:choose>
- <xsl:when test="multiple_uploader!=''">
- <div class="pure-control-group">
- <label>
- <a
href="javascript:fileuploader()">
- <xsl:attribute
name="title">
- <xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
- </xsl:attribute>
- <xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
- </a>
- </label>
- </div>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template xmlns:php="http://php.net/xsl"; name="jasper_upload">
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'jasper upload')"/>
- </label>
- <input type="file" name="jasperfile" size="40">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'upload a jasper definition file')"/>
- </xsl:attribute>
- </input>
- </div>
-</xsl:template>
Deleted:
branches/Version-2_0-branch/property/templates/base/multi_upload_file.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/multi_upload_file.xsl
2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/property/templates/base/multi_upload_file.xsl
2017-02-28 17:38:36 UTC (rev 16390)
@@ -1,146 +0,0 @@
-
-<!-- $Id: multi_upload_file.xsl 14753 2016-02-18 18:23:21Z sigurdne $ -->
-
-<!-- New template-->
-<xsl:template xmlns:php="http://php.net/xsl"; name="multi_upload_file">
- <xsl:variable name="action">
- <xsl:value-of select="multi_upload_action"/>
- </xsl:variable>
- <form id="multi_upload_file" action="{$action}" method="POST"
enctype="multipart/form-data">
- <!-- The fileupload-buttonbar contains buttons to add/delete
files and start/cancel the upload -->
- <div class="fileupload-buttonbar">
- <div class="fileupload-buttons">
- <!-- The fileinput-button span is used to style
the file input field as button -->
- <span class="fileinput-button pure-button">
- <span><xsl:value-of
select="php:function('lang', 'Add files')"/>...</span>
- <input type="file" id="files"
name="files[]" multiple=""/>
- </span>
- <button type="submit" class="start
pure-button"><xsl:value-of select="php:function('lang', 'Start
upload')"/></button>
- <button type="reset" class="cancel
pure-button"><xsl:value-of select="php:function('lang', 'Cancel
upload')"/></button>
- <button type="button" class="delete
pure-button"><xsl:value-of select="php:function('lang', 'Delete')"/></button>
- <input type="checkbox" class="toggle"/>
- <!-- The global file processing state -->
- <span class="fileupload-process"></span>
- </div>
- <div class="fileupload-count">
- <xsl:value-of select="php:function('lang',
'Number files')"/>: <span id="files-count"></span>
- </div>
- <div class="fileupload-progress fade"
style="display:none">
- <!-- The global progress bar -->
- <div class="progress" role="progressbar"
aria-valuemin="0" aria-valuemax="100"></div>
- <!-- The extended global progress state -->
- <div class="progress-extended"> </div>
- </div>
- </div>
- <!-- The table listing the files available for upload/download
-->
- <div class="content_upload_download">
- <div class="presentation files" style="display:
inline-table;"></div>
- </div>
- </form>
-
- <!-- The template to display files available for upload -->
- <script id="template-upload" type="text/x-tmpl">
-<![CDATA[
- {% for (var i=0, file; file=o.files[i]; i++) { %}
- <div class="template-upload">
- <div class="table-cell">
- <div class="name">{%=file.name%}</div>
- <div class="error"></div>
- </div>
- <div class="table-cell">
- <div class="size">Processing...</div>
- </div>
- <div class="table-cell">
- <div class="progress" style="width:
100px;"></div>
- </div>
- <div class="table-cell">
- {% if (!i && !o.options.autoUpload) { %}
- <button class="start pure-button"
disabled="">Start</button>
- {% } %}
- {% if (!i) { %}
- <button class="cancel
pure-button">Cancel</button>
- {% } %}
- </div>
- </div>
- {% } %}
-]]>
- </script>
- <!-- The template to display files available for download -->
- <script id="template-download" type="text/x-tmpl">
-<![CDATA[
- {% for (var i=0, file; file=o.files[i]; i++) { %}
- <div class="template-download">
- <div class="table-cell">
- <div class="name">
- <!--<a href="{%=file.url%}"
title="{%=file.name%}" download="{%=file.name%}"
{%=file.thumbnailUrl?'data-gallery':''%}>{%=file.name%}</a>-->
- {%=file.name%}
- </div>
- {% if (file.error) { %} <div
class="error">Error: {%=file.error%} </div>{% } %}
- </div>
- <div class="table-cell">
- <div
class="size">{%=o.formatFileSize(file.size)%}</div>
- </div>
- <div class="table-cell">
- <button class="delete pure-button"
data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if
(file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{%
} %}>Delete</button>
- <input type="checkbox" name="delete" value="1"
class="toggle"/>
- </div>
- </div>
- {% } %}
-]]>
- </script>
-
- <script>
- $(function () {
- 'use strict';
-
- // Initialize the jQuery File Upload widget:
- $('#multi_upload_file').fileupload({
- // Uncomment the following to send cross-domain
cookies:
- //xhrFields: {withCredentials: true},
- url: '<xsl:value-of
select="multi_upload_action"/>',
- limitConcurrentUploads: 4,
- // maxChunkSize: 838855500
- maxChunkSize: 8388000
- //acceptFileTypes: /(\.|\/)(png|pdf)$/i
- });
-
- // Enable iframe cross-domain access via redirect
option:
- $('#multi_upload_file').fileupload(
- 'option',
- 'redirect',
- window.location.href.replace(
- /\/[^\/]*$/,
- '/cors/result.html?%s'
- )
- );
-
- $('#multi_upload_file')
- .bind('fileuploadcompleted', function (e, data)
{
- $( "#files-count" ).html(data.result.num_files);
- });
-
- $('#multi_upload_file')
- .bind('fileuploaddestroyed', function (e, data)
{
- var n = 0;
- $( ".template-download" ).each(function( i ) {
- n ++;
- });
- $("#files-count").html(n);
- });
-
- // Load existing files:
-
$('#multi_upload_file').addClass('fileupload-processing');
- $.ajax({
- // Uncomment the following to send cross-domain
cookies:
- //xhrFields: {withCredentials: true},
- url:
$('#multi_upload_file').fileupload('option', 'url'),
- dataType: 'json',
- context: $('#multi_upload_file')[0]
- }).always(function () {
- $(this).removeClass('fileupload-processing');
- }).done(function (result) {
- $(this).fileupload('option', 'done').call(this,
$.Event('done'), {result: result});
- });
- });
- </script>
-</xsl:template>
\ No newline at end of file
Modified: branches/Version-2_0-branch/property/templates/base/project.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/project.xsl
2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/property/templates/base/project.xsl
2017-02-28 17:38:36 UTC (rev 16390)
@@ -213,7 +213,7 @@
</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}">
+ <input type="text"
name="values[name]" value="{value_name}" class="pure-input-1-2">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_name_statustext"/>
</xsl:attribute>
@@ -229,7 +229,7 @@
<label for="name">
<xsl:value-of
select="lang_descr"/>
</label>
- <textarea cols="60" rows="6"
name="values[descr]">
+ <textarea
class="pure-input-1-2" rows="6" name="values[descr]">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_descr_statustext"/>
</xsl:attribute>
@@ -301,7 +301,7 @@
<label for="name">
<xsl:value-of
select="lang_remark"/>
</label>
- <textarea cols="60" rows="6"
name="values[remark]">
+ <textarea
class="pure-input-1-2" rows="6" name="values[remark]">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_remark_statustext"/>
</xsl:attribute>
Modified: branches/Version-2_0-branch/property/templates/base/request.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/request.xsl
2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/property/templates/base/request.xsl
2017-02-28 17:38:36 UTC (rev 16390)
@@ -1,32 +1,32 @@
<!-- $Id$ -->
<xsl:template match="data">
- <xsl:choose>
- <xsl:when test="edit">
- <xsl:apply-templates select="edit"/>
- </xsl:when>
- <xsl:when test="view">
- <xsl:apply-templates select="view"/>
- </xsl:when>
+ <xsl:choose>
+ <xsl:when test="edit">
+ <xsl:apply-templates select="edit"/>
+ </xsl:when>
+ <xsl:when test="view">
+ <xsl:apply-templates select="view"/>
+ </xsl:when>
<xsl:when test="priority_form">
- <xsl:apply-templates select="priority_form"/>
- </xsl:when>
- </xsl:choose>
+ <xsl:apply-templates select="priority_form"/>
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
<!-- New template-->
<xsl:template xmlns:php="http://php.net/xsl"; match="priority_form">
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
<dl>
- <xsl:choose>
- <xsl:when test="msgbox_data !=
''">
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
<dt>
-
<xsl:call-template name="msgbox"/>
+ <xsl:call-template name="msgbox"/>
</dt>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
</dl>
<form name="form" id="form" method="post" action="{$form_action}"
class="pure-form pure-form-aligned">
<div id="tab-content">
@@ -38,31 +38,31 @@
<label for="name">
<xsl:value-of
select="php:function('lang', 'Authorities Demands')"/>
</label>
- <input type="text"
size="5" name="values[authorities_demands]" value="{value_authorities_demands}">
- <xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'Authorities Demands')"/>
- </xsl:attribute>
- </input>
+ <input type="text" size="5"
name="values[authorities_demands]" value="{value_authorities_demands}">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'Authorities Demands')"/>
+ </xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label for="name"></label>
- <xsl:variable
name="lang_save">
- <xsl:value-of
select="php:function('lang', 'save')"/>
- </xsl:variable>
+ <xsl:variable name="lang_save">
+ <xsl:value-of
select="php:function('lang', 'save')"/>
+ </xsl:variable>
<input type="submit"
class="pure-button pure-button-primary" name="values[update]"
value="{$lang_save}"></input>
</div>
</fieldset>
</div>
- </div>
- </form>
- <!-- to reload the table -->
- <xsl:choose>
- <xsl:when test="//exchange_values!=''">
- <script type="text/javascript">
- <xsl:value-of
select="//exchange_values"/>
- </script>
- </xsl:when>
- </xsl:choose>
+ </div>
+ </form>
+ <!-- to reload the table -->
+ <xsl:choose>
+ <xsl:when test="//exchange_values!=''">
+ <script type="text/javascript">
+ <xsl:value-of select="//exchange_values"/>
+ </script>
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
<!-- New template-->
@@ -69,212 +69,212 @@
<xsl:template match="priority_key">
<div class="pure-control-group">
<label for="name">
- <xsl:value-of select="name"/>
- <xsl:text>::</xsl:text>
- <xsl:value-of select="descr"/>
+ <xsl:value-of select="name"/>
+ <xsl:text>::</xsl:text>
+ <xsl:value-of select="descr"/>
</label>
- <input type="text" size="3"
name="values[priority_key][{id}]" value="{priority_key}">
- <xsl:attribute name="title">
- <xsl:value-of
select="lang_priority_key_statustext"/>
- </xsl:attribute>
- </input>
+ <input type="text" size="3" name="values[priority_key][{id}]"
value="{priority_key}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_priority_key_statustext"/>
+ </xsl:attribute>
+ </input>
</div>
</xsl:template>
<!-- add / edit -->
<xsl:template xmlns:php="http://php.net/xsl"; match="edit">
- <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 align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
- <xsl:choose>
- <xsl:when test="value_request_id!=''
and acl_add_project='1'">
- <tr>
- <td valign="top"
align="center">
- <xsl:variable
name="generate_project_action">
-
<xsl:value-of select="generate_project_action"/>
- </xsl:variable>
- <xsl:variable
name="lang_generate_project">
-
<xsl:value-of select="lang_generate_project"/>
- </xsl:variable>
- <form
method="post" action="{$generate_project_action}">
- <input
type="hidden" name="origin" value="{value_acl_location}"/>
- <input
type="hidden" name="origin_id" value="{value_request_id}"/>
- <input
type="hidden" name="location_code" value="{location_code}"/>
- <input
type="hidden" name="bypass" value="true"/>
- <input
type="hidden" name="descr" value="{value_descr}"/>
- <input
type="hidden" name="tenant_id" value="{tenant_id}"/>
- <input
type="hidden" name="p_num" value="{p_num}"/>
- <input
type="hidden" name="p_entity_id" value="{p_entity_id}"/>
- <input
type="hidden" name="p_cat_id" value="{p_cat_id}"/>
+ <xsl:choose>
+ <xsl:when test="value_request_id!='' and
acl_add_project='1'">
+ <tr>
+ <td valign="top" align="center">
+ <xsl:variable
name="generate_project_action">
+ <xsl:value-of
select="generate_project_action"/>
+ </xsl:variable>
+ <xsl:variable
name="lang_generate_project">
+ <xsl:value-of
select="lang_generate_project"/>
+ </xsl:variable>
+ <form method="post"
action="{$generate_project_action}">
+ <input
type="hidden" name="origin" value="{value_acl_location}"/>
+ <input
type="hidden" name="origin_id" value="{value_request_id}"/>
+ <input
type="hidden" name="location_code" value="{location_code}"/>
+ <input
type="hidden" name="bypass" value="true"/>
+ <input
type="hidden" name="descr" value="{value_descr}"/>
+ <input
type="hidden" name="tenant_id" value="{tenant_id}"/>
+ <input
type="hidden" name="p_num" value="{p_num}"/>
+ <input
type="hidden" name="p_entity_id" value="{p_entity_id}"/>
+ <input
type="hidden" name="p_cat_id" value="{p_cat_id}"/>
<input
type="submit" class="pure-button pure-button-primary" name="generate_project"
value="{$lang_generate_project}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_generate_project_statustext"/>
-
</xsl:attribute>
- </input>
- </form>
- </td>
- <td valign="top">
- <xsl:variable
name="add_to_project_link">
-
<xsl:value-of select="php:function('get_phpgw_link', '/index.php',
'menuaction:property.uiproject.index,from:workorder,lookup:true,origin:.project.request')"/>
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_generate_project_statustext"/>
+
</xsl:attribute>
+ </input>
+ </form>
+ </td>
+ <td valign="top">
+ <xsl:variable
name="add_to_project_link">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:property.uiproject.index,from:workorder,lookup:true,origin:.project.request')"/>
+ </xsl:variable>
+ <form method="post"
action="{$add_to_project_link}">
+ <xsl:variable
name="lang_add_to_project">
+
<xsl:value-of select="php:function('lang', 'add to project as order')"/>
</xsl:variable>
- <form
method="post" action="{$add_to_project_link}">
-
<xsl:variable name="lang_add_to_project">
-
<xsl:value-of select="php:function('lang', 'add to project as order')"/>
-
</xsl:variable>
- <input
type="hidden" name="origin_id" value="{value_request_id}"/>
- <input
type="hidden" name="query" value="{loc1}"/>
+ <input
type="hidden" name="origin_id" value="{value_request_id}"/>
+ <input
type="hidden" name="query" value="{loc1}"/>
<input
type="submit" class="pure-button pure-button-primary" name="location"
value="{$lang_add_to_project}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'click this to add an order
to an existing project')"/>
-
</xsl:attribute>
- </input>
- </form>
- </td>
- <td valign="top">
- <xsl:variable
name="add_to_project_link2">
-
<xsl:value-of select="php:function('get_phpgw_link', '/index.php',
'menuaction:property.uiproject.index,from:project,lookup:true,origin:.project.request')"/>
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'click this to add an order to an
existing project')"/>
+
</xsl:attribute>
+ </input>
+ </form>
+ </td>
+ <td valign="top">
+ <xsl:variable
name="add_to_project_link2">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:property.uiproject.index,from:project,lookup:true,origin:.project.request')"/>
+ </xsl:variable>
+ <form method="post"
action="{$add_to_project_link2}">
+ <input
type="hidden" name="origin_id" value="{value_request_id}"/>
+ <input
type="hidden" name="query" value="{loc1}"/>
+ <input
type="submit" class="pure-button pure-button-primary" name="location"
value="{php:function('lang', 'add to project as relation')}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'click this to link this request to
an existing project')"/>
+
</xsl:attribute>
+ </input>
+ </form>
+ </td>
+ <td>
+ <form method="post"
action="{ticket_link}">
+ <xsl:variable
name="lang_start_ticket">
+
<xsl:value-of select="php:function('lang', 'start ticket')"/>
</xsl:variable>
- <form
method="post" action="{$add_to_project_link2}">
- <input
type="hidden" name="origin_id" value="{value_request_id}"/>
- <input
type="hidden" name="query" value="{loc1}"/>
- <input
type="submit" class="pure-button pure-button-primary" name="location"
value="{php:function('lang', 'add to project as relation')}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'click this to link this
request to an existing project')"/>
-
</xsl:attribute>
- </input>
- </form>
- </td>
- <td>
- <form
method="post" action="{ticket_link}">
-
<xsl:variable name="lang_start_ticket">
-
<xsl:value-of select="php:function('lang', 'start ticket')"/>
-
</xsl:variable>
- <input
type="hidden" name="values[subject]" value="{value_title}"/>
- <input
type="hidden" name="values[details]" value="{value_descr}"/>
+ <input
type="hidden" name="values[subject]" value="{value_title}"/>
+ <input
type="hidden" name="values[details]" value="{value_descr}"/>
<input
type="submit" class="pure-button pure-button-primary" name="start_ticket"
value="{$lang_start_ticket}">
- </input>
- </form>
- </td>
- </tr>
- </xsl:when>
- </xsl:choose>
- </table>
- </div>
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
+ </input>
+ </form>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ </table>
+ </div>
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
<form ENCTYPE="multipart/form-data" method="post" name="form" id="form"
action="{$form_action}" class= "pure-form pure-form-aligned">
<div id="request_tabview">
- <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
- <div id="general">
+ <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
+ <div id="general" class="pure-g">
<div class="pure-u-1">
<h2>
<xsl:value-of
select="php:function('lang', 'request')"/>
</h2>
- <xsl:choose>
-
<xsl:when test="value_request_id!=''">
+ <xsl:choose>
+ <xsl:when
test="value_request_id!=''">
<div
class="pure-control-group">
-
<label>
-
<xsl:value-of select="php:function('lang', 'id')"/>
-
</label>
+ <label>
+
<xsl:value-of select="php:function('lang', 'id')"/>
+ </label>
<div
class="pure-custom">
-
<xsl:value-of select="value_request_id"/>
+
<xsl:value-of select="value_request_id"/>
</div>
</div>
-
</xsl:when>
- </xsl:choose>
- <xsl:choose>
-
<xsl:when test="value_request_id!=''">
-
<xsl:for-each select="value_origin">
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="value_request_id!=''">
+ <xsl:for-each
select="value_origin">
<div
class="pure-control-group">
-
<label for="msg_table" class="messages">
-
<xsl:value-of select="descr"/>
-
</label>
+ <label
for="msg_table" class="messages">
+
<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:for-each select="value_target">
+ </xsl:for-each>
+ <xsl:for-each
select="value_target">
<div
class="pure-control-group">
-
<label>
-
<xsl:value-of select="descr"/>
-
</label>
+ <label>
+
<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:when>
+ </xsl:for-each>
+ </xsl:when>
<xsl:when
test="value_origin!=''">
-
<xsl:for-each select="value_origin">
+ <xsl:for-each
select="value_origin">
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="descr"/>
-
</label>
+
<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:for-each>
</xsl:when>
- </xsl:choose>
+ </xsl:choose>
+ </div>
+ <div class="clearBoth"> </div>
+ <hr/>
+ <div>
+ <div class="pure-u-1">
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'responsible unit')"/>
+ </label>
+ <select
name="values[responsible_unit]" class="forms" style="width:300px;">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'Set responsible unit')"/>
+ </xsl:attribute>
+ <option
value="0">
+
<xsl:value-of select="php:function('lang', 'select')"/>
+ </option>
+
<xsl:apply-templates select="responsible_unit_list/options"/>
+ </select>
</div>
- <div
class="clearBoth"> </div>
- <hr/>
- <div>
- <div class="pure-u-1-2">
<div class="pure-control-group">
-
<label>
-
<xsl:value-of
select="php:function('lang', 'responsible unit')"/>
-
</label>
-
<select name="values[responsible_unit]"
class="forms" style="width:300px;">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'Set responsible unit')"/>
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of
select="php:function('lang', 'select')"/>
-
</option>
-
<xsl:apply-templates
select="responsible_unit_list/options"/>
-
</select>
-
</div>
- <div class="pure-control-group">
-
<label>
-
<xsl:value-of select="php:function('lang',
'request status')"/>
-
</label>
+ <label>
+ <xsl:value-of
select="php:function('lang', 'request status')"/>
+ </label>
<select
name="values[status]" style="width:200px;">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'Set the status of the request')"/>
-
</xsl:attribute>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'Set the status of the request')"/>
+ </xsl:attribute>
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -282,70 +282,70 @@
<xsl:value-of select="php:function('lang', 'Please select a status !')"/>
</xsl:attribute>
<option
value="">
-
<xsl:value-of
select="php:function('lang', 'no status')"/>
-
</option>
-
<xsl:apply-templates
select="status_list/options"/>
-
</select>
-
</div>
+
<xsl:value-of select="php:function('lang', 'no status')"/>
+ </option>
+
<xsl:apply-templates select="status_list/options"/>
+ </select>
+ </div>
<div class="pure-control-group">
-
<label>
-
<xsl:value-of
select="lang_coordinator"/>
-
</label>
-
<xsl:call-template name="user_id_select"/>
-
</div>
- </div>
- <div class="pure-u-1-2">
-
<input type="hidden" name="values[origin]"
value="{value_origin_type}"/>
-
<input type="hidden" name="values[origin_id]"
value="{value_origin_id}"/>
-
<xsl:choose>
-
<xsl:when test="mode ='edit'">
-
<xsl:call-template
name="location_form2"/>
-
</xsl:when>
-
<xsl:otherwise>
-
<xsl:call-template
name="location_view2"/>
-
<xsl:choose>
-
<xsl:when test="contact_phone
!=''">
+ <label>
+ <xsl:value-of
select="lang_coordinator"/>
+ </label>
+ <xsl:call-template
name="user_id_select"/>
+ </div>
+ </div>
+ <div class="pure-u-1">
+ <input type="hidden"
name="values[origin]" value="{value_origin_type}"/>
+ <input type="hidden"
name="values[origin_id]" value="{value_origin_id}"/>
+ <xsl:choose>
+ <xsl:when test="mode
='edit'">
+
<xsl:call-template name="location_form2"/>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:call-template name="location_view2"/>
+ <xsl:choose>
+
<xsl:when test="contact_phone !=''">
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="lang_contact_phone"/>
-
</label>
-
<xsl:value-of
select="contact_phone"/>
+
<label>
+
<xsl:value-of select="lang_contact_phone"/>
+
</label>
+
<xsl:value-of select="contact_phone"/>
</div>
-
</xsl:when>
-
</xsl:choose>
-
</xsl:otherwise>
-
</xsl:choose>
-
<xsl:choose>
-
<xsl:when test="suppressmeter =''">
+
</xsl:when>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="suppressmeter =''">
<div
class="pure-control-group">
-
<label>
-
<xsl:value-of
select="lang_power_meter"/>
-
</label>
-
<input type="text"
name="values[power_meter]" value="{value_power_meter}" size="12">
-
<xsl:attribute
name="title">
-
<xsl:value-of
select="lang_power_meter_statustext"/>
-
</xsl:attribute>
-
</input>
+ <label>
+
<xsl:value-of select="lang_power_meter"/>
+ </label>
+ <input
type="text" name="values[power_meter]" value="{value_power_meter}" size="12">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_power_meter_statustext"/>
+
</xsl:attribute>
+ </input>
</div>
-
</xsl:when>
-
</xsl:choose>
-
</div>
- </div>
+ </xsl:when>
+ </xsl:choose>
+ </div>
+ </div>
- <div
class="clearBoth"> </div>
- <hr/>
+ <div class="clearBoth"> </div>
+ <hr/>
<div class="pure-u-1">
- <h3>
- <xsl:value-of
select="php:function('lang', 'description')"/>
- </h3>
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'description')"/>
+ </h3>
<div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'building part')"/>
- </label>
+ <label>
+ <xsl:value-of
select="php:function('lang', 'building part')"/>
+ </label>
<select
data-validation="required" name="values[building_part]">
- <xsl:attribute
name="title">
-
<xsl:value-of select="php:function('lang', 'select building part')"/>
- </xsl:attribute>
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'select building part')"/>
+ </xsl:attribute>
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -353,19 +353,19 @@
<xsl:value-of
select="php:function('lang', 'Please select a building part!')"/>
</xsl:attribute>
<option value="">
-
<xsl:value-of select="php:function('lang', 'select building part')"/>
- </option>
-
<xsl:apply-templates select="building_part_list/options"/>
- </select>
+ <xsl:value-of
select="php:function('lang', 'select building part')"/>
+ </option>
+ <xsl:apply-templates
select="building_part_list/options"/>
+ </select>
</div>
<div class="pure-control-group">
- <xsl:variable
name="lang_request_title">
- <xsl:value-of
select="php:function('lang', 'request action mouseover title')"/>
- </xsl:variable>
- <label
title="{$lang_request_title}">
- <xsl:value-of
select="php:function('lang', 'request action title')"/>
- </label>
- <input type="text"
name="values[title]" value="{value_title}" size="120"
title="{$lang_request_title}">
+ <xsl:variable
name="lang_request_title">
+ <xsl:value-of
select="php:function('lang', 'request action mouseover title')"/>
+ </xsl:variable>
+ <label
title="{$lang_request_title}">
+ <xsl:value-of
select="php:function('lang', 'request action title')"/>
+ </label>
+ <input type="text"
name="values[title]" value="{value_title}" class="pure-input-1-2"
title="{$lang_request_title}">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -372,209 +372,209 @@
<xsl:attribute
name="data-validation-error-msg">
<xsl:value-of
select="php:function('lang', 'Please enter a request TITLE !')"/>
</xsl:attribute>
- </input>
+ </input>
</div>
<div class="pure-control-group">
- <xsl:variable
name="lang_request_description">
- <xsl:value-of
select="php:function('lang', 'request condition mouseover description')"/>
- </xsl:variable>
- <label
title="{$lang_request_description}">
- <xsl:value-of
select="php:function('lang', 'request condition description')"/>
- </label>
- <textarea cols="120"
rows="6" name="values[descr]" title="{$lang_request_description}">
- <xsl:value-of
select="value_descr"/>
- </textarea>
- </div>
+ <xsl:variable
name="lang_request_description">
+ <xsl:value-of
select="php:function('lang', 'request condition mouseover description')"/>
+ </xsl:variable>
+ <label
title="{$lang_request_description}">
+ <xsl:value-of
select="php:function('lang', 'request condition description')"/>
+ </label>
+ <textarea
class="pure-input-1-2" rows="6" name="values[descr]"
title="{$lang_request_description}">
+ <xsl:value-of
select="value_descr"/>
+ </textarea>
+ </div>
</div>
- <div
class="clearBoth"> </div>
- <hr/>
- <div
class="requirement-condition">
- <h3>
- <xsl:value-of
select="php:function('lang', 'condition')"/>
- </h3>
-
<xsl:apply-templates select="custom_attributes/attributes"/>
- <div class="pure-form">
-
<xsl:apply-templates select="condition_list"/>
+ <div class="clearBoth"> </div>
+ <hr/>
+ <div class="pure-u-1">
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'condition')"/>
+ </h3>
+ <xsl:apply-templates
select="custom_attributes/attributes"/>
+ <div>
+ <xsl:apply-templates
select="condition_list"/>
</div>
-
<xsl:choose>
-
<xsl:when test="authorities_demands/options!=''">
- <div class="pure-form">
+ <xsl:choose>
+ <xsl:when
test="authorities_demands/options!=''">
+ <div>
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'Authorities
Demands')"/>
+
<xsl:value-of select="php:function('lang', 'Authorities Demands')"/>
</label>
-
<select name="values[authorities_demands]"
class="forms">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'Is there a demand from the authorities to correct
this condition?')"/>
-
<xsl:text> + </xsl:text>
-
<xsl:value-of
select="value_authorities_demands"/>
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of
select="php:function('lang', 'no authorities demands')"/>
-
</option>
-
<xsl:apply-templates
select="authorities_demands/options"/>
-
</select>
+ <select
name="values[authorities_demands]">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'Is there a demand from the
authorities to correct this condition?')"/>
+
<xsl:text> + </xsl:text>
+
<xsl:value-of select="value_authorities_demands"/>
+
</xsl:attribute>
+
<option value="0">
+
<xsl:value-of select="php:function('lang', 'no authorities demands')"/>
+
</option>
+
<xsl:apply-templates select="authorities_demands/options"/>
+
</select>
</div>
</div>
-
</xsl:when>
-
</xsl:choose>
- </div>
- <div
class="clearBoth"> </div>
- <hr/>
- <div>
- <div
class="requirement-action-left">
- <h3>
- <!--
xsl:value-of select="php:function('lang', 'economy and progress')"/ -->
-
<xsl:value-of select="php:function('lang', 'action year')"/>
- </h3>
+ </xsl:when>
+ </xsl:choose>
+ </div>
+ <div class="clearBoth"> </div>
+ <hr/>
+ <div class="pure-u-1 pure-u-lx-1-3">
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'action year')"/>
+ </h3>
<div class="pure-control-group">
- <label>
-
<xsl:value-of select="php:function('lang', 'recommended year')"/>
- </label>
+ <label>
+ <xsl:value-of
select="php:function('lang', 'recommended year')"/>
+ </label>
<input type="text"
data-validation="number" id="recommended_year" name="values[recommended_year]"
size="10" value="{value_recommended_year}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'year')"/>
-
</xsl:attribute>
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'year')"/>
+ </xsl:attribute>
<xsl:attribute
name="data-validation-optional">
<xsl:text>true</xsl:text>
</xsl:attribute>
- </input>
+ </input>
</div>
- <xsl:choose>
-
<xsl:when test="show_dates !=''">
+ <xsl:choose>
+ <xsl:when
test="show_dates !=''">
<div
class="pure-control-group">
-
<label>
-
<xsl:value-of select="php:function('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>
+ <label>
+
<xsl:value-of select="php:function('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>
</div>
<div
class="pure-control-group">
-
<label>
-
<xsl:value-of select="php:function('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>
+ <label>
+
<xsl:value-of select="php:function('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>
</div>
-
</xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div class="pure-control-group">
- <label>
-
<xsl:value-of select="php:function('lang', 'entry date')"/>
- </label>
- <xsl:value-of
select="value_entry_date"/>
- </div>
+ <label>
+ <xsl:value-of
select="php:function('lang', 'entry date')"/>
+ </label>
+ <xsl:value-of
select="value_entry_date"/>
+ </div>
</div>
- <div
class="requirement-action-right">
- <h3>
- <!--
xsl:value-of select="php:function('lang', 'economy and progress')"/ -->
-
<xsl:value-of select="php:function('lang', 'action cost overview')"/>
- </h3>
- <div
class="requirement-action-sub-left">
- <div
class="pure-control-group">
-
<label class="requirement-action-label">
-
<xsl:value-of select="php:function('lang', 'cost operation')"/>
-
</label>
- <input
type="text" data-validation="number" data-validation-allowing="float"
name="values[amount_operation]" value="{value_amount_operation}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_budget_statustext"/>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-optional">
-
<xsl:text>true</xsl:text>
-
</xsl:attribute>
-
</input>
-
<xsl:text> </xsl:text>
- </div>
- <div
class="pure-control-group">
-
<label class="requirement-action-label">
-
<xsl:value-of select="php:function('lang', 'cost investment')"/>
-
</label>
- <input
type="text" data-validation="number" data-validation-allowing="float"
name="values[amount_investment]" value="{value_amount_investment}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_budget_statustext"/>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-optional">
-
<xsl:text>true</xsl:text>
-
</xsl:attribute>
-
</input>
-
<xsl:text> </xsl:text>
- </div>
- <div
class="pure-control-group">
-
<label class="requirement-action-label">
-
<xsl:value-of select="php:function('lang', 'cost estimate')"/>
-
</label>
- <xsl:value-of
select="value_budget"/>
- <xsl:text>
</xsl:text> [ <xsl:value-of select="currency"/> ]
- </div>
- <div
class="pure-control-group">
-
<label class="requirement-action-label">
-
<xsl:value-of select="php:function('lang', 'multiplier')"/>
-
</label>
-
<xsl:value-of select="value_multiplier"/>
- </div>
- <div
class="pure-control-group">
-
<label class="requirement-action-label">
-
<xsl:value-of select="php:function('lang', 'total cost estimate')"/>
-
</label>
- <xsl:value-of
select="value_total_cost_estimate"/>
- <xsl:text>
</xsl:text> [ <xsl:value-of select="currency"/> ]
- </div>
+ <div class="pure-u-1 pure-u-lx-1-3">
+
+ <h3>
+ <!-- xsl:value-of
select="php:function('lang', 'economy and progress')"/ -->
+ <xsl:value-of
select="php:function('lang', 'action cost overview')"/>
+ </h3>
+ <div class="pure-control-group">
+ <label
class="requirement-action-label">
+ <xsl:value-of
select="php:function('lang', 'cost operation')"/>
+ </label>
+ <input type="text"
data-validation="number" data-validation-allowing="float"
name="values[amount_operation]" value="{value_amount_operation}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="lang_budget_statustext"/>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-optional">
+
<xsl:text>true</xsl:text>
+ </xsl:attribute>
+ </input>
+ <xsl:text> </xsl:text>
+ </div>
+ <div class="pure-control-group">
+ <label
class="requirement-action-label">
+ <xsl:value-of
select="php:function('lang', 'cost investment')"/>
+ </label>
+ <input type="text"
data-validation="number" data-validation-allowing="float"
name="values[amount_investment]" value="{value_amount_investment}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="lang_budget_statustext"/>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-optional">
+
<xsl:text>true</xsl:text>
+ </xsl:attribute>
+ </input>
+ <xsl:text> </xsl:text>
+ </div>
+ <div class="pure-control-group">
+ <label
class="requirement-action-label">
+ <xsl:value-of
select="php:function('lang', 'cost estimate')"/>
+ </label>
+ <xsl:value-of
select="value_budget"/>
+ <xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
+ </div>
+ <div class="pure-control-group">
+ <label
class="requirement-action-label">
+ <xsl:value-of
select="php:function('lang', 'multiplier')"/>
+ </label>
+ <xsl:value-of
select="value_multiplier"/>
+ </div>
+ <div class="pure-control-group">
+ <label
class="requirement-action-label">
+ <xsl:value-of
select="php:function('lang', 'total cost estimate')"/>
+ </label>
+ <xsl:value-of
select="value_total_cost_estimate"/>
+ <xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
+ </div>
+ </div>
+ <div class="pure-u-1 pure-u-lx-1-3">
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'extra')"/>
+ </h3>
+
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'potential grants')"/>
+ </label>
+ <input type="text"
data-validation="number" data-validation-allowing="float"
name="values[amount_potential_grants]" value="{value_amount_potential_grants}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="lang_budget_statustext"/>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-optional">
+
<xsl:text>true</xsl:text>
+ </xsl:attribute>
+ </input>
+ <xsl:text> </xsl:text>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'category')"/>
+ </label>
+ <xsl:call-template
name="categories"/>
+ </div>
+ <xsl:choose>
+ <xsl:when
test="notify='yes'">
+ <div
class="pure-control-group">
+ <label
class="requirement-action-label-wide">
+
<xsl:value-of select="lang_notify"/>
+ </label>
+ <input
type="checkbox" name="values[notify]" value="True">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_notify_statustext"/>
+
</xsl:attribute>
+ </input>
+ <input
type="text" name="values[mail_address]" value="{value_notify_mail_address}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_notify_statustext"/>
+
</xsl:attribute>
+ </input>
</div>
- <div
class="requirement-action-sub-right">
- <div
class="pure-control-group">
-
<label class="requirement-action-label-wide">
-
<xsl:value-of select="php:function('lang', 'potential grants')"/>
-
</label>
- <input
type="text" data-validation="number" data-validation-allowing="float"
name="values[amount_potential_grants]" value="{value_amount_potential_grants}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_budget_statustext"/>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-optional">
-
<xsl:text>true</xsl:text>
-
</xsl:attribute>
-
</input>
-
<xsl:text> </xsl:text>
- </div>
- <div
class="pure-control-group">
-
<label class="requirement-action-label-wide">
-
<xsl:value-of select="php:function('lang', 'category')"/>
-
</label>
-
<xsl:call-template name="categories"/>
- </div>
-
<xsl:choose>
-
<xsl:when test="notify='yes'">
- <div
class="pure-control-group">
-
<label class="requirement-action-label-wide">
-
<xsl:value-of select="lang_notify"/>
-
</label>
-
<input type="checkbox" name="values[notify]" value="True">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_notify_statustext"/>
-
</xsl:attribute>
-
</input>
-
<input type="text" name="values[mail_address]"
value="{value_notify_mail_address}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_notify_statustext"/>
-
</xsl:attribute>
-
</input>
-
</div>
-
</xsl:when>
-
</xsl:choose>
- </div>
- </div>
- </div>
- <div
class="clearBoth"> </div>
- <hr/>
- <div
class="requirement-related">
- <h3><!-- xsl:value-of
select="php:function('lang', 'related')"/-->
- <xsl:value-of
select="php:function('lang', 'economy and progress')"/>
- </h3>
+ </xsl:when>
+ </xsl:choose>
+ </div>
+ <div class="clearBoth"> </div>
+ <hr/>
+ <div class="pure-u-1">
+ <h3><!-- xsl:value-of
select="php:function('lang', 'related')"/-->
+ <xsl:value-of
select="php:function('lang', 'economy and progress')"/>
+ </h3>
<!--div id="datatable-container_2"/-->
<xsl:for-each select="datatable_def">
<xsl:if test="container =
'datatable-container_2'">
@@ -588,14 +588,14 @@
</xsl:call-template>
</xsl:if>
</xsl:for-each>
- </div>
- </div>
- <div id="documents">
- <xsl:choose>
- <xsl:when
test="files!=''">
+ </div>
+ </div>
+ <div id="documents">
+ <xsl:choose>
+ <xsl:when test="files!=''">
<div class="pure-control-group">
<label>
-
<xsl:value-of select="//lang_files"/>
+ <xsl:value-of
select="//lang_files"/>
</label>
<xsl:for-each
select="datatable_def">
<xsl:if
test="container = 'datatable-container_1'">
@@ -610,17 +610,17 @@
</xsl:if>
</xsl:for-each>
</div>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when
test="fileupload = 1">
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="fileupload = 1">
<div class="pure-control-group">
-
<xsl:call-template name="file_upload"/>
+ <xsl:call-template
name="file_upload"/>
</div>
- </xsl:when>
- </xsl:choose>
- </div>
- <div id="history">
+ </xsl:when>
+ </xsl:choose>
+ </div>
+ <div id="history">
<xsl:for-each select="datatable_def">
<xsl:if test="container =
'datatable-container_0'">
<xsl:call-template
name="table_setup">
@@ -632,66 +632,66 @@
<xsl:with-param
name="data" select ='data' />
</xsl:call-template>
</xsl:if>
- </xsl:for-each>
- </div>
+ </xsl:for-each>
</div>
- <div class="controlButton">
- <xsl:choose>
- <xsl:when test="mode =
'edit'">
-
<xsl:variable name="lang_save">
-
<xsl:value-of select="php:function('lang', 'save')"/>
-
</xsl:variable>
+ </div>
+ <div class="controlButton">
+ <xsl:choose>
+ <xsl:when test="mode = 'edit'">
+ <xsl:variable name="lang_save">
+ <xsl:value-of
select="php:function('lang', 'save')"/>
+ </xsl:variable>
<input type="submit" class="pure-button
pure-button-primary" name="values[save]" value="{$lang_save}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_save_statustext"/>
-
</xsl:attribute>
- </input>
-
<xsl:variable name="lang_save_new">
-
<xsl:value-of select="php:function('lang', 'save new')"/>
-
</xsl:variable>
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_save_statustext"/>
+ </xsl:attribute>
+ </input>
+ <xsl:variable name="lang_save_new">
+ <xsl:value-of
select="php:function('lang', 'save new')"/>
+ </xsl:variable>
<input type="submit" class="pure-button
pure-button-primary" name="values[save_new]" value="{$lang_save_new}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="$lang_save_new"/>
-
</xsl:attribute>
- </input>
- </xsl:when>
- </xsl:choose>
- <xsl:variable
name="done_action">
- <xsl:value-of
select="done_action"/>
- </xsl:variable>
- <xsl:variable
name="lang_done">
- <xsl:value-of
select="php:function('lang', 'done')"/>
- </xsl:variable>
+ <xsl:attribute name="title">
+ <xsl:value-of
select="$lang_save_new"/>
+ </xsl:attribute>
+ </input>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:variable name="done_action">
+ <xsl:value-of select="done_action"/>
+ </xsl:variable>
+ <xsl:variable name="lang_done">
+ <xsl:value-of select="php:function('lang',
'done')"/>
+ </xsl:variable>
<input type="button" class="pure-button
pure-button-primary" name="done" value="{$lang_done}"
onclick="location.href='{$done_action}'">
- <xsl:attribute
name="title">
-
<xsl:value-of select="lang_done_statustext"/>
- </xsl:attribute>
- </input>
- <xsl:choose>
- <xsl:when test="mode =
'view'">
-
<xsl:variable name="edit_action">
-
<xsl:value-of select="edit_action"/>
-
</xsl:variable>
-
<xsl:variable name="lang_edit">
-
<xsl:value-of select="php:function('lang', 'edit')"/>
-
</xsl:variable>
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_done_statustext"/>
+ </xsl:attribute>
+ </input>
+ <xsl:choose>
+ <xsl:when test="mode = 'view'">
+ <xsl:variable name="edit_action">
+ <xsl:value-of
select="edit_action"/>
+ </xsl:variable>
+ <xsl:variable name="lang_edit">
+ <xsl:value-of
select="php:function('lang', 'edit')"/>
+ </xsl:variable>
<input type="button" class="pure-button
pure-button-primary" name="edit" value="{$lang_edit}"
onclick="location.href='{$edit_action}'">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'edit')"/>
-
</xsl:attribute>
- </input>
- </xsl:when>
- </xsl:choose>
- </div>
- </form>
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'edit')"/>
+ </xsl:attribute>
+ </input>
+ </xsl:when>
+ </xsl:choose>
+ </div>
+ </form>
</xsl:template>
<!-- New template-->
<xsl:template xmlns:php="http://php.net/xsl"; match="condition_list">
- <xsl:choose>
- <xsl:when test="condition_type_list != ''">
- </xsl:when>
- <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="condition_type_list != ''">
+ </xsl:when>
+ <xsl:otherwise>
<div class="pure-control-group">
<label>
<xsl:attribute name="title">
@@ -699,10 +699,10 @@
</xsl:attribute>
<xsl:value-of
select="php:function('lang', 'consequence type')"/>
</label>
- <xsl:value-of
select="condition_type_name"/>
+ <xsl:value-of select="condition_type_name"/>
</div>
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
<div class="pure-control-group">
<label>
<xsl:attribute name="title">
@@ -710,15 +710,15 @@
</xsl:attribute>
<xsl:value-of select="php:function('lang', 'condition
degree')"/>
</label>
- <select
name="values[condition][{condition_type}][degree]" class="forms">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'select value')"/>
- </xsl:attribute>
- <xsl:apply-templates
select="degree/options"/>
- </select>
+ <select name="values[condition][{condition_type}][degree]"
class="forms">
+ <xsl:attribute name="title">
+ <xsl:value-of select="php:function('lang',
'select value')"/>
+ </xsl:attribute>
+ <xsl:apply-templates select="degree/options"/>
+ </select>
</div>
- <xsl:choose>
- <xsl:when test="condition_type_list != ''">
+ <xsl:choose>
+ <xsl:when test="condition_type_list != ''">
<div class="pure-control-group">
<label>
<xsl:attribute name="title">
@@ -726,15 +726,15 @@
</xsl:attribute>
<xsl:value-of
select="php:function('lang', 'consequence type')"/>
</label>
- <select
name="values[condition][{condition_type}][condition_type]" class="forms">
- <xsl:attribute
name="title">
- <xsl:value-of
select="php:function('lang', 'select value')"/>
- </xsl:attribute>
- <xsl:apply-templates
select="condition_type_list/options"/>
- </select>
+ <select
name="values[condition][{condition_type}][condition_type]" class="forms">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'select value')"/>
+ </xsl:attribute>
+ <xsl:apply-templates
select="condition_type_list/options"/>
+ </select>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div class="pure-control-group">
<label>
<xsl:attribute name="title">
@@ -742,12 +742,12 @@
</xsl:attribute>
<xsl:value-of select="php:function('lang',
'Consequence')"/>
</label>
- <select
name="values[condition][{condition_type}][consequence]" class="forms">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'select value')"/>
- </xsl:attribute>
- <xsl:apply-templates
select="consequence/options"/>
- </select>
+ <select name="values[condition][{condition_type}][consequence]"
class="forms">
+ <xsl:attribute name="title">
+ <xsl:value-of select="php:function('lang',
'select value')"/>
+ </xsl:attribute>
+ <xsl:apply-templates select="consequence/options"/>
+ </select>
</div>
<div class="pure-control-group">
<label>
@@ -756,12 +756,12 @@
</xsl:attribute>
<xsl:value-of select="php:function('lang',
'Probability')"/>
</label>
- <select
name="values[condition][{condition_type}][probability]" class="forms">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'select value')"/>
- </xsl:attribute>
- <xsl:apply-templates
select="probability/options"/>
- </select>
+ <select name="values[condition][{condition_type}][probability]"
class="forms">
+ <xsl:attribute name="title">
+ <xsl:value-of select="php:function('lang',
'select value')"/>
+ </xsl:attribute>
+ <xsl:apply-templates select="probability/options"/>
+ </select>
</div>
<div class="pure-control-group">
<label>
@@ -770,7 +770,7 @@
</xsl:attribute>
<xsl:value-of select="php:function('lang', 'weight')"/>
</label>
- <xsl:value-of select="weight"/>
+ <xsl:value-of select="weight"/>
</div>
<div class="pure-control-group">
<label>
@@ -779,7 +779,7 @@
</xsl:attribute>
<xsl:value-of select="php:function('lang', 'risk')"/>
</label>
- <xsl:value-of select="risk"/>
+ <xsl:value-of select="risk"/>
</div>
<div class="pure-control-group">
<label>
@@ -788,176 +788,176 @@
</xsl:attribute>
<xsl:value-of select="php:function('lang', 'score')"/>
</label>
- <xsl:value-of select="score"/>
+ <xsl:value-of select="score"/>
</div>
</xsl:template>
<!-- New template-->
<xsl:template match="condition_list_view">
- <tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod 2 = 0">
- <xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td class="small_text" align="left">
- <xsl:value-of select="condition_type_name"/>
- </td>
- <td class="small_text" align="center">
- <select disabled="" class="forms">
- <xsl:apply-templates select="degree"/>
- </select>
- </td>
- <td class="small_text" align="center">
- <select disabled="" class="forms">
- <xsl:apply-templates
select="probability"/>
- </select>
- </td>
- <td class="small_text" align="center">
- <select disabled="" class="forms">
- <xsl:apply-templates
select="consequence"/>
- </select>
- </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 class="small_text" align="left">
+ <xsl:value-of select="condition_type_name"/>
+ </td>
+ <td class="small_text" align="center">
+ <select disabled="" class="forms">
+ <xsl:apply-templates select="degree"/>
+ </select>
+ </td>
+ <td class="small_text" align="center">
+ <select disabled="" class="forms">
+ <xsl:apply-templates select="probability"/>
+ </select>
+ </td>
+ <td class="small_text" align="center">
+ <select disabled="" class="forms">
+ <xsl:apply-templates select="consequence"/>
+ </select>
+ </td>
+ </tr>
</xsl:template>
<!-- New template-->
<xsl:template match="options">
- <option value="{id}">
- <xsl:if test="selected != 0">
- <xsl:attribute name="selected"
value="selected"/>
- </xsl:if>
- <xsl:if test="descr != ''">
- <xsl:attribute name="title">
- <xsl:value-of
disable-output-escaping="yes" select="descr"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:value-of disable-output-escaping="yes"
select="name"/>
- </option>
+ <option value="{id}">
+ <xsl:if test="selected != 0">
+ <xsl:attribute name="selected" value="selected"/>
+ </xsl:if>
+ <xsl:if test="descr != ''">
+ <xsl:attribute name="title">
+ <xsl:value-of disable-output-escaping="yes"
select="descr"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
</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="record_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>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template xmlns:php="http://php.net/xsl"; name="table_header_importance">
- <tr>
+ <tr>
+ <xsl:attribute name="class">
<xsl:choose>
- <xsl:when test="//condition_type_list != ''">
+ <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>
- <th width="20%" align="left">
- <xsl:attribute name="title">
-
<xsl:text>Konsekvenstype - tema for tilstand</xsl:text>
- </xsl:attribute>
- <xsl:value-of
select="php:function('lang', 'consequence type')"/>
- </th>
+ <xsl:text>row_on</xsl:text>
</xsl:otherwise>
</xsl:choose>
- <th width="20%" align="center">
- <xsl:attribute name="title">
- <xsl:text>Tilstandsgrad iht NS
3424</xsl:text>
- </xsl:attribute>
- <xsl:value-of select="php:function('lang',
'condition degree')"/>
- </th>
- <xsl:choose>
- <xsl:when test="//condition_type_list != ''">
- <th width="20%" align="left">
- <xsl:attribute name="title">
-
<xsl:text>Konsekvenstype - tema for tilstand</xsl:text>
- </xsl:attribute>
- <xsl:value-of
select="php:function('lang', 'consequence type')"/>
- </th>
- </xsl:when>
- </xsl:choose>
- <th width="20%" align="center">
- <xsl:attribute name="title">
- <xsl:text>Konsekvensgrad iht NS
3424</xsl:text>
- </xsl:attribute>
- <xsl:value-of select="php:function('lang',
'Consequence')"/>
- </th>
- <th width="20%" align="center">
- <xsl:attribute name="title">
- <xsl:text>Sannsynlighet iht NS
3424</xsl:text>
- </xsl:attribute>
- <xsl:value-of select="php:function('lang',
'Probability')"/>
- </th>
- <!--
+ </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-->
+<xsl:template xmlns:php="http://php.net/xsl"; name="table_header_importance">
+ <tr>
+ <xsl:choose>
+ <xsl:when test="//condition_type_list != ''">
+ </xsl:when>
+ <xsl:otherwise>
+ <th width="20%" align="left">
+ <xsl:attribute name="title">
+ <xsl:text>Konsekvenstype - tema
for tilstand</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'consequence type')"/>
+ </th>
+ </xsl:otherwise>
+ </xsl:choose>
+ <th width="20%" align="center">
+ <xsl:attribute name="title">
+ <xsl:text>Tilstandsgrad iht NS 3424</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'condition
degree')"/>
+ </th>
+ <xsl:choose>
+ <xsl:when test="//condition_type_list != ''">
+ <th width="20%" align="left">
+ <xsl:attribute name="title">
+ <xsl:text>Konsekvenstype - tema
for tilstand</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'consequence type')"/>
+ </th>
+ </xsl:when>
+ </xsl:choose>
+ <th width="20%" align="center">
+ <xsl:attribute name="title">
+ <xsl:text>Konsekvensgrad iht NS 3424</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang',
'Consequence')"/>
+ </th>
+ <th width="20%" align="center">
+ <xsl:attribute name="title">
+ <xsl:text>Sannsynlighet iht NS 3424</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang',
'Probability')"/>
+ </th>
+ <!--
<th width="5%" align="center">
<xsl:value-of select="php:function('lang', 'failure')" />
</th>
-->
- <th width="5%" align="center">
- <xsl:attribute name="title">
- <xsl:text>Vekt = konfigurerbar verdi pr
konsekvenstype</xsl:text>
- </xsl:attribute>
- <xsl:value-of select="php:function('lang',
'weight')"/>
- </th>
- <th width="5%" align="center">
- <xsl:attribute name="title">
- <xsl:text>Risiko = Konsekvensgrad x
Sannsynlighetsgrad</xsl:text>
- </xsl:attribute>
- <xsl:value-of select="php:function('lang',
'risk')"/>
- </th>
- <th width="5%" align="center">
- <xsl:attribute name="title">
- <xsl:text>Poeng = Tilstandsgrad x
Risiko x Vekt</xsl:text>
- </xsl:attribute>
- <xsl:value-of select="php:function('lang',
'score')"/>
- </th>
- </tr>
+ <th width="5%" align="center">
+ <xsl:attribute name="title">
+ <xsl:text>Vekt = konfigurerbar verdi pr
konsekvenstype</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'weight')"/>
+ </th>
+ <th width="5%" align="center">
+ <xsl:attribute name="title">
+ <xsl:text>Risiko = Konsekvensgrad x
Sannsynlighetsgrad</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'risk')"/>
+ </th>
+ <th width="5%" align="center">
+ <xsl:attribute name="title">
+ <xsl:text>Poeng = Tilstandsgrad x Risiko x
Vekt</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'score')"/>
+ </th>
+ </tr>
</xsl:template>
Modified: branches/Version-2_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/tts.xsl 2017-02-28
17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/property/templates/base/tts.xsl 2017-02-28
17:38:36 UTC (rev 16390)
@@ -115,7 +115,7 @@
<xsl:variable
name="select_priority_name">
<xsl:value-of select="select_priority_name"/>
</xsl:variable>
- <select
name="{$select_priority_name}"
onMouseover="window.status='{$lang_priority_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <select
name="{$select_priority_name}">
<xsl:apply-templates select="priority_list/options"/>
</select>
</div>
@@ -137,7 +137,7 @@
<label>
<xsl:value-of select="php:function('lang', 'finnish date')"/>
</label>
-
<input type="text" id="values_finnish_date" name="values[finnish_date]"
size="10" value="{value_finnish_date}" readonly="readonly"
onMouseout="window.status='';return true;">
+
<input type="text" id="values_finnish_date" name="values[finnish_date]"
size="10" value="{value_finnish_date}" readonly="readonly">
<xsl:attribute name="title">
<xsl:value-of select="lang_finnish_date_statustext"/>
</xsl:attribute>
@@ -153,7 +153,7 @@
<xsl:value-of
select="php:function('lang', 'subject')"/>
</label>
- <input type="text"
name="values[subject]" value="{value_subject}" size="60" >
+ <input type="text"
name="values[subject]" value="{value_subject}" class="pure-input-1-2" >
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'Enter the subject of this ticket')"/>
</xsl:attribute>
@@ -173,7 +173,7 @@
<xsl:value-of
select="php:function('lang', 'Details')"/>
</label>
- <textarea cols="60" rows="10"
name="values[details]" >
+ <textarea
class="pure-input-1-2" rows="10" name="values[details]" >
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'Enter the details of this ticket')"/>
</xsl:attribute>
@@ -193,7 +193,7 @@
<xsl:value-of select="lang_upload_file"/>
</label>
- <input
type="file" name="file" size="40">
+ <input
class="pure-input-1-2" type="file" name="file">
<xsl:attribute name="title">
<xsl:value-of select="lang_file_statustext"/>
</xsl:attribute>
@@ -368,7 +368,7 @@
<xsl:text> </xsl:text>
<xsl:value-of
select="value_id"/>
</label>
- <input type="text"
name="values[subject]" value="{value_subject}">
+ <input class="pure-input-1-2"
type="text" name="values[subject]" value="{value_subject}">
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'update subject')"/>
</xsl:attribute>
@@ -534,7 +534,7 @@
<xsl:variable
name="select_priority_name">
<xsl:value-of
select="select_priority_name"/>
</xsl:variable>
- <select
name="{$select_priority_name}" class="forms"
title="{$lang_priority_statustext}">
+ <select
name="{$select_priority_name}" title="{$lang_priority_statustext}">
<xsl:if test="simple
='1'">
<xsl:attribute
name="disabled">
<xsl:text>disabled</xsl:text>
@@ -549,7 +549,7 @@
<label>
<xsl:value-of select="php:function('lang', 'status')"/>
</label>
- <select
id="status_id" name="values[status]" class="forms">
+ <select
id="status_id" name="values[status]">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'Set the status of the ticket')"/>
</xsl:attribute>
@@ -578,7 +578,7 @@
<xsl:value-of select="php:function('lang', 'finnish date')"/>
</label>
-
<input type="text" id="values_finnish_date" name="values[finnish_date]"
size="10" value="{value_finnish_date}" readonly="readonly"
onMouseout="window.status='';return true;">
+
<input type="text" id="values_finnish_date" name="values[finnish_date]"
size="10" value="{value_finnish_date}" readonly="readonly">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'select the
estimated date for closing the task')"/>
</xsl:attribute>
@@ -592,12 +592,12 @@
<label>
<xsl:value-of select="php:function('lang', 'billable hours')"/>
</label>
-
<input type="text" id="values_billable_hour" name="values[billable_hours]"
size="10" value="">
+
<input class="pure-input-1-4" type="text" id="values_billable_hour"
name="values[billable_hours]" value="">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'enter the billable
hour for the task')"/>
</xsl:attribute>
</input>
-
<input type="text" id="values_billable_hour_orig"
name="values[billable_hours_orig]" size="10" value="{value_billable_hours}"
readonly="readonly">
+
<input class="pure-input-1-4" type="text" id="values_billable_hour_orig"
name="values[billable_hours_orig]" value="{value_billable_hours}"
readonly="readonly">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'enter the billable
hour for the task')"/>
</xsl:attribute>
@@ -621,7 +621,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'new note')"/>
</label>
- <textarea cols="{textareacols}"
rows="{textarearows}" name="values[note]">
+ <textarea
class="pure-input-1-2" rows="{textarearows}" name="values[note]">
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'add new comments')"/>
</xsl:attribute>
@@ -669,7 +669,7 @@
<xsl:value-of select="value_sms_client_order_notice"/>
</xsl:attribute>
</input>
- <input
type="text" name="to_sms_phone" value="{value_sms_phone}">
+ <input
class="pure-input-1-8" 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>
@@ -684,7 +684,7 @@
<xsl:value-of select="php:function('lang', 'response')"/>
</a>
</label>
- <textarea
cols="{textareacols}" rows="{textarearows}" id="response_text"
name="values[response_text]" onKeyUp="javascript: SmsCountKeyUp(160);"
onKeyDown="javascript: SmsCountKeyDown(160);" wrap="virtual">
+ <textarea
class="pure-input-1-2" rows="{textarearows}" id="response_text"
name="values[response_text]" onKeyUp="javascript: SmsCountKeyUp(160);"
onKeyDown="javascript: SmsCountKeyDown(160);" wrap="virtual">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'response')"/>
</xsl:attribute>
@@ -760,7 +760,7 @@
<xsl:value-of select="php:function('lang', 'external project')"/>
</label>
<input type="hidden" id="external_project_id"
name="values[external_project_id]" value="{value_external_project_id}"/>
-
<input type="text" id="external_project_name"
name="values[external_project_name]" value="{value_external_project_name}"/>
+
<input class="pure-input-1-2" type="text" id="external_project_name"
name="values[external_project_name]" value="{value_external_project_name}"/>
<div id="external_project_container"/>
</div>
@@ -769,7 +769,7 @@
<label>
<xsl:value-of select="php:function('lang', 'contract')"/>
</label>
-
<select id="vendor_contract_id" name="values[contract_id]">
+
<select id="vendor_contract_id" name="values[contract_id]"
class="pure-input-1-2">
<option value="">
<xsl:value-of select="php:function('lang', 'select')"/>
</option>
@@ -785,7 +785,7 @@
<xsl:value-of select="$lang_service"/>
</label>
<input type="hidden" id="service_id" name="values[service_id]"
value="{value_service_id}"/>
-
<input type="text" id="service_name" name="values[service_name]"
value="{value_service_name}">
+
<input class="pure-input-1-2" type="text" id="service_name"
name="values[service_name]" value="{value_service_name}">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -805,7 +805,7 @@
<xsl:value-of select="$lang_dimb"/>
</label>
<input type="hidden" id="ecodimb" name="values[ecodimb]"
value="{ecodimb_data/value_ecodimb}"/>
-
<input type="text" id="ecodimb_name" name="values[ecodimb_name]"
value="{ecodimb_data/value_ecodimb} {ecodimb_data/value_ecodimb_descr}">
+
<input class="pure-input-1-2" type="text" id="ecodimb_name"
name="values[ecodimb_name]" value="{ecodimb_data/value_ecodimb}
{ecodimb_data/value_ecodimb_descr}">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -823,7 +823,7 @@
<xsl:value-of select="$lang_budget_account"/>
</label>
<input type="hidden" id="b_account_id" name="values[b_account_id]"
value="{b_account_data/value_b_account_id}"/>
-
<input type="text" id="b_account_name" name="values[b_account_name]"
value="{b_account_data/value_b_account_id}
{b_account_data/value_b_account_name}">
+
<input class="pure-input-1-2" type="text" id="b_account_name"
name="values[b_account_name]" value="{b_account_data/value_b_account_id}
{b_account_data/value_b_account_name}">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -842,7 +842,7 @@
<xsl:value-of select="$lang_unspsc_code"/>
</label>
<input type="hidden" id="unspsc_code" name="values[unspsc_code]"
value="{value_unspsc_code}"/>
-
<input type="text" id="unspsc_code_name"
name="values[unspsc_code_name]" value="{value_unspsc_code}
{value_unspsc_code_name}">
+
<input class="pure-input-1-2" type="text" id="unspsc_code_name"
name="values[unspsc_code_name]" value="{value_unspsc_code}
{value_unspsc_code_name}">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -951,7 +951,7 @@
</a>
</label>
-
<textarea cols="{textareacols}" rows="{textarearows}" id="order_descr"
name="values[order_descr]" wrap="virtual">
+
<textarea class="pure-input-1-2" rows="{textarearows}" id="order_descr"
name="values[order_descr]" wrap="virtual">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'description
order')"/>
</xsl:attribute>
@@ -963,7 +963,7 @@
<label>
<xsl:value-of select="php:function('lang', 'cost estimate')"/>
</label>
-
<input id="field_budget" type="text" name="values[budget]">
+
<input class="pure-input-1-2" id="field_budget" type="text"
name="values[budget]">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'Enter the
budget')"/>
</xsl:attribute>
@@ -1023,7 +1023,7 @@
<xsl:value-of select="php:function('lang', 'period')"/>
</xsl:variable>
-
<select name="values[actual_cost_period]">
+
<select name="values[actual_cost_period]" class="pure-input-1-2">
<xsl:attribute name="title">
<xsl:value-of select='$lang_period'/>
</xsl:attribute>
@@ -1073,7 +1073,7 @@
<table class="pure-table pure-u-md-1-2">
<tr>
<td valign = 'top'>
-
<select name="values[send_order_format]" class="forms">
+
<select name="values[send_order_format]">
<xsl:attribute name="title">
<xsl:value-of
select="php:function('lang', 'format')"/>
</xsl:attribute>
@@ -1123,7 +1123,7 @@
<label>
<xsl:value-of select="php:function('lang', 'status')"/>
</label>
-
<select id="status_id" name="values[status]" class="forms">
+
<select id="status_id" name="values[status]" class="pure-input-1-2">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'Set the status of
the ticket')"/>
</xsl:attribute>
Modified: branches/Version-2_0-branch/property/templates/base/workorder.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/workorder.xsl
2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/property/templates/base/workorder.xsl
2017-02-28 17:38:36 UTC (rev 16390)
@@ -415,7 +415,7 @@
</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[title]" value="{value_title}" size="60">
+ <input type="text"
name="values[title]" value="{value_title}" class="pure-input-1-2">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_title_statustext"/>
</xsl:attribute>
@@ -428,7 +428,7 @@
<label for="name">
<xsl:value-of
select="lang_descr"/>
</label>
- <textarea cols="60" rows="6"
name="values[descr]">
+ <textarea
class="pure-input-1-2" rows="6" name="values[descr]">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_descr_statustext"/>
</xsl:attribute>
@@ -481,7 +481,7 @@
<label for="name">
<xsl:value-of
select="lang_remark"/>
</label>
- <textarea cols="60" rows="6"
name="values[remark]">
+ <textarea
class="pure-input-1-2" rows="6" name="values[remark]">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_remark_statustext"/>
</xsl:attribute>
@@ -1554,7 +1554,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'remark')"/>
</label>
- <textarea cols="60" rows="10"
name="values[merknad]">
+ <textarea
class="pure-input-1-2" rows="10" name="values[merknad]">
<xsl:value-of
select="value_merknad"/>
</textarea>
</div>
Modified: branches/Version-2_0-branch/rental/inc/class.bofellesdata.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.bofellesdata.inc.php
2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/rental/inc/class.bofellesdata.inc.php
2017-02-28 17:38:36 UTC (rev 16390)
@@ -87,8 +87,12 @@
$config = CreateObject('phpgwapi.config', 'rental');
$config->read();
- if (!$config->config_data['external_db_host'] ||
!$this->ping($config->config_data['external_db_host']))
+ if (empty($config->config_data['external_db_host']))
{
+ return false;
+ }
+ if ($config->config_data['external_db_host'] &&
!$this->ping($config->config_data['external_db_host']))
+ {
$message = "Database server
{$config->config_data['external_db_host']} is not accessible";
phpgwapi_cache::message_set($message, 'error');
return false;
@@ -116,6 +120,7 @@
catch (Exception $e)
{
$status = lang('unable_to_connect_to_database');
+ phpgwapi_cache::message_set($status, 'error');
}
$this->db = $db;
Modified: branches/Version-2_0-branch/rental/inc/class.uicomposite.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.uicomposite.inc.php
2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/rental/inc/class.uicomposite.inc.php
2017-02-28 17:38:36 UTC (rev 16390)
@@ -26,7 +26,11 @@
'query' => true,
'download' => true,
'schedule' => true,
- 'get_schedule' => true
+ 'get_schedule' => true,
+ 'handle_multi_upload_file' => true,
+ 'build_multi_upload_file' => true,
+ 'view_file' => true,
+ 'get_files' => true
);
public function __construct()
@@ -38,6 +42,12 @@
$this->config = CreateObject('phpgwapi.config',
'rental');
$this->config->read();
+ $this->acl = & $GLOBALS['phpgw']->acl;
+ $this->acl_location = '.contract'; //for now
+ $this->acl_read =
$this->acl->check($this->acl_location, PHPGW_ACL_READ, 'rental');
+ $this->acl_add = $this->acl->check($this->acl_location,
PHPGW_ACL_ADD, 'rental');
+ $this->acl_edit =
$this->acl->check($this->acl_location, PHPGW_ACL_EDIT, 'rental');
+ $this->acl_delete =
$this->acl->check($this->acl_location, PHPGW_ACL_DELETE, 'rental');
}
private function get_status_options( $selected = 0 )
@@ -1007,7 +1017,30 @@
$status_application_options[] = array('id' =>
2, 'name' => lang('pending'), 'selected' => 0);
$status_application_options[] = array('id' =>
3, 'name' => lang('rejected'), 'selected' => 0);
$status_application_options[] = array('id' =>
4, 'name' => lang('approved'), 'selected' => 0);
+
+ $file_def = array
+ (
+ array('key' => 'file_name', 'label' =>
lang('Filename'), 'sortable' => false,
+ 'resizeable' => true),
+ array('key' => 'delete_file', 'label'
=> lang('Delete file'), 'sortable' => false,
+ 'resizeable' => true,
'formatter' => 'JqueryPortico.FormatterCenter'),
+ );
+
+ $datatable_def[] = array
+ (
+ 'container' => 'datatable-container_4',
+ 'requestUrl' =>
json_encode(self::link(array(
+ 'menuaction' =>
'rental.uicomposite.get_files',
+ 'id' => $composite_id,
+ 'phpgw_return_as' => 'json'))),
+ 'ColumnDefs' => $file_def,
+ 'data' => array(),
+ 'config' => array(
+ array('disableFilter' => true),
+ array('disablePagination' =>
true)
+ )
+ );
}
$link_index = array
@@ -1124,12 +1157,15 @@
'composite_id' => $composite_id,
'validator' =>
phpgwapi_jquery::formvalidator_generate(array('location',
'date',
- 'security', 'file'))
+ 'security', 'file')),
+ 'multiple_uploader' => true,
+ 'fileupload' => !!$composite_id,
+ 'multi_upload_parans' =>
"{menuaction:'rental.uicomposite.build_multi_upload_file',
id:'{$composite_id}'}",
);
self::add_javascript('rental', 'rental', 'composite.' .
$mode . '.js');
phpgwapi_jquery::load_widget('numberformat');
- self::render_template_xsl(array('composite',
'datatable_inline'), array($mode => $data));
+ self::render_template_xsl(array('composite',
'datatable_inline', 'files'), array($mode => $data));
}
public function save()
@@ -1174,6 +1210,7 @@
{
phpgwapi_cache::message_set(lang('messages_saved_form'), 'message');
$composite_id = $composite->get_id();
+ $this->_handle_files($composite_id);
}
else
{
@@ -1185,6 +1222,40 @@
'id' => $composite_id));
}
+ private function _handle_files( $composite_id )
+ {
+ $file_name = @str_replace(' ', '_',
$_FILES['file']['name']);
+
+ if ($file_name && $composite_id)
+ {
+ $bofiles = CreateObject('property.bofiles',
'/rental');
+ $to_file =
"{$bofiles->fakebase}/composite/{$composite_id}/{$file_name}";
+
+ if ($bofiles->vfs->file_exists(array(
+ 'string' => $to_file,
+ 'relatives' =>
array(RELATIVE_NONE)
+ )))
+ {
+ phpgwapi_cache::message_set(lang('This
file already exists !'), 'error');
+ }
+ else
+ {
+
$bofiles->create_document_dir("composite/{$composite_id}");
+ $bofiles->vfs->override_acl = 1;
+
+ if (!$bofiles->vfs->cp(array(
+ 'from' =>
$_FILES['file']['tmp_name'],
+ 'to' => $to_file,
+ 'relatives' =>
array(RELATIVE_NONE | VFS_REAL, RELATIVE_ALL))))
+ {
+
phpgwapi_cache::message_set(lang('Failed to upload file !'), 'error');
+ }
+ $bofiles->vfs->override_acl = 0;
+ }
+ }
+
+ }
+
/**
* Public method. Called when user wants to add a unit to a
composite
* @param HTTP::id the composite ID
@@ -1456,4 +1527,128 @@
return $data;
}
+
+ public function handle_multi_upload_file()
+ {
+ $id = phpgw::get_var('id');
+
+ phpgw::import_class('property.multiuploader');
+
+ $options['base_dir'] = 'composite/'.$id;
+ $options['upload_dir'] =
$GLOBALS['phpgw_info']['server']['files_dir'].'/rental/'.$options['base_dir'].'/';
+ $options['script_url'] =
html_entity_decode(self::link(array('menuaction' =>
'rental.uicomposite.handle_multi_upload_file', 'id' => $id)));
+ $options['fakebase'] = '/rental';
+ $upload_handler = new property_multiuploader($options,
false);
+
+ switch ($_SERVER['REQUEST_METHOD']) {
+ case 'OPTIONS':
+ case 'HEAD':
+ $upload_handler->head();
+ break;
+ case 'GET':
+ $upload_handler->get();
+ break;
+ case 'PATCH':
+ case 'PUT':
+ case 'POST':
+ $upload_handler->add_file();
+ break;
+ case 'DELETE':
+ $upload_handler->delete_file();
+ break;
+ default:
+ $upload_handler->header('HTTP/1.1 405
Method Not Allowed');
+ }
+
+ $GLOBALS['phpgw']->common->phpgw_exit();
+ }
+
+ public function build_multi_upload_file()
+ {
+ phpgwapi_jquery::init_multi_upload_file();
+ $id = phpgw::get_var('id', 'int');
+
+ $GLOBALS['phpgw_info']['flags']['noframework'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
+
+ $multi_upload_action =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'rental.uicomposite.handle_multi_upload_file', 'id' => $id));
+
+ $data = array
+ (
+ 'multi_upload_action' => $multi_upload_action
+ );
+
+ $GLOBALS['phpgw']->xslttpl->add_file(array('files',
'multi_upload_file'));
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('multi_upload' => $data));
+ }
+
+ function get_files()
+ {
+ $id = phpgw::get_var('id', 'int');
+
+ if (!($this->isExecutiveOfficer() ||
$this->isAdministrator()))
+ {
+ return array(
+ 'data' => array(),
+ 'draw' => phpgw::get_var('draw', 'int'),
+ 'recordsTotal' => 0,
+ 'recordsFiltered' => 0
+ );
+ }
+
+ $link_file_data = array
+ (
+ 'menuaction' => 'rental.uicomposite.view_file',
+ );
+
+
+ $link_view_file = $GLOBALS['phpgw']->link('/index.php',
$link_file_data);
+
+ $vfs = CreateObject('phpgwapi.vfs');
+ $vfs->override_acl = 1;
+
+ $values = $vfs->ls(array(
+ 'string' => "/rental/composite/{$id}",
+ 'relatives' => array(RELATIVE_NONE)));
+
+ $vfs->override_acl = 0;
+
+ $content_files = array();
+
+ foreach ($values as $_entry)
+ {
+
+ $content_files[] = array(
+ 'file_name' => '<a href="' .
$link_view_file . '&file_id=' . $_entry['file_id'] . '" target="_blank"
title="' . lang('click to view file') . '">' . $_entry['name'] . '</a>',
+ 'delete_file' => '<input
type="checkbox" name="values[file_action][]" value="' . $_entry['file_id'] . '"
title="' . lang('Check to delete file') . '">',
+ );
+ }
+
+ if (phpgw::get_var('phpgw_return_as') == 'json')
+ {
+
+ $total_records = count($content_files);
+
+ return array
+ (
+ 'data' => $content_files,
+ 'draw' => phpgw::get_var('draw', 'int'),
+ 'recordsTotal' => $total_records,
+ 'recordsFiltered' => $total_records
+ );
+ }
+ return $content_files;
+ }
+
+ function view_file()
+ {
+ if (!$this->acl_read)
+ {
+ phpgw::no_access();
+ }
+
+ ExecMethod('property.bofiles.get_file',
phpgw::get_var('file_id', 'int'));
+ }
+
}
Modified: branches/Version-2_0-branch/rental/inc/model/class.composite.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/model/class.composite.inc.php
2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/rental/inc/model/class.composite.inc.php
2017-02-28 17:38:36 UTC (rev 16390)
@@ -327,9 +327,9 @@
return (int)$this->object_type_id;
}
- public function set_furnish_type_id( int $furnish_type )
+ public function set_furnish_type_id( $furnish_type )
{
- $this->furnish_type_id = $furnish_type;
+ $this->furnish_type_id = (int)$furnish_type;
}
public function get_furnish_type_id()
@@ -347,9 +347,9 @@
return $this->part_of_town_id;
}
- public function set_custom_price_factor( float
$custom_price_factor )
+ public function set_custom_price_factor( $custom_price_factor )
{
- $this->custom_price_factor = $custom_price_factor;
+ $this->custom_price_factor =
(float)$custom_price_factor;
}
public function get_custom_price_factor()
Modified: branches/Version-2_0-branch/rental/js/rental/composite.edit.js
===================================================================
--- branches/Version-2_0-branch/rental/js/rental/composite.edit.js
2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/rental/js/rental/composite.edit.js
2017-02-28 17:38:36 UTC (rev 16390)
@@ -195,4 +195,24 @@
oTable0.fnDraw();
}, data, 'POST', 'JSON');
-};
\ No newline at end of file
+};
+
+this.fileuploader = function ()
+{
+ var sUrl = phpGWLink('index.php', multi_upload_parans);
+ TINY.box.show({iframe: sUrl, boxid: 'frameless', width: 750, height:
450, fixed: false, maskid: 'darkmask', maskopacity: 40, mask: true, animate:
true,
+ close: true,
+ closejs: function ()
+ {
+ refresh_files()
+ }
+ });
+};
+
+this.refresh_files = function ()
+{
+ var oArgs = {menuaction:'rental.uicomposite.get_files',
id:multi_upload_parans.id};
+ oArgs.menuaction = 'rental.uicomposite.get_files';
+ var strURL = phpGWLink('index.php', oArgs, true);
+ JqueryPortico.updateinlineTableHelper(oTable4, strURL);
+};
Modified: branches/Version-2_0-branch/rental/templates/base/composite.xsl
===================================================================
--- branches/Version-2_0-branch/rental/templates/base/composite.xsl
2017-02-28 17:35:22 UTC (rev 16389)
+++ branches/Version-2_0-branch/rental/templates/base/composite.xsl
2017-02-28 17:38:36 UTC (rev 16390)
@@ -33,7 +33,7 @@
<xsl:value-of select="form_action"/>
</xsl:variable>
- <form id="form" name="form" method="post"
action="{$form_action}" class="pure-form pure-form-stacked">
+ <form id="form" name="form" method="post"
ENCTYPE="multipart/form-data" action="{$form_action}" class="pure-form
pure-form-stacked">
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="tabs"/>
<div id="details" class="pure-g">
@@ -200,7 +200,38 @@
</div>
</div>
+ <xsl:choose>
+ <xsl:when test="fileupload = 1">
+ <div class="pure-u-1">
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'files')"/>
+ </label>
+ <div >
+
<xsl:for-each select="datatable_def">
+
<xsl:if test="container = 'datatable-container_4'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl'/>
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
+
<xsl:with-param name="data" select ='data'/>
+
<xsl:with-param name="tabletools" select ='tabletools'
/>
+
<xsl:with-param name="config" select ='config'/>
+
</xsl:call-template>
+
</xsl:if>
+
</xsl:for-each>
+ </div>
+ </div>
+ <script
type="text/javascript">
+ var
multi_upload_parans = <xsl:value-of select="multi_upload_parans"/>;
+ </script>
+
<xsl:call-template name="file_upload"/>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+
</div>
+
<xsl:choose>
<xsl:when test="composite_id > 0">
<div id="units">
| [Prev in Thread] | Current Thread | [Next in Thread] |