=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/aggregationReportAnalysisFront.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/aggregationReportAnalysisFront.vm	2010-09-09 12:12:20 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/aggregationReportAnalysisFront.vm	2010-12-09 10:23:58 +0000
@@ -94,13 +94,11 @@
                   <tr>
                         <td class="NormalB">
                             <label for="startDate">$i18n.getString( 'start_date' ) ($i18n.getString( "format.date.label" ))</label><br/>
-                            <input type="text" id="startDate" name="startDate" onChange="if(!isDate( this.value )) this.value='';" style="width:20em" class="{validate:{required:true,dateISO:true}}">
-                            <img src="../images/calendar_icon.gif" width="16" height="16" id="getStartDate" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''">
+                            <input type="text" id="startDate" name="startDate" onChange="if(!isDate( this.value )) this.value='';" style="width:20em" class="{validate:{required:true,dateISO:true}}">                            
                         </td>
                             <td class="NormalB">
                             <label for="endDate">$i18n.getString( 'end_date' ) ($i18n.getString( "format.date.label" ))</label><br />
-                            <input type="text" id="endDate" name="endDate" onChange="if(!isDate( this.value )) this.value='';" style="width:20em" class="{validate:{required:true,dateISO:true}}">
-                            <img src="../images/calendar_icon.gif" width="16" height="16" id="getEndDate" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''">
+                            <input type="text" id="endDate" name="endDate" onChange="if(!isDate( this.value )) this.value='';" style="width:20em" class="{validate:{required:true,dateISO:true}}">                            
                         </td>
                   </tr>
                   <tr>
@@ -133,17 +131,9 @@
             </table>
         </form>
         <script type="text/javascript">
-    
-    Calendar.setup({
-        inputField     :    "startDate",      // id of the input field
-        ifFormat       :    "$i18n.getString("format.date.label")",       // format of the input field
-        button         :    "getStartDate"   // trigger for the calendar (button ID)
-    });
-    
-    Calendar.setup({
-        inputField     :    "endDate",      // id of the input field
-        ifFormat       :    "$i18n.getString("format.date.label")",       // format of the input field
-        button         :    "getEndDate"   // trigger for the calendar (button ID)
-    });
+		jQuery( function(){
+			datePickerInRange( "startDate", "endDate", false, false );
+		});		
+	
 </script>
            
\ No newline at end of file

=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/benificiaryInfoReportsForm.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/benificiaryInfoReportsForm.vm	2010-08-06 09:50:49 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/benificiaryInfoReportsForm.vm	2010-12-09 10:23:58 +0000
@@ -108,13 +108,11 @@
                 <tr>
                     <td class="NormalB">
                         <label for="startDate" id="lblStartDate">$i18n.getString( 'start_date' ) ($i18n.getString( "format.date.label" ))</label><br/>
-                        <input type="text" id="startDate" name="startDate" style="width:20em">
-                        <img src="../images/calendar_icon.gif" width="16" height="16" id="getStartDate" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''">
+                        <input type="text" id="startDate" name="startDate" style="width:20em">                        
                     </td>
                     <td class="NormalB">
                         <label for="endDate" id="lblEndDate">$i18n.getString( 'end_date' ) ($i18n.getString( "format.date.label" ))</label><br />
-                        <input type="text" id="endDate" name="endDate" style="width:20em">
-                        <img src="../images/calendar_icon.gif" width="16" height="16" id="getEndDate" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''">
+                        <input type="text" id="endDate" name="endDate" style="width:20em">                       
                     </td>                 
                 </tr>
                 <tr>
@@ -145,18 +143,9 @@
             </table>
 		</form>
 <script type="text/javascript">
-
-    Calendar.setup({
-        inputField     :    "startDate",      // id of the input field
-        ifFormat       :    "$i18n.getString("format.date.label")",       // format of the input field
-        button         :    "getStartDate"   // trigger for the calendar (button ID)
-    });
-
-    Calendar.setup({
-        inputField     :    "endDate",      // id of the input field
-        ifFormat       :    "$i18n.getString("format.date.label")",       // format of the input field
-        button         :    "getEndDate"   // trigger for the calendar (button ID)
-    });
+	jQuery( function(){
+			datePickerInRange( "startDate", "endDate", false, false );
+	});		
 </script>
 
 

=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/csReviewReportFront.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/csReviewReportFront.vm	2010-09-18 13:07:13 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/csReviewReportFront.vm	2010-12-09 10:23:58 +0000
@@ -67,7 +67,7 @@
                     formValidations();
                   }
         });
-        jQuery.validator.loadLocaled( jQuery("#curLocaleCode").val() );
+        ///jQuery.validator.loadLocaled( jQuery("#curLocaleCode").val() );
         jQuery("#name").focus();
       }
   );
@@ -81,12 +81,12 @@
           <td class="NormalB">
                         <label for="startDate">$i18n.getString( 'start_date' ) ($i18n.getString( "format.date.label" ))</label><br/>
                         <input type="text" id="startDate" name="startDate" onchange="if(!checkStartDate( this.value )) this.value='';" style="width:15em" class="{validate:{required:true,dateISO:true}}">
