erp_app 3.0.0 → 3.0.1

data/public/stylesheets/extjs/resources/sass/ext-all-access.scss

@@ -160,6 +160,13 @@ $progress-background-color: #232d38;
 $progress-text-color-back: #aaa;
 $progress-bar-background-color: $orange;
 
+//btn group
+$btn-group-background-color: #393d4e;
+$btn-group-header-background-color: #676772;
+$btn-group-border-color: #606068;
+$btn-group-inner-border-color: #757478;
+$btn-group-header-color: #D2D2D2;
+
 //datepicker
 $datepicker-background-color: #21252e;
 $datepicker-border-color: #798294;

data/public/stylesheets/extjs/resources/sass/ext-all-gray.scss

@@ -39,6 +39,12 @@ $toolbar-background-gradient: color-stops(#e6e6e6, #efefef);
 $toolbar-separator-color: #aca899;
 $toolbar-text-color: #000;
 
+//btn group
+$btn-group-background-color: #f0f0f0;
+$btn-group-header-background-color: #dfdfdf;
+$btn-group-border-color: #d0d0d0;
+$btn-group-header-color: #666;
+
 //form
 $fieldset-header-color: #333;
 

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

@@ -39,6 +39,7 @@ $include-default-uis: true !default;
         	@include extjs-form;
         	    @include extjs-form-field;
         	    @include extjs-form-fieldset;
+        	    @include extjs-form-file;
         	    @include extjs-form-checkboxfield;
         	    @include extjs-form-checkboxgroup;
         	    @include extjs-form-triggerfield;
@@ -66,6 +67,8 @@ $include-default-uis: true !default;
         
         @include extjs-html;
     }
+
+    @include extjs-reset-extras;
 }
 @else {
     @if $include-default {

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/_mixins.scss

@@ -2,11 +2,14 @@
 @import 'mixins/theme-background-image';
 @import 'mixins/inner-border';
 @import 'mixins/frame';
+@import 'mixins/reset-extras';
 
 @mixin no-select {
-    -moz-user-select:none;
-    -khtml-user-select:none;
-    -webkit-user-select:ignore;
+    user-select: none;
+    -o-user-select: none;
+    -ms-user-select: none;
+    -moz-user-select: -moz-none;
+    -webkit-user-select: none;
     
     cursor:default;
 }

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/core/_core.scss

@@ -36,7 +36,7 @@
 }
 
 .#{$prefix}item-disabled {
-    @include opacity(0.4);
+    @include opacity(0.3);
 }
 
 .#{$prefix}ie6 .#{$prefix}item-disabled {
@@ -152,7 +152,7 @@
     float: left;
 
     @if $include-shadow-images {
-        @include theme-background-image($theme-name, 'shared/shadow.png');
+        background-image: theme-background-image($theme-name, 'shared/shadow.png');
     }
 }
 
@@ -163,7 +163,7 @@
     height: 100%;
 
     @if $include-shadow-images {
-        @include theme-background-image($theme-name, 'shared/shadow-lr.png');
+        background-image: theme-background-image($theme-name, 'shared/shadow-lr.png');
     }
 }
 
@@ -172,7 +172,7 @@
     height: 100%;
 
     @if $include-shadow-images {
-        @include theme-background-image($theme-name, 'shared/shadow-c.png');
+        background-image: theme-background-image($theme-name, 'shared/shadow-c.png');
     }
 }
 
