[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15263] logistic: fix table reference
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15263] logistic: fix table reference |
Date: |
Tue, 7 Jun 2016 10:59:34 +0000 (UTC) |
Revision: 15263
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15263
Author: sigurdne
Date: 2016-06-07 10:59:33 +0000 (Tue, 07 Jun 2016)
Log Message:
-----------
logistic: fix table reference
Modified Paths:
--------------
trunk/logistic/inc/class.uiactivity.inc.php
trunk/logistic/js/logistic/requirement_overview.js
trunk/logistic/js/logistic/resource_allocation.js
trunk/logistic/templates/base/allocation/book_resources.xsl
trunk/logistic/templates/base/css/base.css
trunk/logistic/templates/base/requirement/requirement_overview.xsl
Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2016-06-07 09:41:19 UTC (rev
15262)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2016-06-07 10:59:33 UTC (rev
15263)
@@ -670,7 +670,7 @@
$datatable_def[] = array
(
- 'container' => 'requirement-container',
+ 'container' => 'requirement-container_0',
'requestUrl' =>
json_encode(self::link(array('menuaction' => 'logistic.uirequirement.index',
'activity_id' => $activity_id,
'phpgw_return_as' => 'json'))),
'ColumnDefs' => $ColumnDefs0,
@@ -698,7 +698,7 @@
$datatable_def[] = array
(
- 'container' => 'allocation-container',
+ 'container' => 'allocation-container_0',
'requestUrl' => "''",
//json_encode(self::link(array('menuaction' =>
'logistic.uirequirement_resource_allocation.index', 'requirement_id' =>
$requirement_id, 'type' => "requirement_id", 'phpgw_return_as' => 'json'))),
'ColumnDefs' => $ColumnDefs1,
'data' => json_encode(array()),
Modified: trunk/logistic/js/logistic/requirement_overview.js
===================================================================
--- trunk/logistic/js/logistic/requirement_overview.js 2016-06-07 09:41:19 UTC
(rev 15262)
+++ trunk/logistic/js/logistic/requirement_overview.js 2016-06-07 10:59:33 UTC
(rev 15263)
@@ -30,7 +30,7 @@
var callback = function (result)
{
-
JqueryPortico.updateinlineTableHelper('requirement-container');
+
JqueryPortico.updateinlineTableHelper('requirement-container_0');
};
JqueryPortico.execute_ajax(requestUrl, callback, {}, 'POST',
'json');
}
@@ -61,8 +61,8 @@
var requestUrl2 =
phpGWLink('index.php', oArgs2, true);
-
JqueryPortico.updateinlineTableHelper('allocation-container', requestUrl2);
-
JqueryPortico.updateinlineTableHelper('requirement-container');
+
JqueryPortico.updateinlineTableHelper('allocation-container_0', requestUrl2);
+
JqueryPortico.updateinlineTableHelper('requirement-container_0');
}
},
error: function (XMLHttpRequest, textStatus,
errorThrown)
@@ -120,7 +120,7 @@
var requestUrl = phpGWLink('index.php', oArgs, true);
- JqueryPortico.updateinlineTableHelper('requirement-container',
requestUrl);
+ JqueryPortico.updateinlineTableHelper('requirement-container_0',
requestUrl);
}
@@ -134,6 +134,6 @@
var requestUrl = phpGWLink('index.php', oArgs, true);
- JqueryPortico.updateinlineTableHelper(oTable1, requestUrl);
+ JqueryPortico.updateinlineTableHelper('requirement-container_0',
requestUrl);
}
Modified: trunk/logistic/js/logistic/resource_allocation.js
===================================================================
--- trunk/logistic/js/logistic/resource_allocation.js 2016-06-07 09:41:19 UTC
(rev 15262)
+++ trunk/logistic/js/logistic/resource_allocation.js 2016-06-07 10:59:33 UTC
(rev 15263)
@@ -1,7 +1,7 @@
$(document).ready(function ()
{
- $("#requirement-container tr").on("click", function (e)
+ $("#requirement-container_0 tr").on("click", function (e)
{
var requirement_id = $('td', this).eq(0).text();
updateAllocationTable(requirement_id);
@@ -23,5 +23,5 @@
var requestUrl = phpGWLink('index.php', oArgs, true);
- JqueryPortico.updateinlineTableHelper('allocation-container',
requestUrl);
+ JqueryPortico.updateinlineTableHelper('allocation-container_0',
requestUrl);
}
Modified: trunk/logistic/templates/base/allocation/book_resources.xsl
===================================================================
--- trunk/logistic/templates/base/allocation/book_resources.xsl 2016-06-07
09:41:19 UTC (rev 15262)
+++ trunk/logistic/templates/base/allocation/book_resources.xsl 2016-06-07
10:59:33 UTC (rev 15263)
@@ -158,5 +158,4 @@
</form>
</div>
</div>
-<xsl:call-template name="jquery_phpgw_i18n"/>
</xsl:template>
Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css 2016-06-07 09:41:19 UTC (rev
15262)
+++ trunk/logistic/templates/base/css/base.css 2016-06-07 10:59:33 UTC (rev
15263)
@@ -763,7 +763,7 @@
padding: 20px;
}
-#datatable-container {
+#datatable-container_0 {
margin: 20px;
}
@@ -1971,7 +1971,7 @@
float: left;
}
-#choose-location #datatable-container{
+#choose-location #datatable-container_0{
margin: 20px 0;
}
@@ -2369,7 +2369,7 @@
margin-top: 0;
}
-#requirement-container .btn-sm {
+#requirement-container_0 .btn-sm {
border-color: #4378B1 #2663A3 #366CA4;
font-size: 12px;
padding: 1px 8px;
@@ -2380,7 +2380,7 @@
padding: 0;
}
-#requirement-container table td{
+#requirement-container_0 table td{
padding: 5px 0;
}
@@ -2398,7 +2398,7 @@
}
-#allocation-container .yui-dt-col-delete_link .yui-dt-liner {
+#allocation-container_0 .yui-dt-col-delete_link .yui-dt-liner {
text-align: center;
}
@@ -2417,11 +2417,11 @@
width: 136px;
}
-#sub-activities-container th div, #requirement-container th div {
+#sub-activities-container th div, #requirement-container_0 th div {
/*background: #6292C5;*/
}
-#sub-activities-container .yui-dt table, #requirement-container .yui-dt table {
+#sub-activities-container .yui-dt table, #requirement-container_0 .yui-dt
table {
/*border: 1px solid #98BFE8;*/
}
@@ -2429,14 +2429,14 @@
width: 800px;
}
-#requirement-container .yui-dt table, #allocation-container .yui-dt table {
+#requirement-container_0 .yui-dt table, #allocation-container_0 .yui-dt table {
width: 1000px;
}
#sub-activities-container th a, #sub-activities-container th span,
-#requirement-container th a, #requirement-container th span,
-#allocation-container th a, #allocation-container th span,
-#datatable-container th a, #datatable-container th span
+#requirement-container_0 th a, #requirement-container_0 th span,
+#allocation-container_0 th a, #allocation-container_0 th span,
+#datatable-container_0 th a, #datatable-container_0 th span
{
/*color: #F9FCFE;*/
font-weight: bold;
@@ -2465,6 +2465,6 @@
text-decoration: underline;
}
-#requirement-container .btn-sm.cancel {
+#requirement-container_0 .btn-sm.cancel {
border: 1px solid #CCCCCC;
}
Modified: trunk/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_overview.xsl
2016-06-07 09:41:19 UTC (rev 15262)
+++ trunk/logistic/templates/base/requirement/requirement_overview.xsl
2016-06-07 10:59:33 UTC (rev 15263)
@@ -27,7 +27,7 @@
<div style="clear:both;" id="paging"></div>
<div style="margin-bottom: 40px;">
<xsl:for-each select="datatable_def">
- <xsl:if test="container =
'requirement-container'">
+ <xsl:if test="container =
'requirement-container_0'">
<xsl:call-template
name="table_setup">
<xsl:with-param
name="container" select ='container'/>
<xsl:with-param
name="requestUrl" select ='requestUrl' />
@@ -46,7 +46,7 @@
<!-- // Needed for case of only one checkbox in
datatable-->
<input type='hidden' name='assign_requirement'
value = '0'/>
<xsl:for-each select="datatable_def">
- <xsl:if test="container =
'allocation-container'">
+ <xsl:if test="container =
'allocation-container_0'">
<xsl:call-template
name="table_setup">
<xsl:with-param
name="container" select ='container'/>
<xsl:with-param
name="requestUrl" select ='requestUrl' />
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15263] logistic: fix table reference,
sigurdne <=