[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13994] rental: datepicker in price-table
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [13994] rental: datepicker in price-table |
Date: |
Wed, 23 Sep 2015 09:18:40 +0000 |
Revision: 13994
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13994
Author: sigurdne
Date: 2015-09-23 09:18:40 +0000 (Wed, 23 Sep 2015)
Log Message:
-----------
rental: datepicker in price-table
Modified Paths:
--------------
branches/dev-syncromind/rental/inc/class.uicontract.inc.php
branches/dev-syncromind/rental/js/rental/contract.edit.js
branches/dev-syncromind/rental/templates/base/contract.xsl
Modified: branches/dev-syncromind/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uicontract.inc.php 2015-09-23
00:22:06 UTC (rev 13993)
+++ branches/dev-syncromind/rental/inc/class.uicontract.inc.php 2015-09-23
09:18:40 UTC (rev 13994)
@@ -2056,7 +2056,10 @@
'link_upload_document'
=> $link_upload_document,
- 'tabs'
=> phpgwapi_jquery::tabview_generate($tabs, $active_tab)
+ 'tabs'
=> phpgwapi_jquery::tabview_generate($tabs, $active_tab),
+
+ 'img_cal'
=>
json_encode($GLOBALS['phpgw']->common->image('phpgwapi','cal')),
+ 'dateformat'
=> str_ireplace(array('d', 'm', 'y'), array('dd', 'mm',
'yy'),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']),
);
//$appname = $this->location_info['name'];
Modified: branches/dev-syncromind/rental/js/rental/contract.edit.js
===================================================================
--- branches/dev-syncromind/rental/js/rental/contract.edit.js 2015-09-23
00:22:06 UTC (rev 13993)
+++ branches/dev-syncromind/rental/js/rental/contract.edit.js 2015-09-23
09:18:40 UTC (rev 13994)
@@ -52,22 +52,29 @@
date_start.each(function(i, obj)
{
- $( "#" + obj.id ).datepicker({
- dateFormat: 'dd/mm/yy',
+ $( "#" + obj.id ).datepicker({
+ beforeShow: function(input, inst)
+ {
+
alert('setDatePicker_price_item::date_start should open...');
+ console.log(inst);
+ // inst.dpDiv.css({marginTop:
-input.offsetHeight + 'px', marginLeft: input.offsetWidth + 'px'});
+ },
+ dateFormat: dateformat,
showWeek: true,
changeMonth: true,
changeYear: true,
showOn: "button",
showButtonPanel:true,
- buttonImage:
"/portico/phpgwapi/templates/base/images/cal.png",
- buttonText: "Select date",
+ buttonImage: img_cal,
+ buttonText: lang_select_date,
buttonImageOnly: true
+
});
$("#" + obj.id).on('change', function ()
{
changeDate_price_item(obj.id, $(this).val());
- });
+ });
});
var date_end = $('.date_end');
@@ -75,14 +82,20 @@
date_end.each(function(i, obj)
{
$( "#" + obj.id ).datepicker({
- dateFormat: 'dd/mm/yy',
+ beforeShow: function(input, inst)
+ {
+
alert('setDatePicker_price_item::date_end should open...');
+ console.log(inst);
+ // inst.dpDiv.css({marginTop:
-input.offsetHeight + 'px', marginLeft: input.offsetWidth + 'px'});
+ },
+ dateFormat: dateformat,
showWeek: true,
changeMonth: true,
changeYear: true,
showOn: "button",
showButtonPanel:true,
- buttonImage:
"/portico/phpgwapi/templates/base/images/cal.png",
- buttonText: "Select date",
+ buttonImage: img_cal,
+ buttonText: lang_select_date,
buttonImageOnly: true
});
Modified: branches/dev-syncromind/rental/templates/base/contract.xsl
===================================================================
--- branches/dev-syncromind/rental/templates/base/contract.xsl 2015-09-23
00:22:06 UTC (rev 13993)
+++ branches/dev-syncromind/rental/templates/base/contract.xsl 2015-09-23
09:18:40 UTC (rev 13994)
@@ -408,6 +408,9 @@
<script
type="text/javascript">
var
link_included_price_items = <xsl:value-of select="link_included_price_items"/>;
var
link_not_included_price_items = <xsl:value-of
select="link_not_included_price_items"/>;
+ var
img_cal = <xsl:value-of select="img_cal"/>;
+ var
dateformat = "<xsl:value-of select="dateformat"/>";
+ var
lang_select_date = "<xsl:value-of select="php:function('lang', 'select
date')"/>";
</script>
<div>
<xsl:for-each select="datatable_def">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13994] rental: datepicker in price-table,
Sigurd Nes <=