=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html	2011-05-16 14:01:53 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html	2011-05-19 08:26:11 +0000
@@ -13,11 +13,7 @@
 
             <!-- UX -->
             <link rel="stylesheet" type="text/css" href="../resources/ext-ux/theme/gray-extend/xtheme-gray-extend.css"/>
-            <link rel="stylesheet" type="text/css" href="../resources/ext-ux/colorfield/color-field.css"/>
-            <link rel="stylesheet" type="text/css" href="../resources/ext-ux/multiselect/multiselect.css"/>
-            <link rel="stylesheet" type="text/css" href="../resources/ext-ux/msg/msg.css"/>
-            <link rel="stylesheet" type="text/css" href="../resources/ext-ux/checkbox/checkbox_or.css"/>
-            <link rel="stylesheet" type="text/css" href="../resources/ext-ux/iconcombo/IconCombo.css"/>
+            <link rel="stylesheet" type="text/css" href="../resources/ext-ux/ext-ux.css"/>
         
 		<!-- DHIS -->
 		<link rel="stylesheet" type="text/css" href="css/style.css"/>
@@ -71,12 +67,7 @@
         <script type="text/javascript" src="../resources/ext/ext-all.js"></script>
         
             <!-- UX -->
-            <script type="text/javascript" src="../resources/ext-ux/msg/msg.js"></script>
-            <script type="text/javascript" src="../resources/ext-ux/colorfield/color-field.js"></script>
-            <script type="text/javascript" src="../resources/ext-ux/itemselector/DDView.js"></script>
-            <script type="text/javascript" src="../resources/ext-ux/multiselect/MultiSelect.js"></script>
-            <script type="text/javascript" src="../resources/ext-ux/itemselector/ItemSelector.js"></script>
-            <script type="text/javascript" src="../resources/ext-ux/iconcombo/IconCombo.js"></script>
+            <script type="text/javascript" src="../resources/ext-ux/ext-ux.js"></script>
         
         <!-- OpenLayers -->
         <script type="text/javascript" src="../resources/openlayers-2.10/OpenLayers.js"></script>

