dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8053
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-09-12 17:23:57 +0200
message:
  Cleanup
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js
  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/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2012-07-12 09:32:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2012-09-12 15:23:57 +0000
@@ -88,4 +88,5 @@
 compact=Compact
 none=None
 allow_future_periods=Allow future periods
-skip_aggregation=Skip aggregation
\ No newline at end of file
+skip_aggregation=Skip aggregation
+insert_data_elements=Insert data elements
\ 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/javascript/viewDataEntryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js	2012-09-11 14:07:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js	2012-09-12 15:23:57 +0000
@@ -28,16 +28,16 @@
 	$("#indicatorInsertButton").click(insertIndicator);
 
 	$("#selectionDialog").bind("dialogopen", function(event, ui) {
-		$("#showSelectionBoxButton").button("disable");
+		$("#insertDataElementsButton").button("disable");
 	});
 
 	$("#selectionDialog").bind("dialogclose", function(event, ui) {
-		$("#showSelectionBoxButton").button("enable");
+		$("#insertDataElementsButton").button("enable");
 	});
 
-	$("#showSelectionBoxButton").button("disable");
+	$("#insertDataElementsButton").button("disable");
 
-	$("#showSelectionBoxButton").click(function() {
+	$("#insertDataElementsButton").click(function() {
 		$("#selectionDialog").dialog("open");
 	});
 	
@@ -84,7 +84,7 @@
 	$("#insertButton").button("option", "icons", { primary: "ui-icon-plusthick" });
 	$("#saveButton").button("option", "icons", { primary: "ui-icon-disk" });
 	$("#saveCloseButton").button("option", "icons", { primary: "ui-icon-disk" });
-	$("#showSelectionBoxButton").button("option", "icons", { primary: "ui-icon-newwin" });
+	$("#insertDataElementsButton").button("option", "icons", { primary: "ui-icon-newwin" });
 	$("#cancelButton").button("option", "icons", { primary: "ui-icon-cancel" });
 	$("#delete").button("option", "icons", { primary: "ui-icon-trash" });
 	

=== 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	2012-09-11 14:07:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2012-09-12 15:23:57 +0000
@@ -89,11 +89,11 @@
     </tr>
     <tr>
       <td>
-	    <button type="button" id="saveButton" name="save" onclick="validateDataEntryForm( false )">$i18n.getString( 'save' )</button>
-        <button type="button" id="saveCloseButton" name="saveClose" onclick="validateDataEntryForm( true )">$i18n.getString( 'save_close' )</button>
-        <button type="button" id="cancelButton" name="cancel" onclick="window.location.href='dataSet.action'">$i18n.getString( 'cancel' )</button>&nbsp;&nbsp;<span style="color:#606060">|</span>&nbsp;
-        <button type="button" id="showSelectionBoxButton" name="showselectionbox">$i18n.getString( 'show_selection_box' )</button>&nbsp;&nbsp;<span style="color:#606060">|</span>&nbsp;
-        <button type="button" id="delete" name="delete" onclick="removeDataEntryForm( '$dataSet.id', '$dataEntryForm.id', '$dataEntryForm.name' )">$i18n.getString( 'delete' )</button>
+	    <button type="button" id="saveButton" onclick="validateDataEntryForm( false )">$i18n.getString( 'save' )</button>
+        <button type="button" id="saveCloseButton" onclick="validateDataEntryForm( true )">$i18n.getString( 'save_close' )</button>
+        <button type="button" id="cancelButton" onclick="window.location.href='dataSet.action'">$i18n.getString( 'cancel' )</button>&nbsp;&nbsp;<span style="color:#606060">|</span>&nbsp;
+        <button type="button" id="insertDataElementsButton" >$i18n.getString( 'insert_data_elements' )</button>&nbsp;&nbsp;<span style="color:#606060">|</span>&nbsp;
+        <button type="button" id="delete" onclick="removeDataEntryForm( '$dataSet.id', '$dataEntryForm.id', '$dataEntryForm.name' )">$i18n.getString( 'delete' )</button>
       </td>          
 	  <script>
 		if(stat == "EDIT")