erp_app 3.0.0 → 3.0.1

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/widgets/_tab.scss

@@ -89,6 +89,10 @@
         }
     }
 
+    .#{$prefix}tab-disabled {
+        @include opacity(1);
+    }
+
     .#{$prefix}border-box {
         .#{$prefix}tab-default-top {
             height: $tab-height + top($tabbar-top-strip-border-width);
@@ -318,17 +322,25 @@
 
     @if not $supports-gradients or $compile-all {
         .#{$prefix}nlg {
-            .#{$prefix}tab-top { background-image: theme-image($theme-name, 'tab/tab-default-top-bg.gif'); }
-            .#{$prefix}tab-bottom { background-image: theme-image($theme-name, 'tab/tab-default-bottom-bg.gif'); }
+            @if $tab-background-gradient != null {
+                .#{$prefix}tab-top { background-image: theme-background-image($theme-name, 'tab/tab-default-top-bg.gif'); }
+                .#{$prefix}tab-bottom { background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-bg.gif'); }
+            }
 
-            .#{$prefix}tab-top-over { background-image: theme-image($theme-name, 'tab/tab-default-top-over-bg.gif'); }
-            .#{$prefix}tab-bottom-over { background-image: theme-image($theme-name, 'tab/tab-default-bottom-over-bg.gif'); }
+            @if $tab-background-gradient-over != null {
+                .#{$prefix}tab-top-over { background-image: theme-background-image($theme-name, 'tab/tab-default-top-over-bg.gif'); }
+                .#{$prefix}tab-bottom-over { background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-over-bg.gif'); }
+            }
 
-            .#{$prefix}tab-top-active { background-image: theme-image($theme-name, 'tab/tab-default-top-active-bg.gif'); }
-            .#{$prefix}tab-bottom-active { background-image: theme-image($theme-name, 'tab/tab-default-bottom-active-bg.gif'); }
+            @if $tab-background-gradient-active != null {
+                .#{$prefix}tab-top-active { background-image: theme-background-image($theme-name, 'tab/tab-default-top-active-bg.gif'); }
+                .#{$prefix}tab-bottom-active { background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-active-bg.gif'); }
+            }
 
-            .#{$prefix}tab-top-disabled { background-image: theme-image($theme-name, 'tab/tab-default-top-disabled-bg.gif') !important; }
-            .#{$prefix}tab-bottom-disabled { background-image: theme-image($theme-name, 'tab/tab-default-bottom-disabled-bg.gif') !important; }
+            @if $tab-background-gradient-disabled != null {
+                .#{$prefix}tab-top-disabled { background-image: theme-background-image($theme-name, 'tab/tab-default-top-disabled-bg.gif') !important; }
+                .#{$prefix}tab-bottom-disabled { background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-disabled-bg.gif') !important; }
+            }
         }
     }
 
@@ -345,7 +357,8 @@
         font-size: 0;
         line-height: 0;
         text-indent: -999px;
-        background: theme-image($theme-name, $tab-closable-icon) no-repeat;
+        background: no-repeat;
+        background-image: theme-background-image($theme-name, $tab-closable-icon);
         @include opacity(.6);
     }
     .#{$prefix}tab-close-btn:hover {
@@ -361,16 +374,18 @@
                 .#{$prefix}frame-br,
                 .#{$prefix}frame-tc,
                 .#{$prefix}frame-bc {
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-over-corners.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-top-over-corners.gif');
                 }
                 .#{$prefix}frame-ml,
                 .#{$prefix}frame-mr {
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-over-sides.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-top-over-sides.gif');
                 }
-                .#{$prefix}frame-mc {
-                    background-color: $tab-base-color-over;
-                    background-repeat: repeat-x;
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-over-bg.gif');
+                @if $tab-background-gradient-over != null {
+                    .#{$prefix}frame-mc {
+                        background-color: $tab-base-color-over;
+                        background-repeat: repeat-x;
+                        background-image: theme-background-image($theme-name, 'tab/tab-default-top-over-bg.gif');
+                    }
                 }
             }
 
@@ -381,16 +396,18 @@
                 .#{$prefix}frame-br,
                 .#{$prefix}frame-tc,
                 .#{$prefix}frame-bc {
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-over-corners.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-over-corners.gif');
                 }
                 .#{$prefix}frame-ml,
                 .#{$prefix}frame-mr {
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-over-sides.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-over-sides.gif');
                 }
