upgrade to extjs 3.1.1

deluge/ui/web/js/ext-base-debug.js

@@ -1,6 +1,6 @@
 /*!
- * Ext JS Library 3.1.0
- * Copyright(c) 2006-2009 Ext JS, LLC
+ * Ext JS Library 3.1.1
+ * Copyright(c) 2006-2010 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
  */
@@ -19,7 +19,7 @@ Ext = {
      * The version of the framework
      * @type String
      */
-    version : '3.1.0'
+    version : '3.1.1'
 };
 
 /**
@@ -53,7 +53,7 @@ Ext.apply = function(o, c, defaults){
         DOC = document,
         isStrict = DOC.compatMode == "CSS1Compat",
         isOpera = check(/opera/),
-        isChrome = check(/chrome/),
+        isChrome = check(/\bchrome\b/),
         isWebKit = check(/webkit/),
         isSafari = !isChrome && check(/safari/),
         isSafari2 = isSafari && check(/applewebkit\/4/), // unique to Safari 2
@@ -161,7 +161,11 @@ Ext.apply = function(o, c, defaults){
          * @return {String} The generated Id.
          */
         id : function(el, prefix){
-            return (el = Ext.getDom(el) || {}).id = el.id || (prefix || "ext-gen") + (++idSeed);
+            el = Ext.getDom(el, true) || {};
+            if (!el.id) {
+                el.id = (prefix || "ext-gen") + (++idSeed);
+            }
+            return el.id;
         },
 
         /**
@@ -404,7 +408,7 @@ Ext.urlDecode("foo=1&bar=2&bar=3&bar=4", false); // returns {foo: "1", bar: ["2"
             }
             //NodeList has an item and length property
             //IXMLDOMNodeList has nextNode method, needs to be checked first.
-            return ((v.nextNode || v.item) && Ext.isNumber(v.length));
+            return ((typeof v.nextNode != 'undefined' || v.item) && Ext.isNumber(v.length));
         },
 
         /**
@@ -484,6 +488,8 @@ Ext.urlDecode("foo=1&bar=2&bar=3&bar=4", false); // returns {foo: "1", bar: ["2"
 
         /**
          * Return the dom node for the passed String (id), dom node, or Ext.Element.
+         * Optional 'strict' flag is needed for IE since it can return 'name' and
+         * 'id' elements by using getElementById.
          * Here are some examples:
          * <pre><code>
 // gets dom node based on id
@@ -503,11 +509,29 @@ function(el){
          * @param {Mixed} el
          * @return HTMLElement
          */
