FLUID-5161: Adjusted all paths used in tests and demo files since uiO…

…ptions has been renamed to "prefsEditor" and moved into frameword as well as the relocation of slidingPanel and textfieldSlider.

build-scripts/build.properties

@@ -74,7 +74,7 @@ src=${base-dir}/src
 working=${build}/working
 web-inf=${base-dir}/src/WEB-INF
 lint=${src}
-fssImportant=${src}/components/uiOptions/css/fss
+fssImportant=${src}/framework/preferences/css/fss
 
 <!-- the filename for the package to output -->
 zipfile=infusion-${fluid_version}

src/components/slidingPanel/slidingPanelDependencies.json

@@ -0,0 +1,15 @@
+{
+    "slidingPanel": {
+        "name": "Sliding Panel",
+        "description": "Open or close a sliding panel by clicking on a button.",
+        "files": [
+            "SlidingPanel.js"
+        ],
+        "dependencies": [
+            "jQuery",
+            "jQueryUICore",
+            "jQueryUIWidgets",
+            "framework"
+        ]
+    }
+}

src/components/textfieldSlider/textfieldSliderDependencies.json

@@ -0,0 +1,15 @@
+{
+    "textfieldSlider": {
+        "name": "Text Field Slider",
+        "description": "Adjust the value in a text field by sliding a slider.",
+        "files": [
+            "TextfieldSlider.js"
+        ],
+        "dependencies": [
+            "jQuery",
+            "jQueryUICore",
+            "jQueryUIWidgets",
+            "framework"
+        ]
+    }
+}

src/demos/uiOptions/gradesDemo/html/uiOptions.html

@@ -8,26 +8,26 @@
         <link rel="stylesheet" type="text/css" href="../../../../framework/fss/css/fss-base-global.css" />
         <link rel="stylesheet" type="text/css" href="../../../../framework/fss/css/fss-layout.css" />
         <link rel="stylesheet" type="text/css" href="../../../../framework/fss/css/fss-text.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-theme-bw-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-theme-wb-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-theme-by-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-theme-yb-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-theme-lgdg-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-theme-dglg-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-text-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-theme-bw-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-theme-wb-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-theme-by-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-theme-yb-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-theme-lgdg-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-theme-dglg-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-text-uio.css" />
         <link rel="stylesheet" type="text/css" href="../../../../lib/jquery/ui/css/fl-theme-by/by.css" />
         <link rel="stylesheet" type="text/css" href="../../../../lib/jquery/ui/css/fl-theme-yb/yb.css" />
         <link rel="stylesheet" type="text/css" href="../../../../lib/jquery/ui/css/fl-theme-bw/bw.css" />
         <link rel="stylesheet" type="text/css" href="../../../../lib/jquery/ui/css/fl-theme-wb/wb.css" />
         <link rel="stylesheet" type="text/css" href="../../../../lib/jquery/ui/css/fl-theme-lgdg/lgdg.css" />
         <link rel="stylesheet" type="text/css" href="../../../../lib/jquery/ui/css/fl-theme-dglg/dglg.css" />
 
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/PrefsEditor.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/SeparatedPanelPrefsEditor.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/PrefsEditor.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/SeparatedPanelPrefsEditor.css" />
         <link rel="stylesheet" type="text/css" href="../css/uiOptions.css" />
 
         <!--[if IE 8]>
-            <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/ie8.css" />
+            <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/ie8.css" />
         <![endif]-->
 
         <title>User Interface Options Demo: Using Grades</title>
@@ -54,22 +54,22 @@
         <script type="text/javascript" src="../../../../framework/renderer/js/RendererUtilities.js"></script>
 
         <script type="text/javascript" src="../../../../components/tabs/js/Tabs.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/URLUtilities.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/Store.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/TextfieldSlider.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/UIEnhancer.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/PrefsEditor.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/Panels.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/ModelRelay.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/Enactors.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/StarterGrades.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/SeparatedPanelPrefsEditor.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/SlidingPanel.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/URLUtilities.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/Store.js"></script>