@@ -248,24 +248,24 @@
 }
 
 .x-box-tl {
-    @include theme-background-image($theme-name, 'box/corners.gif');
+    background-image: theme-background-image($theme-name, 'box/corners.gif');
 }
 
 .x-box-tc {
-    @include theme-background-image($theme-name, 'box/tb.gif');
+    background-image: theme-background-image($theme-name, 'box/tb.gif');
 }
 
 .x-box-tr {
-    @include theme-background-image($theme-name, 'box/corners.gif');
+    background-image: theme-background-image($theme-name, 'box/corners.gif');
 }
 
 .x-box-ml {
-    @include theme-background-image($theme-name, 'box/l.gif');
+    background-image: theme-background-image($theme-name, 'box/l.gif');
 }
 
 .x-box-mc {
     background-color: #eee;
-    @include theme-background-image($theme-name, 'box/tb.gif');
+    background-image: theme-background-image($theme-name, 'box/tb.gif');
     font-family: "Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif;
     color: #393939;
     font-size: 15px;
@@ -277,27 +277,27 @@
 }
 
 .x-box-mr {
-    @include theme-background-image($theme-name, 'box/r.gif');
+    background-image: theme-background-image($theme-name, 'box/r.gif');
 }
 
 .x-box-bl {
-    @include theme-background-image($theme-name, 'box/corners.gif');
+    background-image: theme-background-image($theme-name, 'box/corners.gif');
 }
 
 .x-box-bc {
-    @include theme-background-image($theme-name, 'box/tb.gif');
+    background-image: theme-background-image($theme-name, 'box/tb.gif');
 }
 
 .x-box-br {
-    @include theme-background-image($theme-name, 'box/corners.gif');
+    background-image: theme-background-image($theme-name, '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 {
-    @include theme-background-image($theme-name, 'box/corners-blue.gif');
+    background-image: theme-background-image($theme-name, 'box/corners-blue.gif');
 }
 
 .x-box-blue .x-box-bc, .x-box-blue .x-box-mc, .x-box-blue .x-box-tc {
-    @include theme-background-image($theme-name, 'box/tb-blue.gif');
+    background-image: theme-background-image($theme-name, 'box/tb-blue.gif');
 }
 
 .x-box-blue .x-box-mc {
@@ -309,9 +309,9 @@
 }
 
 .x-box-blue .x-box-ml {
-    @include theme-background-image($theme-name, 'box/l-blue.gif');
+    background-image: theme-background-image($theme-name, 'box/l-blue.gif');
 }
 
 .x-box-blue .x-box-mr {
-    @include theme-background-image($theme-name, 'box/r-blue.gif');
+    background-image: theme-background-image($theme-name, 'box/r-blue.gif');
 }

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/core/_reset.scss

@@ -1,4 +1,12 @@
 @if $scope-reset-css {
+    .#{$prefix}border-box .#{$prefix}reset, 
+    .#{$prefix}border-box .#{$prefix}reset * {
+        box-sizing:border-box;
+        -moz-box-sizing:border-box;
+        -ms-box-sizing:border-box;
+        -webkit-box-sizing:border-box;
+    }
+
     .#{$prefix}reset {
         html, body, div, dl, dt, dd, ul, ol, li, h1, h2, h3,
         h4, h5, h6, pre, code, form, fieldset, legend,
@@ -125,12 +133,14 @@
     *:focus {
         outline:none;
     }
-}
 
-.#{$prefix}border-box .#{$prefix}reset, 
-.#{$prefix}border-box .#{$prefix}reset * {
-    box-sizing:border-box;
-    -moz-box-sizing:border-box;
-    -ms-box-sizing:border-box;
-    -webkit-box-sizing:border-box;
+    .#{$prefix}border-box, 
+    .#{$prefix}border-box * {
+        box-sizing:border-box;
+        -moz-box-sizing:border-box;
+        -ms-box-sizing:border-box;
+        -webkit-box-sizing:border-box;
+    }
 }
+
+

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/layout/_layout.scss

@@ -74,6 +74,10 @@
         position: absolute;
     }
 
+    .#{$prefix}fit-item {
+        position: relative;
+    }
+
     .#{$prefix}border-layout-ct {
         background-color: $border-layout-ct-background;
     }
@@ -184,7 +188,7 @@
             cursor: pointer;
             height: $tab-height;
             background: transparent no-repeat -18px 0;
-            @include theme-background-image($theme-name, 'tab-bar/scroll-left.gif');
+            background-image: theme-background-image($theme-name, 'tab-bar/scroll-left.gif');
         }
         .#{$prefix}toolbar-scroll-left-hover {
             background-position: 0 0;
@@ -198,7 +202,7 @@
         }
 
         .#{$prefix}toolbar-scroll-left {
-            @include theme-background-image($theme-name, 'toolbar/scroll-left.gif');
+            background-image: theme-background-image($theme-name, 'toolbar/scroll-left.gif');
             background-position: -14px 0;
         }
         .#{$prefix}toolbar-scroll-left-hover {
@@ -232,7 +236,7 @@
             cursor: pointer;
             height: $tab-height;
             background: transparent no-repeat 0 0;
-            @include theme-background-image($theme-name, 'tab-bar/scroll-right.gif');
+            background-image: theme-background-image($theme-name, 'tab-bar/scroll-right.gif');
         }
         .#{$prefix}toolbar-scroll-right-hover {
             background-position: -18px 0;
@@ -246,7 +250,7 @@
         }
 
         .#{$prefix}toolbar-scroll-right {
-            @include theme-background-image($theme-name, 'toolbar/scroll-right.gif');
+            background-image: theme-background-image($theme-name, 'toolbar/scroll-right.gif');
         }
         .#{$prefix}toolbar-scroll-right-hover {
             background-position: -14px 0;
@@ -271,7 +275,7 @@
         }
         .#{$prefix}menu-scroll-top {
             background: transparent no-repeat center center;
-            @include theme-background-image($theme-name, 'layout/mini-top.gif');
+            background-image: theme-background-image($theme-name, 'layout/mini-top.gif');
             height: 8px;
             cursor: pointer;
         }