-                .#{$prefix}frame-mc {
-                    background-color: $tab-base-color-over;
-                    background-repeat: repeat-x;
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-over-bg.gif');
+                @if $tab-background-gradient-over != null {
+                    .#{$prefix}frame-mc {
+                        background-color: $tab-base-color-over;
+                        background-repeat: repeat-x;
+                        background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-over-bg.gif');
+                    }
                 }
             }
 
@@ -401,16 +418,18 @@
                 .#{$prefix}frame-br,
                 .#{$prefix}frame-tc,
                 .#{$prefix}frame-bc {
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-active-corners.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-top-active-corners.gif');
                 }
                 .#{$prefix}frame-ml,
                 .#{$prefix}frame-mr {
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-active-sides.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-top-active-sides.gif');
                 }
-                .#{$prefix}frame-mc {
-                    background-color: $tab-base-color-active;
-                    background-repeat: repeat-x;
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-active-bg.gif');
+                @if $tab-background-gradient-active != null {
+                    .#{$prefix}frame-mc {
+                        background-color: $tab-base-color-active;
+                        background-repeat: repeat-x;
+                        background-image: theme-background-image($theme-name, 'tab/tab-default-top-active-bg.gif');
+                    }
                 }
             }
 
@@ -421,16 +440,18 @@
                 .#{$prefix}frame-br,
                 .#{$prefix}frame-tc,
                 .#{$prefix}frame-bc {
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-active-corners.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-active-corners.gif');
                 }
                 .#{$prefix}frame-ml,
                 .#{$prefix}frame-mr {
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-active-sides.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-active-sides.gif');
                 }
-                .#{$prefix}frame-mc {
-                    background-color: $tab-base-color-active;
-                    background-repeat: repeat-x;
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-active-bg.gif');
+                @if $tab-background-gradient-active != null {
+                    .#{$prefix}frame-mc {
+                        background-color: $tab-base-color-active;
+                        background-repeat: repeat-x;
+                        background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-active-bg.gif');
+                    }
                 }
             }
 
@@ -441,15 +462,17 @@
                 .#{$prefix}frame-br,
                 .#{$prefix}frame-tc,
                 .#{$prefix}frame-bc {
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-disabled-corners.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-top-disabled-corners.gif');
                 }
                 .#{$prefix}frame-ml,
                 .#{$prefix}frame-mr {
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-disabled-sides.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-top-disabled-sides.gif');
                 }
-                .#{$prefix}frame-mc {
-                    background-repeat: repeat-x;
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-disabled-bg.gif');
+                @if $tab-background-gradient-disabled != null {
+                    .#{$prefix}frame-mc {
+                        background-repeat: repeat-x;
+                        background-image: theme-background-image($theme-name, 'tab/tab-default-top-disabled-bg.gif');
+                    }
                 }
             }
 
@@ -460,15 +483,17 @@
                 .#{$prefix}frame-br,
                 .#{$prefix}frame-tc,
                 .#{$prefix}frame-bc {
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-disabled-corners.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-disabled-corners.gif');
                 }
                 .#{$prefix}frame-ml,
                 .#{$prefix}frame-mr {
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-disabled-sides.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-disabled-sides.gif');
                 }
-                .#{$prefix}frame-mc {
-                    background-repeat: repeat-x;
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-disabled-bg.gif');
+                @if $tab-background-gradient-disabled != null {
+                    .#{$prefix}frame-mc {
+                        background-repeat: repeat-x;
+                        background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-disabled-bg.gif');
+                    }
                 }
             }
         }

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/widgets/_tabbar.scss

@@ -10,7 +10,7 @@
     }
 
     .#{$prefix}nlg .#{$prefix}tab-bar {
-        background-image: theme-image($theme-name, 'tab-bar/tab-bar-bg.gif');
+        background-image: theme-background-image($theme-name, 'tab-bar/tab-bar-default-bg.gif');
     }
 
     .#{$prefix}tab-bar-default-plain,

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/widgets/_toolbar.scss

@@ -101,7 +101,7 @@
 
     // Background for overflow button inserted by the Menu box overflow handler within a toolbar
     .#{$prefix}toolbar-more-icon {
-        background-image: theme-image($theme-name, 'toolbar/more.gif') !important;
+        background-image: theme-background-image($theme-name, 'toolbar/more.gif') !important;
         background-position: 2px center !important;
         background-repeat: no-repeat;
     }
@@ -110,7 +110,7 @@
         'default',
         $background-color: $toolbar-background-color,
         $background-gradient: $toolbar-background-gradient,
-        $border-color: $tabbar-border-color
+        $border-color: $toolbar-border-color
     );
     
     //plain toolbars have no border
