Merge branch 'master' into FLUID-4377

Conflicts:
	build-scripts/importantInjection.json
	src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
	src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
	src/webapp/demos/uiOptions/FullPreviewUIOptions/html/UIOptionsPreview.html
	src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html

	Also updated the new demo with the changes that were being made in this branch.

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

build-scripts/importantInjection.json

@@ -1,12 +1,12 @@
 {
     "files": [
-        "../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"
+        "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"
     ]
 }

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));

src/webapp/demos/index.html

@@ -190,9 +190,7 @@ <h4>Progress</h4>
                     <div class="demo">
                         <div class="demoHeader uiOptions">
                             <h4>User Interface Options</h4>
-                            <a href="uiOptions/FatPanelUIOptions/demo.html">Fat Panel Demo</a><br/>
-                            <a href="uiOptions/FullNoPreviewUIOptions/demo.html">Full Page w/o Preview Demo</a><br/>
-                            <a href="uiOptions/FullPreviewUIOptions/demo.html">Full Page with Preview Demo</a><br/>
+                            <a href="uiOptions/demo.html">UI Options Demo</a><br/>
                         </div>
                         <span class="fl-container-flex description">
                             UI Options transforms the presentation of the user interface and content resources so that they are personalized to an individual user's needs.<br />