@@ -283,7 +287,7 @@
         }
         .#{$prefix}menu-scroll-bottom {
             background: transparent no-repeat center center;
-            @include theme-background-image($theme-name, 'layout/mini-bottom.gif');
+            background-image: theme-background-image($theme-name, 'layout/mini-bottom.gif');
             height: 8px;
             cursor: pointer;
         }

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/mixins/_frame.scss

@@ -90,7 +90,7 @@
         .#{$prefix}nlg {
             .#{$prefix}#{$cls-ui}-mc {
                 @if $background-gradient != null {
-                    @include theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-bg.gif', false, $relative-image-path-for-uis);
+                    background-image: theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-bg.gif', false, $relative-image-path-for-uis);
                 }
                 @if $background-color != null {
                     background-color: $background-color;
@@ -148,7 +148,7 @@
                 zoom:1;
                 
                 @if $background-color != transparent {
-                    @include theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-corners.gif', false, $relative-image-path-for-uis);
+                    background-image: theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-corners.gif', false, $relative-image-path-for-uis);
                 }
             }
             
@@ -158,7 +158,7 @@
                     zoom:1;
 
                     @if $background-color != transparent {
-                        @include theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-sides.gif', false, $relative-image-path-for-uis);
+                        background-image: theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-sides.gif', false, $relative-image-path-for-uis);
                         background-position: 0 0;
                         background-repeat: repeat-x;
                     }
@@ -169,7 +169,7 @@
                     zoom:1;
 
                     @if $background-color != transparent {
-                        @include theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-sides.gif', false, $relative-image-path-for-uis);
+                        background-image: theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-sides.gif', false, $relative-image-path-for-uis);
                         background-position: 0 0;
                         @if $background-gradient == null {
                             background-repeat: repeat-y;

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/mixins/_reset-extras.scss

@@ -0,0 +1,144 @@
+@mixin extjs-reset-extras {
+	.#{$prefix}border-box {
+		.#{$prefix}reset {
+			//tab.scss
+			.#{$prefix}tab-default-top {
+				height: $tab-height + top($tabbar-top-strip-border-width);
+			}
+			.#{$prefix}tab-default-bottom {
+				height: $tab-height + bottom($tabbar-bottom-strip-border-width);
+			}
+
+			//qtip.scss
+			.#{$prefix}tip-anchor {
+		        width: 10px;
+		        height: 10px;
+		    }
+
+			//field.scss
+			.#{$prefix}form-text {
+		        height: $form-field-height;
+		    }
+
+			textarea.#{$prefix}form-field {
+		        height: auto;
+		    }
+
+		    .#{$prefix}field-default-toolbar .#{$prefix}form-text {
+		        height: $form-toolbar-field-height;
+		    }
+
+		    //triggerfield.scss
+		    .#{$prefix}form-trigger {
+		        height: $form-trigger-height;
+		    }
+
+		    .#{$prefix}field-default-toolbar .#{$prefix}form-trigger {
+		        height: $form-toolbar-trigger-height;
+		    }
+
+		    //grid.scss
+		    @if $include-ie or $compile-all {
+		        &.#{$prefix}ie9 {
+		            .#{$prefix}grid-header-ct {
+		                padding-left: 1px;
+		            }
+		        }
+		    }
+		}
+    }
+
+    .#{$prefix}webkit {
+    	.#{$prefix}reset {
+	    	//form.scss
+	        * {
+	            &:focus {
+	                outline:none !important;
+	            }
+	        }
+
+	        //field
+	        .#{$prefix}form-empty-field {
+	            line-height: 15px;
+	        }
+
+	        //fieldset
+	        .#{$prefix}fieldset-header {
+		        padding-top: 1px;
+		    }
+	    }
+	}
+
+    /* Top Tabs */
+	@include tab-bar-top-reset(
+	    "tab-bar-top",
+	    "tab-bar-body",
+	    "tab-bar-strip",
+	    $tabbar-top-body-padding,
+	    $tabbar-top-body-border-width,
+	    $tabbar-top-strip-border-width,
+	    $tabbar-strip-height
+	);
+	@include tab-bar-top-reset(
+	    "tab-bar-top",
+	    "tab-bar-body-default-plain",
+	    "tab-bar-strip-default-plain",
+	    $tabbar-top-plain-body-padding,
+	    $tabbar-top-plain-body-border-width,
+	    $tabbar-top-strip-border-width,
+	    $tabbar-strip-height
+	);
+
+	/* Bottom Tabs */
+	@include tab-bar-bottom-reset(
+	    "tab-bar-bottom",
+	    "tab-bar-body",
+	    "tab-bar-strip",
+	    $tabbar-bottom-body-padding,
+	    $tabbar-bottom-body-border-width,
+	    $tabbar-bottom-strip-border-width,
+	    $tabbar-strip-height
+	);
+
+	@include tab-bar-bottom-reset(
+	    "tab-bar-bottom",
+	    "tab-bar-body-default-plain",
+	    "tab-bar-strip-default-plain",
+	    $tabbar-bottom-plain-body-padding,
+	    $tabbar-bottom-plain-body-border-width,
+	    $tabbar-bottom-strip-border-width,
+	    $tabbar-strip-height
+	);
+}
+
+@mixin tab-bar-top-reset($toolbarCls, $bodyCls, $stripCls, $body-padding, $body-border-width, $strip-border-width, $strip-height) {
+    .#{$prefix}border-box {
+    	.#{$prefix}reset {
+	        .#{$prefix}#{$toolbarCls} {
+	            .#{$prefix}#{$bodyCls} {
+	                height: $tab-height + vertical($body-border-width) + vertical($body-padding);
+	            }
+
+	            .#{$prefix}#{$stripCls} {
+	                height: $strip-height;
+	            }
+	        }
+		}
+    }
+}
+
+@mixin tab-bar-bottom-reset($toolbarCls, $bodyCls, $stripCls, $body-padding, $body-border-width, $strip-border-width, $strip-height) {
+    .#{$prefix}border-box {
+    	.#{$prefix}reset {
+	        .#{$prefix}#{$toolbarCls} {
+	            .#{$prefix}#{$bodyCls} {
+	                height: $tab-height + vertical($body-border-width) + vertical($body-padding);
+	            }
+
+	            .#{$prefix}#{$stripCls} {
+	                height: $strip-height;
+	            }
+	        }
+	    }
+    }
+}

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/mixins/_theme-background-image.scss