@@ -149,7 +149,7 @@
         @if $background-gradient != null {
             .#{$prefix}nlg {
                 .#{$prefix}toolbar-#{$ui} {
-                    background-image: theme-image($theme-name, 'toolbar/toolbar-#{$ui}-bg.gif') !important;
+                    background-image: theme-background-image($theme-name, 'toolbar/toolbar-#{$ui}-bg.gif') !important;
                     background-repeat: repeat-x;
                 }
             }

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/widgets/_tree.scss

@@ -71,43 +71,43 @@
     //elbows
     .#{$prefix}tree-lines {
         .#{$prefix}tree-elbow {
-            background-image: theme-image($theme-name, 'tree/elbow.gif');
+            background-image: theme-background-image($theme-name, 'tree/elbow.gif');
         }
         
         .#{$prefix}tree-elbow-end {
-            background-image: theme-image($theme-name, 'tree/elbow-end.gif');
+            background-image: theme-background-image($theme-name, 'tree/elbow-end.gif');
         }
 
         .#{$prefix}tree-elbow-plus {
-            background-image: theme-image($theme-name, 'tree/elbow-plus.gif');
+            background-image: theme-background-image($theme-name, 'tree/elbow-plus.gif');
         }
 
         .#{$prefix}tree-elbow-end-plus {
-            background-image: theme-image($theme-name, 'tree/elbow-end-plus.gif');
+            background-image: theme-background-image($theme-name, 'tree/elbow-end-plus.gif');
         }
 
         .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-elbow-plus {
-            background-image: theme-image($theme-name, 'tree/elbow-minus.gif');
+            background-image: theme-background-image($theme-name, 'tree/elbow-minus.gif');
         }
 
         .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-elbow-end-plus {
-            background-image: theme-image($theme-name, 'tree/elbow-end-minus.gif');
+            background-image: theme-background-image($theme-name, 'tree/elbow-end-minus.gif');
         }
         
         .#{$prefix}tree-elbow-line {
-            background-image: theme-image($theme-name, 'tree/elbow-line.gif');
+            background-image: theme-background-image($theme-name, 'tree/elbow-line.gif');
         }
     }
     
     .#{$prefix}tree-no-lines {
         .#{$prefix}tree-elbow-plus,
         .#{$prefix}tree-elbow-end-plus {
-        	background-image: theme-image($theme-name, 'tree/elbow-plus-nl.gif');
+        	background-image: theme-background-image($theme-name, 'tree/elbow-plus-nl.gif');
         }
 
         .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-elbow-plus,
         .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-elbow-end-plus {
-            background-image: theme-image($theme-name, 'tree/elbow-end-minus-nl.gif');
+            background-image: theme-background-image($theme-name, 'tree/elbow-end-minus-nl.gif');
         }
     }
     
@@ -116,7 +116,7 @@
         .#{$prefix}tree-elbow-minus,
         .#{$prefix}tree-elbow-end-plus,
         .#{$prefix}tree-elbow-end-minus {
-            background-image: theme-image($theme-name, 'tree/arrows.gif');
+            background-image: theme-background-image($theme-name, 'tree/arrows.gif');
         }
     }
     
@@ -136,16 +136,16 @@
     
     .#{$prefix}tree-icon-leaf {
         width: $tree-elbow-width;
-        background-image: theme-image($theme-name, 'tree/leaf.gif');
+        background-image: theme-background-image($theme-name, 'tree/leaf.gif');
     }
 
     .#{$prefix}tree-icon-parent {
         width: $tree-elbow-width;
-        background-image: theme-image($theme-name, 'tree/folder.gif');
+        background-image: theme-background-image($theme-name, 'tree/folder.gif');
     }
     
     .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-icon-parent {
-        background-image: theme-image($theme-name, 'tree/folder-open.gif');
+        background-image: theme-background-image($theme-name, 'tree/folder-open.gif');
     }
     
     .#{$prefix}grid-rowbody {
@@ -155,7 +155,7 @@
     .#{$prefix}tree-panel .#{$prefix}grid-cell-inner {
         padding: 0px;
     }
-    
+
     .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell {
         border: none;
     }
@@ -164,29 +164,26 @@
         height: $tree-elbow-height;
         
         line-height: $tree-elbow-height;
-        vertical-align: middle;
         cursor: pointer;
+        white-space: nowrap;
+        vertical-align: middle;
         
         img {
-            float: left;
-        }
-    }
-    
-    .#{$prefix}ie {
-        .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell-inner {
-            white-space: normal;
+            margin-top: 0;
+            display: inline-block;
+            vertical-align: top;
         }
     }
     
-    
     .#{$prefix}tree-checkbox {
-        float: left;
         margin: 2px 3px 0 0;