=== removed directory 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/checkbox'
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/checkbox/checkbox_or.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/checkbox/checkbox_or.css	2010-03-08 15:23:59 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/checkbox/checkbox_or.css	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<style type="text/css">
-.x-form-check-group .x-form-check-wrap,.x-form-radio-group .x-form-radio-wrap{height:auto;}
-.ext-ie .x-form-check-group .x-form-check-wrap,.ext-ie .x-form-radio-group .x-form-radio-wrap{height:auto;}
-.x-form-check-wrap,.x-form-radio-wrap{padding:1px 0 3px;line-height:18px;}
-.ext-ie .x-form-check-wrap,.ext-ie .x-form-radio-wrap{padding-top:3px;}
-.ext-strict .ext-ie7 .x-form-check-wrap,.ext-strict .ext-ie7 .x-form-radio-wrap{padding-bottom:1px;}
-.x-form-check-wrap-inner,.x-form-radio-wrap-inner{display:inline;padding:0;}
-.x-form-check,.x-form-radio{height:13px;width:13px;vertical-align:bottom;margin:2px 0;}
-.ext-ie .x-form-check,.ext-ie .x-form-radio{margin-top:1px;}
-.ext-strict .ext-ie7 .x-form-check,.ext-strict .ext-ie7 .x-form-radio{margin-bottom:4px;}
-.ext-opera .x-form-check,.ext-opera .x-form-radio{margin-top:3px;}
-.x-form-check-focus .x-form-check,.x-form-check-over .x-form-check,.x-form-check-focus .x-form-radio,.x-form-check-over .x-form-radio{background-position:-13px 0;}
-.x-form-check-down .x-form-check,.x-form-check-down .x-form-radio{background-position:-26px 0;}
-.x-item-disabled .x-form-check,.x-item-disabled .x-form-radio{background-position:-39px 0;}
-.x-form-check-checked,.x-form-radio-checked{background-position:0 -13px;}
-.x-form-check-focus .x-form-check-checked,.x-form-check-over .x-form-check-checked,.x-form-check-focus .x-form-radio-checked,.x-form-check-over .x-form-radio-checked{background-position:-13px -13px;}
-.x-form-check-down .x-form-check-checked,.x-form-check-down .x-form-radio-checked{background-position:-26px -13px;}
-.x-item-disabled .x-form-check-checked,.x-item-disabled .x-form-radio-checked{background-position:-39px -13px;}
-.x-form-check-wrap-inner input,.x-form-radio-wrap-inner input{position:absolute;-ms-filter:"alpha(opacity=0)";filter:alpha(opacity=0);-moz-opacity:0;opacity:0;}
-</style>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/colorfield/color-field.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/colorfield/color-field.css	2010-03-08 15:23:59 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/colorfield/color-field.css	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-.x-form-field-wrap .x-form-color-trigger {
-	background-image: url(color-trigger.png);
-}
-
-.ie6 .x-form-field-wrap .x-form-color-trigger {
-	background-image: url(color-trigger.gif);
-}
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/colorfield/color-field.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/colorfield/color-field.js	2010-12-06 15:05:09 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/colorfield/color-field.js	1970-01-01 00:00:00 +0000
@@ -1,167 +0,0 @@
-/**
- * @class Ext.ux.ColorField
- * @extends Ext.form.TriggerField
- * Provides a color input field with a {@link Ext.ColorPalette} dropdown.
-* @constructor
-* Create a new ColorField
- * <br />Example:
- * <pre><code>
-var color_field = new Ext.ux.ColorField({
-	fieldLabel: 'Color',
-	id: 'color',
-	width: 175,
-	allowBlank: false
-});
-</code></pre>
-* @param {Object} config
- */
-
-Ext.ux.ColorField = Ext.extend(Ext.form.TriggerField,  {
-    /**
-     * @cfg {String} invalidText
-     * The error to display when the color in the field is invalid (defaults to
-     * '{value} is not a valid color - it must be in the format {format}').
-     */
-    invalidText : "'{0}' is not a valid color - it must be in a the hex format (# followed by 3 or 6 letters/numbers 0-9 A-F)",
-    /**
-     * @cfg {String} triggerClass
-     * An additional CSS class used to style the trigger button.  The trigger will always get the
-     * class 'x-form-trigger' and triggerClass will be <b>appended</b> if specified (defaults to 'x-form-color-trigger'
-     * which displays a color wheel icon).
-     */
-    triggerClass : 'x-form-color-trigger',
-    /**
-     * @cfg {String/Object} autoCreate
-     * A DomHelper element spec, or true for a default element spec (defaults to
-     * {tag: "input", type: "text", size: "10", autocomplete: "off"})
-     */
-
-    // private
-    defaultAutoCreate : {tag: "input", type: "text", size: "10", maxlength: "7", autocomplete: "off"},
-
-    // Limit input to hex values
-	maskRe: /[#a-f0-9]/i,
-	
-    // private
-    validateValue : function(value){
-        if(!Ext.ux.ColorField.superclass.validateValue.call(this, value)){
-            return false;
-        }
-        if(value.length < 1){ // if it's blank and textfield didn't flag it then it's valid
-        	 this.setColor('');
-        	 return true;
-        }
-
-        var parseOK = this.parseColor(value);
-
-        if(!value || (parseOK == false)){
-            this.markInvalid(String.format(this.invalidText,value));
-            return false;
-        }
-		this.setColor(value);
-        return true;
-    },
-
-	/**
-	 * Sets the current color and changes the background.
-	 * Does *not* change the value of the field.
-	 * @param {String} hex The color value.
-	 */
-	setColor : function(color) {
-		if (color=='' || color==undefined)
-		{
-			if (this.emptyText!='' && this.parseColor(this.emptyText))
-				color=this.emptyText;
-			else
-				color='transparent';
-		}
-		if (this.trigger)
-			this.trigger.setStyle( {
-				'background-color': color
-			});
-		else
-		{
-			this.on('render',function(){this.setColor(color)},this);
-		}
-	},
-	
-    // private
-    // Provides logic to override the default TriggerField.validateBlur which just returns true
-    validateBlur : function(){
-        return !this.menu || !this.menu.isVisible();
-    },
-
-    /**
-     * Returns the current value of the color field
-     * @return {String} value The color value
-     */
-    getValue : function(){
-        return Ext.ux.ColorField.superclass.getValue.call(this) || "";
-    },
-
-    /**
-     * Sets the value of the color field.  You can pass a string that can be parsed into a valid HTML color
-     * <br />Usage:
-     * <pre><code>
-		colorField.setValue('#FFFFFF');
-       </code></pre>
-     * @param {String} color The color string
-     */
-    setValue : function(color){
-        Ext.ux.ColorField.superclass.setValue.call(this, this.formatColor(color));
-		this.setColor( this.formatColor(color));
-    },
-
-    // private
-    parseColor : function(value){
-		return (!value || (value.substring(0,1) != '#')) ?
-			false : (value.length==4 || value.length==7 );
-    },
-
-    // private
-    formatColor : function(value){
-		if (!value || this.parseColor(value))
-			return value;
-		if (value.length==3 || value.length==6) {
-			return '#' + value;
-		}
-        return '';
-    },
-
-    // private
-    menuListeners : {
-        select: function(e, c){
-            this.setValue(c);
-            this.fireEvent('select', this, c);
-        },
-        show : function(){ // retain focus styling
-            this.onFocus();
-        },
-        hide : function(){
-            this.focus.defer(10, this);
-            var ml = this.menuListeners;
-            this.menu.un("select", ml.select,  this);
-            this.menu.un("show", ml.show,  this);
-            this.menu.un("hide", ml.hide,  this);
-        }
-    },
-
-    // private
-    // Implements the default empty TriggerField.onTriggerClick function to display the ColorPalette
-    onTriggerClick : function(){
-        if(this.disabled){
-            return;
-        }
-        if(this.menu == null){
-            this.menu = new Ext.menu.ColorMenu();
-        }
-
-        this.menu.on(Ext.apply({}, this.menuListeners, {
-            scope:this
-        }));
-
-        this.menu.show(this.el, "tl-bl?");
-    }
-});
-
-Ext.reg('colorfield',Ext.ux.ColorField);

=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/ext-ux.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/ext-ux.css	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/ext-ux.css	2011-05-19 08:26:11 +0000
@@ -0,0 +1,222 @@
+/* ColorField */
+.x-form-field-wrap .x-form-color-trigger {
+	background-image: url(colorfield/color-trigger.png);
+}
+.ie6 .x-form-field-wrap .x-form-color-trigger {
+	background-image: url(colorfield/color-trigger.gif);
+}
+
+/* MultiSelect */
+.ux-mselect{
+    overflow:auto;
+    background:white;
+    position:relative; /* for calculating scroll offsets */
+    zoom:1;
+    overflow:auto;	
+}
+.ux-mselect-item{
+    font:normal 11px tahoma, arial, helvetica, sans-serif;
+    padding:2px;
+    border:1px solid #fff;
+    white-space: nowrap;
+    cursor:pointer;
+}
+.ux-mselect-selected{
+	border:1px dotted #a3bae9 !important;
+    background:#DFE8F6;
+    cursor:pointer;
+}
+.x-view-drag-insert-above { 
+    border-top:1px dotted #3366cc; 
+} 
+.x-view-drag-insert-below { 
+    border-bottom:1px dotted #3366cc; 
+}
+
+/* Msg */
+.msg body {
+	font:normal 11px arial,ubuntu;
+    color:#111111;
+	padding:20px;
+    padding-top:32px;
+    font-size:13px;
+	background-color:#fff !important;
+}
+.msg .icon {
+    vertical-align:middle;
+    padding:0px 8px 0px 0px;
+}
+.msg .x-box-mc {
+    padding:8px 23px 7px 12px;
+}
+.x-msg-hl {
+	font-weight:bold;
+	color:#222222;
+}
+#msg-div {
+    display: table;
+    margin-left:auto;
+    margin-right:auto;
+    z-index:20000;
+}
+
+/* CheckBox override */
+.x-form-check-group .x-form-check-wrap,.x-form-radio-group .x-form-radio-wrap{height:auto;}
+.ext-ie .x-form-check-group .x-form-check-wrap,.ext-ie .x-form-radio-group .x-form-radio-wrap{height:auto;}
+.x-form-check-wrap,.x-form-radio-wrap{padding:1px 0 3px;line-height:18px;}
+.ext-ie .x-form-check-wrap,.ext-ie .x-form-radio-wrap{padding-top:3px;}
+.ext-strict .ext-ie7 .x-form-check-wrap,.ext-strict .ext-ie7 .x-form-radio-wrap{padding-bottom:1px;}
+.x-form-check-wrap-inner,.x-form-radio-wrap-inner{display:inline;padding:0;}
+.x-form-check,.x-form-radio{height:13px;width:13px;vertical-align:bottom;margin:2px 0;}
+.ext-ie .x-form-check,.ext-ie .x-form-radio{margin-top:1px;}
+.ext-strict .ext-ie7 .x-form-check,.ext-strict .ext-ie7 .x-form-radio{margin-bottom:4px;}
+.ext-opera .x-form-check,.ext-opera .x-form-radio{margin-top:3px;}
+.x-form-check-focus .x-form-check,.x-form-check-over .x-form-check,.x-form-check-focus .x-form-radio,.x-form-check-over .x-form-radio{background-position:-13px 0;}
+.x-form-check-down .x-form-check,.x-form-check-down .x-form-radio{background-position:-26px 0;}
+.x-item-disabled .x-form-check,.x-item-disabled .x-form-radio{background-position:-39px 0;}
+.x-form-check-checked,.x-form-radio-checked{background-position:0 -13px;}
+.x-form-check-focus .x-form-check-checked,.x-form-check-over .x-form-check-checked,.x-form-check-focus .x-form-radio-checked,.x-form-check-over .x-form-radio-checked{background-position:-13px -13px;}
+.x-form-check-down .x-form-check-checked,.x-form-check-down .x-form-radio-checked{background-position:-26px -13px;}
+.x-item-disabled .x-form-check-checked,.x-item-disabled .x-form-radio-checked{background-position:-39px -13px;}
+.x-form-check-wrap-inner input,.x-form-radio-wrap-inner input{position:absolute;-ms-filter:"alpha(opacity=0)";filter:alpha(opacity=0);-moz-opacity:0;opacity:0;}
+
+/* IconCombo */
+.ux-ic-icon-0 {
+    background-image:url(iconcombo/ux-ic-icon-0.png) ! important;
+}
+.ux-ic-icon-0-title {
+    background:url(iconcombo/ux-ic-icon-0.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-ic-icon-1 {
+    background-image:url(iconcombo/ux-ic-icon-1.png) ! important;
+}
+.ux-ic-icon-1-title {
+    background:url(iconcombo/ux-ic-icon-1.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-ic-icon-2 {
+    background-image:url(iconcombo/ux-ic-icon-2.png) ! important;
+}
+.ux-ic-icon-2-title {
+    background:url(iconcombo/ux-ic-icon-2.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-ic-icon-3 {
+    background-image:url(iconcombo/ux-ic-icon-3.png) ! important;
+}
+.ux-ic-icon-3-title {
+    background:url(iconcombo/ux-ic-icon-3.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-ic-icon-4 {
+    background-image:url(iconcombo/ux-ic-icon-4.png) ! important;
+}
+.ux-ic-icon-4-title {
+    background:url(iconcombo/ux-ic-icon-4.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-ic-icon-5 {
+    background-image:url(iconcombo/ux-ic-icon-5.png) ! important;
+}
+.ux-ic-icon-5-title {
+    background:url(iconcombo/ux-ic-icon-5.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-ic-icon-6 {
+    background-image:url(iconcombo/ux-ic-icon-6.png) ! important;
+}
+.ux-ic-icon-6-title {
+    background:url(iconcombo/ux-ic-icon-6.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-ic-icon-7 {
+    background-image:url(iconcombo/ux-ic-icon-7.png) ! important;
+}
+.ux-ic-icon-7-title {
+    background:url(iconcombo/ux-ic-icon-7.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-ic-icon-8 {
+    background-image:url(iconcombo/ux-ic-icon-8.png) ! important;
+}
+.ux-ic-icon-8-title {
+    background:url(iconcombo/ux-ic-icon-8.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-ic-icon-9 {
+    background-image:url(iconcombo/ux-ic-icon-9.png) ! important;
+}
+.ux-ic-icon-9-title {
+    background:url(iconcombo/ux-ic-icon-9.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-ic-icon-10 {
+    background-image:url(iconcombo/ux-ic-icon-10.png) ! important;
+}
+.ux-ic-icon-10-title {
+    background:url(iconcombo/ux-ic-icon-10.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-ic-icon-11 {
+    background-image:url(iconcombo/ux-ic-icon-11.png) ! important;
+}
+.ux-ic-icon-11-title {
+    background:url(iconcombo/ux-ic-icon-11.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-ic-icon-12 {
+    background-image:url(iconcombo/ux-ic-icon-12.png) ! important;
+}
+.ux-ic-icon-12-title {
+    background:url(iconcombo/ux-ic-icon-12.png) no-repeat 0 0 transparent;
+    padding:0 0 3px 21px;
+	font:bold 11px arial;
+	color:#111;
+}
+.ux-icon-combo-icon {
+    background-repeat: no-repeat;
+    background-position: 5px 50%;
+    width: 22px;
+    height: 16px;
+}
+.ux-icon-combo-input {
+    color: #ffffff;
+    z-index: -1;
+    padding-left: 8px;
+}
+.ux-icon-combo-item {
+    background-repeat: no-repeat ! important;
+    background-position: 5px 50% ! important;
+    color: #f6f6f6;
+    height: 16px;
+    padding-left: 50px;
+}
+.x-form-field-wrap .ux-icon-combo-icon {
+    top: 3px;
+    left: 5px;
+}

=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/ext-ux.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/ext-ux.js	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/ext-ux.js	2011-05-19 08:26:11 +0000
@@ -0,0 +1,94 @@
+/* ColorField */
+Ext.ux.ColorField=Ext.extend(Ext.form.TriggerField,{invalidText:"'{0}' is not a valid color - it must be in a the hex format (# followed by 3 or 6 letters/numbers 0-9 A-F)",triggerClass:'x-form-color-trigger',defaultAutoCreate:{tag:"input",type:"text",size:"10",maxlength:"7",autocomplete:"off"},maskRe:/[#a-f0-9]/i,validateValue:function(value){if(!Ext.ux.ColorField.superclass.validateValue.call(this,value)){return false;}
+if(value.length<1){this.setColor('');return true;}
+var parseOK=this.parseColor(value);if(!value||(parseOK==false)){this.markInvalid(String.format(this.invalidText,value));return false;}
+this.setColor(value);return true;},setColor:function(color){if(color==''||color==undefined)
+{if(this.emptyText!=''&&this.parseColor(this.emptyText))
+color=this.emptyText;else
+color='transparent';}
+if(this.trigger)
+this.trigger.setStyle({'background-color':color});else
+{this.on('render',function(){this.setColor(color)},this);}},validateBlur:function(){return!this.menu||!this.menu.isVisible();},getValue:function(){return Ext.ux.ColorField.superclass.getValue.call(this)||"";},setValue:function(color){Ext.ux.ColorField.superclass.setValue.call(this,this.formatColor(color));this.setColor(this.formatColor(color));},parseColor:function(value){return(!value||(value.substring(0,1)!='#'))?false:(value.length==4||value.length==7);},formatColor:function(value){if(!value||this.parseColor(value))
+return value;if(value.length==3||value.length==6){return'#'+value;}
+return'';},menuListeners:{select:function(e,c){this.setValue(c);this.fireEvent('select',this,c);},show:function(){this.onFocus();},hide:function(){this.focus.defer(10,this);var ml=this.menuListeners;this.menu.un("select",ml.select,this);this.menu.un("show",ml.show,this);this.menu.un("hide",ml.hide,this);}},onTriggerClick:function(){if(this.disabled){return;}
+if(this.menu==null){this.menu=new Ext.menu.ColorMenu();}
+this.menu.on(Ext.apply({},this.menuListeners,{scope:this}));this.menu.show(this.el,"tl-bl?");}});Ext.reg('colorfield',Ext.ux.ColorField);
+
+/* IconCombo */
+Ext.namespace('Ext.ux.plugins');Ext.ux.plugins.IconCombo=function(config){Ext.apply(this,config);};Ext.extend(Ext.ux.plugins.IconCombo,Ext.util.Observable,{init:function(combo){Ext.apply(combo,{tpl:'<tpl for=".">'+'<div class="x-combo-list-item ux-icon-combo-item '+'{'+combo.iconClsField+'}">'+'{'+combo.displayField+'}'+'</div></tpl>',onRender:combo.onRender.createSequence(function(ct,position){this.wrap.applyStyles({position:'relative'});this.el.addClass('ux-icon-combo-input');this.icon=Ext.DomHelper.append(this.el.up('div.x-form-field-wrap'),{tag:'div',style:'position:absolute'});}),setIconCls:function(){var rec=this.store.query(this.valueField,this.getValue()).itemAt(0);if(rec){this.icon.className='ux-icon-combo-icon '+rec.get(this.iconClsField);}},setValue:combo.setValue.createSequence(function(value){this.setIconCls();})});}});
+
+/* DD View */
+Ext.ux.DDView=function(config){if(!config.itemSelector){var tpl=config.tpl;if(this.classRe.test(tpl)){config.tpl=tpl.replace(this.classRe,'class=$1x-combo-list-item $2$1');}
+else{config.tpl=tpl.replace(this.tagRe,'$1 class="x-combo-list-item" $2');}
+config.itemSelector=".x-combo-list-item";}
+Ext.ux.DDView.superclass.constructor.call(this,Ext.apply(config,{border:false}));};Ext.extend(Ext.ux.DDView,Ext.DataView,{sortDir:'ASC',isFormField:true,classRe:/class=(['"])(.*)\1/,tagRe:/(<\w*)(.*?>)/,reset:Ext.emptyFn,clearInvalid:Ext.form.Field.prototype.clearInvalid,afterRender:function(){Ext.ux.DDView.superclass.afterRender.call(this);if(this.dragGroup){this.setDraggable(this.dragGroup.split(","));}
+if(this.dropGroup){this.setDroppable(this.dropGroup.split(","));}
+if(this.deletable){this.setDeletable();}
+this.isDirtyFlag=false;this.addEvents("drop");},validate:function(){return true;},destroy:function(){this.purgeListeners();this.getEl().removeAllListeners();this.getEl().remove();if(this.dragZone){if(this.dragZone.destroy){this.dragZone.destroy();}}
+if(this.dropZone){if(this.dropZone.destroy){this.dropZone.destroy();}}},getName:function(){return this.name;},setValue:function(v){if(!this.store){throw"DDView.setValue(). DDView must be constructed with a valid Store";}
+var data={};data[this.store.reader.meta.root]=v?[].concat(v):[];this.store.proxy=new Ext.data.MemoryProxy(data);this.store.load();},getValue:function(){var result='(';this.store.each(function(rec){result+=rec.id+',';});return result.substr(0,result.length-1)+')';},getIds:function(){var i=0,result=new Array(this.store.getCount());this.store.each(function(rec){result[i++]=rec.id;});return result;},isDirty:function(){return this.isDirtyFlag;},getTargetFromEvent:function(e){var target=e.getTarget();while((target!==null)&&(target.parentNode!=this.el.dom)){target=target.parentNode;}
+if(!target){target=this.el.dom.lastChild||this.el.dom;}
+return target;},getDragData:function(e){var target=this.findItemFromChild(e.getTarget());if(target){if(!this.isSelected(target)){delete this.ignoreNextClick;this.onItemClick(target,this.indexOf(target),e);this.ignoreNextClick=true;}
+var dragData={sourceView:this,viewNodes:[],records:[],copy:this.copy||(this.allowCopy&&e.ctrlKey)};if(this.getSelectionCount()==1){var i=this.getSelectedIndexes()[0];var n=this.getNode(i);dragData.viewNodes.push(dragData.ddel=n);dragData.records.push(this.store.getAt(i));dragData.repairXY=Ext.fly(n).getXY();}else{dragData.ddel=document.createElement('div');dragData.ddel.className='multi-proxy';this.collectSelection(dragData);}
+return dragData;}
+return false;},getRepairXY:function(e){return this.dragData.repairXY;},collectSelection:function(data){data.repairXY=Ext.fly(this.getSelectedNodes()[0]).getXY();if(this.preserveSelectionOrder===true){Ext.each(this.getSelectedIndexes(),function(i){var n=this.getNode(i);var dragNode=n.cloneNode(true);dragNode.id=Ext.id();data.ddel.appendChild(dragNode);data.records.push(this.store.getAt(i));data.viewNodes.push(n);},this);}else{var i=0;this.store.each(function(rec){if(this.isSelected(i)){var n=this.getNode(i);var dragNode=n.cloneNode(true);dragNode.id=Ext.id();data.ddel.appendChild(dragNode);data.records.push(this.store.getAt(i));data.viewNodes.push(n);}
+i++;},this);}},setDraggable:function(ddGroup){if(ddGroup instanceof Array){Ext.each(ddGroup,this.setDraggable,this);return;}
+if(this.dragZone){this.dragZone.addToGroup(ddGroup);}else{this.dragZone=new Ext.dd.DragZone(this.getEl(),{containerScroll:true,ddGroup:ddGroup});if(!this.multiSelect){this.singleSelect=true;}
+this.dragZone.getDragData=this.getDragData.createDelegate(this);this.dragZone.getRepairXY=this.getRepairXY;this.dragZone.onEndDrag=this.onEndDrag;}},setDroppable:function(ddGroup){if(ddGroup instanceof Array){Ext.each(ddGroup,this.setDroppable,this);return;}
+if(this.dropZone){this.dropZone.addToGroup(ddGroup);}else{this.dropZone=new Ext.dd.DropZone(this.getEl(),{owningView:this,containerScroll:true,ddGroup:ddGroup});this.dropZone.getTargetFromEvent=this.getTargetFromEvent.createDelegate(this);this.dropZone.onNodeEnter=this.onNodeEnter.createDelegate(this);this.dropZone.onNodeOver=this.onNodeOver.createDelegate(this);this.dropZone.onNodeOut=this.onNodeOut.createDelegate(this);this.dropZone.onNodeDrop=this.onNodeDrop.createDelegate(this);}},getDropPoint:function(e,n,dd){if(n==this.el.dom){return"above";}
+var t=Ext.lib.Dom.getY(n),b=t+n.offsetHeight;var c=t+(b-t)/2;var y=Ext.lib.Event.getPageY(e);if(y<=c){return"above";}else{return"below";}},isValidDropPoint:function(pt,n,data){if(!data.viewNodes||(data.viewNodes.length!=1)){return true;}
+var d=data.viewNodes[0];if(d==n){return false;}
+if((pt=="below")&&(n.nextSibling==d)){return false;}
+if((pt=="above")&&(n.previousSibling==d)){return false;}
+return true;},onNodeEnter:function(n,dd,e,data){if(this.highlightColor&&(data.sourceView!=this)){this.el.highlight(this.highlightColor);}
+return false;},onNodeOver:function(n,dd,e,data){var dragElClass=this.dropNotAllowed;var pt=this.getDropPoint(e,n,dd);if(this.isValidDropPoint(pt,n,data)){if(this.appendOnly||this.sortField){return"x-tree-drop-ok-below";}
+if(pt){var targetElClass;if(pt=="above"){dragElClass=n.previousSibling?"x-tree-drop-ok-between":"x-tree-drop-ok-above";targetElClass="x-view-drag-insert-above";}else{dragElClass=n.nextSibling?"x-tree-drop-ok-between":"x-tree-drop-ok-below";targetElClass="x-view-drag-insert-below";}
+if(this.lastInsertClass!=targetElClass){Ext.fly(n).replaceClass(this.lastInsertClass,targetElClass);this.lastInsertClass=targetElClass;}}}
+return dragElClass;},onNodeOut:function(n,dd,e,data){this.removeDropIndicators(n);},onNodeDrop:function(n,dd,e,data){if(this.fireEvent("drop",this,n,dd,e,data)===false){return false;}
+var pt=this.getDropPoint(e,n,dd);var insertAt=(this.appendOnly||(n==this.el.dom))?this.store.getCount():n.viewIndex;if(pt=="below"){insertAt++;}
+if(data.sourceView==this){if(pt=="below"){if(data.viewNodes[0]==n){data.viewNodes.shift();}}else{if(data.viewNodes[data.viewNodes.length-1]==n){data.viewNodes.pop();}}
+if(!data.viewNodes.length){return false;}
+if(insertAt>this.store.indexOf(data.records[0])){insertAt--;}}
+if(data.node instanceof Ext.tree.TreeNode){var r=data.node.getOwnerTree().recordFromNode(data.node);if(r){data.records=[r];}}
+if(!data.records){alert("Programming problem. Drag data contained no Records");return false;}
+for(var i=0;i<data.records.length;i++){var r=data.records[i];var dup=this.store.getById(r.id);if(dup&&(dd!=this.dragZone)){if(!this.allowDup&&!this.allowTrash){Ext.fly(this.getNode(this.store.indexOf(dup))).frame("red",1);return true}
+var x=new Ext.data.Record();r.id=x.id;delete x;}
+if(data.copy){this.store.insert(insertAt++,r.copy());}else{if(data.sourceView){data.sourceView.isDirtyFlag=true;data.sourceView.store.remove(r);}
+if(!this.allowTrash)this.store.insert(insertAt++,r);}
+if(this.sortField){this.store.sort(this.sortField,this.sortDir);}
+this.isDirtyFlag=true;}
+this.dragZone.cachedTarget=null;return true;},onEndDrag:function(data,e){var d=Ext.get(this.dragData.ddel);if(d&&d.hasClass("multi-proxy")){d.remove();}},removeDropIndicators:function(n){if(n){Ext.fly(n).removeClass(["x-view-drag-insert-above","x-view-drag-insert-left","x-view-drag-insert-right","x-view-drag-insert-below"]);this.lastInsertClass="_noclass";}},setDeletable:function(imageUrl){if(!this.singleSelect&&!this.multiSelect){this.singleSelect=true;}
+var c=this.getContextMenu();this.contextMenu.on("itemclick",function(item){switch(item.id){case"delete":this.remove(this.getSelectedIndexes());break;}},this);this.contextMenu.add({icon:imageUrl||AU.resolveUrl("/images/delete.gif"),id:"delete",text:AU.getMessage("deleteItem")});},getContextMenu:function(){if(!this.contextMenu){this.contextMenu=new Ext.menu.Menu({id:this.id+"-contextmenu"});this.el.on("contextmenu",this.showContextMenu,this);}
+return this.contextMenu;},disableContextMenu:function(){if(this.contextMenu){this.el.un("contextmenu",this.showContextMenu,this);}},showContextMenu:function(e,item){item=this.findItemFromChild(e.getTarget());if(item){e.stopEvent();this.select(this.getNode(item),this.multiSelect&&e.ctrlKey,true);this.contextMenu.showAt(e.getXY());}},remove:function(selectedIndices){selectedIndices=[].concat(selectedIndices);for(var i=0;i<selectedIndices.length;i++){var rec=this.store.getAt(selectedIndices[i]);this.store.remove(rec);}},onDblClick:function(e){var item=this.findItemFromChild(e.getTarget());if(item){if(this.fireEvent("dblclick",this,this.indexOf(item),item,e)===false){return false;}
+if(this.dragGroup){var targets=Ext.dd.DragDropMgr.getRelated(this.dragZone,true);while(targets.indexOf(this.dropZone)!==-1){targets.remove(this.dropZone);}
+if((targets.length==1)&&(targets[0].owningView)){this.dragZone.cachedTarget=null;var el=Ext.get(targets[0].getEl());var box=el.getBox(true);targets[0].onNodeDrop(el.dom,{target:el.dom,xy:[box.x,box.y+box.height-1]},null,this.getDragData(e));}}}},onItemClick:function(item,index,e){if(this.ignoreNextClick){delete this.ignoreNextClick;return;}
+if(this.fireEvent("beforeclick",this,index,item,e)===false){return false;}
+if(this.multiSelect||this.singleSelect){if(this.multiSelect&&e.shiftKey&&this.lastSelection){this.select(this.getNodes(this.indexOf(this.lastSelection),index),false);}else if(this.isSelected(item)&&e.ctrlKey){this.deselect(item);}else{this.deselect(item);this.select(item,this.multiSelect&&e.ctrlKey);this.lastSelection=item;}
+e.preventDefault();}
+return true;}});
+
+/* Msg */
+Ext.message=function(){var msgCt;function createBox(bool,s){var icon=bool?'../../images/check.png':'../../images/error2.png';return['<div class="msg">','<div class="x-box-tl"><div class="x-box-tr"><div class="x-box-tc"></div></div></div>','<div class="x-box-ml"><div class="x-box-mr"><div class="x-box-mc"><img src="'+icon+'" class="icon"/>',s,'</div></div></div>','<div class="x-box-bl"><div class="x-box-br"><div class="x-box-bc"></div></div></div>','</div>'].join('');}
+return{msg:function(bool,format){if(!msgCt){msgCt=Ext.DomHelper.insertFirst(document.body,{id:'msg-div'},true);}
+msgCt.alignTo(document,'t-t');var s=String.format.apply(String,Array.prototype.slice.call(arguments,1));var m=Ext.DomHelper.append(msgCt,{html:createBox(bool,s)},true);m.slideIn('t').pause(3).ghost("t",{remove:true});},init:function(){var t=Ext.get('exttheme');if(!t){return;}
+var theme=Cookies.get('exttheme')||'aero';if(theme){t.dom.value=theme;Ext.getBody().addClass('x-'+theme);}
+t.on('change',function(){Cookies.set('exttheme',t.getValue());setTimeout(function(){window.location.reload();},250);});var lb=Ext.get('lib-bar');if(lb){lb.show();}}};}();
+
+/* MultiSelect */
+Ext.ux.Multiselect=Ext.extend(Ext.form.Field,{appendOnly:false,dataFields:[],data:[],width:100,height:100,displayField:0,valueField:1,allowBlank:true,minLength:0,maxLength:Number.MAX_VALUE,blankText:Ext.form.TextField.prototype.blankText,minLengthText:'Minimum {0} item(s) required',maxLengthText:'Maximum {0} item(s) allowed',delimiter:',',copy:false,allowDup:false,allowTrash:false,focusClass:undefined,sortDir:'ASC',defaultAutoCreate:{tag:"div"},initComponent:function(){Ext.ux.Multiselect.superclass.initComponent.call(this);this.addEvents({'dblclick':true,'click':true,'change':true,'drop':true});},onRender:function(ct,position){Ext.ux.Multiselect.superclass.onRender.call(this,ct,position);var cls='ux-mselect';var fs=new Ext.form.FieldSet({renderTo:this.el,title:this.legend,height:this.height,width:this.width,style:"padding:0;",tbar:this.tbar});fs.body.addClass(cls);var tpl='<tpl for="."><div class="'+cls+'-item';if(Ext.isIE||Ext.isIE7){tpl+='" unselectable=on';}else{tpl+=' x-unselectable"';}
+tpl+='>{'+this.displayField+'}</div></tpl>';if(!this.store){this.store=new Ext.data.SimpleStore({fields:this.dataFields,data:this.data});}
+this.view=new Ext.ux.DDView({multiSelect:true,store:this.store,selectedClass:cls+"-selected",tpl:tpl,allowDup:this.allowDup,copy:this.copy,allowTrash:this.allowTrash,dragGroup:this.dragGroup,dropGroup:this.dropGroup,itemSelector:"."+cls+"-item",isFormField:false,applyTo:fs.body,appendOnly:this.appendOnly,sortField:this.sortField,sortDir:this.sortDir});fs.add(this.view);this.view.on('click',this.onViewClick,this);this.view.on('beforeClick',this.onViewBeforeClick,this);this.view.on('dblclick',this.onViewDblClick,this);this.view.on('drop',function(ddView,n,dd,e,data){return this.fireEvent("drop",ddView,n,dd,e,data);},this);this.hiddenName=this.name;var hiddenTag={tag:"input",type:"hidden",value:"",name:this.name};if(this.isFormField){this.hiddenField=this.el.createChild(hiddenTag);}else{this.hiddenField=Ext.get(document.body).createChild(hiddenTag);}
+fs.doLayout();},initValue:Ext.emptyFn,onViewClick:function(vw,index,node,e){var arrayIndex=this.preClickSelections.indexOf(index);if(arrayIndex!=-1)
+{this.preClickSelections.splice(arrayIndex,1);this.view.clearSelections(true);this.view.select(this.preClickSelections);}
+this.fireEvent('change',this,this.getValue(),this.hiddenField.dom.value);this.hiddenField.dom.value=this.getValue();this.fireEvent('click',this,e);this.validate();},onViewBeforeClick:function(vw,index,node,e){this.preClickSelections=this.view.getSelectedIndexes();if(this.disabled){return false;}},onViewDblClick:function(vw,index,node,e){return this.fireEvent('dblclick',vw,index,node,e);},getValue:function(valueField){var returnArray=[];var selectionsArray=this.view.getSelectedIndexes();if(selectionsArray.length==0){return'';}
+for(var i=0;i<selectionsArray.length;i++){returnArray.push(this.store.getAt(selectionsArray[i]).get(((valueField!=null)?valueField:this.valueField)));}
+return returnArray.join(this.delimiter);},setValue:function(values){var index;var selections=[];this.view.clearSelections();this.hiddenField.dom.value='';if(!values||(values=='')){return;}
+if(!(values instanceof Array)){values=values.split(this.delimiter);}
+for(var i=0;i<values.length;i++){index=this.view.store.indexOf(this.view.store.query(this.valueField,new RegExp('^'+values[i]+'$',"i")).itemAt(0));selections.push(index);}
+this.view.select(selections);this.hiddenField.dom.value=this.getValue();this.validate();},reset:function(){this.setValue('');},getRawValue:function(valueField){var tmp=this.getValue(valueField);if(tmp.length){tmp=tmp.split(this.delimiter);}
+else{tmp=[];}
+return tmp;},setRawValue:function(values){setValue(values);},validateValue:function(value){if(value.length<1){if(this.allowBlank){this.clearInvalid();return true;}else{this.markInvalid(this.blankText);return false;}}
+if(value.length<this.minLength){this.markInvalid(String.format(this.minLengthText,this.minLength));return false;}
+if(value.length>this.maxLength){this.markInvalid(String.format(this.maxLengthText,this.maxLength));return false;}
+return true;}});Ext.reg("multiselect",Ext.ux.Multiselect);
+

=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/IconCombo.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/IconCombo.css	2011-05-16 15:25:26 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/IconCombo.css	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-.ux-ic-icon-0 {
-    background-image:url(ux-ic-icon-0.png) ! important;
-}
-.ux-ic-icon-0-title {
-    background:url(ux-ic-icon-0.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-ic-icon-1 {
-    background-image:url(ux-ic-icon-1.png) ! important;
-}
-.ux-ic-icon-1-title {
-    background:url(ux-ic-icon-1.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-ic-icon-2 {
-    background-image:url(ux-ic-icon-2.png) ! important;
-}
-.ux-ic-icon-2-title {
-    background:url(ux-ic-icon-2.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-ic-icon-3 {
-    background-image:url(ux-ic-icon-3.png) ! important;
-}
-.ux-ic-icon-3-title {
-    background:url(ux-ic-icon-3.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-ic-icon-4 {
-    background-image:url(ux-ic-icon-4.png) ! important;
-}
-.ux-ic-icon-4-title {
-    background:url(ux-ic-icon-4.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-ic-icon-5 {
-    background-image:url(ux-ic-icon-5.png) ! important;
-}
-.ux-ic-icon-5-title {
-    background:url(ux-ic-icon-5.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-ic-icon-6 {
-    background-image:url(ux-ic-icon-6.png) ! important;
-}
-.ux-ic-icon-6-title {
-    background:url(ux-ic-icon-6.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-ic-icon-7 {
-    background-image:url(ux-ic-icon-7.png) ! important;
-}
-.ux-ic-icon-7-title {
-    background:url(ux-ic-icon-7.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-ic-icon-8 {
-    background-image:url(ux-ic-icon-8.png) ! important;
-}
-.ux-ic-icon-8-title {
-    background:url(ux-ic-icon-8.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-ic-icon-9 {
-    background-image:url(ux-ic-icon-9.png) ! important;
-}
-.ux-ic-icon-9-title {
-    background:url(ux-ic-icon-9.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-ic-icon-10 {
-    background-image:url(ux-ic-icon-10.png) ! important;
-}
-.ux-ic-icon-10-title {
-    background:url(ux-ic-icon-10.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-ic-icon-11 {
-    background-image:url(ux-ic-icon-11.png) ! important;
-}
-.ux-ic-icon-11-title {
-    background:url(ux-ic-icon-11.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-ic-icon-12 {
-    background-image:url(ux-ic-icon-12.png) ! important;
-}
-.ux-ic-icon-12-title {
-    background:url(ux-ic-icon-12.png) no-repeat 0 0 transparent;
-    padding:0 0 3px 21px;
-	font:bold 11px arial;
-	color:#111;
-}
-.ux-icon-combo-icon {
-    background-repeat: no-repeat;
-    background-position: 5px 50%;
-    width: 22px;
-    height: 16px;
-}
-.ux-icon-combo-input {
-    color: #ffffff;
-    z-index: -1;
-    padding-left: 8px;
-}
-.ux-icon-combo-item {
-    background-repeat: no-repeat ! important;
-    background-position: 5px 50% ! important;
-    color: #f6f6f6;
-    height: 16px;
-    padding-left: 50px;
-}
-.x-form-field-wrap .ux-icon-combo-icon {
-    top: 3px;
-    left: 5px;
-}

=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/IconCombo.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/IconCombo.js	2011-05-12 12:36:10 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/IconCombo.js	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/* @author  Ing. Jozef Sakalos */
-Ext.namespace('Ext.ux.plugins');
-
-Ext.ux.plugins.IconCombo = function(config) {
-    Ext.apply(this, config);
-};
- 
-Ext.extend(Ext.ux.plugins.IconCombo, Ext.util.Observable, {
-    init: function(combo) {
-        Ext.apply(combo, {
-            tpl:  '<tpl for=".">'
-                + '<div class="x-combo-list-item ux-icon-combo-item '
-                + '{' + combo.iconClsField + '}">'
-                + '{' + combo.displayField + '}'
-                + '</div></tpl>',
- 
-            onRender: combo.onRender.createSequence(function(ct, position) {
-                this.wrap.applyStyles({position:'relative'});
-                this.el.addClass('ux-icon-combo-input');
- 
-                this.icon = Ext.DomHelper.append(this.el.up('div.x-form-field-wrap'), {
-                    tag: 'div', style:'position:absolute'
-                });
-            }),
- 
-            setIconCls: function() {
-                var rec = this.store.query(this.valueField, this.getValue()).itemAt(0);
-                if (rec) {
-                    this.icon.className = 'ux-icon-combo-icon ' + rec.get(this.iconClsField);
-                }
-            },
-             
-            setValue: combo.setValue.createSequence(function(value) {
-                this.setIconCls();
-            })
-        });
-    }
-});

=== removed directory 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector'
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/DDView.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/DDView.js	2010-03-08 15:23:59 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/DDView.js	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-Ext.ux.DDView=function(config){if(!config.itemSelector){var tpl=config.tpl;if(this.classRe.test(tpl)){config.tpl=tpl.replace(this.classRe,'class=$1x-combo-list-item $2$1');}
-else{config.tpl=tpl.replace(this.tagRe,'$1 class="x-combo-list-item" $2');}
-config.itemSelector=".x-combo-list-item";}
-Ext.ux.DDView.superclass.constructor.call(this,Ext.apply(config,{border:false}));};Ext.extend(Ext.ux.DDView,Ext.DataView,{sortDir:'ASC',isFormField:true,classRe:/class=(['"])(.*)\1/,tagRe:/(<\w*)(.*?>)/,reset:Ext.emptyFn,clearInvalid:Ext.form.Field.prototype.clearInvalid,afterRender:function(){Ext.ux.DDView.superclass.afterRender.call(this);if(this.dragGroup){this.setDraggable(this.dragGroup.split(","));}
-if(this.dropGroup){this.setDroppable(this.dropGroup.split(","));}
-if(this.deletable){this.setDeletable();}
-this.isDirtyFlag=false;this.addEvents("drop");},validate:function(){return true;},destroy:function(){this.purgeListeners();this.getEl().removeAllListeners();this.getEl().remove();if(this.dragZone){if(this.dragZone.destroy){this.dragZone.destroy();}}
-if(this.dropZone){if(this.dropZone.destroy){this.dropZone.destroy();}}},getName:function(){return this.name;},setValue:function(v){if(!this.store){throw"DDView.setValue(). DDView must be constructed with a valid Store";}
-var data={};data[this.store.reader.meta.root]=v?[].concat(v):[];this.store.proxy=new Ext.data.MemoryProxy(data);this.store.load();},getValue:function(){var result='(';this.store.each(function(rec){result+=rec.id+',';});return result.substr(0,result.length-1)+')';},getIds:function(){var i=0,result=new Array(this.store.getCount());this.store.each(function(rec){result[i++]=rec.id;});return result;},isDirty:function(){return this.isDirtyFlag;},getTargetFromEvent:function(e){var target=e.getTarget();while((target!==null)&&(target.parentNode!=this.el.dom)){target=target.parentNode;}
-if(!target){target=this.el.dom.lastChild||this.el.dom;}
-return target;},getDragData:function(e){var target=this.findItemFromChild(e.getTarget());if(target){if(!this.isSelected(target)){delete this.ignoreNextClick;this.onItemClick(target,this.indexOf(target),e);this.ignoreNextClick=true;}
-var dragData={sourceView:this,viewNodes:[],records:[],copy:this.copy||(this.allowCopy&&e.ctrlKey)};if(this.getSelectionCount()==1){var i=this.getSelectedIndexes()[0];var n=this.getNode(i);dragData.viewNodes.push(dragData.ddel=n);dragData.records.push(this.store.getAt(i));dragData.repairXY=Ext.fly(n).getXY();}else{dragData.ddel=document.createElement('div');dragData.ddel.className='multi-proxy';this.collectSelection(dragData);}
-return dragData;}
-return false;},getRepairXY:function(e){return this.dragData.repairXY;},collectSelection:function(data){data.repairXY=Ext.fly(this.getSelectedNodes()[0]).getXY();if(this.preserveSelectionOrder===true){Ext.each(this.getSelectedIndexes(),function(i){var n=this.getNode(i);var dragNode=n.cloneNode(true);dragNode.id=Ext.id();data.ddel.appendChild(dragNode);data.records.push(this.store.getAt(i));data.viewNodes.push(n);},this);}else{var i=0;this.store.each(function(rec){if(this.isSelected(i)){var n=this.getNode(i);var dragNode=n.cloneNode(true);dragNode.id=Ext.id();data.ddel.appendChild(dragNode);data.records.push(this.store.getAt(i));data.viewNodes.push(n);}
-i++;},this);}},setDraggable:function(ddGroup){if(ddGroup instanceof Array){Ext.each(ddGroup,this.setDraggable,this);return;}
-if(this.dragZone){this.dragZone.addToGroup(ddGroup);}else{this.dragZone=new Ext.dd.DragZone(this.getEl(),{containerScroll:true,ddGroup:ddGroup});if(!this.multiSelect){this.singleSelect=true;}
-this.dragZone.getDragData=this.getDragData.createDelegate(this);this.dragZone.getRepairXY=this.getRepairXY;this.dragZone.onEndDrag=this.onEndDrag;}},setDroppable:function(ddGroup){if(ddGroup instanceof Array){Ext.each(ddGroup,this.setDroppable,this);return;}
-if(this.dropZone){this.dropZone.addToGroup(ddGroup);}else{this.dropZone=new Ext.dd.DropZone(this.getEl(),{owningView:this,containerScroll:true,ddGroup:ddGroup});this.dropZone.getTargetFromEvent=this.getTargetFromEvent.createDelegate(this);this.dropZone.onNodeEnter=this.onNodeEnter.createDelegate(this);this.dropZone.onNodeOver=this.onNodeOver.createDelegate(this);this.dropZone.onNodeOut=this.onNodeOut.createDelegate(this);this.dropZone.onNodeDrop=this.onNodeDrop.createDelegate(this);}},getDropPoint:function(e,n,dd){if(n==this.el.dom){return"above";}
-var t=Ext.lib.Dom.getY(n),b=t+n.offsetHeight;var c=t+(b-t)/2;var y=Ext.lib.Event.getPageY(e);if(y<=c){return"above";}else{return"below";}},isValidDropPoint:function(pt,n,data){if(!data.viewNodes||(data.viewNodes.length!=1)){return true;}
-var d=data.viewNodes[0];if(d==n){return false;}
-if((pt=="below")&&(n.nextSibling==d)){return false;}
-if((pt=="above")&&(n.previousSibling==d)){return false;}
-return true;},onNodeEnter:function(n,dd,e,data){if(this.highlightColor&&(data.sourceView!=this)){this.el.highlight(this.highlightColor);}
-return false;},onNodeOver:function(n,dd,e,data){var dragElClass=this.dropNotAllowed;var pt=this.getDropPoint(e,n,dd);if(this.isValidDropPoint(pt,n,data)){if(this.appendOnly||this.sortField){return"x-tree-drop-ok-below";}
-if(pt){var targetElClass;if(pt=="above"){dragElClass=n.previousSibling?"x-tree-drop-ok-between":"x-tree-drop-ok-above";targetElClass="x-view-drag-insert-above";}else{dragElClass=n.nextSibling?"x-tree-drop-ok-between":"x-tree-drop-ok-below";targetElClass="x-view-drag-insert-below";}
-if(this.lastInsertClass!=targetElClass){Ext.fly(n).replaceClass(this.lastInsertClass,targetElClass);this.lastInsertClass=targetElClass;}}}
-return dragElClass;},onNodeOut:function(n,dd,e,data){this.removeDropIndicators(n);},onNodeDrop:function(n,dd,e,data){if(this.fireEvent("drop",this,n,dd,e,data)===false){return false;}
-var pt=this.getDropPoint(e,n,dd);var insertAt=(this.appendOnly||(n==this.el.dom))?this.store.getCount():n.viewIndex;if(pt=="below"){insertAt++;}
-if(data.sourceView==this){if(pt=="below"){if(data.viewNodes[0]==n){data.viewNodes.shift();}}else{if(data.viewNodes[data.viewNodes.length-1]==n){data.viewNodes.pop();}}
-if(!data.viewNodes.length){return false;}
-if(insertAt>this.store.indexOf(data.records[0])){insertAt--;}}
-if(data.node instanceof Ext.tree.TreeNode){var r=data.node.getOwnerTree().recordFromNode(data.node);if(r){data.records=[r];}}
-if(!data.records){alert("Programming problem. Drag data contained no Records");return false;}
-for(var i=0;i<data.records.length;i++){var r=data.records[i];var dup=this.store.getById(r.id);if(dup&&(dd!=this.dragZone)){if(!this.allowDup&&!this.allowTrash){Ext.fly(this.getNode(this.store.indexOf(dup))).frame("red",1);return true}
-var x=new Ext.data.Record();r.id=x.id;delete x;}
-if(data.copy){this.store.insert(insertAt++,r.copy());}else{if(data.sourceView){data.sourceView.isDirtyFlag=true;data.sourceView.store.remove(r);}
-if(!this.allowTrash)this.store.insert(insertAt++,r);}
-if(this.sortField){this.store.sort(this.sortField,this.sortDir);}
-this.isDirtyFlag=true;}
-this.dragZone.cachedTarget=null;return true;},onEndDrag:function(data,e){var d=Ext.get(this.dragData.ddel);if(d&&d.hasClass("multi-proxy")){d.remove();}},removeDropIndicators:function(n){if(n){Ext.fly(n).removeClass(["x-view-drag-insert-above","x-view-drag-insert-left","x-view-drag-insert-right","x-view-drag-insert-below"]);this.lastInsertClass="_noclass";}},setDeletable:function(imageUrl){if(!this.singleSelect&&!this.multiSelect){this.singleSelect=true;}
-var c=this.getContextMenu();this.contextMenu.on("itemclick",function(item){switch(item.id){case"delete":this.remove(this.getSelectedIndexes());break;}},this);this.contextMenu.add({icon:imageUrl||AU.resolveUrl("/images/delete.gif"),id:"delete",text:AU.getMessage("deleteItem")});},getContextMenu:function(){if(!this.contextMenu){this.contextMenu=new Ext.menu.Menu({id:this.id+"-contextmenu"});this.el.on("contextmenu",this.showContextMenu,this);}
-return this.contextMenu;},disableContextMenu:function(){if(this.contextMenu){this.el.un("contextmenu",this.showContextMenu,this);}},showContextMenu:function(e,item){item=this.findItemFromChild(e.getTarget());if(item){e.stopEvent();this.select(this.getNode(item),this.multiSelect&&e.ctrlKey,true);this.contextMenu.showAt(e.getXY());}},remove:function(selectedIndices){selectedIndices=[].concat(selectedIndices);for(var i=0;i<selectedIndices.length;i++){var rec=this.store.getAt(selectedIndices[i]);this.store.remove(rec);}},onDblClick:function(e){var item=this.findItemFromChild(e.getTarget());if(item){if(this.fireEvent("dblclick",this,this.indexOf(item),item,e)===false){return false;}
-if(this.dragGroup){var targets=Ext.dd.DragDropMgr.getRelated(this.dragZone,true);while(targets.indexOf(this.dropZone)!==-1){targets.remove(this.dropZone);}
-if((targets.length==1)&&(targets[0].owningView)){this.dragZone.cachedTarget=null;var el=Ext.get(targets[0].getEl());var box=el.getBox(true);targets[0].onNodeDrop(el.dom,{target:el.dom,xy:[box.x,box.y+box.height-1]},null,this.getDragData(e));}}}},onItemClick:function(item,index,e){if(this.ignoreNextClick){delete this.ignoreNextClick;return;}
-if(this.fireEvent("beforeclick",this,index,item,e)===false){return false;}
-if(this.multiSelect||this.singleSelect){if(this.multiSelect&&e.shiftKey&&this.lastSelection){this.select(this.getNodes(this.indexOf(this.lastSelection),index),false);}else if(this.isSelected(item)&&e.ctrlKey){this.deselect(item);}else{this.deselect(item);this.select(item,this.multiSelect&&e.ctrlKey);this.lastSelection=item;}
-e.preventDefault();}
-return true;}});
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/ItemSelector.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/ItemSelector.js	2010-03-08 15:23:59 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/ItemSelector.js	1970-01-01 00:00:00 +0000
@@ -1,361 +0,0 @@
-/*
- * Ext JS Library 2.2.1
- * Copyright(c) 2006-2009, Ext JS, LLC.
- * licensing@extjs.com
- * 
- * http://extjs.com/license
- */
-
-/*
- * Note that this control will most likely remain as an example, and not as a core Ext form
- * control.  However, the API will be changing in a future release and so should not yet be
- * treated as a final, stable API at this time.
- */
- 
-/** 
- * @class Ext.ux.ItemSelector
- * @extends Ext.form.Field
- * A control that allows selection of between two Ext.ux.MultiSelect controls.
- * 
- *  @history
- *    2008-06-19 bpm Original code contributed by Toby Stuart (with contributions from Robert Williams)
- * 
- * @constructor
- * Create a new ItemSelector
- * @param {Object} config Configuration options
- */
-Ext.ux.ItemSelector = Ext.extend(Ext.form.Field,  {
-    msWidth:200,
-    msHeight:300,
-    hideNavIcons:false,
-    imagePath:"",
-    iconUp:"up2.gif",
-    iconDown:"down2.gif",
-    iconLeft:"left2.gif",
-    iconRight:"right2.gif",
-    iconTop:"top2.gif",
-    iconBottom:"bottom2.gif",
-    drawUpIcon:true,
-    drawDownIcon:true,
-    drawLeftIcon:true,
-    drawRightIcon:true,
-    drawTopIcon:true,
-    drawBotIcon:true,
-    fromStore:null,
-    toStore:null,
-    fromData:null, 
-    toData:null,
-    displayField:0,
-    valueField:1,
-    switchToFrom:false,
-    allowDup:false,
-    focusClass:undefined,
-    delimiter:',',
-    readOnly:false,
-    toLegend:null,
-    fromLegend:null,
-    toSortField:null,
-    fromSortField:null,
-    toSortDir:'ASC',
-    fromSortDir:'ASC',
-    toTBar:null,
-    fromTBar:null,
-    bodyStyle:null,
-    border:false,
-    defaultAutoCreate:{tag: "div"},
-    
-    initComponent: function(){
-        Ext.ux.ItemSelector.superclass.initComponent.call(this);
-        this.addEvents({
-            'rowdblclick' : true,
-            'change' : true
-        });         
-    },
-
-    onRender: function(ct, position){
-        Ext.ux.ItemSelector.superclass.onRender.call(this, ct, position);
-
-        this.fromMultiselect = new Ext.ux.Multiselect({
-            legend: this.fromLegend,
-            delimiter: this.delimiter,
-            allowDup: this.allowDup,
-            copy: this.allowDup,
-            allowTrash: this.allowDup,
-            dragGroup: this.readOnly ? null : "drop2-"+this.el.dom.id,
-            dropGroup: this.readOnly ? null : "drop1-"+this.el.dom.id,
-            width: this.msWidth,
-            height: this.msHeight,
-            dataFields: this.dataFields,
-            data: this.fromData,
-            displayField: this.displayField,
-            valueField: this.valueField,
-            store: this.fromStore,
-            isFormField: false,
-            tbar: this.fromTBar,
-            appendOnly: true,
-            sortField: this.fromSortField,
-            sortDir: this.fromSortDir
-        });
-        this.fromMultiselect.on('dblclick', this.onRowDblClick, this);
-
-        if (!this.toStore) {
-            this.toStore = new Ext.data.SimpleStore({
-                fields: this.dataFields,
-                data : this.toData
-            });
-        }
-        this.toStore.on('add', this.valueChanged, this);
-        this.toStore.on('remove', this.valueChanged, this);
-        this.toStore.on('load', this.valueChanged, this);
-
-        this.toMultiselect = new Ext.ux.Multiselect({
-            legend: this.toLegend,
-            delimiter: this.delimiter,
-            allowDup: this.allowDup,
-            dragGroup: this.readOnly ? null : "drop1-"+this.el.dom.id,
-            //dropGroup: this.readOnly ? null : "drop2-"+this.el.dom.id+(this.toSortField ? "" : ",drop1-"+this.el.dom.id),
-            dropGroup: this.readOnly ? null : "drop2-"+this.el.dom.id+",drop1-"+this.el.dom.id,
-            width: this.msWidth,
-            height: this.msHeight,
-            displayField: this.displayField,
-            valueField: this.valueField,
-            store: this.toStore,
-            isFormField: false,
-            tbar: this.toTBar,
-            sortField: this.toSortField,
-            sortDir: this.toSortDir
-        });
-        this.toMultiselect.on('dblclick', this.onRowDblClick, this);
-                
-        var p = new Ext.Panel({
-            bodyStyle:this.bodyStyle,
-            border:this.border,
-            layout:"table",
-            layoutConfig:{columns:3}
-        });
-        p.add(this.switchToFrom ? this.toMultiselect : this.fromMultiselect);
-        var icons = new Ext.Panel({header:false});
-        p.add(icons);
-        p.add(this.switchToFrom ? this.fromMultiselect : this.toMultiselect);
-        p.render(this.el);
-        icons.el.down('.'+icons.bwrapCls).remove();
-
-        if (this.imagePath!="" && this.imagePath.charAt(this.imagePath.length-1)!="/")
-            this.imagePath+="/";
-        this.iconUp = this.imagePath + (this.iconUp || 'up2.gif');
-        this.iconDown = this.imagePath + (this.iconDown || 'down2.gif');
-        this.iconLeft = this.imagePath + (this.iconLeft || 'left2.gif');
-        this.iconRight = this.imagePath + (this.iconRight || 'right2.gif');
-        this.iconTop = this.imagePath + (this.iconTop || 'top2.gif');
-        this.iconBottom = this.imagePath + (this.iconBottom || 'bottom2.gif');
-        var el=icons.getEl();
-        if (!this.toSortField) {
-            this.toTopIcon = el.createChild({tag:'img', src:this.iconTop, style:{cursor:'pointer', margin:'2px'}});
-            el.createChild({tag: 'br'});
-            this.upIcon = el.createChild({tag:'img', src:this.iconUp, style:{cursor:'pointer', margin:'2px'}});
-            el.createChild({tag: 'br'});
-        }
-        this.addIcon = el.createChild({tag:'img', src:this.switchToFrom?this.iconLeft:this.iconRight, style:{cursor:'pointer', margin:'2px'}});
-        el.createChild({tag: 'br'});
-        this.removeIcon = el.createChild({tag:'img', src:this.switchToFrom?this.iconRight:this.iconLeft, style:{cursor:'pointer', margin:'2px'}});
-        el.createChild({tag: 'br'});
-        if (!this.toSortField) {
-            this.downIcon = el.createChild({tag:'img', src:this.iconDown, style:{cursor:'pointer', margin:'2px'}});
-            el.createChild({tag: 'br'});
-            this.toBottomIcon = el.createChild({tag:'img', src:this.iconBottom, style:{cursor:'pointer', margin:'2px'}});
-        }
-        if (!this.readOnly) {
-            if (!this.toSortField) {
-                this.toTopIcon.on('click', this.toTop, this);
-                this.upIcon.on('click', this.up, this);
-                this.downIcon.on('click', this.down, this);
-                this.toBottomIcon.on('click', this.toBottom, this);
-            }
-            this.addIcon.on('click', this.fromTo, this);
-            this.removeIcon.on('click', this.toFrom, this);
-        }
-        if (!this.drawUpIcon || this.hideNavIcons) { this.upIcon.dom.style.display='none'; }
-        if (!this.drawDownIcon || this.hideNavIcons) { this.downIcon.dom.style.display='none'; }
-        if (!this.drawLeftIcon || this.hideNavIcons) { this.addIcon.dom.style.display='none'; }
-        if (!this.drawRightIcon || this.hideNavIcons) { this.removeIcon.dom.style.display='none'; }
-        if (!this.drawTopIcon || this.hideNavIcons) { this.toTopIcon.dom.style.display='none'; }
-        if (!this.drawBotIcon || this.hideNavIcons) { this.toBottomIcon.dom.style.display='none'; }
-
-        var tb = p.body.first();
-        this.el.setWidth(p.body.first().getWidth());
-        p.body.removeClass();
-        
-        this.hiddenName = this.name;
-        var hiddenTag={tag: "input", type: "hidden", value: "", name:this.name};
-        this.hiddenField = this.el.createChild(hiddenTag);
-        this.valueChanged(this.toStore);
-    },
-    
-    initValue:Ext.emptyFn,
-    
-    toTop : function() {
-        var selectionsArray = this.toMultiselect.view.getSelectedIndexes();
-        var records = [];
-        if (selectionsArray.length > 0) {
-            selectionsArray.sort();
-            for (var i=0; i<selectionsArray.length; i++) {
-                record = this.toMultiselect.view.store.getAt(selectionsArray[i]);
-                records.push(record);
-            }
-            selectionsArray = [];
-            for (var i=records.length-1; i>-1; i--) {
-                record = records[i];
-                this.toMultiselect.view.store.remove(record);
-                this.toMultiselect.view.store.insert(0, record);
-                selectionsArray.push(((records.length - 1) - i));
-            }
-        }
-        this.toMultiselect.view.refresh();
-        this.toMultiselect.view.select(selectionsArray);
-    },
-
-    toBottom : function() {
-        var selectionsArray = this.toMultiselect.view.getSelectedIndexes();
-        var records = [];
-        if (selectionsArray.length > 0) {
-            selectionsArray.sort();
-            for (var i=0; i<selectionsArray.length; i++) {
-                record = this.toMultiselect.view.store.getAt(selectionsArray[i]);
-                records.push(record);
-            }
-            selectionsArray = [];
-            for (var i=0; i<records.length; i++) {
-                record = records[i];
-                this.toMultiselect.view.store.remove(record);
-                this.toMultiselect.view.store.add(record);
-                selectionsArray.push((this.toMultiselect.view.store.getCount()) - (records.length - i));
-            }
-        }
-        this.toMultiselect.view.refresh();
-        this.toMultiselect.view.select(selectionsArray);
-    },
-    
-    up : function() {
-        var record = null;
-        var selectionsArray = this.toMultiselect.view.getSelectedIndexes();
-        selectionsArray.sort();
-        var newSelectionsArray = [];
-        if (selectionsArray.length > 0) {
-            for (var i=0; i<selectionsArray.length; i++) {
-                record = this.toMultiselect.view.store.getAt(selectionsArray[i]);
-                if ((selectionsArray[i] - 1) >= 0) {
-                    this.toMultiselect.view.store.remove(record);
-                    this.toMultiselect.view.store.insert(selectionsArray[i] - 1, record);
-                    newSelectionsArray.push(selectionsArray[i] - 1);
-                }
-            }
-            this.toMultiselect.view.refresh();
-            this.toMultiselect.view.select(newSelectionsArray);
-        }
-    },
-
-    down : function() {
-        var record = null;
-        var selectionsArray = this.toMultiselect.view.getSelectedIndexes();
-        selectionsArray.sort();
-        selectionsArray.reverse();
-        var newSelectionsArray = [];
-        if (selectionsArray.length > 0) {
-            for (var i=0; i<selectionsArray.length; i++) {
-                record = this.toMultiselect.view.store.getAt(selectionsArray[i]);
-                if ((selectionsArray[i] + 1) < this.toMultiselect.view.store.getCount()) {
-                    this.toMultiselect.view.store.remove(record);
-                    this.toMultiselect.view.store.insert(selectionsArray[i] + 1, record);
-                    newSelectionsArray.push(selectionsArray[i] + 1);
-                }
-            }
-            this.toMultiselect.view.refresh();
-            this.toMultiselect.view.select(newSelectionsArray);
-        }
-    },
-    
-    fromTo : function() {
-        var selectionsArray = this.fromMultiselect.view.getSelectedIndexes();
-        var records = [];
-        if (selectionsArray.length > 0) {
-            for (var i=0; i<selectionsArray.length; i++) {
-                record = this.fromMultiselect.view.store.getAt(selectionsArray[i]);
-                records.push(record);
-            }
-            if(!this.allowDup)selectionsArray = [];
-            for (var i=0; i<records.length; i++) {
-                record = records[i];
-                if(this.allowDup){
-                    var x=new Ext.data.Record();
-                    record.id=x.id;
-                    delete x;   
-                    this.toMultiselect.view.store.add(record);
-                }else{
-                    this.fromMultiselect.view.store.remove(record);
-                    this.toMultiselect.view.store.add(record);
-                    selectionsArray.push((this.toMultiselect.view.store.getCount() - 1));
-                }
-            }
-        }
-        this.toMultiselect.view.refresh();
-        this.fromMultiselect.view.refresh();
-        if(this.toSortField)this.toMultiselect.store.sort(this.toSortField, this.toSortDir);
-        if(this.allowDup)this.fromMultiselect.view.select(selectionsArray);
-        else this.toMultiselect.view.select(selectionsArray);
-    },
-    
-    toFrom : function() {
-        var selectionsArray = this.toMultiselect.view.getSelectedIndexes();
-        var records = [];
-        if (selectionsArray.length > 0) {
-            for (var i=0; i<selectionsArray.length; i++) {
-                record = this.toMultiselect.view.store.getAt(selectionsArray[i]);
-                records.push(record);
-            }
-            selectionsArray = [];
-            for (var i=0; i<records.length; i++) {
-                record = records[i];
-                this.toMultiselect.view.store.remove(record);
-                if(!this.allowDup){
-                    this.fromMultiselect.view.store.add(record);
-                    selectionsArray.push((this.fromMultiselect.view.store.getCount() - 1));
-                }
-            }
-        }
-        this.fromMultiselect.view.refresh();
-        this.toMultiselect.view.refresh();
-        if(this.fromSortField)this.fromMultiselect.store.sort(this.fromSortField, this.fromSortDir);
-        this.fromMultiselect.view.select(selectionsArray);
-    },
-    
-    valueChanged: function(store) {
-        var record = null;
-        var values = [];
-        for (var i=0; i<store.getCount(); i++) {
-            record = store.getAt(i);
-            values.push(record.get(this.valueField));
-        }
-        this.hiddenField.dom.value = values.join(this.delimiter);
-        this.fireEvent('change', this, this.getValue(), this.hiddenField.dom.value);
-    },
-    
-    getValue : function() {
-        return this.hiddenField.dom.value;
-    },
-    
-    onRowDblClick : function(vw, index, node, e) {
-        return this.fireEvent('rowdblclick', vw, index, node, e);
-    },
-    
-    reset: function(){
-        range = this.toMultiselect.store.getRange();
-        this.toMultiselect.store.removeAll();
-        if (!this.allowDup) {
-            this.fromMultiselect.store.add(range);
-            this.fromMultiselect.store.sort(this.displayField,'ASC');
-        }
-        this.valueChanged(this.toMultiselect.store);
-    }
-});
-
-Ext.reg("itemselector", Ext.ux.ItemSelector);
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/bottom2.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/bottom2.gif	2010-03-08 15:23:59 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/bottom2.gif	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/down2.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/down2.gif	2010-03-08 15:23:59 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/down2.gif	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/left2.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/left2.gif	2010-03-08 15:23:59 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/left2.gif	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/right2.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/right2.gif	2010-03-08 15:23:59 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/right2.gif	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/top2.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/top2.gif	2010-03-08 15:23:59 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/top2.gif	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/up2.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/up2.gif	2010-03-08 15:23:59 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/itemselector/up2.gif	1970-01-01 00:00:00 +0000 differ
=== removed directory 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg'
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.css	2011-05-16 15:25:26 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.css	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-.msg body {
-	font:normal 11px arial,ubuntu;
-    color:#111111;
-	padding:20px;
-    padding-top:32px;
-    font-size:13px;
-	background-color:#fff !important;
-}
-.msg .icon {
-    vertical-align:middle;
-    padding:0px 8px 0px 0px;
-}
-.msg .x-box-mc {
-    padding:8px 23px 7px 12px;
-}
-.x-msg-hl {
-	font-weight:bold;
-	color:#222222;
-}
-#msg-div {
-    display: table;
-    margin-left:auto;
-    margin-right:auto;
-    z-index:20000;
-}

=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.js	2011-05-16 15:25:26 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.js	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-Ext.message = function(){
-    var msgCt;
-
-    function createBox(bool, s){
-        var icon = bool ? '../../images/check.png' : '../../images/error2.png';
-        return ['<div class="msg">',
-                '<div class="x-box-tl"><div class="x-box-tr"><div class="x-box-tc"></div></div></div>',
-                '<div class="x-box-ml"><div class="x-box-mr"><div class="x-box-mc"><img src="' + icon + '" class="icon"/>', s, '</div></div></div>',
-                '<div class="x-box-bl"><div class="x-box-br"><div class="x-box-bc"></div></div></div>',
-                '</div>'].join('');
-    }
-    
-    return {
-        msg : function(bool, format){
-            if(!msgCt){
-                msgCt = Ext.DomHelper.insertFirst(document.body, {id:'msg-div'}, true);
-            }
-            msgCt.alignTo(document, 't-t');
-            var s = String.format.apply(String, Array.prototype.slice.call(arguments, 1));
-            var m = Ext.DomHelper.append(msgCt, {html:createBox(bool, s)}, true);
-            m.slideIn('t').pause(3).ghost("t", {remove:true});
-        },
-        
-        init : function(){
-            var t = Ext.get('exttheme');
-            if(!t){ // run locally?
-                return;
-            }
-            var theme = Cookies.get('exttheme') || 'aero';
-            if(theme){
-                t.dom.value = theme;
-                Ext.getBody().addClass('x-'+theme);
-            }
-            t.on('change', function(){
-                Cookies.set('exttheme', t.getValue());
-                setTimeout(function(){
-                    window.location.reload();
-                }, 250);
-            });
-
-            var lb = Ext.get('lib-bar');
-            if(lb){
-                lb.show();
-            }
-        }
-    };
-}();

=== removed directory 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/multiselect'
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/multiselect/MultiSelect.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/multiselect/MultiSelect.js	2010-03-08 15:23:59 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/multiselect/MultiSelect.js	1970-01-01 00:00:00 +0000
@@ -1,319 +0,0 @@
-/*
- * Ext JS Library 2.2.1
- * Copyright(c) 2006-2009, Ext JS, LLC.
- * licensing@extjs.com
- * 
- * http://extjs.com/license
- */
-
-/*
- * Note that this control should still be treated as an example and that the API will most likely
- * change once it is ported into the Ext core as a standard form control.  This is still planned
- * for a future release, so this should not yet be treated as a final, stable API at this time.
- */
- 
-/** 
- * @class Ext.ux.MultiSelect
- * @extends Ext.form.Field
- * A control that allows selection and form submission of multiple list items. The MultiSelect control
- * depends on the Ext.ux.DDView class to provide drag/drop capability both within the list and also 
- * between multiple MultiSelect controls (see the Ext.ux.ItemSelector).
- * 
- *  @history
- *    2008-06-19 bpm Original code contributed by Toby Stuart (with contributions from Robert Williams)
- *    2008-06-19 bpm Docs and demo code clean up
- * 
- * @constructor
- * Create a new MultiSelect
- * @param {Object} config Configuration options
- */
-Ext.ux.Multiselect = Ext.extend(Ext.form.Field,  {
-    /**
-     * @cfg {String} legend Wraps the object with a fieldset and specified legend.
-     */
-    /**
-     * @cfg {Store} store The {@link Ext.data.Store} used by the underlying Ext.ux.DDView.
-     */
-    /**
-     * @cfg {Ext.ux.DDView} view The Ext.ux.DDView used to render the multiselect list.
-     */
-    /**
-     * @cfg {String/Array} dragGroup The ddgroup name(s) for the DDView's DragZone (defaults to undefined). 
-     */ 
-    /**
-     * @cfg {String/Array} dropGroup The ddgroup name(s) for the DDView's DropZone (defaults to undefined). 
-     */ 
-    /**
-     * @cfg {Object/Array} tbar The top toolbar of the control. This can be a {@link Ext.Toolbar} object, a 
-     * toolbar config, or an array of buttons/button configs to be added to the toolbar.
-     */
-    /**
-     * @cfg {String} fieldName The name of the field to sort by when sorting is enabled.
-     */
-    /**
-     * @cfg {String} appendOnly True if the list should only allow append drops when drag/drop is enabled 
-     * (use for lists which are sorted, defaults to false).
-     */
-    appendOnly:false,
-    /**
-     * @cfg {Array} dataFields Inline data definition when not using a pre-initialised store. Known to cause problems 
-     * in some browswers for very long lists. Use store for large datasets.
-     */
-    dataFields:[],
-    /**
-     * @cfg {Array} data Inline data when not using a pre-initialised store. Known to cause problems in some 
-     * browswers for very long lists. Use store for large datasets.
-     */
-    data:[],
-    /**
-     * @cfg {Number} width Width in pixels of the control (defaults to 100).
-     */
-    width:100,
-    /**
-     * @cfg {Number} height Height in pixels of the control (defaults to 100).
-     */
-    height:100,
-    /**
-     * @cfg {String/Number} displayField Name/Index of the desired display field in the dataset (defaults to 0).
-     */
-    displayField:0,
-    /**
-     * @cfg {String/Number} valueField Name/Index of the desired value field in the dataset (defaults to 1).
-     */
-    valueField:1,
-    /**
-     * @cfg {Boolean} allowBlank True to require at least one item in the list to be selected, false to allow no 
-     * selection (defaults to true).
-     */
-    allowBlank:true,
-    /**
-     * @cfg {Number} minLength Minimum number of selections allowed (defaults to 0).
-     */
-    minLength:0,
-    /**
-     * @cfg {Number} maxLength Maximum number of selections allowed (defaults to Number.MAX_VALUE). 
-     */
-    maxLength:Number.MAX_VALUE,
-    /**
-     * @cfg {String} blankText Default text displayed when the control contains no items (defaults to the same value as
-     * {@link Ext.form.TextField#blankText}.
-     */
-    blankText:Ext.form.TextField.prototype.blankText,
-    /**
-     * @cfg {String} minLengthText Validation message displayed when {@link #minLength} is not met (defaults to 'Minimum {0} 
-     * item(s) required').  The {0} token will be replaced by the value of {@link #minLength}.
-     */
-    minLengthText:'Minimum {0} item(s) required',
-    /**
-     * @cfg {String} maxLengthText Validation message displayed when {@link #maxLength} is not met (defaults to 'Maximum {0} 
-     * item(s) allowed').  The {0} token will be replaced by the value of {@link #maxLength}.
-     */
-    maxLengthText:'Maximum {0} item(s) allowed',
-    /**
-     * @cfg {String} delimiter The string used to delimit between items when set or returned as a string of values
-     * (defaults to ',').
-     */
-    delimiter:',',
-    
-    // DDView settings
-    copy:false,
-    allowDup:false,
-    allowTrash:false,
-    focusClass:undefined,
-    sortDir:'ASC',
-    
-    // private
-    defaultAutoCreate : {tag: "div"},
-    
-    // private
-    initComponent: function(){
-        Ext.ux.Multiselect.superclass.initComponent.call(this);
-        this.addEvents({
-            'dblclick' : true,
-            'click' : true,
-            'change' : true,
-            'drop' : true
-        });     
-    },
-    
-    // private
-    onRender: function(ct, position){
-        Ext.ux.Multiselect.superclass.onRender.call(this, ct, position);
-        
-        var cls = 'ux-mselect';
-        var fs = new Ext.form.FieldSet({
-            renderTo:this.el,
-            title:this.legend,
-            height:this.height,
-            width:this.width,
-            style:"padding:0;",
-            tbar:this.tbar
-        });
-        //if(!this.legend)fs.el.down('.'+fs.headerCls).remove();
-        fs.body.addClass(cls);
-
-        var tpl = '<tpl for="."><div class="' + cls + '-item';
-        if(Ext.isIE || Ext.isIE7){
-            tpl+='" unselectable=on';
-        }else{
-            tpl+=' x-unselectable"';
-        }
-        tpl+='>{' + this.displayField + '}</div></tpl>';
-
-        if(!this.store){
-            this.store = new Ext.data.SimpleStore({
-                fields: this.dataFields,
-                data : this.data
-            });
-        }
-
-        this.view = new Ext.ux.DDView({
-            multiSelect: true, 
-            store: this.store, 
-            selectedClass: cls+"-selected", 
-            tpl:tpl,
-            allowDup:this.allowDup, 
-            copy: this.copy, 
-            allowTrash: this.allowTrash, 
-            dragGroup: this.dragGroup, 
-            dropGroup: this.dropGroup, 
-            itemSelector:"."+cls+"-item",
-            isFormField:false, 
-            applyTo:fs.body,
-            appendOnly:this.appendOnly,
-            sortField:this.sortField, 
-            sortDir:this.sortDir
-        });
-
-        fs.add(this.view);
-        
-        this.view.on('click', this.onViewClick, this);
-        this.view.on('beforeClick', this.onViewBeforeClick, this);
-        this.view.on('dblclick', this.onViewDblClick, this);
-        this.view.on('drop', function(ddView, n, dd, e, data){
-            return this.fireEvent("drop", ddView, n, dd, e, data);
-        }, this);
-        
-        this.hiddenName = this.name;
-        var hiddenTag={tag: "input", type: "hidden", value: "", name:this.name};
-        if (this.isFormField) { 
-            this.hiddenField = this.el.createChild(hiddenTag);
-        } else {
-            this.hiddenField = Ext.get(document.body).createChild(hiddenTag);
-        }
-        fs.doLayout();
-    },
-    
-    // private
-    initValue:Ext.emptyFn,
-    
-    // private
-    onViewClick: function(vw, index, node, e) {
-        var arrayIndex = this.preClickSelections.indexOf(index);
-        if (arrayIndex  != -1)
-        {
-            this.preClickSelections.splice(arrayIndex, 1);
-            this.view.clearSelections(true);
-            this.view.select(this.preClickSelections);
-        }
-        this.fireEvent('change', this, this.getValue(), this.hiddenField.dom.value);
-        this.hiddenField.dom.value = this.getValue();
-        this.fireEvent('click', this, e);
-        this.validate();        
-    },
-
-    // private
-    onViewBeforeClick: function(vw, index, node, e) {
-        this.preClickSelections = this.view.getSelectedIndexes();
-        if (this.disabled) {return false;}
-    },
-
-    // private
-    onViewDblClick : function(vw, index, node, e) {
-        return this.fireEvent('dblclick', vw, index, node, e);
-    },  
-    
-    /**
-     * Returns an array of data values for the selected items in the list. The values will be separated
-     * by {@link #delimiter}.
-     * @return {Array} value An array of string data values
-     */
-    getValue: function(valueField){
-        var returnArray = [];
-        var selectionsArray = this.view.getSelectedIndexes();
-        if (selectionsArray.length == 0) {return '';}
-        for (var i=0; i<selectionsArray.length; i++) {
-            returnArray.push(this.store.getAt(selectionsArray[i]).get(((valueField != null)? valueField : this.valueField)));
-        }
-        return returnArray.join(this.delimiter);
-    },
-
-    /**
-     * Sets a delimited string (using {@link #delimiter}) or array of data values into the list.
-     * @param {String/Array} values The values to set
-     */
-    setValue: function(values) {
-        var index;
-        var selections = [];
-        this.view.clearSelections();
-        this.hiddenField.dom.value = '';
-        
-        if (!values || (values == '')) { return; }
-        
-        if (!(values instanceof Array)) { values = values.split(this.delimiter); }
-        for (var i=0; i<values.length; i++) {
-            index = this.view.store.indexOf(this.view.store.query(this.valueField, 
-                new RegExp('^' + values[i] + '$', "i")).itemAt(0));
-            selections.push(index);
-        }
-        this.view.select(selections);
-        this.hiddenField.dom.value = this.getValue();
-        this.validate();
-    },
-    
-    // inherit docs
-    reset : function() {
-        this.setValue('');
-    },
-    
-    // inherit docs
-    getRawValue: function(valueField) {
-        var tmp = this.getValue(valueField);
-        if (tmp.length) {
-            tmp = tmp.split(this.delimiter);
-        }
-        else{
-            tmp = [];
-        }
-        return tmp;
-    },
-
-    // inherit docs
-    setRawValue: function(values){
-        setValue(values);
-    },
-
-    // inherit docs
-    validateValue : function(value){
-        if (value.length < 1) { // if it has no value
-             if (this.allowBlank) {
-                 this.clearInvalid();
-                 return true;
-             } else {
-                 this.markInvalid(this.blankText);
-                 return false;
-             }
-        }
-        if (value.length < this.minLength) {
-            this.markInvalid(String.format(this.minLengthText, this.minLength));
-            return false;
-        }
-        if (value.length > this.maxLength) {
-            this.markInvalid(String.format(this.maxLengthText, this.maxLength));
-            return false;
-        }
-        return true;
-    }
-});
-
-Ext.reg("multiselect", Ext.ux.Multiselect);

=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/multiselect/multiselect.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/multiselect/multiselect.css	2010-03-08 15:23:59 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/multiselect/multiselect.css	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Ext JS Library 2.2.1
- * Copyright(c) 2006-2009, Ext JS, LLC.
- * licensing@extjs.com
- * 
- * http://extjs.com/license
- */
-
-.ux-mselect{
-    overflow:auto;
-    background:white;
-    position:relative; /* for calculating scroll offsets */
-    zoom:1;
-    overflow:auto;	
-}
-.ux-mselect-item{
-    font:normal 11px tahoma, arial, helvetica, sans-serif;
-    padding:2px;
-    border:1px solid #fff;
-    white-space: nowrap;
-    cursor:pointer;
-}
-.ux-mselect-selected{
-	border:1px dotted #a3bae9 !important;
-    background:#DFE8F6;
-    cursor:pointer;
-}
-
-.x-view-drag-insert-above { 
-    border-top:1px dotted #3366cc; 
-} 
-.x-view-drag-insert-below { 
-    border-bottom:1px dotted #3366cc; 
-} 
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend/xtheme-gray-extend.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend/xtheme-gray-extend.css	2010-04-12 17:05:27 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend/xtheme-gray-extend.css	2011-05-19 08:26:11 +0000
@@ -13,7 +13,6 @@
 .ext-el-mask {
     background-color: #ccc;
 }
-
 .ext-el-mask-msg {
     border-color:#8f8f8f;
     background-color:#d7d7d7;
@@ -25,69 +24,54 @@
     color:#222;
     font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-mask-loading div {
     background-color:#fbfbfb;
     background-image:url(gray-extend/grid/loading.gif);
 }
-
 .x-item-disabled {
     color: gray;
 }
-
 .x-item-disabled * {
     color: gray !important;
 }
-
 .x-splitbar-proxy {
     background-color: #aaa;
 }
-
 .x-color-palette a {
     border-color:#fff;
 }
-
 .x-color-palette a:hover, .x-color-palette a.x-color-palette-sel {
     border-color:#b4b4b4;
     background-color: #ebebeb;
 }
-
 .x-color-palette em {
     border-color:#aca899;
 }
-
 .x-ie-shadow {
     background-color:#777;
 }
-
 .x-shadow .xsmc {
     background-image: url(gray-extend/shadow-c.png);
 }
-
 .x-shadow .xsml, .x-shadow .xsmr {
     background-image: url(gray-extend/shadow-lr.png);
 }
-
 .x-shadow .xstl, .x-shadow .xstc,  .x-shadow .xstr, .x-shadow .xsbl, .x-shadow .xsbc, .x-shadow .xsbr{
     background-image: url(gray-extend/shadow.png);
 }
-
 .loading-indicator {
     font-size: 11px;
     background-image: url(gray-extend/grid/loading.gif);
 }
-
 .x-spotlight {
     background-color: #ccc;
 }
-
 .x-tab-panel-header, .x-tab-panel-footer {
 	background-color: #ebebeb;
 	border-color:#d0d0d0;
     overflow:hidden;
     zoom:1;
 }
-
 .x-tab-panel-header, .x-tab-panel-footer {
 	border-color:#d0d0d0;
 }
@@ -103,81 +87,63 @@
 	background-image: url(gray-extend/tabs/tab-strip-btm-bg.gif);
 	border-top-color:#d0d0d0;
 }
-
 .x-tab-panel-header-plain .x-tab-strip-spacer,
 .x-tab-panel-footer-plain .x-tab-strip-spacer {
     border-color:#d0d0d0;
     background-color: #ebebeb;
 }
-
 .x-tab-strip span.x-tab-strip-text {
 	font:normal 11px arial, tahoma, helvetica;
 	color:#686868;
 }
-
 .x-tab-strip-over span.x-tab-strip-text {
 	color:#434343;
 }
-
 .x-tab-strip-active span.x-tab-strip-text {
 	color:#434343;
     font-weight:bold;
 }
-
 .x-tab-strip-disabled .x-tabs-text {
 	color:#aaaaaa;
 }
-
 .x-tab-strip-top .x-tab-right, .x-tab-strip-top .x-tab-left, .x-tab-strip-top .x-tab-strip-inner{
 	background-image: url(gray-extend/tabs/tabs-sprite.gif);
 }
-
 .x-tab-strip-bottom .x-tab-right {
 	background-image: url(gray-extend/tabs/tab-btm-inactive-right-bg.gif);
 }
-
 .x-tab-strip-bottom .x-tab-left {
 	background-image: url(gray-extend/tabs/tab-btm-inactive-left-bg.gif);
 }
-
 .x-tab-strip-bottom .x-tab-strip-active .x-tab-right {
 	background-image: url(gray-extend/tabs/tab-btm-right-bg.gif);
 }
-
 .x-tab-strip-bottom .x-tab-strip-active .x-tab-left {
 	background-image: url(gray-extend/tabs/tab-btm-left-bg.gif);
 }
-
 .x-tab-strip .x-tab-strip-closable a.x-tab-strip-close {
 	background-image:url(gray-extend/tabs/tab-close.gif);
 }
-
 .x-tab-strip .x-tab-strip-closable a.x-tab-strip-close:hover{
 	background-image:url(gray-extend/tabs/tab-close.gif);
 }
-
 .x-tab-panel-body {
     border-color:#d0d0d0;
     background-color:#fff;
 }
-
 .x-tab-panel-body-top {
     border-top: 0 none;
 }
-
 .x-tab-panel-body-bottom {
     border-bottom: 0 none;
 }
-
 .x-tab-scroller-left {
     background-image:url(gray-extend/tabs/scroll-left.gif);
     border-bottom-color:#d0d0d0;
 }
-
 .x-tab-scroller-left-over {
     background-position: 0 0;
 }
-
 .x-tab-scroller-left-disabled {
     background-position: -18px 0;
     opacity:.5;
@@ -185,212 +151,165 @@
     filter:alpha(opacity=50);
     cursor:default;
 }
-
 .x-tab-scroller-right {
     background-image:url(gray-extend/tabs/scroll-right.gif);
     border-bottom-color:#d0d0d0;
 }
-
 .x-tab-panel-bbar .x-toolbar, .x-tab-panel-tbar .x-toolbar {
     border-color:#d0d0d0;
 }
 .x-form-field{
     font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-form-text, textarea.x-form-field{
     background-color:#fff;
     background-image:url(gray-extend/form/text-bg.gif);
     border-color:#b5b8c8;
 }
-
 .x-form-select-one {
     background-color:#fff;
     border-color:#b5b8c8;
 }
-
 .x-form-check-group-label {
     border-bottom: 1px solid #d0d0d0;
     color: #434343;
 }
-
 .x-editor .x-form-check-wrap {
     background-color:#fff;
 }
-
 .x-form-field-wrap .x-form-trigger{
     background-image:url(gray-extend/form/trigger.gif);
     border-bottom-color:#b5b8c8;
 }
-
 .x-form-field-wrap .x-form-date-trigger{
     background-image: url(gray-extend/form/date-trigger.gif);
 }
-
 .x-form-field-wrap .x-form-clear-trigger{
     background-image: url(gray-extend/form/clear-trigger.gif);
 }
-
 .x-form-field-wrap .x-form-search-trigger{
     background-image: url(gray-extend/form/search-trigger.gif);
 }
-
 .x-trigger-wrap-focus .x-form-trigger{
     border-bottom-color:#a7a7a7;
 }
-
 .x-item-disabled .x-form-trigger-over{
     border-bottom-color:#b5b8c8;
 }
-
 .x-item-disabled .x-form-trigger-click{
     border-bottom-color:#b5b8c8;
 }
-
 .x-form-focus, textarea.x-form-focus{
 	border-color:#a7a7a7;
 }
-
 .x-form-invalid, textarea.x-form-invalid{
     background-color:#fff;
 	background-image:url(gray-extend/grid/invalid_line.gif);
 	border-color:#c30;
 }
-
 .ext-safari .x-form-invalid{
 	background-color:#fee;
 	border-color:#ff7870;
 }
-
 .x-form-inner-invalid, textarea.x-form-inner-invalid{
     background-color:#fff;
 	background-image:url(gray-extend/grid/invalid_line.gif);
 }
-
 .x-form-grow-sizer {
 	font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-form-item {
     font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-form-invalid-msg {
     color:#c0272b;
     font:normal 11px arial, tahoma, helvetica, sans-serif;
     background-image:url(gray-extend/shared/warning.gif);
 }
-
 .x-form-empty-field {
     color:gray;
 }
-
 .x-small-editor .x-form-field {
     font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .ext-safari .x-small-editor .x-form-field {
     font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-form-invalid-icon {
     background-image:url(gray-extend/form/exclamation.gif);
 }
-
 .x-fieldset {
     border-color:#b5b8c8;
 }
-
 .x-fieldset legend {
     font:bold 11px arial, tahoma, helvetica, sans-serif;
     color:#434343;
 }
-
 .x-btn{
 	font:normal 11px arial, tahoma, verdana, helvetica;
 }
-
 .x-btn button{
     font:normal 11px arial,tahoma,verdana,helvetica;
     color:#333;
 }
-
 .x-btn em {
     font-style:normal;
     font-weight:normal;
 }
-
 .x-btn-tl, .x-btn-tr, .x-btn-tc, .x-btn-ml, .x-btn-mr, .x-btn-mc, .x-btn-bl, .x-btn-br, .x-btn-bc{
 	background-image:url(gray-extend/button/btn.gif);
 }
-
 .x-btn-click .x-btn-text, .x-btn-menu-active .x-btn-text, .x-btn-pressed .x-btn-text{
     color:#000;
 }
-
 .x-btn-disabled *{
 	color:gray !important;
 }
-
 .x-btn-mc em.x-btn-arrow {
     background-image:url(gray-extend/button/arrow.gif);
 }
-
 .x-btn-mc em.x-btn-split {
     background-image:url(gray-extend/button/s-arrow.gif);
 }
-
 .x-btn-over .x-btn-mc em.x-btn-split, .x-btn-click .x-btn-mc em.x-btn-split, .x-btn-menu-active .x-btn-mc em.x-btn-split, .x-btn-pressed .x-btn-mc em.x-btn-split {
     background-image:url(gray-extend/button/s-arrow-o.gif);
 }
-
 .x-btn-mc em.x-btn-arrow-bottom {
     background-image:url(gray-extend/button/s-arrow-b-noline.gif);
 }
-
 .x-btn-mc em.x-btn-split-bottom {
     background-image:url(gray-extend/button/s-arrow-b.gif);
 }
-
 .x-btn-over .x-btn-mc em.x-btn-split-bottom, .x-btn-click .x-btn-mc em.x-btn-split-bottom, .x-btn-menu-active .x-btn-mc em.x-btn-split-bottom, .x-btn-pressed .x-btn-mc em.x-btn-split-bottom {
     background-image:url(gray-extend/button/s-arrow-bo.gif);
 }
-
 .x-btn-group-header {
     color: #686868;
 }
-
 .x-btn-group-tc {
 	background-image: url(gray-extend/button/group-tb.gif);
 }
-
 .x-btn-group-tl {
 	background-image: url(gray-extend/button/group-cs.gif);
 }
-
 .x-btn-group-tr {
 	background-image: url(gray-extend/button/group-cs.gif);
 }
-
 .x-btn-group-bc {
 	background-image: url(gray-extend/button/group-tb.gif);
 }
-
 .x-btn-group-bl {
 	background-image: url(gray-extend/button/group-cs.gif);
 }
-
 .x-btn-group-br {
 	background-image: url(gray-extend/button/group-cs.gif);
 }
-
 .x-btn-group-ml {
 	background-image: url(gray-extend/button/group-lr.gif);
 }
 .x-btn-group-mr {
 	background-image: url(gray-extend/button/group-lr.gif);
 }
-
 .x-btn-group-notitle .x-btn-group-tc {
 	background-image: url(gray-extend/button/group-tb.gif);
 }
@@ -400,114 +319,89 @@
 	background-color:#ededed;
     background-image:url(gray-extend/toolbar/bg.gif);
 }
-
 .x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{
     font:normal 11px arial,tahoma, helvetica, sans-serif;
 }
-
 .x-toolbar .x-item-disabled {
 	color:gray;
 }
-
 .x-toolbar .x-item-disabled * {
 	color:gray;
 }
-
 .x-toolbar .x-btn-mc em.x-btn-split {
     background-image:url(gray-extend/button/s-arrow-noline.gif);
 }
-
 .x-toolbar .x-btn-over .x-btn-mc em.x-btn-split, .x-toolbar .x-btn-click .x-btn-mc em.x-btn-split, 
 .x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split, .x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split 
 {
     background-image:url(gray-extend/button/s-arrow-o.gif);
 }
-
 .x-toolbar .x-btn-mc em.x-btn-split-bottom {
     background-image:url(gray-extend/button/s-arrow-b-noline.gif);
 }
-
 .x-toolbar .x-btn-over .x-btn-mc em.x-btn-split-bottom, .x-toolbar .x-btn-click .x-btn-mc em.x-btn-split-bottom, 
 .x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split-bottom, .x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split-bottom 
 {
     background-image:url(gray-extend/button/s-arrow-bo.gif);
 }
-
 .x-toolbar .xtb-sep {
 	background-image: url(gray-extend/grid/grid-blue-split.gif);
 }
-
 .x-tbar-page-first{
 	background-image: url(gray-extend/grid/page-first.gif) !important;
 }
-
 .x-tbar-loading{
 	background-image: url(gray-extend/grid/refresh.gif) !important;
 }
-
 .x-tbar-page-last{
 	background-image: url(gray-extend/grid/page-last.gif) !important;
 }
-
 .x-tbar-page-next{
 	background-image: url(gray-extend/grid/page-next.gif) !important;
 }
-
 .x-tbar-page-prev{
 	background-image: url(gray-extend/grid/page-prev.gif) !important;
 }
-
 .x-item-disabled .x-tbar-loading{
 	background-image: url(gray-extend/grid/loading.gif) !important;
 }
-
 .x-item-disabled .x-tbar-page-first{
 	background-image: url(gray-extend/grid/page-first-disabled.gif) !important;
 }
-
 .x-item-disabled .x-tbar-page-last{
 	background-image: url(gray-extend/grid/page-last-disabled.gif) !important;
 }
-
 .x-item-disabled .x-tbar-page-next{
 	background-image: url(gray-extend/grid/page-next-disabled.gif) !important;
 }
-
 .x-item-disabled .x-tbar-page-prev{
 	background-image: url(gray-extend/grid/page-prev-disabled.gif) !important;
 }
-
 .x-paging-info {
     color:#444;
 }
-
 .x-toolbar-more-icon {
     background-image: url(gray-extend/toolbar/more.gif) !important;
 }
-
 .x-statusbar .x-status-busy {
     background-image: url(gray-extend/grid/loading.gif);
 }
-
 .x-statusbar .x-status-text-panel {
     border-color: #d0d0d0 #fff #fff #d0d0d0;
 }
 .x-resizable-handle {
 	background-color:#fff;
 }
-
 .x-resizable-over .x-resizable-handle-east, .x-resizable-pinned .x-resizable-handle-east,
 .x-resizable-over .x-resizable-handle-west, .x-resizable-pinned .x-resizable-handle-west
 {
     background-image:url(gray-extend/sizer/e-handle.gif);
 }
-
 .x-resizable-over .x-resizable-handle-south, .x-resizable-pinned .x-resizable-handle-south,
 .x-resizable-over .x-resizable-handle-north, .x-resizable-pinned .x-resizable-handle-north
 {
     background-image:url(gray-extend/sizer/s-handle.gif);
 }
-
 .x-resizable-over .x-resizable-handle-north, .x-resizable-pinned .x-resizable-handle-north{
     background-image:url(gray-extend/sizer/s-handle.gif);
 }
@@ -529,61 +423,48 @@
 .x-resizable-overlay{
     background-color:#fff;
 }
-
 .x-grid3 {
     background-color:#fff;
 }
-
 .x-grid-panel .x-panel-mc .x-panel-body {
     border-color:#d0d0d0;
 }
-
 .x-grid3-hd-row td, .x-grid3-row td, .x-grid3-summary-row td{
 	font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-grid3-hd-row td {
     border-left-color:#eee;
     border-right-color:#d0d0d0;
 }
-
 .x-grid-row-loading {
     background-color: #fff;
     background-image:url(gray-extend/shared/loading-balls.gif);
 }
-
 .x-grid3-row {
     border-color:#ededed;
     border-top-color:#fff;
 }
-
 .x-grid3-row-alt{
 	background-color:#fafafa;
 }
-
 .x-grid3-row-over {
 	border-color:#ddd;
     background-color:#efefef;
     background-image:url(gray-extend/grid/row-over.gif);
 }
-
 .x-grid3-resize-proxy {
     background-color:#777;
 }
-
 .x-grid3-resize-marker {
     background-color:#777;
 }
-
 .x-grid3-header{
     background-color:#f9f9f9;
 	background-image:url(gray-extend/grid/grid3-hrow.gif);
 }
-
 .x-grid3-header-pop {
     border-left-color:#d0d0d0;
 }
-
 .x-grid3-header-pop-inner {
     border-left-color:#eee;
     background-image:url(gray-extend/grid/hd-pop.gif);
@@ -599,60 +480,47 @@
     background-image:url(gray-extend/grid/grid3-hrow-over.gif);
 
 }
-
 .sort-asc .x-grid3-sort-icon {
 	background-image: url(gray-extend/grid/sort_asc.gif);
 }
-
 .sort-desc .x-grid3-sort-icon {
 	background-image: url(gray-extend/grid/sort_desc.gif);
 }
-
 .x-grid3-cell-text, .x-grid3-hd-text {
 	color:#000;
 }
-
 .x-grid3-split {
 	background-image: url(gray-extend/grid/grid-split.gif);
 }
-
 .x-grid3-hd-text {
 	color:#434343;
 }
-
 .x-dd-drag-proxy .x-grid3-hd-inner{
     background-color:#f2f2f2;
 	background-image:url(gray-extend/grid/grid3-hrow-over.gif);
 	border-color:#c8c8c8;
 }
-
 .col-move-top{
 	background-image:url(gray-extend/grid/col-move-top.gif);
 }
-
 .col-move-bottom{
 	background-image:url(gray-extend/grid/col-move-bottom.gif);
 }
-
 .x-grid3-row-selected {
 	background-color: #e7e7e7 !important;
 	background-image: none;
 	border-color:#b9b9b9;
 }
-
 .x-grid3-cell-selected{
 	background-color: #cdcdcd !important;
 	color:#000;
 }
-
 .x-grid3-cell-selected span{
 	color:#000 !important;
 }
-
 .x-grid3-cell-selected .x-grid3-cell-text{
 	color:#000;
 }
-
 .x-grid3-locked td.x-grid3-row-marker, .x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker{
     background-color:#d7d9df !important;
     background-image:url(gray-extend/grid/grid-hrow.gif) !important;
@@ -660,139 +528,107 @@
     border-top-color:#fff;
     border-right-color:#9c9c9c !important;
 }
-
 .x-grid3-locked td.x-grid3-row-marker div, .x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker div{
     color:#434343 !important;
 }
-
 .x-grid3-dirty-cell {
     background-image:url(gray-extend/grid/dirty.gif);
 }
-
 .x-grid3-topbar, .x-grid3-bottombar{
 	font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-grid3-bottombar .x-toolbar{
 	border-top-color:#bcbcbc;
 }
-
 .x-props-grid .x-grid3-td-name .x-grid3-cell-inner{
 	background-image:url(gray-extend/grid/grid3-special-col-bg.gif) !important;
     color:#000 !important;
 }
-
 .x-props-grid .x-grid3-body .x-grid3-td-name{
     background-color:#fff !important;
     border-right-color:#eee;
 }
-
 .xg-hmenu-sort-asc .x-menu-item-icon{
 	background-image: url(gray-extend/grid/hmenu-asc.gif);
 }
-
 .xg-hmenu-sort-desc .x-menu-item-icon{
 	background-image: url(gray-extend/grid/hmenu-desc.gif);
 }
-
 .xg-hmenu-lock .x-menu-item-icon{
 	background-image: url(gray-extend/grid/hmenu-lock.gif);
 }
-
 .xg-hmenu-unlock .x-menu-item-icon{
 	background-image: url(gray-extend/grid/hmenu-unlock.gif);
 }
-
 .x-grid3-hd-btn {
     background-color:#d8d8d8;
     background-image:url(gray-extend/grid/grid3-hd-btn.gif);
 }
-
 .x-grid3-body .x-grid3-td-expander {
     background-image:url(gray-extend/grid/grid3-special-col-bg.gif);
 }
-
 .x-grid3-row-expander {
     background-image:url(gray-extend/grid/row-expand-sprite.gif);
 }
-
 .x-grid3-body .x-grid3-td-checker {
     background-image: url(gray-extend/grid/grid3-special-col-bg.gif);
 }
-
 .x-grid3-row-checker, .x-grid3-hd-checker {
     background-image:url(gray-extend/grid/row-check-sprite.gif);
 }
-
 .x-grid3-body .x-grid3-td-numberer {
     background-image:url(gray-extend/grid/grid3-special-col-bg.gif);
 }
-
 .x-grid3-body .x-grid3-td-numberer .x-grid3-cell-inner {
 	color:#444;
 }
-
 .x-grid3-body .x-grid3-td-row-icon {
     background-image:url(gray-extend/grid/grid3-special-col-bg.gif);
 }
-
 .x-grid3-body .x-grid3-row-selected .x-grid3-td-numberer,
 .x-grid3-body .x-grid3-row-selected .x-grid3-td-checker,
 .x-grid3-body .x-grid3-row-selected .x-grid3-td-expander {
 	background-image:url(gray-extend/grid/grid3-special-col-sel-bg.gif);
 }
-
 .x-grid3-check-col {
 	background-image:url(gray-extend/menu/unchecked.gif);
 }
-
 .x-grid3-check-col-on {
 	background-image:url(gray-extend/menu/checked.gif);
 }
-
 .x-grid-group, .x-grid-group-body, .x-grid-group-hd {
     zoom:1;
 }
-
 .x-grid-group-hd {
     border-bottom-color:#d0d0d0;
 }
-
 .x-grid-group-hd div.x-grid-group-title {
     background-image:url(gray-extend/grid/group-collapse.gif);
     color:#3764a0;
     font:bold 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-grid-group-collapsed .x-grid-group-hd div.x-grid-group-title {
     background-image:url(gray-extend/grid/group-expand.gif);
 }
-
 .x-group-by-icon {
     background-image:url(gray-extend/grid/group-by.gif);
 }
-
 .x-cols-icon {
     background-image:url(gray-extend/grid/columns.gif);
 }
-
 .x-show-groups-icon {
     background-image:url(gray-extend/grid/group-by.gif);
 }
-
 .x-grid-empty {
     color:gray;
     font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-grid-with-col-lines .x-grid3-row td.x-grid3-cell {
     border-right-color:#ededed;
 }
-
 .x-grid-with-col-lines .x-grid3-row{
     border-top-color:#ededed;
 }
-
 .x-grid-with-col-lines .x-grid3-row-selected {
 	border-top-color:#b9b9b9;
 }
@@ -802,19 +638,15 @@
     border-color: #ddd #bbb #bbb #ddd;
 	background-color:#fff;
 }
-
 .x-dd-drop-nodrop .x-dd-drop-icon{
   background-image: url(gray-extend/dd/drop-no.gif);
 }
-
 .x-dd-drop-ok .x-dd-drop-icon{
   background-image: url(gray-extend/dd/drop-yes.gif);
 }
-
 .x-dd-drop-ok-add .x-dd-drop-icon{
   background-image: url(gray-extend/dd/drop-add.gif);
 }
-
 .x-view-selector {
     background-color:#d8d8d8;
     border-color:#8d8d8d;
@@ -822,155 +654,118 @@
 .x-tree .x-panel-body{
     background-color:#fff;
 }
-
 .x-tree-node-expanded .x-tree-node-icon{
 	background-image:url(gray-extend/tree/folder-open.gif);
 }
-
 .x-tree-node-leaf .x-tree-node-icon{
 	background-image:url(gray-extend/tree/leaf.gif);
 }
-
 .x-tree-node-collapsed .x-tree-node-icon{
 	background-image:url(gray-extend/tree/folder.gif);
 }
-
 .x-tree-node-loading .x-tree-node-icon{
 	background-image:url(gray-extend/tree/loading.gif) !important;
 }
-
 .x-tree-node .x-tree-node-inline-icon {
     background-image: none;
 }
-
 .x-tree-node-loading a span{
 	 font-style: italic;
 	 color:#444444;
 }
-
 .ext-ie .x-tree-node-el input {
     width:15px;
     height:15px;
 }
-
 .x-tree-lines .x-tree-elbow{
 	background-image:url(gray-extend/tree/elbow.gif);
 }
-
 .x-tree-lines .x-tree-elbow-plus{
 	background-image:url(gray-extend/tree/elbow-plus.gif);
 }
-
 .x-tree-lines .x-tree-elbow-minus{
 	background-image:url(gray-extend/tree/elbow-minus.gif);
 }
-
 .x-tree-lines .x-tree-elbow-end{
 	background-image:url(gray-extend/tree/elbow-end.gif);
 }
-
 .x-tree-lines .x-tree-elbow-end-plus{
 	background-image:url(gray-extend/tree/elbow-end-plus.gif);
 }
-
 .x-tree-lines .x-tree-elbow-end-minus{
 	background-image:url(gray-extend/tree/elbow-end-minus.gif);
 }
-
 .x-tree-lines .x-tree-elbow-line{
 	background-image:url(gray-extend/tree/elbow-line.gif);
 }
-
 .x-tree-no-lines .x-tree-elbow-plus{
 	background-image:url(gray-extend/tree/elbow-plus-nl.gif);
 }
-
 .x-tree-no-lines .x-tree-elbow-minus{
 	background-image:url(gray-extend/tree/elbow-minus-nl.gif);
 }
-
 .x-tree-no-lines .x-tree-elbow-end-plus{
 	background-image:url(gray-extend/tree/elbow-end-plus-nl.gif);
 }
-
 .x-tree-no-lines .x-tree-elbow-end-minus{
 	background-image:url(gray-extend/tree/elbow-end-minus-nl.gif);
 }
-
 .x-tree-arrows .x-tree-elbow-plus{
     background-image:url(gray-extend/tree/arrows.gif);
 }
-
 .x-tree-arrows .x-tree-elbow-minus{
     background-image:url(gray-extend/tree/arrows.gif);
 }
-
 .x-tree-arrows .x-tree-elbow-end-plus{
     background-image:url(gray-extend/tree/arrows.gif);
 }
-
 .x-tree-arrows .x-tree-elbow-end-minus{
     background-image:url(gray-extend/tree/arrows.gif);
 }
-
 .x-tree-node{
 	color:#000;
 	font: normal 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-tree-node a, .x-dd-drag-ghost a{
 	color:#000;
 }
-
 .x-tree-node a span, .x-dd-drag-ghost a span{
 	color:#000;
 }
-
 .x-tree-node .x-tree-node-disabled a span{
 	color:gray !important;
 }
-
 .x-tree-node div.x-tree-drag-insert-below{
  	 border-bottom-color:#686868;
 }
-
 .x-tree-node div.x-tree-drag-insert-above{
 	 border-top-color:#686868;
 }
-
 .x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-below a{
  	 border-bottom-color:#686868;
 }
-
 .x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-above a{
 	 border-top-color:#686868;
 }
-
 .x-tree-node .x-tree-drag-append a span{
 	 background-color:#ddd;
 	 border-color:gray;
 }
-
 .x-tree-node .x-tree-node-over {
 	background-color: #eee;
 }
-
 .x-tree-node .x-tree-selected {
 	background-color: #e6e6e6;
 }
-
 .x-tree-drop-ok-append .x-dd-drop-icon{
   background-image: url(gray-extend/tree/drop-add.gif);
 }
-
 .x-tree-drop-ok-above .x-dd-drop-icon{
   background-image: url(gray-extend/tree/drop-over.gif);
 }
-
 .x-tree-drop-ok-below .x-dd-drop-icon{
   background-image: url(gray-extend/tree/drop-under.gif);
 }
-
 .x-tree-drop-ok-between .x-dd-drop-icon{
   background-image: url(gray-extend/tree/drop-between.gif);
 }
@@ -978,29 +773,23 @@
     border-color: #373737;
     background-color:#fff;
 }
-
 .x-date-middle,.x-date-left,.x-date-right {
 	background-image: url(gray-extend/shared/hd-sprite.gif);
 	color:#fff;
 	font:bold 11px arial, "sans serif", tahoma, verdana, helvetica;
 }
-
 .x-date-middle .x-btn .x-btn-text {
     color:#fff;
 }
-
 .x-date-middle .x-btn-mc em.x-btn-arrow {
     background-image:url(gray-extend/toolbar/btn-arrow-light.gif);
 }
-
 .x-date-right a {
     background-image: url(gray-extend/shared/right-btn.gif);
 }
-
 .x-date-left a{
 	background-image: url(gray-extend/shared/left-btn.gif);
 }
-
 .x-date-inner th {
     background-color:#ebebeb;
     background-image:url(gray-extend/shared/glass-bg.gif);
@@ -1008,83 +797,66 @@
     font:normal 11px arial, helvetica,tahoma,sans-serif;
 	color:#3d3d3d;
 }
-
 .x-date-inner td {
     border-color:#fff;
 }
-
 .x-date-inner a {
     font:normal 11px arial, helvetica,tahoma,sans-serif;
     color:#000;
 }
-
 .x-date-inner .x-date-active{
 	color:#000;
 }
-
 .x-date-inner .x-date-selected a{
     background-color:#ebebeb;
 	background-image:url(gray-extend/shared/glass-bg.gif);
 	border-color:#afafaf;
 }
-
 .x-date-inner .x-date-today a{
 	border-color:darkred;
 }
-
 .x-date-inner .x-date-selected span{
     font-weight:bold;
 }
-
 .x-date-inner .x-date-prevday a,.x-date-inner .x-date-nextday a {
 	color:#aaa;
 }
-
 .x-date-bottom {
     border-top-color:#d0d0d0;
     background-color:#ebebeb;
     background-image:url(gray-extend/shared/glass-bg.gif);
 }
-
 .x-date-inner a:hover, .x-date-inner .x-date-disabled a:hover{
     color:#000;
     background-color:#eaeaea;
 }
-
 .x-date-inner .x-date-disabled a {
 	background-color:#eee;
 	color:#bbb;
 }
-
 .x-date-mmenu{
     background-color:#eee !important;
 }
-
 .x-date-mmenu .x-menu-item {
 	font-size:11px;
 	color:#000;
 }
-
 .x-date-mp {
 	background-color:#fff;
 }
-
 .x-date-mp td {
 	font:normal 11px arial, helvetica,tahoma,sans-serif;
 }
-
 .x-date-mp-btns button {
 	background-color:#373737;
 	color:#fff;
 	border-color: #686868 #101010 #101010 #686868;
 	font:normal 11px arial, helvetica,tahoma,sans-serif;
 }
-
 .x-date-mp-btns {
     background-color: #ebebeb;
 	background-image: url(gray-extend/shared/glass-bg.gif);
 }
-
 .x-date-mp-btns td {
 	border-top-color: #d0d0d0;
 }
@@ -1103,7 +875,6 @@
 	background-image: url(gray-extend/shared/glass-bg.gif);
 	border-color:#afafaf;
 }
-
 .x-date-mp-ybtn a {
     background-image:url(gray-extend/panel/tool-sprites.gif);
 }
@@ -1114,38 +885,31 @@
 .x-tip .x-tip-close{
 	background-image: url(gray-extend/qtip/close.gif);
 }
-
 .x-tip .x-tip-tc, .x-tip .x-tip-tl, .x-tip .x-tip-tr, .x-tip .x-tip-bc, .x-tip .x-tip-bl, .x-tip .x-tip-br, .x-tip .x-tip-ml, .x-tip .x-tip-mr {
 	background-image: url(gray-extend/qtip/tip-sprite.gif);
 }
-
 .x-tip .x-tip-mc {
     font: normal 11px arial,tahoma,helvetica,sans-serif;
 }
 .x-tip .x-tip-ml {
 	background-color: #fff;
 }
-
 .x-tip .x-tip-header-text {
     font: bold 11px arial, tahoma, helvetica,sans-serif;
     color:#444;
 }
-
 .x-tip .x-tip-body {
     font: normal 11px arial, tahoma, helvetica,sans-serif;
     color:#444;
 }
-
 .x-form-invalid-tip .x-tip-tc, .x-form-invalid-tip .x-tip-tl, .x-form-invalid-tip .x-tip-tr, .x-form-invalid-tip .x-tip-bc,
 .x-form-invalid-tip .x-tip-bl, .x-form-invalid-tip .x-tip-br, .x-form-invalid-tip .x-tip-ml, .x-form-invalid-tip .x-tip-mr
 {
 	background-image: url(gray-extend/form/error-tip-corners.gif);
 }
-
 .x-form-invalid-tip .x-tip-body {
     background-image:url(gray-extend/form/exclamation.gif);
 }
-
 .x-tip-anchor {
     background-image:url(gray-extend/qtip/tip-anchor-sprite.gif);
 }
@@ -1153,22 +917,18 @@
     background-color:#f0f0f0;
 	background-image:url(gray-extend/menu/menu.gif);
 }
-
 .x-menu-floating{
     border-color:#898989;
 }
 .x-menu-nosep {
 	background-image:none;
 }
-
 .x-menu-list-item{
 	font:normal 11px arial,tahoma, sans-serif;
 }
-
 .x-menu-item-arrow{
 	background-image:url(gray-extend/menu/menu-parent.gif);
 }
-
 .x-menu-sep {
     background-color:#e0e0e0;
 	border-bottom-color:#fff;
@@ -1177,70 +937,54 @@
 a.x-menu-item {
 	color:#222;
 }
-
 .x-menu-item-active {
 	background-image: url(gray-extend/menu/item-over.gif);
 	background-color: #e9e9e9;
     border-color:#c8c8c8;
 }
-
 .x-menu-item-active a.x-menu-item {
 	border-color:#c8c8c8;
 }
-
 .x-menu-check-item .x-menu-item-icon{
 	background-image:url(gray-extend/menu/unchecked.gif);
 }
-
 .x-menu-item-checked .x-menu-item-icon{
 	background-image:url(gray-extend/menu/checked.gif);
 }
-
 .x-menu-item-checked .x-menu-group-item .x-menu-item-icon{
     background-image:url(gray-extend/menu/group-checked.gif);
 }
-
 .x-menu-group-item .x-menu-item-icon{
     background-image:none;
 }
-
 .x-menu-plain {
 	background-color:#fff !important;
 }
-
 .x-menu .x-date-picker{
     border-color:#d0d0d0;
 }
-
 .x-cycle-menu .x-menu-item-checked {
     border-color:#b9b9b9 !important;
     background-color:#e9e9e9;
 }
-
 .x-menu-scroller-top {
     background-image:url(gray-extend/layout/mini-top.gif);
 }
-
 .x-menu-scroller-bottom {
     background-image:url(gray-extend/layout/mini-bottom.gif);
 }
-
 .x-box-tl {
 	background-image: url(gray-extend/box/corners.gif);
 }
-
 .x-box-tc {
 	background-image: url(gray-extend/box/tb.gif);
 }
-
 .x-box-tr {
 	background-image: url(gray-extend/box/corners.gif);
 }
-
 .x-box-ml {
 	background-image: url(gray-extend/box/l.gif);
 }
-
 .x-box-mc {
 	background-color: #eee;
     background-image: url(gray-extend/box/tb.gif);
@@ -1249,48 +993,37 @@
 	font-size: 11px;
 	font-weight: bold;
 }
-
 .x-box-mc h3 {
 	font-size: 14px;
 	font-weight: bold;
 }
-
 .x-box-mr {
 	background-image: url(gray-extend/box/r.gif);
 }
-
 .x-box-bl {
 	background-image: url(gray-extend/box/corners.gif);
 }
-
 .x-box-bc {
 	background-image: url(gray-extend/box/tb.gif);
 }
-
 .x-box-br {
 	background-image: url(gray-extend/box/corners.gif);
 }
-
 .x-box-blue .x-box-bl, .x-box-blue .x-box-br, .x-box-blue .x-box-tl, .x-box-blue .x-box-tr {
 	background-image: url(gray-extend/box/corners-gray.gif);
 }
-
 .x-box-blue .x-box-bc, .x-box-blue .x-box-mc, .x-box-blue .x-box-tc {
 	background-image: url(gray-extend/box/tb-gray.gif);
 }
-
 .x-box-blue .x-box-mc {
 	background-color: #d8d8d8;
 }
-
 .x-box-blue .x-box-mc h3 {
 	color: #363636;
 }
-
 .x-box-blue .x-box-ml {
 	background-image: url(gray-extend/box/l-gray.gif);
 }
-
 .x-box-blue .x-box-mr {
 	background-image: url(gray-extend/box/r-gray.gif);
 }
@@ -1317,42 +1050,34 @@
     background-color:#eaeaea;
     font:normal 12px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-combo-list-inner {
     background-color:#fff;
 }
-
 .x-combo-list-hd {
     font:bold 11px arial, tahoma, helvetica, sans-serif;
     color:#434343;
     background-image: url(gray-extend/layout/panel-title-light-bg.gif);
     border-bottom-color:#bcbcbc;
 }
-
 .x-resizable-pinned .x-combo-list-inner {
     border-bottom-color:#bcbcbc;
 }
-
 .x-combo-list-item {
     border-color:#fff;
 }
-
 .x-combo-list .x-combo-selected{
 	border-color:#b9b9b9 !important;
     background-color:#e7e7e7;
 }
-
 .x-combo-list .x-toolbar {
     border-top-color:#bcbcbc;
 }
-
 .x-combo-list-small {
     font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
 .x-panel {
     border-color: #d0d0d0;
 }
-
 .x-panel-header {
     color:#434343;
 	font-weight:bold; 
@@ -1361,149 +1086,115 @@
     border-color:#d0d0d0;
     background-image: url(gray-extend/panel/white-top-bottom.gif);
 }
-
 .x-panel-body {
     border-color: #d0d0d0;
     background-color:#fff;
 }
-
 .x-panel-bbar .x-toolbar, .x-panel-tbar .x-toolbar {
     border-color: #d0d0d0;
 }
-
 .x-panel-tbar-noheader .x-toolbar, .x-panel-mc .x-panel-tbar .x-toolbar {
     border-top-color: #d0d0d0;
 }
-
 .x-panel-body-noheader, .x-panel-mc .x-panel-body {
     border-top-color: #d0d0d0;
 }
-
 .x-panel-tl .x-panel-header {
     color:#434343;
 	font:bold 11px arial,tahoma,verdana,sans-serif;
 }
-
 .x-panel-tc {
 	background-image: url(gray-extend/panel/top-bottom.gif);
 }
-
 .x-panel-tl, .x-panel-tr, .x-panel-bl,  .x-panel-br{
 	background-image: url(gray-extend/panel/corners-sprite.gif);
     border-bottom-color: #d0d0d0;
 }
-
 .x-panel-bc {
 	background-image: url(gray-extend/panel/top-bottom.gif);
 }
-
 .x-panel-mc {
     font: normal 11px arial,tahoma,helvetica,sans-serif;
     background-color:#efefef;
 }
-
 .x-panel-ml {
 	background-color: #fff;
     background-image:url(gray-extend/panel/left-right.gif);
 }
-
 .x-panel-mr {
 	background-image: url(gray-extend/panel/left-right.gif);
 }
-
 .x-tool {
     background-image:url(gray-extend/panel/tool-sprites.gif);
 }
-
 .x-panel-ghost {
     background-color:#dbdbdb;
 }
-
 .x-panel-ghost ul {
     border-color:#d0d0d0;
 }
-
 .x-panel-dd-spacer {
     border-color:#d0d0d0;
 }
-
 .x-panel-fbar td,.x-panel-fbar span,.x-panel-fbar input,.x-panel-fbar div,.x-panel-fbar select,.x-panel-fbar label{
     font:normal 11px arial,tahoma, helvetica, sans-serif;
 }
-
 .x-window-proxy {
     background-color:#dcdcdc;
     border-color:#d0d0d0;
 }
-
 .x-window-tl .x-window-header {
     color:#434343;
 	font:bold 11px arial,tahoma,verdana,sans-serif;
 }
-
 .x-window-tc {
 	background-image: url(gray-extend/window/top-bottom.png);
 }
-
 .x-window-tl {
 	background-image: url(gray-extend/window/left-corners.png);
 }
-
 .x-window-tr {
 	background-image: url(gray-extend/window/right-corners.png);
 }
-
 .x-window-bc {
 	background-image: url(gray-extend/window/top-bottom.png);
 }
-
 .x-window-bl {
 	background-image: url(gray-extend/window/left-corners.png);
 }
-
 .x-window-br {
 	background-image: url(gray-extend/window/right-corners.png);
 }
-
 .x-window-mc {
     border-color:#d0d0d0;
     font: normal 11px arial,tahoma,helvetica,sans-serif;
     background-color:#e7e7e7;
 }
-
 .x-window-ml {
 	background-image: url(gray-extend/window/left-right.png);
 }
-
 .x-window-mr {
 	background-image: url(gray-extend/window/left-right.png);
 }
-
 .x-window-maximized .x-window-tc {
     background-color:#fff;
 }
-
 .x-window-bbar .x-toolbar {
     border-top-color:#d0d0d0;
 }
-
 .x-panel-ghost .x-window-tl {
     border-bottom-color:#d0d0d0;
 }
-
 .x-panel-collapsed .x-window-tl {
     border-bottom-color:#84a0c4;
 }
-
 .x-dlg-mask{
    background-color:#ccc;
 }
-
 .x-window-plain .x-window-mc {
     background-color: #ebebeb;
     border-color: #b9b9b9 #efefef #efefef #b9b9b9;
 }
-
 .x-window-plain .x-window-body {
     border-color: #efefef #b9b9b9 #b9b9b9 #efefef;
 }
@@ -1521,41 +1212,33 @@
 .x-panel-noborder .x-panel-header-noborder {
     border-bottom-color:#d0d0d0;
 }
-
 .x-panel-noborder .x-panel-tbar-noborder .x-toolbar {
     border-bottom-color:#d0d0d0;
 }
-
 .x-panel-noborder .x-panel-bbar-noborder .x-toolbar {
     border-top-color:#d0d0d0;
 }
-
 .x-tab-panel-bbar-noborder .x-toolbar {
     border-top-color:#d0d0d0;
 }
-
 .x-tab-panel-tbar-noborder .x-toolbar {
     border-bottom-color:#d0d0d0;
 }
 .x-border-layout-ct {
     background-color:#f0f0f0;
 }
-
 .x-accordion-hd {
 	color:#222;
     font-weight:normal;
     background-image: url(gray-extend/panel/light-hd.gif);
 }
-
 .x-layout-collapsed{
     background-color:#dfdfdf;
 	border-color:#bcbcbc;
 }
-
 .x-layout-collapsed-over{
     background-color:#e6e6e6;
 }
-
 .x-layout-split-west .x-layout-mini {
     background-image:url(gray-extend/layout/mini-left.gif);
 }
@@ -1568,31 +1251,25 @@
 .x-layout-split-south .x-layout-mini {
     background-image:url(gray-extend/layout/mini-bottom.gif);
 }
-
 .x-layout-cmini-west .x-layout-mini {
     background-image:url(gray-extend/layout/mini-right.gif);
 }
-
 .x-layout-cmini-east .x-layout-mini {
     background-image:url(gray-extend/layout/mini-left.gif);
 }
-
 .x-layout-cmini-north .x-layout-mini {
     background-image:url(gray-extend/layout/mini-bottom.gif);
 }
-
 .x-layout-cmini-south .x-layout-mini {
     background-image:url(gray-extend/layout/mini-top.gif);
 }
 .x-progress-wrap {
     border-color:#8f8f8f;
 }
-
 .x-progress-inner {
     background-color:#e7e7e7;
     background-image:url(gray-extend/qtip/bg.gif);
 }
-
 .x-progress-bar {
     background-color:#bcbcbc;
     background-image:url(gray-extend/progress/progress-bg.gif);
@@ -1600,13 +1277,11 @@
     border-bottom-color:#a6a6a6;
     border-right-color:#a6a6a6;
 }
-
 .x-progress-text {
     font-size:11px;
     font-weight:bold;
     color:#fff;
 }
-
 .x-progress-text-back {
     color:#396095;
 }
@@ -1614,29 +1289,23 @@
     background-color:#f9f9f9;
 	background-image:url(gray-extend/grid/grid3-hrow.gif);
 }
-
 .x-list-header-inner div em {
     border-left-color:#ddd;
     font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-list-body dt em {
     font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
-
 .x-list-over {
     background-color:#eee;
 }
-
 .x-list-selected {
     background-color:#e7e7e7;
 }
-
 .x-list-resizer {
     border-left-color:#555;
     border-right-color:#555;
 }
-
 .x-list-header-inner em.sort-asc, .x-list-header-inner em.sort-desc {
     background-image:url(gray-extend/grid/sort-hd.gif);
     border-color: #d0d0d0;
@@ -1644,15 +1313,12 @@
 .x-slider-horz, .x-slider-horz .x-slider-end, .x-slider-horz .x-slider-inner {
     background-image:url(gray-extend/slider/slider-bg.png);
 }
-
 .x-slider-horz .x-slider-thumb {
     background-image:url(gray-extend/slider/slider-thumb.png);
 }
-
 .x-slider-vert, .x-slider-vert .x-slider-end, .x-slider-vert .x-slider-inner {
     background-image:url(gray-extend/slider/slider-v-bg.png);
 }
-
 .x-slider-vert .x-slider-thumb {
     background-image:url(gray-extend/slider/slider-v-thumb.png);
 }
@@ -1660,27 +1326,21 @@
 .x-window-dlg .x-window-header-text {
     font-size:12px;
 }
-
 .x-window-dlg .ext-mb-textarea {
     font:normal 12px arial,tahoma,helvetica,sans-serif;
 }
-
 .x-window-dlg .x-msg-box-wait {
     background-image:url(gray-extend/grid/loading.gif);
 }
-
 .x-window-dlg .ext-mb-info {
     background-image:url(gray-extend/window/icon-info.gif);
 }
-
 .x-window-dlg .ext-mb-warning {
     background-image:url(gray-extend/window/icon-warning.gif);
 }
-
 .x-window-dlg .ext-mb-question {
     background-image:url(gray-extend/window/icon-question.gif);
 }
-
 .x-window-dlg .ext-mb-error {
     background-image:url(gray-extend/window/icon-error.gif);
-}
\ No newline at end of file
+}