=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-02-01 09:10:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-02-13 19:27:46 +0000
@@ -48,7 +48,6 @@
 			class="org.hisp.dhis.caseentry.action.caseentry.SearchPatientAction">
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/listPatient.vm</param>
-			<param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
 		</action>
 
 		<action name="listAllPatients"
@@ -56,7 +55,6 @@
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="listAll">true</param>
 			<param name="page">/dhis-web-caseentry/listPatient.vm</param>
-			<param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
 		</action>
 
 		<action name="selectDataRecording"
@@ -149,8 +147,7 @@
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/dataentryRecords.vm</param>
 			<param name="javascripts">javascript/customcheckbox/prettyCheckboxes.js</param>
-			<param name="stylesheets">style/patient.css,javascript/customcheckbox/prettyCheckboxes.css
-				,../dhis-web-commons/paging/paging.css</param>
+			<param name="stylesheets">style/patient.css,javascript/customcheckbox/prettyCheckboxes.css</param>
 		</action>
 
 		<action name="viewProgramStageRecords"
@@ -190,7 +187,6 @@
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/loadVisitPlan.vm</param>
 			<param name="javascripts">javascript/visitPlan.js</param>
-			<param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
 		</action>
 
 		<!-- Report -->
@@ -220,7 +216,6 @@
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/report.vm</param>
 			<param name="javascripts">javascript/commons.js,javascript/report.js</param>
-			<param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
 		</action>
 
 		<action name="viewRecords"
@@ -234,9 +229,7 @@
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/historyAnonymousEvents.vm</param>
 			<param name="javascripts">javascript/anonymousRegistration.js</param>
-			<param name="stylesheets">
-                 ../dhis-web-caseentry/style/patient.css,
-                 ../dhis-web-commons/paging/paging.css</param>
+			<param name="stylesheets">../dhis-web-caseentry/style/patient.css</param>
 		</action>
 		
 		<action name="showSingleEventReportForm" 
@@ -251,9 +244,7 @@
 			class="org.hisp.dhis.caseentry.action.report.GenerateSingleEventReportAction">
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/historyAnonymousEvents.vm</param>
-			<param name="stylesheets">
-                 ../dhis-web-caseentry/style/patient.css,
-                 ../dhis-web-commons/paging/paging.css</param>
+			<param name="stylesheets">../dhis-web-caseentry/style/patient.css</param>
 		</action>
 		
         <action name="viewAnonymousEvents"
@@ -371,7 +362,6 @@
 			class="org.hisp.dhis.caseentry.action.patient.SearchPatientAction">
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/patientRegistrationList.vm</param>
-			<param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
 		</action>
 		
 		<action name="removePatient"
@@ -452,7 +442,6 @@
 			class="org.hisp.dhis.caseentry.action.patient.GetPatientsByNameAction">
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/resultSearchPatients.vm</param>
-			<param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
 		</action>
 
 		<action name="anonymousRegistration"

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2012-02-12 19:23:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2012-02-13 19:27:46 +0000
@@ -280,7 +280,6 @@
   border: 1px solid #cccc00;
   width: 500px;
   border-radius: 3px;
-  -moz-border-radius: 3px; /* Firefox */
 }
 
 span#info
@@ -292,7 +291,6 @@
   border: 1px solid #12cd17;
   width: 500px;
   border-radius: 3px;
-  -moz-border-radius: 3px; /* Firefox */
 }
 
 div#detailsArea 
@@ -337,7 +335,6 @@
   vertical-align: center;
   line-height: 30px;
   border-radius: 3px;
-  -moz-border-radius: 3px; /* Firefox */
 }
 
 /*----------------------------------------------------------------------------*/
@@ -470,7 +467,6 @@
   padding-left: 20px;
   margin-bottom: 15px;
   border-radius: 3px;
-  -moz-border-radius: 3px; /* Firefox */
 }
 
 /*----------------------------------------------------------------------------*/