-        display: block;
+        display: inline-block;
+        vertical-align: top;
 
         width: $form-checkbox-size;
         height: $form-checkbox-size;
-        background: theme-image($theme-name, $form-checkbox-image) no-repeat;
+        background: no-repeat;
+        background-image: theme-background-image($theme-name, $form-checkbox-image);
 
         overflow: hidden;
         padding: 0;
@@ -196,6 +193,7 @@
             border: 0;
         }
     }
+
     @if $include-ie {
         /* Hack for IE; causes alignment problem in IE9 standards mode so exclude that */
         .#{$prefix}nbr.#{$prefix}ie {
@@ -212,6 +210,25 @@
         .#{$prefix}tree-panel .#{$prefix}grid-cell-inner {
             border-width: 0 !important;
         }
+
+        .#{$prefix}ie6 .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell-inner img,
+        .#{$prefix}quirks .#{$prefix}ie .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell-inner img {
+            margin-top: -1px;
+            vertical-align: middle;
+        }
+        .#{$prefix}strict .#{$prefix}ie7 .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell-inner img {
+            margin-top: -3px;
+            vertical-align: middle;
+        }
+        .#{$prefix}ie6 .#{$prefix}tree-checkbox,
+        .#{$prefix}quirks .#{$prefix}ie7 .#{$prefix}tree-checkbox {
+            margin-top: 0;
+            vertical-align: middle;
+        }
+        .#{$prefix}strict .#{$prefix}ie7 .#{$prefix}tree-checkbox {
+            margin-top: -2px;
+            vertical-align: middle;
+        }
     }
     
     @if $include-ff {
@@ -223,23 +240,23 @@
     }
     
     .#{$prefix}tree-drop-ok-append .#{$prefix}dd-drop-icon {
-        background-image: theme-image($theme-name, 'tree/drop-append.gif');
+        background-image: theme-background-image($theme-name, 'tree/drop-append.gif');
     }
 
     .#{$prefix}tree-drop-ok-above .#{$prefix}dd-drop-icon {
-        background-image: theme-image($theme-name, 'tree/drop-above.gif');
+        background-image: theme-background-image($theme-name, 'tree/drop-above.gif');
     }
 
     .#{$prefix}tree-drop-ok-below .#{$prefix}dd-drop-icon {
-        background-image: theme-image($theme-name, 'tree/drop-below.gif');
+        background-image: theme-background-image($theme-name, 'tree/drop-below.gif');
     }
 
     .#{$prefix}tree-drop-ok-between .#{$prefix}dd-drop-icon {
-        background-image: theme-image($theme-name, 'tree/drop-between.gif');
+        background-image: theme-background-image($theme-name, 'tree/drop-between.gif');
     }
     
     .#{$prefix}grid-tree-loading .#{$prefix}tree-icon {
-        background-image: theme-image($theme-name, 'tree/loading.gif');
+        background-image: theme-background-image($theme-name, 'tree/loading.gif');
     }
 
     .#{$prefix}tree-ddindicator {

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/widgets/form/_all.scss

@@ -50,7 +50,8 @@
         font: $form-error-msg-font;
         line-height: $form-error-msg-line-height;
 
-        background: theme-image($theme-name, $form-exclamation-icon) no-repeat 0 2px;
+        background: no-repeat 0 2px;
+        background-image: theme-background-image($theme-name, $form-exclamation-icon);
     }
     
     .#{$prefix}form-invalid-icon {
@@ -63,7 +64,8 @@
         left: 0;
         top: 0;
         
-        background: theme-image($theme-name, $form-exclamation-icon) no-repeat 2px 3px;
+        background: no-repeat 2px 3px;
+        background-image: theme-background-image($theme-name, $form-exclamation-icon);
 
         ul {
             /* prevent inner elements from interfering with QuickTip hovering */

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/widgets/form/_checkbox.scss

@@ -10,7 +10,8 @@
 
         width: $form-checkbox-size;
         height: $form-checkbox-size;
-        background: theme-image($theme-name, $form-checkbox-image) no-repeat;
+        background: no-repeat;
+        background-image: theme-background-image($theme-name, $form-checkbox-image);
 
         overflow: hidden;
         padding: 0;
@@ -48,7 +49,7 @@
 
     /* Radios */
     .#{$prefix}form-radio {
-        background-image: theme-image($theme-name, $form-radio-image);
+        background-image: theme-background-image($theme-name, $form-radio-image);
     }
 
     /* boxLabel */

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/widgets/form/_checkboxgroup.scss

