Merge branch 'master' into FLUID-4397

fluid-project · Aug 25, 2011 · e2c4b6d · e2c4b6d
2 parents 0bbd82e + 3876dd4
commit e2c4b6d
Show file tree

Hide file tree

Showing 201 changed files with 4,254 additions and 3,777 deletions.
diff --git a/build-scripts/build.properties b/build-scripts/build.properties
@@ -52,7 +52,7 @@ module_swfupload=lib/swfupload
 module_swfobject=lib/swfobject
 
 <!-- !important injection module -->
-importantInjectionModule=./importantInjection.json
+importantInjectionModule=${base-dir}/build-scripts/importantInjection.json
 
 <!-- Dependency Locations -->
 yuicompressor=lib/yuicompressor-2.3.3.jar

diff --git a/build-scripts/importantInjection.json b/build-scripts/importantInjection.json
@@ -1,12 +1,12 @@
 {
     "files": [
-        "../src/webapp/framework/fss/css/fss-theme-blackYellow.css",
-        "../src/webapp/framework/fss/css/fss-theme-yellowBlack.css",
-        "../src/webapp/framework/fss/css/fss-theme-coal.css",
-        "../src/webapp/framework/fss/css/fss-theme-hc.css",
-        "../src/webapp/framework/fss/css/fss-theme-hci.css",
-        "../src/webapp/framework/fss/css/fss-theme-mist.css",
-        "../src/webapp/framework/fss/css/fss-theme-rust.css",
-        "../src/webapp/framework/fss/css/fss-theme-slate.css"
+        "src/webapp/framework/fss/css/fss-theme-by.css",
+        "src/webapp/framework/fss/css/fss-theme-yb.css",
+        "src/webapp/framework/fss/css/fss-theme-coal.css",
+        "src/webapp/framework/fss/css/fss-theme-bw.css",
+        "src/webapp/framework/fss/css/fss-theme-wb.css",
+        "src/webapp/framework/fss/css/fss-theme-mist.css",
+        "src/webapp/framework/fss/css/fss-theme-rust.css",
+        "src/webapp/framework/fss/css/fss-theme-slate.css"
     ]
 }
diff --git a/build-scripts/uiOptions/js/StylesheetImportant.js b/build-scripts/uiOptions/js/StylesheetImportant.js
@@ -61,7 +61,13 @@ var fluid = fluid || {};
     };
 
     // loop through files to run !important injection on
-    var files = fluid.build.readJSONFile(importantInjectionModule).files;
+    var files = fluid.build.readJSONFile(importantInjectionModule).files,
+        i;
+
+    // Make them absolute.
+    for (i = 0; i < files.length; i++) {
+        files[i] = project.getProperty("base-dir") + "/" + files[i];
+    }
 
     var generateWritePath = function (originalPath) {
         var startIdx = Math.max(originalPath.lastIndexOf("/"), 0);
@@ -70,7 +76,7 @@ var fluid = fluid || {};
         return fssImportant + fileName.replace(".css", "-uio.css");
     };
 