@@ -5,17 +5,21 @@
  * but this can be changed by changing the default value of $include-missing-images to 
  * be true. 
  */
-@mixin theme-background-image($theme-name, $path, $without-url: false, $relative: false) {
+@function theme-background-image($theme-name, $path, $without-url: false, $relative: false) {
     $exists_image: theme-image($theme-name, $path, true, false);
-
+    
     @if $exists_image {
         $exists: theme_image_exists($exists_image);
 
-        @if $exists or $include-missing-images {
-            background-image: theme-image($theme-name, $path, $without-url, $relative);
+        @if $exists == true {
+            @return theme-image($theme-name, $path, $without-url, $relative);
         }
         @else {
             @warn "@theme-background-image: Theme image not found: #{$exists_image}";
+
+            @if $include-missing-images {
+                @return theme-image($theme-name, $path, $without-url, $relative);
+            }
         }
     }
     @else {

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/util/_dragdrop.scss

@@ -63,14 +63,14 @@
     }
     
     .#{$prefix}dd-drop-nodrop .#{$prefix}dd-drop-icon {
-        @include theme-background-image($theme-name, 'dd/drop-no.gif');
+        background-image: theme-background-image($theme-name, 'dd/drop-no.gif');
     }
 
     .#{$prefix}dd-drop-ok .#{$prefix}dd-drop-icon {
-        @include theme-background-image($theme-name, 'dd/drop-yes.gif');
+        background-image: theme-background-image($theme-name, 'dd/drop-yes.gif');
     }
 
     .#{$prefix}dd-drop-ok-add .#{$prefix}dd-drop-icon {
-        @include theme-background-image($theme-name, 'dd/drop-add.gif');
+        background-image: theme-background-image($theme-name, 'dd/drop-add.gif');
     }
 }

data/public/stylesheets/extjs/resources/themes/stylesheets/ext4/default/util/_messagebox.scss

@@ -29,22 +29,22 @@
     }
 
     .#{$prefix}message-box .#{$prefix}msg-box-wait {
-        @include theme-background-image($theme-name, 'shared/blue-loading.gif');
+        background-image: theme-background-image($theme-name, 'shared/blue-loading.gif');
     }
 
     .#{$prefix}message-box .ext-mb-info {
-        @include theme-background-image($theme-name, 'shared/icon-info.gif');
+        background-image: theme-background-image($theme-name, 'shared/icon-info.gif');
     }
 
     .#{$prefix}message-box .ext-mb-warning {
-        @include theme-background-image($theme-name, 'shared/icon-warning.gif');
+        background-image: theme-background-image($theme-name, 'shared/icon-warning.gif');
     }
 
     .#{$prefix}message-box .ext-mb-question {
-        @include theme-background-image($theme-name, 'shared/icon-question.gif');
+        background-image: theme-background-image($theme-name, 'shared/icon-question.gif');
     }
 
     .#{$prefix}message-box .ext-mb-error {
-        @include theme-background-image($theme-name, 'shared/icon-error.gif');
+        background-image: theme-background-image($theme-name, 'shared/icon-error.gif');
     }
 }