-        getDom : function(el){
+        getDom : function(el, strict){
             if(!el || !DOC){
                 return null;
             }
-            return el.dom ? el.dom : (Ext.isString(el) ? DOC.getElementById(el) : el);
+            if (el.dom){
+                return el.dom;
+            } else {
+                if (Ext.isString(el)) {
+                    var e = DOC.getElementById(el);
+                    // IE returns elements with the 'name' and 'id' attribute.
+                    // we do a strict check to return the element with only the id attribute
+                    if (e && isIE && strict) {
+                        if (el == e.getAttribute('id')) {
+                            return e;
+                        } else {
+                            return null;
+                        }
+                    }
+                    return e;
+                } else {
+                    return el;
+                }
+            }
         },
 
         /**
@@ -1050,7 +1074,7 @@ Ext.apply(Ext, function(){
          * @return {Number} Value, if numeric, else defaultValue
          */
         num : function(v, defaultValue){
-            v = Number(Ext.isEmpty(v) || Ext.isBoolean(v) ? NaN : v);
+            v = Number(Ext.isEmpty(v) || Ext.isArray(v) || Ext.isBoolean(v) || (Ext.isString(v) && v.trim().length == 0) ? NaN : v);
             return isNaN(v) ? defaultValue : v;
         },
 
@@ -1324,7 +1348,7 @@ ImageComponent = Ext.extend(Ext.BoxComponent, {
          * @return {Number} The mean.
          */
         mean : function(arr){
-           return Ext.sum(arr) / arr.length;
+           return arr.length > 0 ? Ext.sum(arr) / arr.length : undefined;
         },
 
         /**
@@ -2116,7 +2140,7 @@ Ext.TaskMgr = new Ext.util.TaskRunner();(function(){
                     if(!v.checkReady || loadComplete || element.nextSibling || (doc && doc.body)) {
                         element = v.override ? (v.override === true ? v.obj : v.override) : element;
                         v.fn.call(element, v.obj);
-                        v = null;
+                        onAvailStack.remove(v);
                     } else {
                         notAvail.push(v);
                     }
@@ -2208,14 +2232,13 @@ Ext.TaskMgr = new Ext.util.TaskRunner();(function(){
         // This function should ALWAYS be called from Ext.EventManager
         removeListener: function(el, eventName, fn) {
             el = Ext.getDom(el);
-            var i, len, li;
+            var i, len, li, lis;
             if (el && fn) {
-                if (eventName == UNLOAD) {
-                    if (unloadListeners[id] !== undefined) {
-                        for (i = 0, len = unloadListeners[id].length; i < len; i++) {
-                            li = unloadListeners[id][i];
-                            if (li && li[TYPE] == eventName && li[FN] == fn) {
-                                unloadListeners[id].splice(i, 1);
+                if(eventName == UNLOAD){
+                    if((lis = unloadListeners[el.id]) !== undefined){
+                        for(i = 0, len = lis.length; i < len; i++){
+                            if((li = lis[i]) && li[TYPE] == eventName && li[FN] == fn){
+                                unloadListeners[el.id].splice(i, 1);
                             }
                         }
                     }
@@ -3477,12 +3500,14 @@ Ext.lib.Ajax = function() {
             var me = this,
             	val,
             	floor = Math.floor,
-				i, len = start.length, v;            
+				i, 
+                len,
+                v;            
 
             if(colorRE.test(attr)){
                 val = [];
 				
-				for(i=0; i<len; i++) {
+				for(i = 0, len = start.length; i < len; i++) {
 					v = start[i];
 					val[i] = superclass.doMethod.call(me, attr, v, end[i]);
 				}

deluge/ui/web/themes/css/xtheme-blue.css

@@ -1,6 +1,6 @@
 /*!
- * Ext JS Library 3.1.0
- * Copyright(c) 2006-2009 Ext JS, LLC
+ * Ext JS Library 3.1.1
+ * Copyright(c) 2006-2010 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
  */
@@ -294,7 +294,7 @@ ul.x-tab-strip-bottom{
 }
 
 .ext-webkit .x-small-editor .x-form-field {
-    font:normal 12px arial, tahoma, helvetica, sans-serif;
+    font:normal 11px arial, tahoma, helvetica, sans-serif;
 }
 
 .x-form-invalid-icon {

deluge/ui/web/themes/css/xtheme-gray.css

@@ -1,6 +1,6 @@
 /*!
- * Ext JS Library 3.1.0
- * Copyright(c) 2006-2009 Ext JS, LLC
+ * Ext JS Library 3.1.1
+ * Copyright(c) 2006-2010 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
  */
@@ -9,13 +9,13 @@
 }
 
 .ext-el-mask-msg {
-    border-color:#6593cf;
-    background-color:#c3daf9;
-    background-image:url(../images/default/box/tb-blue.gif);
+    border-color:#999;
+    background-color:#ddd;
+    background-image:url(../images/default/box/tb.gif);
 }
 .ext-el-mask-msg div {
     background-color: #eee;
-    border-color:#a3bad9;
+    border-color:#d0d0d0;
     color:#222;
     font:normal 11px tahoma, arial, helvetica, sans-serif;
 }
@@ -42,7 +42,7 @@
 }
 
 .x-color-palette a:hover, .x-color-palette a.x-color-palette-sel {
-    border-color:#8bb8f3;
+    border-color:#CFCFCF;
     background-color: #eaeaea;
 }
 
@@ -77,9 +77,7 @@
 
 .x-spotlight {
     background-color: #ccc;
-}
-
-.x-tab-panel-header, .x-tab-panel-footer {
+}.x-tab-panel-header, .x-tab-panel-footer {
 	background-color: #eaeaea;
 	border-color:#d0d0d0;
     overflow:hidden;
@@ -138,6 +136,14 @@ ul.x-tab-strip-bottom{
 	background-image: url(../images/gray/tabs/tab-btm-inactive-left-bg.gif);
 }
 
+.x-tab-strip-bottom .x-tab-strip-over .x-tab-left {
+	background-image: url(../images/gray/tabs/tab-btm-over-left-bg.gif);
+}
+
+.x-tab-strip-bottom .x-tab-strip-over .x-tab-right {
+	background-image: url(../images/gray/tabs/tab-btm-over-right-bg.gif);
+}
+
 .x-tab-strip-bottom .x-tab-strip-active .x-tab-right {
 	background-image: url(../images/gray/tabs/tab-btm-right-bg.gif);
 }
@@ -199,12 +205,12 @@ ul.x-tab-strip-bottom{
 .x-form-text, textarea.x-form-field{
     background-color:#fff;
     background-image:url(../images/default/form/text-bg.gif);
-    border-color:#b5b8c8;
+    border-color:#C1C1C1;
 }
 
 .x-form-select-one {
     background-color:#fff;
-    border-color:#b5b8c8;
+    border-color:#C1C1C1;
 }
 
 .x-form-check-group-label {
@@ -217,24 +223,24 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-field-wrap .x-form-trigger{
-    background-image:url(../images/default/form/trigger.gif);
+    background-image:url(../images/gray/form/trigger.gif);
     border-bottom-color:#b5b8c8;
 }
 
 .x-form-field-wrap .x-form-date-trigger{
-    background-image: url(../images/default/form/date-trigger.gif);
+    background-image: url(../images/gray/form/date-trigger.gif);
 }
 
 .x-form-field-wrap .x-form-clear-trigger{
-    background-image: url(../images/default/form/clear-trigger.gif);
+    background-image: url(../images/gray/form/clear-trigger.gif);
 }
 
 .x-form-field-wrap .x-form-search-trigger{
-    background-image: url(../images/default/form/search-trigger.gif);
+    background-image: url(../images/gray/form/search-trigger.gif);
 }
 
 .x-trigger-wrap-focus .x-form-trigger{
-    border-bottom-color:#7eadd9;
+    border-bottom-color: #777777;
 }
 
 .x-item-disabled .x-form-trigger-over{
@@ -246,7 +252,7 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-focus, textarea.x-form-focus{
-	border-color:#7eadd9;
+	border-color:#777777;
 }
 
 .x-form-invalid, textarea.x-form-invalid{
@@ -296,15 +302,13 @@ ul.x-tab-strip-bottom{
 }
 
 .x-fieldset {
-    border-color:#b5b8c8;
+    border-color:#CCCCCC;
 }
 
 .x-fieldset legend {
     font:bold 11px tahoma, arial, helvetica, sans-serif;
-    color:#15428B;
-}
-
-.x-btn{
+    color:#777777;
+}.x-btn{
 	font:normal 11px tahoma, verdana, helvetica;
 }
 
@@ -319,7 +323,7 @@ ul.x-tab-strip-bottom{
 }
 
 .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(../images/default/button/btn.gif);
+	background-image:url(../images/gray/button/btn.gif);
 }
 
 .x-btn-click .x-btn-text, .x-btn-menu-active .x-btn-text, .x-btn-pressed .x-btn-text{
@@ -339,7 +343,7 @@ ul.x-tab-strip-bottom{
 }
 
 .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(../images/default/button/s-arrow-o.gif);
+    background-image:url(../images/gray/button/s-arrow-o.gif);
 }
 
 .x-btn-mc em.x-btn-arrow-bottom {
@@ -351,7 +355,7 @@ ul.x-tab-strip-bottom{
 }
 
 .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(../images/default/button/s-arrow-bo.gif);
+    background-image:url(../images/gray/button/s-arrow-bo.gif);
 }
 
 .x-btn-group-header {
@@ -417,7 +421,7 @@ ul.x-tab-strip-bottom{
 .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(../images/default/button/s-arrow-o.gif);
+    background-image:url(../images/gray/button/s-arrow-o.gif);
 }
 
 .x-toolbar .x-btn-mc em.x-btn-split-bottom {
@@ -427,31 +431,31 @@ ul.x-tab-strip-bottom{
 .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(../images/default/button/s-arrow-bo.gif);
+    background-image:url(../images/gray/button/s-arrow-bo.gif);
 }
 
 .x-toolbar .xtb-sep {
-	background-image: url(../ext/resources/images/default/grid/grid-split.gif);
+	background-image: url(../images/default/grid/grid-split.gif);
 }
 
 .x-tbar-page-first{
-	background-image: url(../images/default/grid/page-first.gif) !important;
+	background-image: url(../images/gray/grid/page-first.gif) !important;
 }
 
 .x-tbar-loading{
-	background-image: url(../images/default/grid/refresh.gif) !important;
+	background-image: url(../images/gray/grid/refresh.gif) !important;
 }
 
 .x-tbar-page-last{
-	background-image: url(../images/default/grid/page-last.gif) !important;
+	background-image: url(../images/gray/grid/page-last.gif) !important;
 }
 
 .x-tbar-page-next{
-	background-image: url(../images/default/grid/page-next.gif) !important;
+	background-image: url(../images/gray/grid/page-next.gif) !important;
 }
 
 .x-tbar-page-prev{
-	background-image: url(../images/default/grid/page-prev.gif) !important;
+	background-image: url(../images/gray/grid/page-prev.gif) !important;
 }
 
 .x-item-disabled .x-tbar-loading{
@@ -481,14 +485,6 @@ ul.x-tab-strip-bottom{
 .x-toolbar-more-icon {
     background-image: url(../images/gray/toolbar/more.gif) !important;
 }
-
-.x-statusbar .x-status-busy {
-    background-image: url(../images/default/grid/loading.gif);
-}
-
-.x-statusbar .x-status-text-panel {
-    border-color: #d0d0d0 #fff #fff #d0d0d0;
-}
 .x-resizable-handle {
 	background-color:#fff;
 }
@@ -496,37 +492,36 @@ ul.x-tab-strip-bottom{
 .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(../images/default/sizer/e-handle.gif);
+    background-image:url(../images/gray/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(../images/default/sizer/s-handle.gif);
+    background-image:url(../images/gray/sizer/s-handle.gif);
 }
 
 .x-resizable-over .x-resizable-handle-north, .x-resizable-pinned .x-resizable-handle-north{
-    background-image:url(../images/default/sizer/s-handle.gif);
+    background-image:url(../images/gray/sizer/s-handle.gif);
 }
 .x-resizable-over .x-resizable-handle-southeast, .x-resizable-pinned .x-resizable-handle-southeast{
-    background-image:url(../images/default/sizer/se-handle.gif);
+    background-image:url(../images/gray/sizer/se-handle.gif);
 }
 .x-resizable-over .x-resizable-handle-northwest, .x-resizable-pinned .x-resizable-handle-northwest{
-    background-image:url(../images/default/sizer/nw-handle.gif);
+    background-image:url(../images/gray/sizer/nw-handle.gif);
 }
 .x-resizable-over .x-resizable-handle-northeast, .x-resizable-pinned .x-resizable-handle-northeast{
-    background-image:url(../images/default/sizer/ne-handle.gif);
+    background-image:url(../images/gray/sizer/ne-handle.gif);
 }
 .x-resizable-over .x-resizable-handle-southwest, .x-resizable-pinned .x-resizable-handle-southwest{
-    background-image:url(../images/default/sizer/sw-handle.gif);
+    background-image:url(../images/gray/sizer/sw-handle.gif);
 }
 .x-resizable-proxy{
-    border-color:#3b5a82;
+    border-color:#565656;
 }
 .x-resizable-overlay{
     background-color:#fff;
 }
-
 .x-grid3 {
     background-color:#fff;
 }
@@ -574,7 +569,7 @@ ul.x-tab-strip-bottom{
 
 .x-grid3-header{
     background-color:#f9f9f9;
-	background-image:url(../images/default/grid/grid3-hrow.gif);
+	background-image:url(../images/gray/grid/grid3-hrow2.gif);
 }
 
 .x-grid3-header-pop {
@@ -587,22 +582,22 @@ ul.x-tab-strip-bottom{
 }
 
 td.x-grid3-hd-over, td.sort-desc, td.sort-asc, td.x-grid3-hd-menu-open {
-    border-left-color:#aaccf6;
-    border-right-color:#aaccf6;
+    border-left-color:#ACACAC;
+    border-right-color:#ACACAC;
 }
 
 td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-asc .x-grid3-hd-inner, td.x-grid3-hd-menu-open .x-grid3-hd-inner {
-    background-color:#ebf3fd;
-    background-image:url(../images/default/grid/grid3-hrow-over.gif);
+    background-color:#f9f9f9;
+    background-image:url(../images/gray/grid/grid3-hrow-over2.gif);
 
 }
 
 .sort-asc .x-grid3-sort-icon {
-	background-image: url(../images/default/grid/sort_asc.gif);
+	background-image: url(../images/gray/grid/sort_asc.gif);
 }
 
 .sort-desc .x-grid3-sort-icon {
-	background-image: url(../images/default/grid/sort_desc.gif);
+	background-image: url(../images/gray/grid/sort_desc.gif);
 }
 
 .x-grid3-cell-text, .x-grid3-hd-text {
@@ -618,27 +613,27 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-dd-drag-proxy .x-grid3-hd-inner{
-    background-color:#ebf3fd;
-	background-image:url(../images/default/grid/grid3-hrow-over.gif);
-	border-color:#aaccf6;
+    background-color:#f9f9f9;
+	background-image:url(../images/gray/grid/grid3-hrow-over2.gif);
+	border-color:#ACACAC;
 }
 
 .col-move-top{
-	background-image:url(../images/default/grid/col-move-top.gif);
+	background-image:url(../images/gray/grid/col-move-top.gif);
 }
 
 .col-move-bottom{
-	background-image:url(../images/default/grid/col-move-bottom.gif);
+	background-image:url(../images/gray/grid/col-move-bottom.gif);
 }
 
 .x-grid3-row-selected {
-	background-color: #dfe8f6 !important;
+	background-color:#CCCCCC !important;
 	background-image: none;
-	border-color:#a3bae9;
+	border-color:#ACACAC;
 }
 
 .x-grid3-cell-selected{
-	background-color: #b8cfee !important;
+	background-color: #CBCBCB !important;
 	color:#000;
 }
 
@@ -701,8 +696,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid3-hd-btn {
-    background-color:#c3daf9;
-    background-image:url(../images/default/grid/grid3-hd-btn.gif);
+    background-color:#f9f9f9;
+    background-image:url(../images/gray/grid/grid3-hd-btn.gif);
 }
 
 .x-grid3-body .x-grid3-td-expander {
@@ -710,7 +705,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid3-row-expander {
-    background-image:url(../images/default/grid/row-expand-sprite.gif);
+    background-image:url(../images/gray/grid/row-expand-sprite.gif);
 }
 
 .x-grid3-body .x-grid3-td-checker {
@@ -736,7 +731,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 .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(../images/default/grid/grid3-special-col-sel-bg.gif);
+	background-image:url(../images/gray/grid/grid3-special-col-sel-bg.gif);
 }
 
 .x-grid3-check-col {
@@ -756,13 +751,13 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid-group-hd div.x-grid-group-title {
-    background-image:url(../images/default/grid/group-collapse.gif);
-    color:#3764a0;
+    background-image:url(../images/gray/grid/group-collapse.gif);
+    color:#5F5F5F;
     font:bold 11px tahoma, arial, helvetica, sans-serif;
 }
 
 .x-grid-group-collapsed .x-grid-group-hd div.x-grid-group-title {
-    background-image:url(../images/default/grid/group-expand.gif);
+    background-image:url(../images/gray/grid/group-expand.gif);
 }
 
 .x-group-by-icon {
@@ -791,7 +786,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid-with-col-lines .x-grid3-row-selected {
-	border-top-color:#a3bae9;
+	border-top-color:#B9B9B9;
 }
 .x-dd-drag-ghost{
 	color:#000;
@@ -813,10 +808,9 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-view-selector {
-    background-color:#c3daf9;
-    border-color:#3399bb;
-}
-.x-tree-node-expanded .x-tree-node-icon{
+    background-color:#D6D6D6;
+    border-color:#888888;
+}.x-tree-node-expanded .x-tree-node-icon{
 	background-image:url(../images/default/tree/folder-open.gif);
 }
 
@@ -863,11 +857,11 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-tree-lines .x-tree-elbow-end-plus{
-	background-image:url(../images/default/tree/elbow-end-plus.gif);
+	background-image:url(../images/gray/tree/elbow-end-plus.gif);
 }
 
 .x-tree-lines .x-tree-elbow-end-minus{
-	background-image:url(../images/default/tree/elbow-end-minus.gif);
+	background-image:url(../images/gray/tree/elbow-end-minus.gif);
 }
 
 .x-tree-lines .x-tree-elbow-line{
@@ -883,27 +877,27 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-tree-no-lines .x-tree-elbow-end-plus{
-	background-image:url(../images/default/tree/elbow-end-plus-nl.gif);
+	background-image:url(../images/gray/tree/elbow-end-plus-nl.gif);
 }
 
 .x-tree-no-lines .x-tree-elbow-end-minus{
-	background-image:url(../images/default/tree/elbow-end-minus-nl.gif);
+	background-image:url(../images/gray/tree/elbow-end-minus-nl.gif);
 }
 
 .x-tree-arrows .x-tree-elbow-plus{
-    background-image:url(../images/default/tree/arrows.gif);
+    background-image:url(../images/gray/tree/arrows.gif);
 }
 
 .x-tree-arrows .x-tree-elbow-minus{
-    background-image:url(../images/default/tree/arrows.gif);
+    background-image:url(../images/gray/tree/arrows.gif);
 }
 
 .x-tree-arrows .x-tree-elbow-end-plus{
-    background-image:url(../images/default/tree/arrows.gif);
+    background-image:url(../images/gray/tree/arrows.gif);
 }
 
 .x-tree-arrows .x-tree-elbow-end-minus{
-    background-image:url(../images/default/tree/arrows.gif);
+    background-image:url(../images/gray/tree/arrows.gif);
 }
 
 .x-tree-node{
@@ -949,7 +943,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-tree-node .x-tree-selected {
-	background-color: #d9e8fb;
+	background-color: #ddd;
 }
 
 .x-tree-drop-ok-append .x-dd-drop-icon{
@@ -968,12 +962,12 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
   background-image: url(../images/default/tree/drop-between.gif);
 }
 .x-date-picker {
-    border-color: #1b376c;
+    border-color:#585858;
     background-color:#fff;
 }
 
 .x-date-middle,.x-date-left,.x-date-right {
-	background-image: url(../images/default/shared/hd-sprite.gif);
+	background-image: url(../images/gray/shared/hd-sprite.gif);
 	color:#fff;
 	font:bold 11px "sans serif", tahoma, verdana, helvetica;
 }
@@ -987,19 +981,19 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-right a {
-    background-image: url(../images/default/shared/right-btn.gif);
+    background-image: url(../images/gray/shared/right-btn.gif);
 }
 
 .x-date-left a{
-	background-image: url(../images/default/shared/left-btn.gif);
+	background-image: url(../images/gray/shared/left-btn.gif);
 }
 
 .x-date-inner th {
-    background-color:#dfecfb;
-    background-image:url(../images/default/shared/glass-bg.gif);
-	border-bottom-color:#a3bad9;
+    background-color:#D8D8D8;
+    background-image: url(../images/gray/panel/white-top-bottom.gif);
+	border-bottom-color:#AFAFAF;
     font:normal 10px arial, helvetica,tahoma,sans-serif;
-	color:#233d6d;
+	color:#595959;
 }
 
 .x-date-inner td {
@@ -1016,9 +1010,9 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-inner .x-date-selected a{
-    background-color:#dfecfb;
-	background-image:url(../images/default/shared/glass-bg.gif);
-	border-color:#8db2e3;
+    background-color:#D8D8D8;
+    background-image:url(../images/gray/glass-bg.gif);
+	border-color:#DCDCDC;
 }
 
 .x-date-inner .x-date-today a{
@@ -1034,14 +1028,14 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-bottom {
-    border-top-color:#a3bad9;
-    background-color:#dfecfb;
-    background-image:url(../images/default/shared/glass-bg.gif);
+    border-top-color:#AFAFAF;
+    background-color:#D8D8D8;
+    background:#D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
 }
 
 .x-date-inner a:hover, .x-date-inner .x-date-disabled a:hover{
     color:#000;
-    background-color:#ddecfe;
+    background-color:#D8D8D8;
 }
 
 .x-date-inner .x-date-disabled a {
@@ -1067,49 +1061,48 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-mp-btns button {
-	background-color:#083772;
+	background-color:#4E565F;
 	color:#fff;
-	border-color: #3366cc #000055 #000055 #3366cc;
+	border-color:#C0C0C0 #434343 #434343 #C0C0C0;
 	font:normal 11px arial, helvetica,tahoma,sans-serif;
 }
 
 .x-date-mp-btns {
-    background-color: #dfecfb;
-	background-image: url(../images/default/shared/glass-bg.gif);
+    background-color:#D8D8D8;
+    background:#D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
 }
 
 .x-date-mp-btns td {
-	border-top-color: #c5d2df;
+	border-top-color:#AFAFAF;
 }
 
 td.x-date-mp-month a,td.x-date-mp-year a {
-	color:#333;
+	color: #333;
 }
 
 td.x-date-mp-month a:hover,td.x-date-mp-year a:hover {
 	color:#333;
-	background-color: #ddecfe;
+	background-color:#FDFDFD;
 }
 
 td.x-date-mp-sel a {
-    background-color: #dfecfb;
-	background-image: url(../images/default/shared/glass-bg.gif);
-	border-color:#8db2e3;
+    background-color:#D8D8D8;
+    background:#D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
+	border-color:#DCDCDC;
 }
 
 .x-date-mp-ybtn a {
-    background-image:url(../images/default/panel/tool-sprites.gif);
+    background-image:url(../images/gray/panel/tool-sprites.gif);
 }
 
 td.x-date-mp-sep {
-   border-right-color:#c5d2df;
-}
-.x-tip .x-tip-close{
-	background-image: url(../images/default/qtip/close.gif);
+   border-right-color:#D7D7D7;
+}.x-tip .x-tip-close{
+	background-image: url(../images/gray/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(../images/default/qtip/tip-sprite.gif);
+	background-image: url(../images/gray/qtip/tip-sprite.gif);
 }
 
 .x-tip .x-tip-mc {
@@ -1140,15 +1133,14 @@ td.x-date-mp-sep {
 }
 
 .x-tip-anchor {
-    background-image:url(../images/default/qtip/tip-anchor-sprite.gif);
-}
-.x-menu {
+    background-image:url(../images/gray/qtip/tip-anchor-sprite.gif);
+}.x-menu {
     background-color:#f0f0f0;
 	background-image:url(../images/default/menu/menu.gif);
 }
 
 .x-menu-floating{
-    border-color:#718bb7;
+    border-color:#7D7D7D;
 }
 
 .x-menu-nosep {
@@ -1160,7 +1152,7 @@ td.x-date-mp-sep {
 }
 
 .x-menu-item-arrow{
-	background-image:url(../images/default/menu/menu-parent.gif);
+	background-image:url(../images/gray/menu/menu-parent.gif);
 }
 
 .x-menu-sep {
@@ -1173,13 +1165,13 @@ a.x-menu-item {
 }
 
 .x-menu-item-active {
-    background-image: url(../images/default/menu/item-over.gif);
-	background-color: #dbecf4;
-    border-color:#aaccf6;
+    background-image: url(../images/gray/menu/item-over.gif);
+	background-color: #f1f1f1;
+    border-color:#ACACAC;
 }
 
 .x-menu-item-active a.x-menu-item {
-	border-color:#aaccf6;
+	border-color:#ACACAC;
 }
 
 .x-menu-check-item .x-menu-item-icon{
@@ -1191,7 +1183,7 @@ a.x-menu-item {
 }
 
 .x-menu-item-checked .x-menu-group-item .x-menu-item-icon{
-    background-image:url(../images/default/menu/group-checked.gif);
+    background-image:url(../images/gray/menu/group-checked.gif);
 }
 
 .x-menu-group-item .x-menu-item-icon{
@@ -1203,12 +1195,12 @@ a.x-menu-item {
 }
 
 .x-menu .x-date-picker{
-    border-color:#a3bad9;
+    border-color:#AFAFAF;
 }
 
 .x-cycle-menu .x-menu-item-checked {
-    border-color:#a3bae9 !important;
-    background-color:#def8f6;
+    border-color:#B9B9B9 !important;
+    background-color:#F1F1F1;
 }
 
 .x-menu-scroller-top {
@@ -1217,9 +1209,7 @@ a.x-menu-item {
 
 .x-menu-scroller-bottom {
     background-image:url(../images/default/layout/mini-bottom.gif);
-}
-
-.x-box-tl {
+}.x-box-tl {
 	background-image: url(../images/default/box/corners.gif);
 }
 
@@ -1287,27 +1277,9 @@ a.x-menu-item {
 .x-box-blue .x-box-mr {
 	background-image: url(../images/default/box/r-blue.gif);
 }
-#x-debug-browser .x-tree .x-tree-node a span {
-    color:#222297;
-    font-size:11px;
-    font-family:"monotype","courier new",sans-serif;
-}
-
-#x-debug-browser .x-tree a i {
-    color:#ff4545;
-    font-style:normal;
-}
-
-#x-debug-browser .x-tree a em {
-    color:#999;
-}
-
-#x-debug-browser .x-tree .x-tree-node .x-tree-selected a span{
-    background-color:#c3daf9;
-}
 .x-combo-list {
-    border-color:#98c0f4;
-    background-color:#ddecfe;
+    border-color:#ccc;
+    background-color:#ddd;
     font:normal 12px tahoma, arial, helvetica, sans-serif;
 }
 
@@ -1319,11 +1291,11 @@ a.x-menu-item {
     font:bold 11px tahoma, arial, helvetica, sans-serif;
     color:#333;
     background-image: url(../images/default/layout/panel-title-light-bg.gif);
-    border-bottom-color:#98c0f4;
+    border-bottom-color:#BCBCBC;
 }
 
 .x-resizable-pinned .x-combo-list-inner {
-    border-bottom-color:#98c0f4;
+    border-bottom-color:#BEBEBE;
 }
 
 .x-combo-list-item {
@@ -1331,18 +1303,17 @@ a.x-menu-item {
 }
 
 .x-combo-list .x-combo-selected{
-	border-color:#a3bae9 !important;
+	border-color:#777 !important;
     background-color:#f0f0f0;
 }
 
 .x-combo-list .x-toolbar {
-    border-top-color:#98c0f4;
+    border-top-color:#BCBCBC;
 }
 
 .x-combo-list-small {
     font:normal 11px tahoma, arial, helvetica, sans-serif;
-}
-.x-panel {
+}.x-panel {
     border-color: #d0d0d0;
 }
 
@@ -1423,7 +1394,6 @@ a.x-menu-item {
 .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:#fcfcfc;
     border-color:#d0d0d0;
@@ -1505,7 +1475,7 @@ body.x-body-masked .x-window-plain .x-window-mc {
     background-color: #E4E4E4;
 }
 .x-html-editor-wrap {
-    border-color:#a9bfd3;
+    border-color:#BCBCBC;
     background-color:#fff;
 }
 .x-html-editor-tb .x-btn-text {
@@ -1530,6 +1500,10 @@ body.x-body-masked .x-window-plain .x-window-mc {
 .x-tab-panel-tbar-noborder .x-toolbar {
     border-bottom-color:#d0d0d0;
 }
+
+.x-border-layout-ct {
+    background-color:#f0f0f0;
+}
 .x-border-layout-ct {
     background-color:#f0f0f0;
 }
@@ -1541,12 +1515,12 @@ body.x-body-masked .x-window-plain .x-window-mc {
 }
 
 .x-layout-collapsed{
-    background-color:#d2e0f2;
-	border-color:#98c0f4;
+    background-color:#dfdfdf;
+	border-color:#d0d0d0;
 }
 
 .x-layout-collapsed-over{
-    background-color:#d9e8fb;
+    background-color:#e7e7e7;
 }
 
 .x-layout-split-west .x-layout-mini {
@@ -1578,20 +1552,20 @@ body.x-body-masked .x-window-plain .x-window-mc {
     background-image:url(../images/default/layout/mini-top.gif);
 }
 .x-progress-wrap {
-    border-color:#6593cf;
+    border-color:#8E8E8E;
 }
 
 .x-progress-inner {
-    background-color:#e0e8f3;
-    background-image:url(../images/default/qtip/bg.gif);
+    background-color:#E7E7E7;
+    background-image:url(../images/gray/qtip/bg.gif);
 }
 
 .x-progress-bar {
-    background-color:#9cbfee;
-    background-image:url(../images/default/progress/progress-bg.gif);
-    border-top-color:#d1e4fd;
-    border-bottom-color:#7fa9e4;
-    border-right-color:#7fa9e4;
+    background-color:#BCBCBC;
+    background-image:url(../images/gray/progress/progress-bg.gif);
+    border-top-color:#E2E2E2;
+    border-bottom-color:#A4A4A4;
+    border-right-color:#A4A4A4;
 }
 
 .x-progress-text {
@@ -1601,11 +1575,11 @@ body.x-body-masked .x-window-plain .x-window-mc {
 }
 
 .x-progress-text-back {
-    color:#396095;
+    color:#5F5F5F;
 }
 .x-list-header{
     background-color:#f9f9f9;
-	background-image:url(../images/default/grid/grid3-hrow.gif);
+	background-image:url(../images/gray/grid/grid3-hrow2.gif);
 }
 
 .x-list-header-inner div em {
@@ -1639,7 +1613,7 @@ body.x-body-masked .x-window-plain .x-window-mc {
 }
 
 .x-slider-horz .x-slider-thumb {
-    background-image:url(../images/default/slider/slider-thumb.png);
+    background-image:url(../images/gray/slider/slider-thumb.png);
 }
 
 .x-slider-vert, .x-slider-vert .x-slider-end, .x-slider-vert .x-slider-inner {
@@ -1647,7 +1621,7 @@ body.x-body-masked .x-window-plain .x-window-mc {
 }
 
 .x-slider-vert .x-slider-thumb {
-    background-image:url(../images/default/slider/slider-v-thumb.png);
+    background-image:url(../images/gray/slider/slider-v-thumb.png);
 }
 .x-window-dlg .ext-mb-text,
 .x-window-dlg .x-window-header-text {
@@ -1663,17 +1637,17 @@ body.x-body-masked .x-window-plain .x-window-mc {
 }
 
 .x-window-dlg .ext-mb-info {
-    background-image:url(../images/default/window/icon-info.gif);
+    background-image:url(../images/gray/window/icon-info.gif);
 }
 
 .x-window-dlg .ext-mb-warning {
-    background-image:url(../images/default/window/icon-warning.gif);
+    background-image:url(../images/gray/window/icon-warning.gif);
 }
 
 .x-window-dlg .ext-mb-question {
-    background-image:url(../images/default/window/icon-question.gif);
+    background-image:url(../images/gray/window/icon-question.gif);
 }
 
 .x-window-dlg .ext-mb-error {
-    background-image:url(../images/default/window/icon-error.gif);
+    background-image:url(../images/gray/window/icon-error.gif);
 }