+        <script type="text/javascript" src="../../../../components/textfieldSlider/js/TextfieldSlider.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/UIEnhancer.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/PrefsEditor.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/Panels.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/ModelRelay.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/Enactors.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/StarterGrades.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/SeparatedPanelPrefsEditor.js"></script>
+        <script type="text/javascript" src="../../../../components/slidingPanel/js/SlidingPanel.js"></script>
         <script type="text/javascript" src="../../../../components/tableOfContents/js/TableOfContents.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/PrimaryBuilder.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/AuxBuilder.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/StarterSchemas.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/Builder.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/PrimaryBuilder.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/AuxBuilder.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/StarterSchemas.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/Builder.js"></script>
 
         <script type="text/javascript" src="../js/uiOptionsDemo.js"></script>
     </head>

src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js

@@ -24,8 +24,8 @@ var demo = demo || {};
      * needs to know where those templates are. This variable will be used by all
      * versions of the component.
      */
-    var pathToTemplates = "../../../../components/uiOptions/html/";
-    var pathToMessages = "../../../../components/uiOptions/messages/";
+    var pathToTemplates = "../../../../framework/preferences/html/";
+    var pathToMessages = "../../../../framework/preferences/messages/";
 
     /**
      * The UI Enhancer's Table of Contents uses a template. This path variable is used by all

src/demos/uiOptions/schemaDemo/html/uiOptions.html

@@ -8,26 +8,26 @@
         <link rel="stylesheet" type="text/css" href="../../../../framework/fss/css/fss-base-global.css" />
         <link rel="stylesheet" type="text/css" href="../../../../framework/fss/css/fss-layout.css" />
         <link rel="stylesheet" type="text/css" href="../../../../framework/fss/css/fss-text.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-theme-bw-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-theme-wb-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-theme-by-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-theme-yb-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-theme-lgdg-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-theme-dglg-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/fss/fss-text-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-theme-bw-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-theme-wb-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-theme-by-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-theme-yb-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-theme-lgdg-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-theme-dglg-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/fss/fss-text-uio.css" />
         <link rel="stylesheet" type="text/css" href="../../../../lib/jquery/ui/css/fl-theme-by/by.css" />
         <link rel="stylesheet" type="text/css" href="../../../../lib/jquery/ui/css/fl-theme-yb/yb.css" />
         <link rel="stylesheet" type="text/css" href="../../../../lib/jquery/ui/css/fl-theme-bw/bw.css" />
         <link rel="stylesheet" type="text/css" href="../../../../lib/jquery/ui/css/fl-theme-wb/wb.css" />
         <link rel="stylesheet" type="text/css" href="../../../../lib/jquery/ui/css/fl-theme-lgdg/lgdg.css" />
         <link rel="stylesheet" type="text/css" href="../../../../lib/jquery/ui/css/fl-theme-dglg/dglg.css" />
 
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/PrefsEditor.css" />
-        <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/SeparatedPanelPrefsEditor.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/PrefsEditor.css" />
+        <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/SeparatedPanelPrefsEditor.css" />
         <link rel="stylesheet" type="text/css" href="../css/uiOptions.css" />
 
         <!--[if IE 8]>
-            <link rel="stylesheet" type="text/css" href="../../../../components/uiOptions/css/ie8.css" />
+            <link rel="stylesheet" type="text/css" href="../../../../framework/preferences/css/ie8.css" />
         <![endif]-->
 
         <title>User Interface Options Demo: Using Schemas</title>
@@ -54,22 +54,22 @@
         <script type="text/javascript" src="../../../../framework/renderer/js/RendererUtilities.js"></script>
 
         <script type="text/javascript" src="../../../../components/tabs/js/Tabs.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/URLUtilities.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/Store.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/TextfieldSlider.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/UIEnhancer.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/PrefsEditor.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/Panels.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/ModelRelay.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/Enactors.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/StarterGrades.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/SeparatedPanelPrefsEditor.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/SlidingPanel.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/URLUtilities.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/Store.js"></script>
+        <script type="text/javascript" src="../../../../components/textfieldSlider/js/TextfieldSlider.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/UIEnhancer.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/PrefsEditor.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/Panels.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/ModelRelay.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/Enactors.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/StarterGrades.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/SeparatedPanelPrefsEditor.js"></script>
+        <script type="text/javascript" src="../../../../components/slidingPanel/js/SlidingPanel.js"></script>
         <script type="text/javascript" src="../../../../components/tableOfContents/js/TableOfContents.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/PrimaryBuilder.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/AuxBuilder.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/StarterSchemas.js"></script>
-        <script type="text/javascript" src="../../../../components/uiOptions/js/Builder.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/PrimaryBuilder.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/AuxBuilder.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/StarterSchemas.js"></script>
+        <script type="text/javascript" src="../../../../framework/preferences/js/Builder.js"></script>
 
         <script type="text/javascript" src="../js/uiOptionsDemo.js"></script>
     </head>

src/demos/uiOptions/schemaDemo/js/uiOptionsDemo.js

@@ -29,8 +29,8 @@ var demo = demo || {};
         var builder = fluid.prefs.builder({
             gradeNames: ["fluid.prefs.auxSchema.starter"],
             auxiliarySchema: {
-                "templatePrefix": "../../../../components/uiOptions/html/",
-                "messagePrefix": "../../../../components/uiOptions/messages/"
+                "templatePrefix": "../../../../framework/preferences/html/",
+                "messagePrefix": "../../../../framework/preferences/messages/"
             }
         });
         return fluid.invokeGlobalFunction(builder.options.assembledUIOGrade, [container]);

src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html

@@ -8,13 +8,13 @@
         <link rel="stylesheet" type="text/css" href="../../../framework/fss/css/fss-base-global.css" />
         <link rel="stylesheet" type="text/css" href="../../../framework/fss/css/fss-layout.css" />
         <link rel="stylesheet" type="text/css" href="../../../framework/fss/css/fss-text.css" />
-        <link rel="stylesheet" type="text/css" href="../../../components/uiOptions/css/fss/fss-theme-bw-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../components/uiOptions/css/fss/fss-theme-wb-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../components/uiOptions/css/fss/fss-theme-by-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../components/uiOptions/css/fss/fss-theme-yb-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../components/uiOptions/css/fss/fss-theme-lgdg-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../components/uiOptions/css/fss/fss-theme-dglg-uio.css" />
-        <link rel="stylesheet" type="text/css" href="../../../components/uiOptions/css/fss/fss-text-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../framework/preferences/css/fss/fss-theme-bw-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../framework/preferences/css/fss/fss-theme-wb-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../framework/preferences/css/fss/fss-theme-by-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../framework/preferences/css/fss/fss-theme-yb-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../framework/preferences/css/fss/fss-theme-lgdg-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../framework/preferences/css/fss/fss-theme-dglg-uio.css" />
+        <link rel="stylesheet" type="text/css" href="../../../framework/preferences/css/fss/fss-text-uio.css" />
 
         <link rel="stylesheet" type="text/css" href="../../../lib/jquery/ui/css/fl-theme-bw/bw.css" />
         <link rel="stylesheet" type="text/css" href="../../../lib/jquery/ui/css/fl-theme-wb/wb.css" />    

src/framework/preferences/js/StarterSchemas.js

@@ -30,9 +30,9 @@ var fluid_1_5 = fluid_1_5 || {};
         gradeNames: ["fluid.prefs.auxSchema", "autoInit"],
         auxiliarySchema: {
             "namespace": "fluid.prefs.constructed", // The author of the auxiliary schema will provide this and will be the component to call to initialize the constructed UIO.
-            "templatePrefix": "../../../components/uiOptions/html/",  // The common path to settings panel templates. The template defined in "panels" element will take precedence over this definition.
+            "templatePrefix": "../../../framework/preferences/html/",  // The common path to settings panel templates. The template defined in "panels" element will take precedence over this definition.
             "template": "%prefix/SeparatedPanelPrefsEditor.html",
-            "messagePrefix": "../../../components/uiOptions/messages/",  // The common path to settings panel templates. The template defined in "panels" element will take precedence over this definition.
+            "messagePrefix": "../../../framework/preferences/messages/",  // The common path to settings panel templates. The template defined in "panels" element will take precedence over this definition.
             "message": "%prefix/prefsEditor.json",
             "textSize": {
                 "type": "fluid.prefs.textSize",