dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11047
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3079: js cleanup in module dhis-web-maintenance-dataset
------------------------------------------------------------
revno: 3079
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-03-18 15:20:18 +0100
message:
js cleanup in module dhis-web-maintenance-dataset
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/compulsoryDataElementsForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/mobileDatasetList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortDataSetForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortSectionForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.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-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/compulsoryDataElementsForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/compulsoryDataElementsForm.vm 2010-12-05 19:34:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/compulsoryDataElementsForm.vm 2011-03-18 14:20:18 +0000
@@ -1,12 +1,9 @@
-
<script type="text/javascript">
-
-function saveCompulsoryDataElements()
-{
- selectAllById( "selectedOperands" );
- document.getElementById( "compulsoryDataElementsForm" ).submit();
-}
-
+ function saveCompulsoryDataElements()
+ {
+ selectAllById( "selectedOperands" );
+ document.getElementById( "compulsoryDataElementsForm" ).submit();
+ }
</script>
<h3>$i18n.getString( "edit_compulsory_data_elements" )</h3>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm 2011-03-18 14:20:18 +0000
@@ -20,4 +20,4 @@
</tr>
</table>
-</form>
\ No newline at end of file
+</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2011-03-07 12:18:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2011-03-18 14:20:18 +0000
@@ -1,3 +1,17 @@
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'listTable' );
+ leftBar.showAnimated();
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete" ) , "'" )';
+
+ function showsection(dataSetId)
+ {
+ window.location.href="section.action?dataSetId=" + dataSetId;
+ }
+</script>
+
<h3>$i18n.getString( "dataset_management" )</h3>
<table class="mainPageTable">
@@ -72,19 +86,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
-
- function showsection(dataSetId)
- {
- window.location.href="section.action?dataSetId=" + dataSetId;
- }
-
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete" ) , "'" )';
-
- jQuery(document).ready(function(){
- tableSorter( 'listTable' );
- leftBar.showAnimated();
- });
-
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm 2010-12-09 22:05:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm 2011-03-18 14:20:18 +0000
@@ -1,28 +1,35 @@
- <h3>$i18n.getString( "section_grey_field_managment" ) #openHelp( "grey_field" )</h3>
+<script type="text/javascript">
+ var i18n_enable = '$encoder.jsEscape( $i18n.getString( "enable" ) , "'" )';
+ var i18n_disable = '$encoder.jsEscape( $i18n.getString( "disable" ) , "'" )';
+</script>
+
+<h3>$i18n.getString( "section_grey_field_managment" ) #openHelp( "grey_field" )</h3>
- <table id="detailsList">
- <col/> ## Labels
- <col/> ## Input
- <thead>
- <tr>
- <th colspan="2">$i18n.getString( "section_details" )</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><b>$section.name</b></td>
- </tr>
- <tr>
- <td><label>$i18n.getString( "dataset" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><b>$section.dataSet.name</b></td>
- </tr>
- <tr>
- <td><label>$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><b>$categoryCombo.name</b></td>
- </tr>
+<table id="detailsList">
+ <col/> ## Labels
+ <col/> ## Input
+ <thead>
+ <tr>
+ <th colspan="2">$i18n.getString( "section_details" )</th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr>
+ <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><b>$section.name</b></td>
+ </tr>
+ <tr>
+ <td><label>$i18n.getString( "dataset" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><b>$section.dataSet.name</b></td>
+ </tr>
+ <tr>
+ <td><label>$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><b>$categoryCombo.name</b></td>
+ </tr>
</tbody>
- </table>
+</table>
+
<br/>
<hr style="clear:both"/>
<br/>
@@ -42,8 +49,3 @@
<p>
<input type="button" onclick="window.location.href='section.action'" value="$i18n.getString( 'done' )"/>
</p>
-
-<script type="text/javascript">
- var i18n_enable = '$encoder.jsEscape( $i18n.getString( "enable" ) , "'" )';
- var i18n_disable = '$encoder.jsEscape( $i18n.getString( "disable" ) , "'" )';
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/mobileDatasetList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/mobileDatasetList.vm 2011-03-03 06:16:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/mobileDatasetList.vm 2011-03-18 14:20:18 +0000
@@ -47,4 +47,4 @@
</tr>
</tbody>
</table>
-</form>
\ No newline at end of file
+</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm 2010-10-29 15:38:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm 2011-03-18 14:20:18 +0000
@@ -52,4 +52,4 @@
</tr>
#end
-</table>
\ No newline at end of file
+</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm 2011-01-22 22:41:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm 2011-03-18 14:20:18 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_section" ) , "'" )';
+ var i18n_please_select_dataset = '$encoder.jsEscape( $i18n.getString( "please_select_dataset" ) , "'" )';
+ var i18n_please_select_dataset_categorycombo = '$encoder.jsEscape( $i18n.getString( "please_select_dataset_or_categorycombo" ) , "'" )';
+</script>
+
<h3>$i18n.getString( "section_management" ) #openHelp( "dataset_sections" )</h3>
<table class="mainPageTable">
@@ -78,13 +84,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_section" ) , "'" )';
- var i18n_please_select_dataset = '$encoder.jsEscape( $i18n.getString( "please_select_dataset" ) , "'" )';
- var i18n_please_select_dataset_categorycombo = '$encoder.jsEscape( $i18n.getString( "please_select_dataset_or_categorycombo" ) , "'" )';
-
- jQuery(document).ready(function(){
- //TODO: nothing
- });
-</script>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortDataSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortDataSetForm.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortDataSetForm.vm 2011-03-18 14:20:18 +0000
@@ -1,3 +1,10 @@
+<script type="text/javascript">
+ function submitForm()
+ {
+ selectAllById( "dataSets" );
+ document.getElementById( "sortOrderForm" ).submit();
+ }
+</script>
<h3>$i18n.getString( "data_set_sort_order" )</h3>
@@ -24,11 +31,3 @@
</p>
</form>
-
-<script type="text/javascript">
- function submitForm()
- {
- selectAllById( "dataSets" );
- document.getElementById( "sortOrderForm" ).submit();
- }
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortSectionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortSectionForm.vm 2010-11-29 16:43:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortSectionForm.vm 2011-03-18 14:20:18 +0000
@@ -1,3 +1,10 @@
+<script type="text/javascript">
+ function submitForm()
+ {
+ selectAllById( "sections" );
+ document.getElementById( "sortOrderForm" ).submit();
+ }
+</script>
<h3>$i18n.getString( "section_sort_order" )</h3>
@@ -24,11 +31,3 @@
</p>
</form>
-
-<script type="text/javascript">
- function submitForm()
- {
- selectAllById( "sections" );
- document.getElementById( "sortOrderForm" ).submit();
- }
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm 2011-03-17 12:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm 2011-03-18 14:20:18 +0000
@@ -24,7 +24,7 @@
}
</script>
-<style>
+<style type="text/css">
#dataElementSelection {
padding: 0.5em;
position:fixed;
@@ -59,10 +59,8 @@
display:block;
color:red;
}
-
</style>
-
<h3>$i18n.getString( "dataentryform_management" ) #openHelp( "custom_forms" )</h3>
<form id="saveDataEntryForm" name="saveDataEntryForm" action="saveDataEntryForm.action" method="post">
