[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17335] controller::uicheck_list add mulitiple fileup
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [17335] controller::uicheck_list add mulitiple fileupload |
Date: |
Mon, 20 Nov 2017 11:18:21 -0500 (EST) |
Revision: 17335
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17335
Author: sigurdne
Date: 2017-11-20 11:18:21 -0500 (Mon, 20 Nov 2017)
Log Message:
-----------
controller::uicheck_list add mulitiple fileupload
Modified Paths:
--------------
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/js/controller/check_list.js
trunk/controller/templates/base/check_list/edit_check_list.xsl
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2017-11-19 18:54:48 UTC
(rev 17334)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2017-11-20 16:18:21 UTC
(rev 17335)
@@ -70,7 +70,11 @@
'view_control_items' => true,
'get_check_list_info' => true,
'get_cases_for_check_list' => true,
- 'update_status' => true
+ 'update_status' => true,
+ 'build_multi_upload_file' => true,
+ 'handle_multi_upload_file' => true,
+ 'get_files3' => true,
+ 'view_file' => true
);
function __construct()
@@ -435,7 +439,7 @@
$check_list_id =
phpgw::get_var('check_list_id');
$check_list =
$this->so->get_single($check_list_id);
}
-
+
$current_time = time();
$absolute_deadline = time() + (14 * 24 * 60 * 60);
$check_list_locked = false;
@@ -442,7 +446,9 @@
if($check_list->get_deadline() < $absolute_deadline)
{
//check list was due two weeks ago, and is
locked
- $check_list_locked = true;
+ //FIXME - funkar inte
+ //Eksempel: frist 30/11/2017, dagens dato
20/11/2017, absolutt frist blir 4/12/2017...
+// $check_list_locked = true;
}
// echo 'tid: '.$current_time.'abs: '.$absolute_deadline;
@@ -549,6 +555,25 @@
$required_actual_hours =
isset($config->config_data['required_actual_hours']) &&
$config->config_data['required_actual_hours'] ?
$config->config_data['required_actual_hours'] : false;
+ $file_def = array
+ (
+ array('key' => 'file_name', 'label' =>
lang('Filename'), 'sortable' => false,'resizeable' => true),
+ array('key' => 'picture', 'label' => '',
'sortable' => false,'resizeable' => false, 'formatter' =>
'JqueryPortico.showPicture')
+ );
+
+ $datatable_def[] = array
+ (
+ 'container' => 'datatable-container_0',
+ 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"controller.uicheck_list.get_files3",
+ 'id' => $check_list_id,
'phpgw_return_as' => 'json'))),
+ 'ColumnDefs' => $file_def,
+ 'data' => json_encode(array()),
+ 'config' => array(
+ array('disableFilter' => true),
+ array('disablePagination' => true)
+ )
+ );
+
$data = array
(
'user_list' => array('options' =>
$user_list_options),
@@ -566,7 +591,11 @@
'building_location_code' =>
$building_location_code,
'location_level' => $level,
'required_actual_hours' =>
$required_actual_hours,
- 'integration' =>
$this->_get_component_integration($location_id, $component_arr)
+ 'integration' =>
$this->_get_component_integration($location_id, $component_arr),
+ 'datatable_def' => $datatable_def,
+ 'multiple_uploader' => true,
+ 'multi_upload_parans' =>
"{menuaction:'controller.uicheck_list.build_multi_upload_file',
id:'{$check_list_id}'}",
+
);
$GLOBALS['phpgw']->jqcal->add_listener('planned_date');
@@ -579,9 +608,202 @@
self::render_template_xsl(array('check_list/fragments/check_list_menu',
'check_list/fragments/nav_control_plan',
'check_list/fragments/check_list_top_section',
'check_list/edit_check_list',
-
'check_list/fragments/select_buildings_on_property'), $data);
+
'check_list/fragments/select_buildings_on_property',
'files','datatable_inline'), $data);
}
+ public function view_file()
+ {
+ $GLOBALS['phpgw_info']['flags']['noheader'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
+
+ if (!$this->read)
+ {
+ phpgw::no_access();
+ }
+
+ $thumb = phpgw::get_var('thumb', 'bool');
+ $file_id = phpgw::get_var('file_id', 'int');
+
+ $bofiles = CreateObject('property.bofiles');
+
+ if($file_id)
+ {
+ $file_info = $bofiles->vfs->get_info($file_id);
+ $file =
"{$file_info['directory']}/{$file_info['name']}";
+ }
+ else
+ {
+ $file = urldecode(phpgw::get_var('file'));
+ }
+
+ $source = "{$bofiles->rootdir}{$file}";
+ $thumbfile = "$source.thumb";
+
+ // prevent path traversal
+ if (preg_match('/\.\./', $source))
+ {
+ return false;
+ }
+
+ $uigallery = CreateObject('property.uigallery');
+
+ $re_create = false;
+ if ($uigallery->is_image($source) && $thumb &&
$re_create)
+ {
+ $uigallery->create_thumb($source, $thumbfile,
$thumb_size = 50);
+ readfile($thumbfile);
+ }
+ else if ($thumb && is_file($thumbfile))
+ {
+ readfile($thumbfile);
+ }
+ else if ($uigallery->is_image($source) && $thumb)
+ {
+ $uigallery->create_thumb($source, $thumbfile,
$thumb_size = 50);
+ readfile($thumbfile);
+ }
+ else if ($file_id)
+ {
+ $bofiles->get_file($file_id);
+ }
+ else
+ {
+ $bofiles->view_file('', $file);
+ }
+ }
+
+ function get_files3()
+ {
+ $id = phpgw::get_var('id', 'int');
+
+ if (empty($this->read))
+ {
+ return array();
+ }
+
+ $link_file_data = array
+ (
+ 'menuaction' =>
"controller.uicheck_list.view_file",
+ );
+
+
+ $link_view_file = $GLOBALS['phpgw']->link('/index.php',
$link_file_data);
+
+ $vfs = CreateObject('phpgwapi.vfs');
+ $vfs->override_acl = 1;
+
+ $files = $vfs->ls(array(
+ 'string' => "/controller/check_list/{$id}",
+ 'relatives' => array(RELATIVE_NONE)));
+
+ $vfs->override_acl = 0;
+
+ $img_types = array(
+ 'image/jpeg',
+ 'image/png',
+ 'image/gif'
+ );
+
+ $content_files = array();
+
+ $z = 0;
+ foreach ($files 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 ( in_array($_entry['mime_type'], $img_types))
+ {
+ $content_files[$z]['file_name'] =
$_entry['name'];
+ $content_files[$z]['img_id'] =
$_entry['file_id'];
+ $content_files[$z]['img_url'] =
self::link(array(
+ 'menuaction' =>
"controller.uicheck_list.view_file",
+ 'file_id' =>
$_entry['file_id'],
+ 'file' =>
$_entry['directory'] . '/' . urlencode($_entry['name'])
+ ));
+ $content_files[$z]['thumbnail_flag'] =
'thumb=1';
+ }
+ $z ++;
+ }
+
+ 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;
+ }
+ public function handle_multi_upload_file()
+ {
+ if (!$this->add)
+ {
+ phpgw::no_access();
+ }
+
+ $id = phpgw::get_var('id', 'int');
+
+ phpgw::import_class('property.multiuploader');
+
+ $options['fakebase'] = "/controller";
+ $options['base_dir'] = "check_list/{$id}";
+ $options['upload_dir'] =
$GLOBALS['phpgw_info']['server']['files_dir'].'/controller/'.$options['base_dir'].'/';
+ $options['script_url'] =
html_entity_decode(self::link(array('menuaction' =>
"controller.uicheck_list.handle_multi_upload_file", 'id' => $id)));
+ $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']['xslt_app'] = true;
+ $GLOBALS['phpgw_info']['flags']['noframework'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+
+ $multi_upload_action = self::link(array('menuaction' =>
"controller.uicheck_list.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));
+ }
+
/**
* Get linked information from external systems - as pictures
* @param integer $location_id
Modified: trunk/controller/js/controller/check_list.js
===================================================================
--- trunk/controller/js/controller/check_list.js 2017-11-19 18:54:48 UTC
(rev 17334)
+++ trunk/controller/js/controller/check_list.js 2017-11-20 16:18:21 UTC
(rev 17335)
@@ -82,3 +82,20 @@
}
});
});
+
+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 ()
+{
+ JqueryPortico.updateinlineTableHelper('datatable-container_0');
+};
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2017-11-19 18:54:48 UTC (rev 17334)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2017-11-20 16:18:21 UTC (rev 17335)
@@ -1,159 +1,204 @@
<!-- $Id$ -->
<xsl:template match="data" name="edit_check_list"
xmlns:php="http://php.net/xsl">
-<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
-<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+ <xsl:variable name="date_format">
+ <xsl:value-of select="php:function('get_phpgw_info',
'user|preferences|common|dateformat')" />
+ </xsl:variable>
+ <xsl:variable name="session_url">
+ <xsl:text>&</xsl:text>
+ <xsl:value-of select="php:function('get_phpgw_session_url')" />
+ </xsl:variable>
-<div id="main_content" class="medium">
+ <div id="main_content" class="medium">
- <xsl:call-template name="check_list_top_section">
- <xsl:with-param name="active_tab">view_details</xsl:with-param>
- </xsl:call-template>
+ <xsl:call-template name="check_list_top_section">
+ <xsl:with-param
name="active_tab">view_details</xsl:with-param>
+ </xsl:call-template>
- <!-- ================== CHECKLIST DETAILS ===================== -->
- <div id="check_list_details">
- <h3 class="box_header">Sjekklistedetaljer::<xsl:value-of
select="current_month_name"/></h3>
- <xsl:variable name="action_url"><xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicheck_list.save_check_list')" /></xsl:variable>
+ <!-- ================== CHECKLIST DETAILS
===================== -->
+ <div id="check_list_details">
+ <h3
class="box_header">Sjekklistedetaljer::<xsl:value-of
select="current_month_name"/></h3>
+ <xsl:variable name="action_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicheck_list.save_check_list')" />
+ </xsl:variable>
<form id="frm_update_check_list" action="{$action_url}"
method="post">
- <xsl:variable name="check_list_id"><xsl:value-of
select="check_list/id"/></xsl:variable>
- <input id="check_list_id" type="hidden"
name="check_list_id" value="{$check_list_id}" />
- <xsl:if test="check_list_locked = '1'">
- <div class='input_error_msg'>
- <xsl:value-of
select="php:function('lang', 'error_msg_control_passed_due_date')" />
- </div>
- </xsl:if>
- <fieldset class="col_1">
- <div class="row">
- <label>Status</label>
- <xsl:variable name="status"><xsl:value-of
select="check_list/status"/></xsl:variable>
- <select id="status" name="status">
- <xsl:choose>
- <xsl:when
test="check_list/status = 0">
- <option
value="1">Utført</option>
- <option
value="0" SELECTED="SELECTED">Ikke utført</option>
- <option value="3">Kansellert</option>
- </xsl:when>
- <xsl:when
test="check_list/status = 1">
- <option
value="1" SELECTED="SELECTED">Utført</option>
- <option
value="0">Ikke utført</option>
- <option value="3">Kansellert</option>
- </xsl:when>
- <xsl:when test="check_list/status = 3">
- <option
value="3" SELECTED="SELECTED">Kansellert</option>
- <option
value="0">Ikke utført</option>
- <option value="1">Utført</option>
- </xsl:when>
- <xsl:otherwise>
- <option
value="0" SELECTED="SELECTED">Ikke utført</option>
- <option
value="1">Utført</option>
- <option value="3">Kansellert</option>
- </xsl:otherwise>
- </xsl:choose>
- </select>
- </div>
- <div class="row">
- <label>Skal utføres innen</label>
- <xsl:value-of select="php:function('date',
$date_format, number(check_list/deadline))"/>
- <input id="deadline_date" name="deadline_date"
type="hidden">
- <xsl:if test="check_list/deadline != 0 or
check_list/deadline != ''">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/deadline))"/></xsl:attribute>
- </xsl:if>
- </input>
- <input type="hidden"
id="original_deadline_date" name="original_deadline_date" >
- <xsl:attribute name="value">
- <xsl:value-of
select="check_list/original_deadline"/>
- </xsl:attribute>
- </input>
- </div>
- <div class="row">
- <xsl:if
test="check_list/error_msg_array/planned_date != ''">
- <xsl:variable name="error_msg">
- <xsl:value-of
select="check_list/error_msg_array/planned_date" />
- </xsl:variable>
+ <xsl:variable name="check_list_id">
+ <xsl:value-of select="check_list/id"/>
+ </xsl:variable>
+ <input id="check_list_id" type="hidden"
name="check_list_id" value="{$check_list_id}" />
+ <xsl:if test="check_list_locked = '1'">
<div class='input_error_msg'>
- <xsl:value-of
select="php:function('lang', $error_msg)" />
+ <xsl:value-of
select="php:function('lang', 'error_msg_control_passed_due_date')" />
</div>
</xsl:if>
- <label>Planlagt dato</label>
- <input class="date" readonly="readonly">
- <xsl:attribute
name="id">planned_date</xsl:attribute>
- <xsl:attribute
name="name">planned_date</xsl:attribute>
- <xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/planned_date != 0 and
check_list/planned_date != ''">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/planned_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </div>
- <div class="row">
- <xsl:if
test="check_list/error_msg_array/completed_date != ''">
- <xsl:variable name="error_msg">
- <xsl:value-of
select="check_list/error_msg_array/completed_date" />
- </xsl:variable>
- <div class='input_error_msg'>
- <xsl:value-of
select="php:function('lang', $error_msg)" />
+ <fieldset class="col_1">
+ <div class="row">
+ <label>Status</label>
+ <xsl:variable name="status">
+ <xsl:value-of
select="check_list/status"/>
+ </xsl:variable>
+ <select id="status"
name="status">
+ <xsl:choose>
+ <xsl:when
test="check_list/status = 0">
+ <option
value="1">Utført</option>
+ <option
value="0" SELECTED="SELECTED">Ikke utført</option>
+ <option
value="3">Kansellert</option>
+ </xsl:when>
+ <xsl:when
test="check_list/status = 1">
+ <option
value="1" SELECTED="SELECTED">Utført</option>
+ <option
value="0">Ikke utført</option>
+ <option
value="3">Kansellert</option>
+ </xsl:when>
+ <xsl:when
test="check_list/status = 3">
+ <option
value="3" SELECTED="SELECTED">Kansellert</option>
+ <option
value="0">Ikke utført</option>
+ <option
value="1">Utført</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option
value="0" SELECTED="SELECTED">Ikke utført</option>
+ <option
value="1">Utført</option>
+ <option
value="3">Kansellert</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </select>
</div>
- </xsl:if>
- <label>Utført dato</label>
- <input class="date" >
- <xsl:attribute
name="id">completed_date</xsl:attribute>
- <xsl:attribute
name="name">completed_date</xsl:attribute>
- <xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/completed_date != 0
and check_list/completed_date != ''">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/completed_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </div>
- <!-- ASSIGNMET -->
- <div class="row">
- <label>Tildelt</label>
- <select name="assigned_to">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'select')"/>
- </xsl:attribute>
- <option value="0">
- <xsl:value-of
select="php:function('lang', 'select')"/>
- </option>
- <xsl:apply-templates
select="user_list/options"/>
- </select>
- </div>
- <xsl:if test="required_actual_hours = 1">
<div class="row">
- <label>Egne Timer</label>
- <input class="date">
- <xsl:attribute
name="id">billable_hours</xsl:attribute>
- <xsl:attribute
name="name">billable_hours</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
+ <label>Skal utføres
innen</label>
+ <xsl:value-of
select="php:function('date', $date_format, number(check_list/deadline))"/>
+ <input id="deadline_date"
name="deadline_date" type="hidden">
+ <xsl:if
test="check_list/deadline != 0 or check_list/deadline != ''">
+ <xsl:attribute
name="value">
+
<xsl:value-of select="php:function('date', $date_format,
number(check_list/deadline))"/>
+ </xsl:attribute>
+ </xsl:if>
</input>
- <xsl:text> </xsl:text>
- <xsl:value-of
select="check_list/billable_hours"/>
+ <input type="hidden"
id="original_deadline_date" name="original_deadline_date" >
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="check_list/original_deadline"/>
+ </xsl:attribute>
+ </input>
</div>
- </xsl:if>
- </fieldset>
- <fieldset class="col_2">
- <div class="row">
- <label>Antall åpne saker</label>
- <xsl:value-of
select="check_list/num_open_cases"/>
- </div>
- <div class="row">
- <label>Antall ventende saker</label>
- <xsl:value-of
select="check_list/num_pending_cases"/>
- </div>
- </fieldset>
+ <div class="row">
+ <xsl:if
test="check_list/error_msg_array/planned_date != ''">
+ <xsl:variable
name="error_msg">
+ <xsl:value-of
select="check_list/error_msg_array/planned_date" />
+ </xsl:variable>
+ <div
class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <label>Planlagt dato</label>
+ <input class="date"
readonly="readonly">
+ <xsl:attribute
name="id">planned_date</xsl:attribute>
+ <xsl:attribute
name="name">planned_date</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ <xsl:if
test="check_list/planned_date != 0 and check_list/planned_date != ''">
+ <xsl:attribute
name="value">
+
<xsl:value-of select="php:function('date', $date_format,
number(check_list/planned_date))"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <div class="row">
+ <xsl:if
test="check_list/error_msg_array/completed_date != ''">
+ <xsl:variable
name="error_msg">
+ <xsl:value-of
select="check_list/error_msg_array/completed_date" />
+ </xsl:variable>
+ <div
class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <label>Utført dato</label>
+ <input class="date" >
+ <xsl:attribute
name="id">completed_date</xsl:attribute>
+ <xsl:attribute
name="name">completed_date</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ <xsl:if
test="check_list/completed_date != 0 and check_list/completed_date != ''">
+ <xsl:attribute
name="value">
+
<xsl:value-of select="php:function('date', $date_format,
number(check_list/completed_date))"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <!-- ASSIGNMET -->
+ <div class="row">
+ <label>Tildelt</label>
+ <select name="assigned_to">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </xsl:attribute>
+ <option value="0">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </option>
+ <xsl:apply-templates
select="user_list/options"/>
+ </select>
+ </div>
+ <xsl:if test="required_actual_hours =
1">
+ <div class="row">
+ <label>Egne
Timer</label>
+ <input class="date">
+ <xsl:attribute
name="id">billable_hours</xsl:attribute>
+ <xsl:attribute
name="name">billable_hours</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ </input>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="check_list/billable_hours"/>
+ </div>
+ </xsl:if>
+ </fieldset>
+ <fieldset class="col_2">
+ <div class="row">
+ <label>Antall åpne saker</label>
+ <xsl:value-of
select="check_list/num_open_cases"/>
+ </div>
+ <div class="row">
+ <label>Antall ventende
saker</label>
+ <xsl:value-of
select="check_list/num_pending_cases"/>
+ </div>
+ </fieldset>
- <div class="comment">
- <label>Kommentar</label>
- <textarea>
- <xsl:attribute
name="name">comment</xsl:attribute>
- <xsl:value-of select="check_list/comment"/>
- </textarea>
- </div>
-
- <xsl:if test="check_list_locked != '1'">
- <div class="form-buttons">
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_check_list')"
/></xsl:variable>
- <input class="btn" type="submit"
name="save_control" value="Lagre detaljer" />
+ <div class="comment">
+ <label>Kommentar</label>
+ <textarea>
+ <xsl:attribute
name="name">comment</xsl:attribute>
+ <xsl:value-of
select="check_list/comment"/>
+ </textarea>
</div>
- </xsl:if>
+
+ <div class="comment">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'files')"/>
+ </label>
+ <div class="pure-u-md-1-2 pure-custom" >
+ <xsl:for-each
select="datatable_def">
+ <xsl:if test="container
= 'datatable-container_0'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl'/>
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
+
<xsl:with-param name="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>
+ <div class="comment">
+ <xsl:call-template name="file_upload"/>
+ </div>
+
+ <xsl:if test="check_list_locked != '1'">
+ <div class="form-buttons">
+ <xsl:variable name="lang_save">
+ <xsl:value-of
select="php:function('lang', 'save_check_list')" />
+ </xsl:variable>
+ <input class="btn"
type="submit" name="save_control" value="Lagre detaljer" />
+ </div>
+ </xsl:if>
</form>
</div>
<xsl:for-each select="integration">
@@ -167,12 +212,12 @@
</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:value-of disable-output-escaping="yes"
select="name"/>
- </option>
- </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:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+</xsl:template>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17335] controller::uicheck_list add mulitiple fileupload,
sigurdne <=