@@ -498,5 +494,58 @@
   border:1px solid #c0c0c0; 
   padding:10px;
   border-radius: 3px;
-  -moz-border-radius: 3px; /* Firefox */
+}
+
+/*----------------------------------------------------------------------------*/
+/* Paging                                                                     */
+/*----------------------------------------------------------------------------*/
+
+.paging-container
+{
+	text-align: right; 
+}
+
+div.paging 
+{
+	width:300px;float:right; margin-right:5em; text-align: center; height:16px; 
+}
+
+div.paging span, div.paging a 
+{
+	padding: 0 5px;font-weight: bold; font-size: 11px;
+}
+
+div.paging a
+{
+	text-decoration: none; color: #FF9900;
+}
+
+div.paging a:hover
+{
+	color: #000;
+}
+
+div.paging span.page 
+{
+	color:#000;
+}
+
+div.paging span.seperator 
+{
+	display:none;
+}
+
+ul.pageSizeSelection 
+{
+	list-style:none; float:left; width: 300px; margin: 0; padding: 0;
+}
+
+ul.pageSizeSelection span 
+{
+	width: 100px; display: block; float :left;
+}
+
+ul.pageSizeSelection input 
+{
+	text-align: right;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-12-25 17:58:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2012-02-13 19:27:46 +0000
@@ -1509,3 +1509,49 @@
 		
 	return ( Math.round( number * factor ) / factor );
 }