@@ -1,13 +1,14 @@
 @mixin extjs-form-checkboxgroup {
 
     .#{$prefix}form-checkboxgroup-body {
-        padding: 3px 4px;
+        //padding: 3px 4px;
     }
 
     .#{$prefix}form-invalid {
         .#{$prefix}form-checkboxgroup-body {
             border: 1px solid #c30;
-            background: #fff theme-image($theme-name, 'grid/invalid_line.gif') repeat-x bottom;
+            background: #fff repeat-x bottom;
+            background-image: theme-background-image($theme-name, 'grid/invalid_line.gif');
             padding: 2px 3px;
         }
     }

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/widgets/form/_field.scss

@@ -18,7 +18,7 @@
         
         background-color: $form-field-background-color;
         @if $form-field-background-image {
-            background-image: theme-image($theme-name, $form-field-background-image);
+            background-image: theme-background-image($theme-name, $form-field-background-image);
         }
         
         border-color: $form-field-border-color;
@@ -52,7 +52,7 @@
         background: repeat-x 0 0;
         background-color: $form-field-background-color;
         @if $form-field-background-image {
-            background-image: theme-image($theme-name, $form-field-background-image);
+            background-image: theme-background-image($theme-name, $form-field-background-image);
         }
         resize: none; //Disable browser resizable textarea
     }
@@ -76,7 +76,7 @@
     textarea.#{$prefix}form-invalid-field {
         background-color: $form-field-invalid-background-color;
         @if $form-field-invalid-background-image {
-            background-image: theme-image($theme-name, $form-field-invalid-background-image);
+            background-image: theme-background-image($theme-name, $form-field-invalid-background-image);
             background-repeat: $form-field-invalid-background-repeat;
             background-position: $form-field-invalid-background-position;
         }

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/widgets/form/_fieldset.scss

@@ -2,7 +2,7 @@
     .#{$prefix}fieldset {
         border: $fieldset-border;
         
-        padding: $fieldset-padding;
+        padding: 0 $fieldset-padding;
         margin-bottom: $fieldset-padding;
         
         display: block; /* preserve margins in IE */
@@ -46,10 +46,6 @@
             padding: 0;
         }
 
-        .#{$prefix}ie .#{$prefix}fieldset-header {
-            margin-bottom: 10px;
-        }
-
         .#{$prefix}ie9 .#{$prefix}fieldset-header {
             padding-top: 1px;
         }

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/widgets/form/_htmleditor.scss

@@ -14,91 +14,92 @@
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}btn-text {
-        background:transparent theme-image($theme-name, 'editor/tb-sprite.gif') no-repeat;
+        background:transparent no-repeat;
+        background-image:theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-bold,
     .#{$prefix}menu-item img.#{$prefix}edit-bold {
         background-position:0 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');    
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');    
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-italic,
     .#{$prefix}menu-item img.#{$prefix}edit-italic {
         background-position:-16px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-underline,
     .#{$prefix}menu-item img.#{$prefix}edit-underline {
         background-position:-32px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-forecolor,
     .#{$prefix}menu-item img.#{$prefix}edit-forecolor {
         background-position:-160px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-backcolor,
     .#{$prefix}menu-item img.#{$prefix}edit-backcolor {
         background-position:-176px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-justifyleft,
     .#{$prefix}menu-item img.#{$prefix}edit-justifyleft {
         background-position:-112px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-justifycenter,
     .#{$prefix}menu-item img.#{$prefix}edit-justifycenter {
         background-position:-128px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-justifyright,
     .#{$prefix}menu-item img.#{$prefix}edit-justifyright {
         background-position:-144px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-insertorderedlist,
     .#{$prefix}menu-item img.#{$prefix}edit-insertorderedlist {
         background-position:-80px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-insertunorderedlist,
     .#{$prefix}menu-item img.#{$prefix}edit-insertunorderedlist {
         background-position:-96px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-increasefontsize,
     .#{$prefix}menu-item img.#{$prefix}edit-increasefontsize {
         background-position:-48px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-decreasefontsize,
     .#{$prefix}menu-item img.#{$prefix}edit-decreasefontsize {
         background-position:-64px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-sourceedit,
     .#{$prefix}menu-item img.#{$prefix}edit-sourceedit {
         background-position:-192px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tb .#{$prefix}edit-createlink,
     .#{$prefix}menu-item img.#{$prefix}edit-createlink {
         background-position: -208px 0;
-        background-image: theme-image($theme-name, 'editor/tb-sprite.gif');
+        background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif');
     }
 
     .#{$prefix}html-editor-tip .#{$prefix}tip-bd .#{$prefix}tip-bd-inner {