=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.select.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.select.js	2011-05-31 11:26:04 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.select.js	2011-05-31 12:24:47 +0000
@@ -64,7 +64,7 @@
     caseSensitive = caseSensitive || false;
 
     if (key.length === 0) {
-        dhisAjaxSelect_moveSorted( $select, $select_ghost.children() );
+        dhis2.select.moveSorted( $select, $select_ghost.children() );
     } else {
         var $select_options = $select.children();
         var $select_ghost_options = $select_ghost.children();
@@ -79,8 +79,8 @@
             $select_not_matched = $select_options.filter( ':not( :containsNC(' + key + ') )' );
         }
 
-        dhisAjaxSelect_moveSorted( $select_ghost, $select_not_matched );
-        dhisAjaxSelect_moveSorted( $select, $select_ghost_matched );
+        dhis2.select.moveSorted( $select_ghost, $select_not_matched );
+        dhis2.select.moveSorted( $select, $select_ghost_matched );
     }
 }
 
@@ -89,7 +89,7 @@
  * assumed to be sorted to start with.
  * 
  * @param $select A jQuery wrapped select which acts as the target
- * @param $array An array of child elements to move
+ * @param $array A jQuery array of child elements to move
  */
 dhis2.select.moveSorted = function ($select, $array)
 {

=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/index.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/index.vm	2011-02-03 16:35:12 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/index.vm	2011-05-31 12:24:47 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+jQuery(function() {
+	/* make sure that the leftBar is always visible when entering page. */
+	leftBar.showAnimated()
+});
+</script>
 
 <h3>$i18n.getString( "dhis-web-datamart" )</h3>
 

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm	2011-01-11 16:52:46 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm	2011-05-31 12:24:47 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+jQuery(function() {
+	/* make sure that the leftBar is always visible when entering page. */
+	leftBar.showAnimated()
+});
+</script>
 
 <h3>$i18n.getString( "dhis-web-maintenance-datadictionary" )</h3>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm	2011-01-11 16:52:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm	2011-05-31 12:24:47 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+jQuery(function() {
+	/* make sure that the leftBar is always visible when entering page. */
+	leftBar.showAnimated()
+});
+</script>
 
 <h3>$i18n.getString( "data_administration" )</h3>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2011-01-11 16:52:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2011-05-31 12:24:47 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+jQuery(function() {
+	/* make sure that the leftBar is always visible when entering page. */
+	leftBar.showAnimated()
+});
+</script>
 
 <h3>$i18n.getString( "dhis-web-maintenance-datadictionary" )</h3>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm	2011-05-30 14:08:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm	2011-05-31 12:24:47 +0000
@@ -6,10 +6,9 @@
 			iterator: "dataElements",
 			connectedTo: 'dataElementsSelectedList',
 			handler: function(item) {
-				var option = jQuery("<option />");
+				var option = jQuery("<option data-id='" + item.groups + "' />");
 				option.text( item.name );
 				option.attr( "value", item.id );
-				option.data('id', item.groups);
 
 				return option;
 			},
@@ -28,10 +27,9 @@
 			iterator: "indicators",
 			connectedTo: 'indicatorsSelectedList',
 			handler: function(item) {
-				var option = jQuery("<option />");
+				var option = jQuery("<option data-id='" + item.groups + "' />");
 				option.text( item.name );
 				option.attr( "value", item.id );
-				option.data('id', item.groups);
 
 				return option;
 			},

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm	2011-03-17 22:55:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm	2011-05-31 12:24:47 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+jQuery(function() {
+	/* make sure that the leftBar is always visible when entering page. */
+	leftBar.showAnimated()
+});
+</script>
 
 <h3>$i18n.getString( "dhis-web-maintenance-organisationunit" ) #openHelp( "ou_hierarchy" )</h3>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2011-04-04 11:57:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2011-05-31 12:24:47 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+jQuery(function() {
+	/* make sure that the leftBar is always visible when entering page. */
+	leftBar.showAnimated()
+});
+</script>
 
 <h3>$i18n.getString( "dhis-web-maintenance-patient" )</h3>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2011-01-11 16:52:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2011-05-31 12:24:47 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+jQuery(function() {
+	/* make sure that the leftBar is always visible when entering page. */
+	leftBar.showAnimated()
+});
+</script>
 
 <h3>$i18n.getString( "dhis-web-maintenance-settings" )</h3>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm	2011-01-11 16:52:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm	2011-05-31 12:24:47 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+jQuery(function() {
+	/* make sure that the leftBar is always visible when entering page. */
+	leftBar.showAnimated()
+});
+</script>
 
 <h3>$i18n.getString( "dhis-web-maintenance-user" ) #openHelp( "users" )</h3>
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm	2011-02-01 11:03:47 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm	2011-05-31 12:24:47 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+jQuery(function() {
+	/* make sure that the leftBar is always visible when entering page. */
+	leftBar.showAnimated()
+});
+</script>
 
 <h3>$i18n.getString( "dhis-web-reporting" )</h3>
 

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm	2011-01-11 16:52:46 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm	2011-05-31 12:24:47 +0000
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+jQuery(function() {
+	/* make sure that the leftBar is always visible when entering page. */
+	leftBar.showAnimated()
+});
+</script>
 
 <h3>$i18n.getString( "dhis-web-validationrule" )</h3>