dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #23099
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11227: Minor UI repair to dataMart date selection.
------------------------------------------------------------
revno: 11227
committer: Bob Jolliffe <bobjolliffe@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-06-18 21:42:30 +0100
message:
Minor UI repair to dataMart date selection.
Addresses https://bugs.launchpad.net/dhis2/+bug/1192321
modified:
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataMart.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataMartForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataMart.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataMart.js 2013-05-27 15:33:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataMart.js 2013-06-18 20:42:30 +0000
@@ -35,7 +35,7 @@
function toggleDataMart()
{
- if ( $( '#dataMart' ).is( ':checked' ) )
+ if ( !$( '#dataMart' ).is( ':checked' ) )
{
$( '.dataMart' ).attr( 'disabled', 'disabled' );
}
@@ -43,4 +43,4 @@
{
$( '.dataMart' ).removeAttr( 'disabled' );
}
-}
\ No newline at end of file
+}
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataMartForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataMartForm.vm 2013-05-27 15:33:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataMartForm.vm 2013-06-18 20:42:30 +0000
@@ -15,8 +15,8 @@
<div class="settingHeader">$i18n.getString( "data_mart" )</div>
<div class="setting">
- <input type="checkbox" id="dataMart" />
- <label for="dataMart" onclick="toggleDataMart()">$i18n.getString( "data_mart_tables_update" )</label>
+ <input type="checkbox" id="dataMart" onclick="toggleDataMart()"/>
+ <label for="dataMart">$i18n.getString( "data_mart_tables_update" )</label>
</div>
<div class="settingLabel">$i18n.getString( "aggregation_period_types" )</div>