-    for (var i = 0; i < files.length; i++) {
+    for (i = 0; i < files.length; i++) {
         var filePath = files[i];
         fluid.build.log("Generating an !important theme for " + files[i]);
         injectImportant(filePath, generateWritePath(filePath));

diff --git a/src/webapp/components/pager/css/Pager.css b/src/webapp/components/pager/css/Pager.css
@@ -57,12 +57,12 @@
 /***********************************************************/
 /** THEMES - High Contrast **/
 /* Pager data */
-.fl-theme-hc .fl-pager .fl-pager-data {
+.fl-theme-bw .fl-pager .fl-pager-data {
 }
-.fl-theme-hc .fl-pager .fl-pager-data .fl-pager-desc {
+.fl-theme-bw .fl-pager .fl-pager-data .fl-pager-desc {
   background: url(../images/arrow-up.png) no-repeat right;
 }
-.fl-theme-hc .fl-pager .fl-pager-data .fl-pager-asc {
+.fl-theme-bw .fl-pager .fl-pager-data .fl-pager-asc {
   background: url(../images/arrow-dn.png) no-repeat right;
 }
 

diff --git a/src/webapp/components/progress/js/Progress.js b/src/webapp/components/progress/js/Progress.js
@@ -174,26 +174,26 @@ var fluid_1_4 = fluid_1_4 || {};
         // afterProgressHidden:  
         // Registering listener with the callback provided by the user and reinitializing
         // the event trigger function. 
-        // Note: callback depricated as of 1.5, use afterProgressHidden event
+        // Note: callback deprecated as of 1.5, use afterProgressHidden event
         if (that.options.hideAnimation.callback) {
             that.events.afterProgressHidden.addListener(that.options.hideAnimation.callback);           
         }
 
         // triggers the afterProgressHidden event    
-        // Note: callback depricated as of 1.5, use afterProgressHidden event
+        // Note: callback deprecated as of 1.5, use afterProgressHidden event
         that.options.hideAnimation.callback = that.events.afterProgressHidden.fire;
 
 
         // onProgressBegin:
         // Registering listener with the callback provided by the user and reinitializing
         // the event trigger function.  
-        // Note: callback depricated as of 1.5, use onProgressBegin event
+        // Note: callback deprecated as of 1.5, use onProgressBegin event
         if (that.options.showAnimation.callback) {
             that.events.onProgressBegin.addListener(that.options.showAnimation.callback);                      
         } 
 
         // triggers the onProgressBegin event
-        // Note: callback depricated as of 1.5, use onProgressBegin event
+        // Note: callback deprecated as of 1.5, use onProgressBegin event
         that.options.showAnimation.callback = that.events.onProgressBegin.fire;
     };
 

diff --git a/src/webapp/components/uiOptions/css/FatPanelUIOptions.css b/src/webapp/components/uiOptions/css/FatPanelUIOptions.css
@@ -26,14 +26,14 @@
 }
 
 /* Theming */
-.fl-theme-hc .fl-uiOptions-fatPanel .fl-panelBar, 
-.fl-theme-hc .fl-uiOptions-fatPanel .fl-toggleButton { background-color: #fff; border-color: #000; }
+.fl-theme-bw .fl-uiOptions-fatPanel .fl-panelBar, 
+.fl-theme-bw .fl-uiOptions-fatPanel .fl-toggleButton { background-color: #fff; border-color: #000; }
 
-.fl-theme-hci .fl-uiOptions-fatPanel .fl-panelBar, 
-.fl-theme-hci .fl-uiOptions-fatPanel .fl-toggleButton { background-color: #000; border-color: #fff; color: #fff; }
+.fl-theme-wb .fl-uiOptions-fatPanel .fl-panelBar, 
+.fl-theme-wb .fl-uiOptions-fatPanel .fl-toggleButton { background-color: #000; border-color: #fff; color: #fff; }
 
-.fl-theme-blackYellow .fl-uiOptions-fatPanel .fl-panelBar, 
-.fl-theme-blackYellow .fl-uiOptions-fatPanel .fl-toggleButton { background-color: #FFFF00; border-color: #000; }
+.fl-theme-by .fl-uiOptions-fatPanel .fl-panelBar, 
+.fl-theme-by .fl-uiOptions-fatPanel .fl-toggleButton { background-color: #FFFF00; border-color: #000; }
 
-.fl-theme-yellowBlack .fl-uiOptions-fatPanel .fl-panelBar, 
-.fl-theme-yellowBlack .fl-uiOptions-fatPanel .fl-toggleButton { background-color: #000; border-color: #ffff00; color: #ffff00 }
+.fl-theme-yb .fl-uiOptions-fatPanel .fl-panelBar, 
+.fl-theme-yb .fl-uiOptions-fatPanel .fl-toggleButton { background-color: #000; border-color: #ffff00; color: #ffff00 }