-                        <img src="../images/calendar_icon.gif" width="16" height="16" id="getStartDate" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''">
+                        
                     </td>
            <td class="NormalB">
                         <label for="endDate">$i18n.getString( 'end_date' ) ($i18n.getString( "format.date.label" ))</label><br />
                         <input type="text" id="endDate" name="endDate" onchange="if(!checkEndDate( this.value )) this.value='';"  style="width:15em" class="{validate:{required:true,dateISO:true}}">
-                        <img src="../images/calendar_icon.gif" width="16" height="16" id="getEndDate" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''">
+                        
                     </td>
         </tr>
         <tr>
@@ -132,19 +132,9 @@
                </tr>
             </table>
     </form>
-
 <script type="text/javascript">
-  
-  Calendar.setup({
-        inputField     :    "startDate",      // id of the input field
-        ifFormat       :    "$i18n.getString("format.date.label")",       // format of the input field
-        button         :    "getStartDate"   // trigger for the calendar (button ID)
-    });
-  
-  Calendar.setup({
-        inputField     :    "endDate",      // id of the input field
-        ifFormat       :    "$i18n.getString("format.date.label")",       // format of the input field
-        button         :    "getEndDate"   // trigger for the calendar (button ID)
-    });
+	jQuery( function(){
+			datePickerInRange( "startDate", "endDate", false, false );
+	});		
 </script>
 

=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/ouWiseProgressReportFront.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/ouWiseProgressReportFront.vm	2010-11-09 15:02:39 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/ouWiseProgressReportFront.vm	2010-12-09 10:23:58 +0000
@@ -81,7 +81,7 @@
                     <td class="NormalB">
 						<label for="startDate">$i18n.getString( 'start_date' ) ($i18n.getString( "format.date.label" ))</label><br/>
 						<input type="text" id="startDate" name="startDate" onChange="if(!isDate( this.value )) this.value='';" style="width:20em" class="{validate:{required:true,dateISO:true}}">
-						<img src="../images/calendar_icon.gif" width="16" height="16" id="getStartDate" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''">
+						
 					</td>
                 </tr>
                 <tr>
@@ -100,7 +100,7 @@
           	        <td class="NormalB">
 						<label for="endDate">$i18n.getString( 'end_date' ) ($i18n.getString( "format.date.label" ))</label><br />
 						<input type="text" id="endDate" name="endDate" onChange="if(!isDate( this.value )) this.value='';"  style="width:20em" class="{validate:{required:true,dateISO:true}}">
-						<img src="../images/calendar_icon.gif" width="16" height="16" id="getEndDate" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''">
+						
 					</td>
                 </tr>
 			<tr>
@@ -132,15 +132,7 @@
 		</form>
 
 <script type="text/javascript">	
-	Calendar.setup({
-        inputField     :    "startDate",      // id of the input field
-        ifFormat       :    "$i18n.getString("format.date.label")",       // format of the input field
-        button         :    "getStartDate"   // trigger for the calendar (button ID)
-    });
-	
-	Calendar.setup({
-        inputField     :    "endDate",      // id of the input field
-        ifFormat       :    "$i18n.getString("format.date.label")",       // format of the input field
-        button         :    "getEndDate"   // trigger for the calendar (button ID)
-    });
+	jQuery( function(){
+			datePickerInRange( "startDate", "endDate", false, false );
+	});		
 </script>

=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/portalReportForm.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/portalReportForm.vm	2010-08-09 10:33:31 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/portalReportForm.vm	2010-12-09 10:23:58 +0000
@@ -103,12 +103,12 @@
                             <td class="NormalB">
                                 <label for="startDate" id="lblStartDate">$i18n.getString( 'start_date' ) ($i18n.getString( "format.date.label" ))</label><br/>
                                 <input type="text" id="startDate" name="startDate" style="width:20em">
-                                <img src="../images/calendar_icon.gif" width="16" height="16" id="getStartDate" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''">
+                                
                             </td>
                             <td class="NormalB">
                                 <label for="endDate" id="lblEndDate">$i18n.getString( 'end_date' ) ($i18n.getString( "format.date.label" ))</label><br />
                                 <input type="text" id="endDate" name="endDate" style="width:20em">
-                                <img src="../images/calendar_icon.gif" width="16" height="16" id="getEndDate" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''">
+                               
                             </td>
                         </tr>
                         <tr>
@@ -135,18 +135,9 @@
 		</form>
 
 <script type="text/javascript">
-
-    Calendar.setup({
-        inputField     :    "startDate",      // id of the input field
-        ifFormat       :    "$i18n.getString("format.date.label")",       // format of the input field
-        button         :    "getStartDate"   // trigger for the calendar (button ID)
-    });
-
-    Calendar.setup({
-        inputField     :    "endDate",      // id of the input field
-        ifFormat       :    "$i18n.getString("format.date.label")",       // format of the input field
-        button         :    "getEndDate"   // trigger for the calendar (button ID)
-    });
+	jQuery( function(){
+			datePickerInRange( "startDate", "endDate", false, false );
+	});		
 </script>