|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [14826] Merge 14823:14825 from trunk |
| Date: | Fri, 11 Mar 2016 08:02:12 +0000 |
Revision: 14826
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14826
Author: sigurdne
Date: 2016-03-11 08:02:11 +0000 (Fri, 11 Mar 2016)
Log Message:
-----------
Merge 14823:14825 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/booking/inc/class.uicommon.inc.php
branches/Version-2_0-branch/booking/templates/base/application_edit.xsl
branches/Version-2_0-branch/booking/templates/base/application_new.xsl
branches/Version-2_0-branch/booking/templates/base/event_new.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/application_edit.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/application_new.xsl
branches/Version-2_0-branch/property/inc/class.uitts.inc.php
branches/Version-2_0-branch/property/js/portico/tts.view.js
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
branches/Version-2_0-branch/bookingfrontend/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732
+ /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825
Modified: branches/Version-2_0-branch/booking/inc/class.uicommon.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uicommon.inc.php
2016-03-11 07:59:57 UTC (rev 14825)
+++ branches/Version-2_0-branch/booking/inc/class.uicommon.inc.php
2016-03-11 08:02:11 UTC (rev 14826)
@@ -744,10 +744,10 @@
$html = 'var html = "<div
class=\'date-container\'>"+
"<a class=\'close-btn btnclose\'
href=\'javascript:void(0);\'>-</a>"+
"<dt><label
for=\'new_start_date_"+this.counter+"\'>' . $lang_from . '</label></dt>"+
- "<dd><input class=\'new_datepicker time\'
name=\'from_[]\' id=\'new_start_date_"+this.counter+"\' type=\'text\'>"+
+ "<dd><input class=\'new_datepicker time\'
readonly=\'readonly\' name=\'from_[]\' id=\'new_start_date_"+this.counter+"\'
type=\'text\'>"+
"</input></dd>"+
"<dt><label for=\'new_end_date_"+this.counter+"\'
>' . $lang_to . '</label></dt>"+
- "<dd><input class=\'new_datepicker time\'
name=\'to_[]\' id=\'new_end_date_"+this.counter+"\' type=\'text\'>"+
+ "<dd><input class=\'new_datepicker time\'
readonly=\'readonly\' name=\'to_[]\' id=\'new_end_date_"+this.counter+"\'
type=\'text\'>"+
"</input></dd>"+
"</div>"';
}
@@ -757,12 +757,12 @@
"<a class=\'close-btn
btnclose\' href=\'javascript:void(0);\'>-</a>"+
"<div
class=\'pure-control-group\'>"+
"<label
for=\'new_start_date_"+this.counter+"\'><h4>' . $lang_from . '</h4></label>"+
- "<input
class=\'new_datepicker time pure-input-2-3\' name=\'from_[]\'
id=\'new_start_date_"+this.counter+"\' type=\'text\'>"+
+ "<input
class=\'new_datepicker time pure-input-2-3\' readonly=\'readonly\'
name=\'from_[]\' id=\'new_start_date_"+this.counter+"\' type=\'text\'>"+
"</input>"+
"</div>"+
"<div
class=\'pure-control-group\'>"+
"<label
for=\'new_end_date_"+this.counter+"\' ><h4>' . $lang_to . '</h4></label>"+
- "<input
class=\'new_datepicker time pure-input-2-3\' name=\'to_[]\'
id=\'new_end_date_"+this.counter+"\' type=\'text\'>"+
+ "<input
class=\'new_datepicker time pure-input-2-3\' readonly=\'readonly\'
name=\'to_[]\' id=\'new_end_date_"+this.counter+"\' type=\'text\'>"+
"</input>"+
"</div>"+
"</div>"';
Modified:
branches/Version-2_0-branch/booking/templates/base/application_edit.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/application_edit.xsl
2016-03-11 07:59:57 UTC (rev 14825)
+++ branches/Version-2_0-branch/booking/templates/base/application_edit.xsl
2016-03-11 08:02:11 UTC (rev 14826)
@@ -166,6 +166,10 @@
<xsl:attribute name="value">
<xsl:value-of select="from_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</div>
<div class="pure-control-group">
@@ -176,6 +180,10 @@
<xsl:attribute name="value">
<xsl:value-of select="to_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</div>
</div>
@@ -191,6 +199,10 @@
<xsl:attribute name="value">
<xsl:value-of select="from_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</div>
<div class="pure-control-group">
@@ -201,6 +213,10 @@
<xsl:attribute name="value">
<xsl:value-of select="to_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</div>
</div>
Modified: branches/Version-2_0-branch/booking/templates/base/application_new.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/application_new.xsl
2016-03-11 07:59:57 UTC (rev 14825)
+++ branches/Version-2_0-branch/booking/templates/base/application_new.xsl
2016-03-11 08:02:11 UTC (rev 14826)
@@ -227,6 +227,9 @@
<xsl:attribute name="value">
<xsl:value-of select="from_" />
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
</input>
</div>
<div class="pure-control-group">
@@ -245,6 +248,9 @@
<xsl:attribute name="value">
<xsl:value-of select="to_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
</input>
</div>
</div>
@@ -260,6 +266,9 @@
<xsl:attribute name="value">
<xsl:value-of select="from_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
</input>
</div>
<div class="pure-control-group">
@@ -278,6 +287,9 @@
<xsl:attribute name="value">
<xsl:value-of select="to_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
</input>
</div>
</div>
Modified: branches/Version-2_0-branch/booking/templates/base/event_new.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/event_new.xsl
2016-03-11 07:59:57 UTC (rev 14825)
+++ branches/Version-2_0-branch/booking/templates/base/event_new.xsl
2016-03-11 08:02:11 UTC (rev 14826)
@@ -162,6 +162,10 @@
<xsl:attribute name="value">
<xsl:value-of select="from_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</div>
<div class="pure-control-group">
@@ -172,6 +176,10 @@
<xsl:attribute name="value">
<xsl:value-of select="to_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</div>
</div>
@@ -187,6 +195,10 @@
<xsl:attribute name="value">
<xsl:value-of select="from_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</div>
<div class="pure-control-group">
@@ -197,6 +209,10 @@
<xsl:attribute name="value">
<xsl:value-of select="to_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</div>
</div>
Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808
+ /branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/application_edit.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/application_edit.xsl
2016-03-11 07:59:57 UTC (rev 14825)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/application_edit.xsl
2016-03-11 08:02:11 UTC (rev 14826)
@@ -185,6 +185,10 @@
<xsl:attribute name="value">
<xsl:value-of select="from_" />
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</dd>
<dt>
@@ -197,6 +201,10 @@
<xsl:attribute name="value">
<xsl:value-of select="to_" />
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</dd>
</div>
@@ -214,6 +222,10 @@
<xsl:attribute name="value">
<xsl:value-of select="from_" />
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</dd>
<dt>
@@ -226,6 +238,10 @@
<xsl:attribute name="value">
<xsl:value-of select="to_" />
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</dd>
</div>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/application_new.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/application_new.xsl
2016-03-11 07:59:57 UTC (rev 14825)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/application_new.xsl
2016-03-11 08:02:11 UTC (rev 14826)
@@ -239,6 +239,9 @@
<xsl:attribute name="value">
<xsl:value-of select="from_" />
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
</input>
</dd>
<dt>
@@ -251,6 +254,9 @@
<xsl:attribute name="value">
<xsl:value-of select="to_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
</input>
</dd>
</div>
@@ -268,6 +274,10 @@
<xsl:attribute name="value">
<xsl:value-of select="from_" />
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</dd>
<dt>
@@ -280,6 +290,10 @@
<xsl:attribute name="value">
<xsl:value-of select="to_"/>
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
</dd>
</div>
Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2016-03-11 07:59:57 UTC (rev 14825)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2016-03-11 08:02:11 UTC (rev 14826)
@@ -2408,7 +2408,7 @@
'ColumnDefs' => array(array('key' => 'period',
'label' => lang('period'), 'sortable' => true,
'resizeable' => true),
array('key' => 'amount', 'label' =>
lang('amount'), 'sortable' => true, 'resizeable' => true,
- 'formatter' =>
'FormatterAmount2'),
+ 'formatter' =>
'JqueryPortico.FormatterAmount2'),
array('key' => 'remark', 'label' =>
lang('remark'), 'sortable' => false, 'resizeable' => true)),
'data' => json_encode($budgets),
'config' => array(
@@ -2424,7 +2424,7 @@
'ColumnDefs' => array(array('key' => 'period',
'label' => lang('period'), 'sortable' => true,
'resizeable' => true),
array('key' => 'amount', 'label' =>
lang('amount'), 'sortable' => true, 'resizeable' => true,
- 'formatter' =>
'FormatterAmount2'),
+ 'formatter' =>
'JqueryPortico.FormatterAmount2'),
array('key' => 'remark', 'label' =>
lang('remark'), 'sortable' => false, 'resizeable' => true)),
'data' => json_encode($payments),
'config' => array(
@@ -2641,6 +2641,7 @@
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab)
);
+ phpgwapi_jquery::load_widget('numberformat');
self::add_javascript('property', 'portico',
'tts.view.js');
$this->_insert_custom_js();
Modified: branches/Version-2_0-branch/property/js/portico/tts.view.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/tts.view.js 2016-03-11
07:59:57 UTC (rev 14825)
+++ branches/Version-2_0-branch/property/js/portico/tts.view.js 2016-03-11
08:02:11 UTC (rev 14826)
@@ -25,7 +25,7 @@
return intVal(a) + intVal(b);
}) : 0;
- $(api.column(col).footer()).html("<div align=\"right\">" +
pageTotal + "</div>");
+ $(api.column(col).footer()).html("<div align=\"right\">" +
$.number(pageTotal, 2, ',', '.') + "</div>");
});
};
@@ -53,7 +53,7 @@
return intVal(a) + intVal(b);
}) : 0;
- $(api.column(col).footer()).html("<div align=\"right\">" +
pageTotal + "</div>");
+ $(api.column(col).footer()).html("<div align=\"right\">" +
$.number(pageTotal, 2, ',', '.') + "</div>");
});
};
@@ -64,10 +64,6 @@
return "<center>" + oData[key] + "</center>";
};
-var FormatterAmount2 = function (key, oData)
-{
- return "<div align=\"right\">" + oData[key] + "</div>";
-};
/********************************************************************************/
| [Prev in Thread] | Current Thread | [Next in Thread] |