dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12176
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3684: minor cosmetic fixes
------------------------------------------------------------
revno: 3684
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-05-20 13:01:54 +0200
message:
minor cosmetic fixes
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js
--
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-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2011-05-19 16:03:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2011-05-20 11:01:54 +0000
@@ -111,19 +111,6 @@
</tr>
</thead>
<tbody>
- <tr>
- <td>
- </td>
- <td>[$i18n.getString( "group" )]</td>
- <td></td>
- </tr>
-
- <tr>
- <td></td>
- <td>[$i18n.getString( "name" )]</td>
- <td></td>
- </tr>
-
<tr>
<td>
<select id="availableDataElementsList" multiple="multiple" style="height: 200px; width: 100%;"></select>
@@ -135,7 +122,7 @@
<input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisPaging_moveAll( 'dataElementsSelectedList' );"/>
</td>
<td>
- <select id="dataElementsSelectedList" name="dataElementsSelectedList" multiple="multiple" style="min-width:25em;height:20em"></select>
+ <select id="dataElementsSelectedList" name="dataElementsSelectedList" multiple="multiple" style="height: 100%; width: 100%;"></select>
</td>
</tr>
</tbody>
@@ -157,19 +144,6 @@
<tbody>
<tr>
<td>
- </td>
- <td>$i18n.getString( "group" )</td>
- <td></td>
- </tr>
-
- <tr>
- <td></td>
- <td>$i18n.getString( "name" )</td>
- <td></td>
- </tr>
-
- <tr>
- <td>
<select id="availableIndicatorsList" multiple="multiple" style="height: 200px; width: 100%;"></select>
</td>
<td>
@@ -179,7 +153,7 @@
<input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisPaging_moveAll( 'indicatorsSelectedList' );"/>
</td>
<td>
- <select id="indicatorsSelectedList" name="indicatorsSelectedList" multiple="multiple" style="min-width:20em;height:20em"></select>
+ <select id="indicatorsSelectedList" name="indicatorsSelectedList" multiple="multiple" style="height: 100%; width: 100%;"></select>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2011-05-19 17:12:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2011-05-20 11:01:54 +0000
@@ -136,18 +136,6 @@
<tbody>
<tr>
- <td></td>
- <td>$i18n.getString( "group" )</td>
- <td></td>
- </tr>
-
- <tr>
- <td></td>
- <td>$i18n.getString( "name" )</td>
- <td></td>
- </tr>
-
- <tr>
<td>
<select id="availableDataElementsList" multiple="multiple" style="height: 200px; width: 100%;"></select>
</td>
@@ -158,7 +146,7 @@
<input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisPaging_moveAll( 'dataElementsSelectedList' );"/>
</td>
<td>
- <select id="dataElementsSelectedList" name="dataElementsSelectedList" multiple="multiple" style="min-width:20em;height:20em">
+ <select id="dataElementsSelectedList" name="dataElementsSelectedList" multiple="multiple" style="height: 100%; width: 100%;">
#foreach ( $availableDataElement in $dataElements )
<option value="$availableDataElement.id">$encoder.htmlEncode( $availableDataElement.name )</option>
#end
@@ -185,19 +173,6 @@
<tbody>
<tr>
<td>
- </td>
- <td>$i18n.getString( "group" )</td>
- <td></td>
- </tr>
-
- <tr>
- <td></td>
- <td>$i18n.getString( "name" )</td>
- <td></td>
- </tr>
-
- <tr>
- <td>
<select id="availableIndicatorsList" multiple="multiple" style="height: 200px; width: 100%;"></select>
</td>
<td>
@@ -207,7 +182,7 @@
<input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisPaging_moveAll( 'indicatorsSelectedList' );"/>
</td>
<td>
- <select id="indicatorsSelectedList" name="indicatorsSelectedList" multiple="multiple" style="min-width:20em;height:20em">
+ <select id="indicatorsSelectedList" name="indicatorsSelectedList" multiple="multiple" style="height: 100%; width: 100%;">
#foreach ( $availableIndicator in $indicators )
<option value="$availableIndicator.id">$encoder.htmlEncode( $availableIndicator.name )</option>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js 2011-05-19 16:03:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js 2011-05-20 11:01:54 +0000
@@ -11,9 +11,7 @@
function dhisPaging_moveAll(sourceId)
{
- var jqSource = jQuery("#" + sourceId);
- jqSource.find("option").attr("selected", "selected");
- jqSource.dblclick();
+ jQuery("#" + sourceId).find("option").attr("selected", "selected").dblclick();
}
function dataElementsSelectedList_dblclick(e) {
@@ -38,7 +36,6 @@
delete settings.params.removeDataElements;
}
- jQuery("#availableDataElementsList").data("settings", settings);
jQuery("#availableDataElementsList").dhisPaging("load", "availableDataElementsList");
}
@@ -65,7 +62,6 @@
delete settings.params.removeDataElements;
}
- jQuery("#availableDataElementsList").data("settings", settings);
jQuery("#availableDataElementsList").dhisPaging("load", "availableDataElementsList");
}