+
+// -----------------------------------------------------------------------------
+// Paging
+// -----------------------------------------------------------------------------
+
+function pagingList( currentPage, pageSize )
+{
+	var baseLink = jQuery( "#baseLink" ).val();	
+	var url = baseLink + 'currentPage=' + currentPage + '&pageSize=' + pageSize;
+	window.location.href = url;
+}
+
+function changePageSize( event )
+{
+	var key = event.keyCode || event.charCode || event.which;
+	
+	if ( key == 13 || key == 1 ) // Enter
+	{
+		// ---------------------------------------------------
+		// Validate parameters
+		// ---------------------------------------------------
+		
+		var pageSize = jQuery( "#sizeOfPage" ).val();
+		
+		if ( pageSize < 1 )
+		{
+			pageSize = 1;
+		}
+
+		var currentPage = jQuery( "#jumpToPage" ).val();
+		var numberOfPages = jQuery( "#numberOfPages" ).val();
+		
+		if ( currentPage > numberOfPages )
+		{
+			currentPage = numberOfPages;
+		}
+		
+		jQuery.cookie( "pageSize", pageSize, {path: "/"} );
+		
+		// ---------------------------------------------------
+		// Paging
+		// ---------------------------------------------------
+		
+		pagingList( currentPage, pageSize );
+	}
+}

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.css	2010-10-05 11:04:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.css	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-.paging-container {text-align: right; }
-div.paging {width:300px;float:right; margin-right:5em; text-align: center; height:16px; }
-div.paging span, div.paging a {padding: 0 5px;font-weight: bold; font-size: 11px;}
-div.paging a {text-decoration: none; color: #FF9900;}
-div.paging a:hover {color: #000;}
-div.paging span.page {color:#000;}
-div.paging span.seperator {display:none;}
-ul.pageSizeSelection {list-style:none; float:left; width: 300px; margin: 0; padding: 0;}
-ul.pageSizeSelection span {width: 100px; display: block; float :left;}
-ul.pageSizeSelection input {text-align: right}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.vm	2011-12-02 09:05:28 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.vm	2012-02-13 19:27:46 +0000
@@ -7,6 +7,7 @@
 	
 	<input type="hidden" id="baseLink" value="$!baseLink"/>
 	<input type="hidden" id="currentPage" value="$!currentPage"/>
+	<input type="hidden" id="numberOfPages" value="$!numberOfPages"/>
 	#if ( $numberOfPages > 0 )
 		<table style="background-color: #ebf0f6;" width='100%'>
 			<tr>
@@ -15,14 +16,14 @@
 				</td>
 				<td>
 					<span>$i18n.getString("rows_in_page"):</span>
-					<input type="text" id="sizeOfPage" value="$!pageSize" style="width:50px" onKeyPress="changePageSize(event,'$baseLink');">
+					<input type="text" id="sizeOfPage" value="$!pageSize" style="width:50px" onKeyPress="changePageSize(event);">
 				</td>
 				<td>
 					<span>$i18n.getString("jump_to_page"):</span>					
-					<input type="text" id="jumpToPage" value="$!currentPage" style="width:50px" onKeyPress="changePageSize(event,'$baseLink');">
+					<input type="text" id="jumpToPage" value="$!currentPage" style="width:50px" onKeyPress="changePageSize(event);">
 				</td>
 				<td>
-					<input type="button" id="submitButton" value="$i18n.getString('go')" onclick="changePageSize(event,'$baseLink');">
+					<input type="button" id="submitButton" value="$i18n.getString( 'go' )" onclick="changePageSize(event);">
 				</td>				
 			</tr>		
 			<tr>
@@ -71,70 +72,5 @@
 </div>
 
 <script>
-	
-var isAjax;
-var contentDiv;
-var isShowLoader;
-
-function pagingList( currentPage, pageSize )
-{
-	var url = '${baseLink}currentPage=' + currentPage + '&pageSize=' + pageSize;
-	if ( isAjax == undefined )
-	{
-		window.location.href = url;
-	}
-	else
-	{
-		var index = url.indexOf( '?' );
-		var link = url.substring( 0, index );
-		var data = url.substring( index + 1 );
-		
-		jQuery.postUTF8( link , data, function(html)
-		{
-			if ( contentDiv == undefined )
-			{
-				setInnerHTML( 'contentDiv', html );
-			}
-			else
-			{
-				setInnerHTML( contentDiv, html );
-			}
-		} );
-	}
-}
-
-function changePageSize( event, baseLink )
-{
-	var key = event.keyCode || event.charCode || event.which;
-	
-	if ( key == 13 || key == 1 )// Enter
-	{
-		// ---------------------------------------------------
-		// Validate parameters
-		// ---------------------------------------------------
-		
-		var pageSize = jQuery( "#sizeOfPage" ).val();
-		
-		if ( pageSize < 1)
-		{
-			pageSize = 1;
-		}
-
-		var currentPage = jQuery( "#jumpToPage" ).val();
-		var numberOfPages = eval( "$numberOfPages" );
-		if ( currentPage > numberOfPages )
-		{
-			currentPage = numberOfPages;
-		}
-		
-		jQuery.cookie( "pageSize", pageSize, {path: "/"} );
-		
-		// ---------------------------------------------------
-		// Paging
-		// ---------------------------------------------------
-		
-		pagingList( currentPage, pageSize );
-	}
-}
 
 </script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2012-02-13 04:51:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2012-02-13 19:27:46 +0000
@@ -423,7 +423,6 @@
       <param name="page">
         /dhis-web-maintenance-dataadmin/constant.vm</param>
 	  <param name="javascripts">javascript/constant.js</param>
-	  <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
       <param name="requiredAuthorities">F_CONSTANT_MANAGEMENT</param>
     </action>
 
@@ -482,14 +481,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="page">/dhis-web-maintenance-dataadmin/lockException.vm</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="showAddLockExceptionForm" class="org.hisp.dhis.dataadmin.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="page">/dhis-web-maintenance-dataadmin/addLockExceptionForm.vm</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
       <param name="requiredAuthorities">F_DATASET_ADD</param>
     </action>
 
@@ -527,14 +524,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="page">/dhis-web-maintenance-dataadmin/attribute.vm</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="showAddAttributeForm" class="org.hisp.dhis.dataadmin.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="page">/dhis-web-maintenance-dataadmin/addAttributeForm.vm</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
       <param name="requiredAuthorities">F_DATAELEMENT_ADD</param>
     </action>
 
@@ -542,7 +537,6 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="page">/dhis-web-maintenance-dataadmin/updateAttributeForm.vm</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
       <param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
     </action>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2012-02-08 03:37:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2012-02-13 19:27:46 +0000
@@ -21,7 +21,6 @@
       <param name="page">/dhis-web-maintenance-datadictionary/dataElement.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="javascripts">javascript/dataElement.js,javascript/dataDictionary.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="showSortDataElementForm" class="org.hisp.dhis.dd.action.dataelement.GetDataElementListSortOrderAction">
@@ -128,7 +127,6 @@
       <param name="page">/dhis-web-maintenance-datadictionary/dataElementGroup.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="javascripts">javascript/dataElementGroup.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="removeDataElementGroup" class="org.hisp.dhis.dd.action.dataelementgroup.RemoveDataElementGroupAction">
@@ -183,7 +181,6 @@
       <param name="page">/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="javascripts">javascript/dataElementGroupSet.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="openAddDataElementGroupSet" class="org.hisp.dhis.dd.action.NoAction">
@@ -240,7 +237,6 @@
       <param name="page">/dhis-web-maintenance-datadictionary/indicator.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="javascripts">javascript/indicator.js,javascript/dataDictionary.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="showSortIndicatorForm" class="org.hisp.dhis.dd.action.indicator.GetIndicatorListSortOrderAction">
@@ -344,7 +340,6 @@
       <param name="page">/dhis-web-maintenance-datadictionary/indicatorGroup.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
 	  <param name="javascripts">javascript/indicatorGroup.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="removeIndicatorGroup" class="org.hisp.dhis.dd.action.indicatorgroup.RemoveIndicatorGroupAction">
@@ -395,7 +390,6 @@
       <param name="page">/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
 	  <param name="javascripts">javascript/indicatorGroupSet.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="openAddIndicatorGroupSet" class="org.hisp.dhis.dd.action.NoAction">
@@ -446,7 +440,6 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/indicatorType.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="getIndicatorType" class="org.hisp.dhis.dd.action.indicatortype.GetIndicatorTypeAction">
@@ -508,7 +501,6 @@
       <param name="page">/dhis-web-maintenance-datadictionary/dataDictionary.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="javascripts">javascript/dataDictionary.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="getDataDictionary" class="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryAction">
@@ -587,7 +579,6 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/category.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="getDataElementCategory" class="org.hisp.dhis.dd.action.category.GetDataElementCategoryAction">
@@ -680,7 +671,6 @@
       <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="javascripts">javascript/categoryCombo.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="getDataElementCategoryCombo" class="org.hisp.dhis.dd.action.categorycombo.GetDataElementCategoryComboAction">
@@ -751,7 +741,6 @@
         /dhis-web-maintenance-datadictionary/multidimensional/concept.vm</param>
       <param name="javascripts">javascript/concept.js</param>
       <param name="requiredAuthorities">F_CONCEPT_MANAGEMENT</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="showAddConceptForm" class="org.hisp.dhis.dd.action.NoAction">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2011-10-31 11:38:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2012-02-13 19:27:46 +0000
@@ -21,7 +21,6 @@
       <param name="page">/dhis-web-maintenance-dataset/dataSetList.vm</param>
       <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
       <param name="javascripts">javascript/dataSet.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
 	<!-- Section -->

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml	2011-09-27 08:37:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml	2012-02-13 19:27:46 +0000
@@ -24,7 +24,6 @@
         ../dhis-web-commons/ouwt/ouwt.js,
         javascript/organisationUnit.js
       </param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
       <interceptor-ref name="organisationUnitTreeStack" />
     </action>
 
@@ -102,7 +101,6 @@
       <param name="page">/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm</param>
       <param name="menu">/dhis-web-maintenance-organisationunit/menu.vm</param>
       <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/organisationUnitGroup.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="getOrganisationUnitGroup" class="org.hisp.dhis.oum.action.organisationunitgroup.GetOrganisationUnitGroupAction">
@@ -162,7 +160,6 @@
       <param name="page">/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm</param>
       <param name="menu">/dhis-web-maintenance-organisationunit/menu.vm</param>
       <param name="javascripts">javascript/organisationUnitGroupSet.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="getOrganisationUnitGroupSet" class="org.hisp.dhis.oum.action.organisationunitgroupset.GetGroupSetAction">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2012-01-03 06:08:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2012-02-13 19:27:46 +0000
@@ -22,7 +22,6 @@
       <param name="menu">/dhis-web-maintenance-user/orgunitMenu.vm</param>
       <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/user.js,javascript/filterTable.js</param>
       <interceptor-ref name="organisationUnitTreeStack" />
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="alluser" class="org.hisp.dhis.user.action.GetUserListAction">
@@ -30,7 +29,6 @@
       <param name="page">/dhis-web-maintenance-user/allUser.vm</param>
       <param name="menu">/dhis-web-maintenance-user/menu.vm</param>
       <param name="javascripts">javascript/user.js,javascript/filterTable.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="getUser" class="org.hisp.dhis.user.action.GetUserAction">
@@ -107,7 +105,6 @@
       <param name="page">/dhis-web-maintenance-user/allRole.vm</param>
       <param name="menu">/dhis-web-maintenance-user/menu.vm</param>
       <param name="javascripts">javascript/role.js,javascript/filterTable.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
       <param name="requiredAuthorities">F_USERROLE_LIST</param>
     </action>
 
@@ -175,7 +172,6 @@
       <param name="page">/dhis-web-maintenance-user/userGroupList.vm</param>
       <param name="menu">/dhis-web-maintenance-user/menu.vm</param>
       <param name="javascripts">javascript/user.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
       <param name="requiredAuthorities">F_USER_GRUP_LIST</param>
     </action>
 

=== removed directory 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/META-INF'
=== removed file 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/META-INF/context.xml'
--- dhis-2/dhis-web/dhis-web-portal/src/main/webapp/META-INF/context.xml	2011-05-26 15:49:30 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/META-INF/context.xml	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-<Context>
-  <!-- don't persist sessions across tomcat restarts -->
-  <Manager pathname="" />
-</Context>
-

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2012-02-12 14:40:54 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2012-02-13 19:27:46 +0000
@@ -39,7 +39,6 @@
       <param name="page">/dhis-web-reporting/viewDocumentForm.vm</param>
       <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">javascript/document.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="displayAddDocumentForm" class="org.hisp.dhis.reporting.document.action.GetDocumentAction">
@@ -100,7 +99,6 @@
       <param name="page">/dhis-web-reporting/viewReportForm.vm</param>
       <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">javascript/report.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 	
     <action name="getReports" class="org.hisp.dhis.reporting.reportviewer.action.GetAllReportsAction">
@@ -134,7 +132,6 @@
       <param name="page">/dhis-web-reporting/viewTableForm.vm</param>
       <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">javascript/table.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 	
     <action name="getReportTables" class="org.hisp.dhis.reporting.tablecreator.action.GetAllTablesAction">

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2011-09-29 06:40:09 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2012-02-13 19:27:46 +0000
@@ -21,7 +21,6 @@
       <param name="page">/dhis-web-validationrule/validationRule.vm</param>
       <param name="menu">/dhis-web-validationrule/menu.vm</param>
       <param name="javascripts">javascript/general.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="getValidationRule" class="org.hisp.dhis.validationrule.action.GetValidationRuleAction">
@@ -85,7 +84,6 @@
       <param name="page">/dhis-web-validationrule/validationRuleGroup.vm</param>
       <param name="menu">/dhis-web-validationrule/menu.vm</param>
       <param name="javascripts">javascript/validationRuleGroup.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
     </action>
 
     <action name="getValidationRuleGroup" class="org.hisp.dhis.validationrule.action.validationrulegroup.GetValidationRuleGroupAction">