[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14755] more fixes
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14755] more fixes |
|
Date: |
Fri, 19 Feb 2016 23:52:51 +0000 |
Revision: 14755
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14755
Author: sigurdne
Date: 2016-02-19 23:51:33 +0000 (Fri, 19 Feb 2016)
Log Message:
-----------
more fixes
Modified Paths:
--------------
trunk/phpgwapi/inc/class.common.inc.php
trunk/phpgwapi/templates/base/datatable_jquery.xsl
trunk/property/inc/class.sotts.inc.php
trunk/property/inc/class.uicondition_survey.inc.php
trunk/property/inc/class.uiinvoice.inc.php
trunk/property/templates/base/condition_survey_import.xsl
Modified: trunk/phpgwapi/inc/class.common.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.common.inc.php 2016-02-18 19:22:44 UTC (rev
14754)
+++ trunk/phpgwapi/inc/class.common.inc.php 2016-02-19 23:51:33 UTC (rev
14755)
@@ -509,13 +509,7 @@
}
}
- $html = phpgwapi_jquery::tabview_generate($tabs,
$selection);
- $output = <<<HTML
-
- {$html}
-
-HTML;
- return $output;
+ return phpgwapi_jquery::tabview_generate($tabs,
$selection);
}
/**
Modified: trunk/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_jquery.xsl 2016-02-18 19:22:44 UTC
(rev 14754)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl 2016-02-19 23:51:33 UTC
(rev 14755)
@@ -30,7 +30,7 @@
<xsl:template name="datatable">
<script type="text/javascript">
var number_of_toolbar_items = 0;
- var filter_selects = [];
+ var filter_selects = {};
</script>
<xsl:call-template name="jquery_phpgw_i18n"/>
<xsl:apply-templates select="form" />
@@ -87,6 +87,7 @@
content: "\2212";
}
</style>
+ <div id="active_filters"></div>
<input class="toggle-box" id="header1" type="checkbox" />
<label for="header1">
@@ -96,7 +97,7 @@
<div id="toolbar">
<!--xsl:if test="item/text and normalize-space(item/text)"-->
<xsl:if test="item">
- <table id="toolbar_table" class="pure-table">
+ <table id="toolbar_table" class="pure-table
pure-table-horizontal">
<thead>
<tr>
<th>
@@ -214,9 +215,9 @@
<xsl:value-of select="name"/>
</xsl:variable>
<script type="text/javascript">
-
filter_selects.push('<xsl:value-of select="$name"/>');
+
filter_selects['<xsl:value-of select="text"/>'] = '<xsl:value-of
select="$name"/>';
</script>
-
<select id="{$name}" name="{$name}">
+
<select id="{$name}" name="{$name}" width="250" style="width: 250px">
<xsl:for-each select="list">
<xsl:variable name="id">
<xsl:value-of select="id"/>
@@ -922,14 +923,26 @@
aoData.columns[column] =
column_to_keep;
}
+ active_filters_html = [];
var select = null;
- for (var i = 0; i <
filter_selects.length; i++)
+ for (var i in filter_selects)
{
select = $("#" +
filter_selects[i]);
var select_name =
select.prop("name");
var select_value =
select.val();
aoData[select_name] =
select_value;
+
+ if(select_value &&
select_value !=0 )
+ {
+
active_filters_html.push(i);
+ }
+
}
+
+ if(active_filters_html.length > 0)
+ {
+
$('#active_filters').html("Aktive filter: " + active_filters_html.join(', '));
+ }
},
fnCreatedRow : function( nRow, aData,
iDataIndex ){
Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php 2016-02-18 19:22:44 UTC (rev
14754)
+++ trunk/property/inc/class.sotts.inc.php 2016-02-19 23:51:33 UTC (rev
14755)
@@ -1751,6 +1751,8 @@
$this->db->query("DELETE FROM phpgw_interlink WHERE
location1_id = {$location_id} AND location1_item_id = {$id}", __LINE__,
__FILE__);
$this->db->query("DELETE FROM phpgw_interlink WHERE
location2_id = {$location_id} AND location2_item_id = {$id}", __LINE__,
__FILE__);
$this->db->query("DELETE FROM fm_tts_history WHERE
history_record_id = {$id}", __LINE__, __FILE__);
+ $this->db->query("DELETE FROM fm_tts_payments WHERE
ticket_id = {$id}", __LINE__, __FILE__);
+ $this->db->query("DELETE FROM fm_tts_budget WHERE
ticket_id = {$id}", __LINE__, __FILE__);
$this->db->query("DELETE FROM fm_tts_views WHERE id =
{$id}", __LINE__, __FILE__);
$this->db->query("DELETE FROM fm_tts_tickets WHERE id =
{$id}", __LINE__, __FILE__);
Modified: trunk/property/inc/class.uicondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.uicondition_survey.inc.php 2016-02-18 19:22:44 UTC
(rev 14754)
+++ trunk/property/inc/class.uicondition_survey.inc.php 2016-02-19 23:51:33 UTC
(rev 14755)
@@ -865,6 +865,7 @@
{
throw new
Exception('uicondition_survey::_handle_import() - missing id');
}
+ phpgwapi_jquery::formvalidator_generate(array('file'));
$step = phpgw::get_var('step', 'int', 'REQUEST');
$sheet_id = phpgw::get_var('sheet_id', 'int',
'REQUEST');
@@ -948,9 +949,9 @@
$active_tab = 'step_1';
$lang_submit = lang('continue');
$tabs['step_1'] = array('label' =>
lang('choose file'), 'link' => '#step_1');
- $tabs['step_2'] = array('label' =>
lang('choose sheet'), 'link' => null);
- $tabs['step_3'] = array('label' =>
lang('choose start line'), 'link' => null);
- $tabs['step_4'] = array('label' =>
lang('choose columns'), 'link' => null);
+ $tabs['step_2'] = array('label' =>
lang('choose sheet'), 'link' => null, 'disable' => true);
+ $tabs['step_3'] = array('label' =>
lang('choose start line'), 'link' => null, 'disable' => true);
+ $tabs['step_4'] = array('label' =>
lang('choose columns'), 'link' => null, 'disable' => true);
break;
case 1:
$active_tab = 'step_2';
@@ -959,8 +960,8 @@
'menuaction' =>
'property.uicondition_survey.import', 'id' => $id, 'step' => 0,
'sheet_id' =>
$sheet_id, 'start_line' => $start_line)));
$tabs['step_2'] = array('label' =>
lang('choose sheet'), 'link' => '#step_2');
- $tabs['step_3'] = array('label' =>
lang('choose start line'), 'link' => null);
- $tabs['step_4'] = array('label' =>
lang('choose columns'), 'link' => null);
+ $tabs['step_3'] = array('label' =>
lang('choose start line'), 'link' => null, 'disable' => true);
+ $tabs['step_4'] = array('label' =>
lang('choose columns'), 'link' => null, 'disable' => true);
break;
case 2:
$active_tab = 'step_3';
@@ -972,7 +973,7 @@
'menuaction' =>
'property.uicondition_survey.import', 'id' => $id, 'step' => 1,
'sheet_id' =>
$sheet_id, 'start_line' => $start_line)));
$tabs['step_3'] = array('label' =>
lang('choose start line'), 'link' => '#step_3');
- $tabs['step_4'] = array('label' =>
lang('choose columns'), 'link' => null);
+ $tabs['step_4'] = array('label' =>
lang('choose columns'), 'link' => null, 'disable' => true);
break;
case 3:
$active_tab = 'step_4';
@@ -1026,6 +1027,9 @@
}
$objPHPExcel->setActiveSheetIndex((int)$sheet_id);
+ $rows =
$objPHPExcel->getActiveSheet()->getHighestDataRow();
+ $highestColumm =
$objPHPExcel->getActiveSheet()->getHighestDataColumn();
+ $highestColumnIndex =
PHPExcel_Cell::columnIndexFromString($highestColumm);
}
catch (Exception $e)
{
@@ -1040,12 +1044,8 @@
$survey = $this->bo->read_single(array('id' => $id,
'view' => $mode == 'view'));
- $rows =
$objPHPExcel->getActiveSheet()->getHighestDataRow();
- $highestColumm =
$objPHPExcel->getActiveSheet()->getHighestDataColumn();
- $highestColumnIndex =
PHPExcel_Cell::columnIndexFromString($highestColumm);
-
$i = 0;
- $html_table = '<table border="1">';
+ $html_table = '<table class="pure-table
pure-table-bordered">';
if ($rows > 1 && $step == 2)
{
@@ -1055,7 +1055,7 @@
$cols[] = $this->getexcelcolumnname($j);
}
- $html_table .= "<tr><th align = 'center'>" .
lang('start') . "</th><th align='center'>" . implode("</th><th
align='center'>", $cols) . '</th></tr>';
+ $html_table .= "<thead><tr><th align =
'center'>" . lang('select') . "</th><th align = 'center'>" . lang('row') .
"</th><th align='center'>" . implode("</th><th align='center'>", $cols) .
'</th></tr></thead>';
foreach
($objPHPExcel->getActiveSheet()->getRowIterator() as $row)
{
if ($i > 20)
@@ -1071,7 +1071,7 @@
$_checked = 'checked="checked"';
}
- $_radio = "[{$row_key}]<input
id=\"start_line\" type =\"radio\" {$_checked} name=\"start_line\"
value=\"{$row_key}\">";
+ $_radio = "<input id=\"start_line\"
type =\"radio\" {$_checked} name=\"start_line\" value=\"{$row_key}\">";
$cellIterator = $row->getCellIterator();
$cellIterator->setIterateOnlyExistingCells(false);
@@ -1084,7 +1084,7 @@
$row_values[] =
$cell->getCalculatedValue();
}
}
- $html_table .=
"<tr><td><pre>{$_radio}</pre></td><td>" . implode('</td><td>', $row_values) .
'</td></tr>';
+ $html_table .=
"<tr><td>{$_radio}</td><td>{$row_key}</td><td>" . implode('</td><td>',
$row_values) . '</td></tr>';
}
echo '</table>';
}
Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php 2016-02-18 19:22:44 UTC (rev
14754)
+++ trunk/property/inc/class.uiinvoice.inc.php 2016-02-19 23:51:33 UTC (rev
14755)
@@ -3405,6 +3405,7 @@
$this->bo->export_deposition();
}
}
+ return;
}
$msgbox_data = $this->bocommon->msgbox_data($receipt);
Modified: trunk/property/templates/base/condition_survey_import.xsl
===================================================================
--- trunk/property/templates/base/condition_survey_import.xsl 2016-02-18
19:22:44 UTC (rev 14754)
+++ trunk/property/templates/base/condition_survey_import.xsl 2016-02-19
23:51:33 UTC (rev 14755)
@@ -2,224 +2,212 @@
<!-- import -->
<xsl:template match="data" xmlns:formvalidator="http://www.w3.org/TR/html4/";
xmlns:php="http://php.net/xsl";>
-
- <div class="yui-navset yui-navset-top" id="survey_edit_tabview">
- <h1>
- <xsl:value-of select="php:function('lang', 'condition
survey import')" />
- </h1>
+ <h2>
+ <xsl:value-of select="php:function('lang', 'condition survey
import')" />
+ </h2>
+ <div class="pure-control-group" >
+ <label>
+ <xsl:value-of select="php:function('lang', 'id')" />
+ </label>
+ <xsl:value-of select="survey/id"/>
+ </div>
- <xsl:variable name="action_url">
- <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.import')" />
- </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="location_data2!=''">
+ <xsl:call-template name="location_view2"/>
+ </xsl:when>
+ </xsl:choose>
- <form name="form" id="form" action="{$action_url}"
method="post" ENCTYPE="multipart/form-data">
- <dl>
- <dt>
- <label>
- <xsl:value-of
select="php:function('lang', 'id')" />
- </label>
- </dt>
- <dd>
- <xsl:value-of
select="survey/id"/>
- <input type="hidden" name="id"
value="{survey/id}"/>
- <input type="hidden"
name="step" value="{step}"/>
- <input type="hidden"
name="selected_sheet_id" value="{sheet_id}"/>
- <input type="hidden"
name="start_line" value="{start_line}"/>
- </dd>
+ <div class="pure-control-group" >
+ <label for="name">
+ <xsl:value-of select="php:function('lang', 'name')" />
+ </label>
+ <xsl:value-of select="survey/title" />
+ </div>
- <xsl:choose>
- <xsl:when
test="location_data2!=''">
- <xsl:call-template
name="location_view2"/>
- </xsl:when>
- </xsl:choose>
-
- <dt>
- <label for="name">
- <xsl:value-of
select="php:function('lang', 'name')" />
- </label>
- </dt>
- <dd>
- <xsl:value-of
select="survey/title" />
- </dd>
-
- <dt>
- <label>
- <xsl:value-of
select="php:function('lang', 'date')" />
- </label>
- </dt>
- <dd>
- <xsl:value-of
select="survey/report_date"/>
- </dd>
- </dl>
- <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
- <div class="yui-content">
- <xsl:choose>
- <xsl:when test="step=1">
- <xsl:call-template
name="import_step_1"/>
- </xsl:when>
- <xsl:when test="step=2">
- <xsl:call-template
name="import_step_2"/>
- </xsl:when>
- <xsl:when test="step=3">
- <xsl:call-template
name="import_step_3"/>
- </xsl:when>
- <xsl:when test="step=4">
- <xsl:call-template
name="import_step_4"/>
- </xsl:when>
- <xsl:otherwise>
- <dl
class="proplist-col">
- <dt>
- <label>
-
<xsl:value-of select="php:function('lang', 'finished')" />
- </label>
- </dt>
- </dl>
- </xsl:otherwise>
- </xsl:choose>
- </div>
-
- <dl class="proplist-col">
- <div class="form-buttons">
- <xsl:variable name="lang_submit">
- <xsl:value-of
select="lang_submit"/>
- </xsl:variable>
- <xsl:variable name="lang_cancel">
- <xsl:value-of
select="php:function('lang', 'cancel')" />
- </xsl:variable>
- <xsl:choose>
- <xsl:when
test="$lang_submit != ''">
- <input
type="submit" name="submit_step" value="{$lang_submit}" title =
"{$lang_submit}" />
- </xsl:when>
- </xsl:choose>
- <input class="button"
type="button" name="cancelButton" id ='cancelButton' value="{$lang_cancel}"
title = "{$lang_cancel}" onClick="document.cancel_form.submit();"/>
- </div>
- </dl>
- </form>
+ <div class="pure-control-group" >
+ <label>
+ <xsl:value-of select="php:function('lang', 'date')" />
+ </label>
+ <xsl:value-of select="survey/report_date"/>
+ </div>
+ <xsl:variable name="action_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.import')" />
+ </xsl:variable>
+ <form name="form" id="form" action="{$action_url}" method="post"
ENCTYPE="multipart/form-data" class="pure-form pure-form-aligned">
+ <input type="hidden" name="id" value="{survey/id}"/>
+ <input type="hidden" name="step" value="{step}"/>
+ <input type="hidden" name="selected_sheet_id"
value="{sheet_id}"/>
+ <input type="hidden" name="start_line" value="{start_line}"/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
+ <xsl:choose>
+ <xsl:when test="step=1">
+ <xsl:call-template
name="import_step_1"/>
+ </xsl:when>
+ <xsl:when test="step=2">
+ <xsl:call-template
name="import_step_2"/>
+ </xsl:when>
+ <xsl:when test="step=3">
+ <xsl:call-template
name="import_step_3"/>
+ </xsl:when>
+ <xsl:when test="step=4">
+ <xsl:call-template
name="import_step_4"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <dl class="proplist-col">
+ <dt>
+ <label>
+ <xsl:value-of
select="php:function('lang', 'finished')" />
+ </label>
+ </dt>
+ </dl>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
- <xsl:variable name="cancel_params">
- <xsl:text>menuaction:property.uicondition_survey.view,
id:</xsl:text>
- <xsl:value-of select="survey/id" />
- </xsl:variable>
- <xsl:variable name="cancel_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $cancel_params )" />
- </xsl:variable>
+ <dl class="proplist-col">
+ <div class="form-buttons">
+ <xsl:variable name="lang_submit">
+ <xsl:value-of select="lang_submit"/>
+ </xsl:variable>
+ <xsl:variable name="lang_cancel">
+ <xsl:value-of
select="php:function('lang', 'cancel')" />
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="$lang_submit != ''">
+ <input type="submit"
name="submit_step" value="{$lang_submit}" title = "{$lang_submit}" />
+ </xsl:when>
+ </xsl:choose>
+ <input class="button" type="button"
name="cancelButton" id ='cancelButton' value="{$lang_cancel}" title =
"{$lang_cancel}" onClick="document.cancel_form.submit();"/>
+ </div>
+ </dl>
+ </form>
- <form name="cancel_form" id="cancel_form"
action="{$cancel_url}" method="post">
- </form>
- <xsl:variable name="new_url">
- <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.add')" />
- </xsl:variable>
- <form name="new_form" id="new_form" action="{$new_url}"
method="post">
- </form>
+ <xsl:variable name="cancel_params">
+ <xsl:text>menuaction:property.uicondition_survey.view,
id:</xsl:text>
+ <xsl:value-of select="survey/id" />
+ </xsl:variable>
+ <xsl:variable name="cancel_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', $cancel_params )" />
+ </xsl:variable>
- <xsl:variable name="edit_params">
-
<xsl:text>menuaction:property.uicondition_survey.import, id:</xsl:text>
- <xsl:value-of select="survey/id" />
- </xsl:variable>
- <xsl:variable name="edit_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $edit_params )" />
- </xsl:variable>
+ <form name="cancel_form" id="cancel_form" action="{$cancel_url}"
method="post">
+ </form>
+ <xsl:variable name="new_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.add')" />
+ </xsl:variable>
+ <form name="new_form" id="new_form" action="{$new_url}" method="post">
+ </form>
- <form name="load_edit_form" id="load_edit_form"
action="{$edit_url}" method="post">
- </form>
+ <xsl:variable name="edit_params">
+ <xsl:text>menuaction:property.uicondition_survey.import,
id:</xsl:text>
+ <xsl:value-of select="survey/id" />
+ </xsl:variable>
+ <xsl:variable name="edit_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', $edit_params )" />
+ </xsl:variable>
+ <form name="load_edit_form" id="load_edit_form" action="{$edit_url}"
method="post">
+ </form>
+
</xsl:template>
<xsl:template name="import_step_1"
xmlns:formvalidator="http://www.w3.org/TR/html4/";
xmlns:php="http://php.net/xsl";>
- <dl class="proplist-col">
- <dt>
- <label>
+ <div id="step_1">
+ <div class="pure-control-group" >
+ <label for="name">
<xsl:value-of select="php:function('lang',
'upload file')"/>
</label>
- </dt>
- <dd>
<input type="file" name="import_file" size="40">
<xsl:attribute name="title">
<xsl:value-of
select="php:function('lang', 'Select file to upload')"/>
</xsl:attribute>
+ <xsl:attribute name="data-validation">
+ <xsl:text>required extension</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation-allowing">
+ <xsl:text>xls xlsx</xsl:text>
+ </xsl:attribute>
</input>
- </dd>
- </dl>
+ </div>
+ </div>
+ <div id="step_2"></div>
+ <div id="step_3"></div>
+ <div id="step_4"></div>
</xsl:template>
<xsl:template name="import_step_2"
xmlns:formvalidator="http://www.w3.org/TR/html4/";
xmlns:php="http://php.net/xsl";>
- <dl class="proplist-col">
- <dt>
- <label for="status">
+ <div id="step_1"></div>
+ <div id="step_2">
+ <div class="pure-control-group" >
+ <label>
<xsl:value-of select="php:function('lang',
'sheet')" />
</label>
- </dt>
- <dd>
- <select id="sheet_id" name="sheet_id">
+ <select id="sheet_id" name="sheet_id">
<xsl:apply-templates select="sheets/options"/>
</select>
- </dd>
- </dl>
+ </div>
+ </div>
+ <div id="step_3"></div>
+ <div id="step_4"></div>
+
</xsl:template>
<xsl:template name="import_step_3" xmlns:php="http://php.net/xsl";>
- <dl class="proplist-col">
+ <div id="step_1"></div>
+ <div id="step_2"></div>
+ <div id="step_3">
+ <div class="pure-control-group" >
- <dt>
<label for="status">
<xsl:value-of select="php:function('lang',
'sheet')" />
</label>
- </dt>
- <dd>
<xsl:for-each select="sheets/options">
<xsl:if test="selected = 'selected' or selected
= 1">
<xsl:value-of
disable-output-escaping="yes" select="name"/>
</xsl:if>
</xsl:for-each>
- </dd>
-
- <dt>
- <label for="status">
- <xsl:value-of select="php:function('lang',
'table')" />
- </label>
- </dt>
- <dd>
+ </div>
+ <div class="pure-control-group" >
<xsl:value-of disable-output-escaping="yes"
select="html_table"/>
- </dd>
- </dl>
+ </div>
+ </div>
+ <div id="step_4"></div>
</xsl:template>
<xsl:template name="import_step_4" xmlns:php="http://php.net/xsl";>
- <dl class="proplist-col">
- <dt>
- <label>
- <xsl:value-of select="php:function('lang',
'sheet')" />
- </label>
- </dt>
- <dd>
- <xsl:for-each select="sheets/options">
- <xsl:if test="selected = 'selected' or selected
= 1">
- <xsl:value-of
disable-output-escaping="yes" select="name"/>
- </xsl:if>
- </xsl:for-each>
- </dd>
- <dt>
- <label>
- <xsl:value-of select="php:function('lang',
'line')" />
- </label>
- </dt>
- <dd>
- <xsl:value-of select="start_line"/>
- </dd>
- <dt>
- <label>
- <xsl:value-of select="php:function('lang',
'columns')" />
- </label>
- </dt>
- <dd>
- <xsl:value-of disable-output-escaping="yes"
select="html_table"/>
- </dd>
- </dl>
+ <div id="step_1"></div>
+ <div id="step_2"></div>
+ <div id="step_3"></div>
+ <div id="step_4">
+ <div class="pure-control-group" >
+ <label>
+ <xsl:value-of
select="php:function('lang', 'sheet')" />
+ </label>
+ <xsl:for-each select="sheets/options">
+ <xsl:if test="selected = 'selected' or
selected = 1">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+ <div class="pure-control-group" >
+ <label>
+ <xsl:value-of
select="php:function('lang', 'line')" />
+ </label>
+ <xsl:value-of select="start_line"/>
+ </div>
+ <div class="pure-control-group" >
+ <label>
+ <xsl:value-of
select="php:function('lang', 'columns')" />
+ </label>
+ <xsl:value-of disable-output-escaping="yes"
select="html_table"/>
+ </div>
+ </div>
</xsl:template>
@@ -234,21 +222,21 @@
</xsl:template>
<xsl:template xmlns:php="http://php.net/xsl"; name="file_upload">
- <dt>
+ <dt>
<label>
<xsl:value-of select="php:function('lang', 'upload
file')"/>
</label>
- </dt>
- <dd>
- <input type="file" name="file" size="40">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'Select file to upload')"/>
- </xsl:attribute>
- </input>
- </dd>
- <xsl:choose>
- <xsl:when test="multiple_uploader!=''">
- <dt>
+ </dt>
+ <dd>
+ <input type="file" name="file" size="40">
+ <xsl:attribute name="title">
+ <xsl:value-of select="php:function('lang',
'Select file to upload')"/>
+ </xsl:attribute>
+ </input>
+ </dd>
+ <xsl:choose>
+ <xsl:when test="multiple_uploader!=''">
+ <dt>
<label>
<a href="javascript:fileuploader()">
<xsl:attribute name="title">
@@ -257,8 +245,8 @@
<xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
</a>
</label>
- </dt>
- </xsl:when>
- </xsl:choose>
+ </dt>
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14755] more fixes,
Sigurd Nes <=