dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10716
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-04-30 10:34:19 +0200
message:
  Removed unused code
removed:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.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

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm	2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-<script type="text/javascript">
-	jQuery(document).ready(function() {
-		datePickerInRange( 'startDate' , 'endDate' );	
-	});
-
-    var i18n_archiving = '$encoder.jsEscape( $i18n.getString( "archiving" ) , "'")';
-    var i18n_unarchiving = '$encoder.jsEscape( $i18n.getString( "unarchiving" ) , "'")';
-    var i18n_done_number_of_values = '$encoder.jsEscape( $i18n.getString( "done_number_of_values" ) , "'")';
-</script>
-
-<style type="text/css">
-	.overlaps
-	{
-	    padding:1em; 
-	    margin:1em;
-	    background-color: #baffbc; 
-	    border: 1px solid #12cd17; 
-	    width: 500px;
-	    display: none;
-	}
-</style>
-
-<h3>$i18n.getString( "data_archive" ) #openHelp( "dataArchive" )</h3>
-
-#parse( "dhis-web-commons/loader/loader.vm" )
-
-<div id="overlapsDiv" class="overlaps">
-    <p>$i18n.getString( "there_are" ) <span id="number"></span> $i18n.getString( "overlapping_values" )</p>
-    <input type="radio" name="strategy" id="oldestRadio" value="oldest" checked="checked"/>
-        <label for="oldestRadio">$i18n.getString( 'eliminate_oldest' )</label><br/>
-	<input type="radio" name="strategy" id="archiveRadio" value="archive"/>
-	    <label for="archiveRadio">$i18n.getString( 'eliminate_from_archive' )</label><br/>
-	<input type="radio" name="strategy" id="regularRadio" value="regular"/>
-	    <label for="regularRadio">$i18n.getString( 'eliminate_from_regular' )</label>
-</div>
-
-<div id="noOverlapsDiv" class="overlaps">
-	$i18n.getString( "there_are_no_overlapping_values" )
-</div>
-
-<br/>
-
-<div id="contentDiv" style="display:none">
-<table width="100%">
-    <tr>
-        <td style="width:120px">$i18n.getString( "start_date" )</td>
-        <td><input type="text" id="startDate"/></td>
-    </tr>
-    <tr>
-        <td>$i18n.getString( "end_date" )</td>
-        <td><input type="text" id="endDate"/></td>
-    </tr>
-    <tr>
-    	<td></td>
-    	<td>
-    		<input type="button" value="$i18n.getString( 'archive' )" style="width:100px" onclick="archive( 'archive' )" />
-    		<input type="button" value="$i18n.getString( 'unarchive' )" style="width:100px" onclick="archive( 'unarchive' )" />
-    	</td>
-    </tr> 
-</table>
-</div>
-
-<br/>
-
-<span id="message"></span>

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm	2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-<script type="text/javascript">
-	jQuery(document).ready(function()
-	{	
-		datePickerInRange( 'startDate' , 'endDate' );	
-	});
-
-    var i18n_archiving = '$encoder.jsEscape( $i18n.getString( "archiving" ) , "'")';
-    var i18n_unarchiving = '$encoder.jsEscape( $i18n.getString( "unarchiving" ) , "'")';
-    var i18n_done_number_of_values = '$encoder.jsEscape( $i18n.getString( "done_number_of_values" ) , "'")';
-</script>
-
-<style type="text/css">
-	.overlaps
-	{
-	    padding:1em; 
-	    margin:1em;
-	    background-color: #baffbc; 
-	    border: 1px solid #12cd17; 
-	    width: 500px;
-	    display: none;
-	}
-</style>
-
-<h3>$i18n.getString( "patient_data_archive" ) #openHelp( "patientDataArchive" )</h3>
-
-#parse( "dhis-web-commons/loader/loader.vm" )
-
-<div id="overlapsDiv" class="overlaps">
-    <p>$i18n.getString( "there_are" ) <span id="number"></span> $i18n.getString( "overlapping_values" )</p>
-    <input type="radio" name="strategy" id="oldestRadio" value="oldest" checked="checked"/>
-        <label for="oldestRadio">$i18n.getString( 'eliminate_oldest' )</label><br/>
-	<input type="radio" name="strategy" id="archiveRadio" value="archive"/>
-	    <label for="archiveRadio">$i18n.getString( 'eliminate_from_archive' )</label><br/>
-	<input type="radio" name="strategy" id="regularRadio" value="regular"/>
-	    <label for="regularRadio">$i18n.getString( 'eliminate_from_regular' )</label>
-</div>
-
-<div id="noOverlapsDiv" class="overlaps">
-	$i18n.getString( "there_are_no_overlapping_values" )
-</div>
-
-<br/>
-
-<div id="contentDiv" style="display:none">
-<table width="100%">
-    <tr>
-        <td style="width:120px">$i18n.getString( "start_date" )</td>
-        <td><input type="text" id="startDate"/></td>
-    </tr>
-    <tr>
-        <td>$i18n.getString( "end_date" )</td>
-        <td><input type="text" id="endDate"/></td>
-    </tr>
-    <tr>
-    	<td></td>
-    	<td>
-    		<input type="button" value="$i18n.getString( 'archive' )" style="width:100px" onclick="patientArchive( 'archive' )" />
-    		<input type="button" value="$i18n.getString( 'unarchive' )" style="width:100px" onclick="patientArchive( 'unarchive' )" />
-    	</td>
-    </tr> 
-</table>
-</div>
-
-<br/>
-
-<span id="message"></span>