[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14823] Merge 14819:14822 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14823] Merge 14819:14822 from trunk |
|
Date: |
Tue, 08 Mar 2016 14:48:03 +0000 |
Revision: 14823
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14823
Author: sigurdne
Date: 2016-03-08 14:48:03 +0000 (Tue, 08 Mar 2016)
Log Message:
-----------
Merge 14819:14822 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/templates/base/css/base.css
branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-2_0-branch/property/js/portico/wo_hour.index.js
Property Changed:
----------------
branches/Version-2_0-branch/
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
+ /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
Modified: branches/Version-2_0-branch/phpgwapi/templates/base/css/base.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/css/base.css
2016-03-08 14:46:59 UTC (rev 14822)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/css/base.css
2016-03-08 14:48:03 UTC (rev 14823)
@@ -1,3 +1,4 @@
+/*
body, div, input, p, select, textarea
{
font-family: "Liberation Sans", Verdana, sans-serif;
@@ -2,3 +3,3 @@
font-size: 1em;
-}
+}*/
/*
@@ -235,3 +236,10 @@
float: right;
margin-top: -1.4em;
}
+.home_portal_controls
+{
+ float: right;
+ text-align: right;
+ padding: 0px 0px 0px 0px;
+ width: 15px;
+}
Modified: branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
2016-03-08 14:46:59 UTC (rev 14822)
+++ branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
2016-03-08 14:48:03 UTC (rev 14823)
@@ -54,6 +54,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
+ $stylesheets[] = "/phpgwapi/templates/base/css/base.css";
$stylesheets[] = "/phpgwapi/templates/portico/css/base.css";
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
{
Modified: branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2016-03-08 14:46:59 UTC (rev 14822)
+++ branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2016-03-08 14:48:03 UTC (rev 14823)
@@ -685,6 +685,7 @@
{
return $this->query();
}
+ phpgwapi_jquery::load_widget('numberformat');
$appname = lang('Workorder');
$function_msg = lang('list hours');
@@ -918,6 +919,16 @@
'sortable' => ($uicols['sortable'][$k])
? true : false,
'hidden' => ($uicols['input_type'][$k]
== 'hidden') ? true : false
);
+ switch ($uicols['name'][$k])
+ {
+ case 'billperae':
+ case 'cost':
+ case 'deviation':
+ case 'result':
+ case 'quantity':
+ $params['formatter'] =
'JqueryPortico.FormatterAmount2';
+ break;
+ }
array_push($data['datatable']['field'],
$params);
}
@@ -1351,8 +1362,8 @@
$proc = new XSLTProcessor;
$proc->registerPHPFunctions(); // enable php
functions
$proc->importStyleSheet($xsl); // attach the
xsl rules
- $css = file_get_contents( PHPGW_SERVER_ROOT
. "/phpgwapi/templates/pure/css/pure-min.css");
- $css .= file_get_contents( PHPGW_SERVER_ROOT
. "/phpgwapi/templates/pure/css/pure-extension.css");
+ $css = file_get_contents(PHPGW_SERVER_ROOT .
"/phpgwapi/templates/pure/css/pure-min.css");
+ $css .= file_get_contents(PHPGW_SERVER_ROOT .
"/phpgwapi/templates/pure/css/pure-extension.css");
$header = <<<HTML
<!DOCTYPE HTML>
Modified: branches/Version-2_0-branch/property/js/portico/wo_hour.index.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/wo_hour.index.js
2016-03-08 14:46:59 UTC (rev 14822)
+++ branches/Version-2_0-branch/property/js/portico/wo_hour.index.js
2016-03-08 14:48:03 UTC (rev 14823)
@@ -3,17 +3,17 @@
var api = oTable.api();
var data = api.ajax.json();
- $('#value_sum_calculation').html(data.table_sum.value_sum_calculation);
- $('#sum_deviation').html(data.table_sum.sum_deviation);
- $('#sum_result').html(data.table_sum.sum_result);
+
$('#value_sum_calculation').html($.number(data.table_sum.value_sum_calculation,
2, ',', '.'));
+ $('#sum_deviation').html($.number(data.table_sum.sum_deviation, 2, ',',
'.'));
+ $('#sum_result').html($.number(data.table_sum.sum_result, 2, ',', '.'));
- $('#value_addition_rs').html(data.table_sum.value_addition_rs);
+ $('#value_addition_rs').html($.number(data.table_sum.value_addition_rs,
2, ',', '.'));
-
$('#value_addition_percentage').html(data.table_sum.value_addition_percentage);
+
$('#value_addition_percentage').html($.number(data.table_sum.value_addition_percentage,
2, ',', '.'));
- $('#value_sum_tax').html(data.table_sum.value_sum_tax);
+ $('#value_sum_tax').html($.number(data.table_sum.value_sum_tax, 2, ',',
'.'));
- $('#value_total_sum').html(data.table_sum.value_total_sum);
+ $('#value_total_sum').html($.number(data.table_sum.value_total_sum, 2,
',', '.'));
var project_id = data.workorder_data.project_id;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14823] Merge 14819:14822 from trunk,
Sigurd Nes <=