FLUID-5934: Corrected paths for pref framework prefixes

fluid-project · Aug 22, 2016 · 079fbb6 · 079fbb6
1 parent 46f2063
commit 079fbb6
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/src/documents/AuxiliarySchemaForPreferencesFramework.md b/src/documents/AuxiliarySchemaForPreferencesFramework.md
@@ -28,7 +28,7 @@ An auxiliary schema must contain some required properties, described below. In a
 * `template`
   * the path to the template for the prefs editor itself
   * provided the term name defined in the `terms` block for the path to the directory containing the html templates is `templatePrefix`, use `%templatePrefix` to reference the prefix specified by `templatePrefix` as part of the path
-        
+
 ### Preference block properties ###
 
 Preference blocks can be given any property name, so long as the name is unique within the schema. Preference blocks will have the following properties:
@@ -76,18 +76,18 @@ For detailed information about how to work with composite panels, see [Composite
     // The author of the auxiliary schema will provide the namespace, which will be used
     //for the component to call to initialize the constructed grades.
     "namespace": "fluid.prefs.constructed",
- 
+
     // The common terms to use in "template" and "message" properties in "panels" elements
     "terms": {
         // The template defined in "panels" element will take precedence over this definition.
-        "templatePrefix": "../../../framework/preferences/html/",
+        "templatePrefix": "../../../framework/preferences/html",
         // The message defined in "panels" element will take precedence over this definition.
-        "messagePrefix": "../../../framework/preferences/messages/",
+        "messagePrefix": "../../../framework/preferences/messages",
     },
- 
+
     // The path to the preferences editor own template (e.g. the separated panel prefs editor template)
     "template": "%templatePrefix/SeparatedPanelPrefsEditor.html",
- 
+
      // The path to the preferences editor own message file (e.g. the separated panel prefs editor message file)
     "message": "%messagePrefix/prefsEditor.json",
 

diff --git a/src/documents/Builder.md b/src/documents/Builder.md
@@ -205,8 +205,8 @@ var myBuilder = fluid.prefs.builder({
     // override the paths in the starter grade
     auxiliarySchema: {
         "terms": {
-            "templatePrefix": "../../../framework/preferences/html/",
-            "messagePrefix": "../../../framework/preferences/messages/"
+            "templatePrefix": "../../../framework/preferences/html",
+            "messagePrefix": "../../../framework/preferences/messages"
         }
     }
 
@@ -241,8 +241,8 @@ fluid.defaults("my.prefs.editor.aux", {
     auxiliarySchema: {
         namespace: "my.prefs.editor",
         terms: {
-            templatePrefix: "templates/",
-            messagePrefix: "messages/"
+            templatePrefix: "templates",
+            messagePrefix: "messages"
         },
         template: "%templatePrefix/MyEditorTemplate.html",
         message: "%messagePrefix/MyEditorStrings.html",

diff --git a/src/documents/LocalizationInThePreferencesFramework.md b/src/documents/LocalizationInThePreferencesFramework.md
@@ -107,8 +107,8 @@ Message Bundles can be specified through the [auxiliary schema](AuxiliarySchemaF
 {
     "namespace": "fluid.prefs.constructed",
     "terms": {
-        "templatePrefix": "../../../framework/preferences/html/",
-        "messagePrefix": "../../../framework/preferences/messages/"
+        "templatePrefix": "../../../framework/preferences/html",
+        "messagePrefix": "../../../framework/preferences/messages"
     },
     "template": "%templatePrefix/SeparatedPanelPrefsEditor.html",
     "message": "%messagePrefix/prefsEditor.json", // Message Bundle for the preference editor itself

diff --git a/src/documents/UserInterfaceOptionsAPI.md b/src/documents/UserInterfaceOptionsAPI.md
@@ -216,8 +216,8 @@ fluid.uiOptions.prefsEditor("#myContainer", {
 <pre>
 <code>
 {
-    templatePrefix: "../../framework/preferences/html/",
-    messagePrefix: "../../framework/preferences/messages/"
+    templatePrefix: "../../framework/preferences/html",
+    messagePrefix: "../../framework/preferences/messages"
 }
 </code>
 </pre>
@@ -230,8 +230,8 @@ fluid.uiOptions.prefsEditor("#myContainer", {
 <code>
 fluid.uiOptions.prefsEditor("#myContainer", {
     terms: {
-        templatePrefix: "../infusion/framework/preferences/html/",
-        messagePrefix: "../infusion/framework/preferences/messages/"
+        templatePrefix: "../infusion/framework/preferences/html",
+        messagePrefix: "../infusion/framework/preferences/messages"
     }
 });
 </code>

diff --git a/src/layouts/default.html.handlebars b/src/layouts/default.html.handlebars
@@ -17,7 +17,7 @@
 
         <script type="text/javascript" src="{{{relativeUrl '/lib/infusion/infusion-uio.js' document.url}}}"></script>
         <script type="text/javascript" src="{{{relativeUrl '/js/infusion-docs.js' document.url}}}"></script>
-        
+
     </head>
     <body class="infusion-docs fl-theme-prefsEditor-default">
 
@@ -99,16 +99,16 @@
                     <div class="infusion-docs-articleContainer">
 
                         <div class="flc-toc-tocContainer infusion-docs-toc"> </div>
-    
+
                         <h1>{{document.title}}</h1>
-    
+
                         <p class="infusion-docs-githubLink"><a href="{{githubLocation}}" target="_blank">Edit on GitHub</a></p>
-    
+
                         {{#if document.noteRendererChangesPost15}}
                         <div class="infusion-docs-note"><strong>Note:</strong> The renderer will undergo significant changes post Infusion 1.5
                         </div>
                         {{/if}}
-    
+
                         <div class="infusion-docs-articleBody">
                             {{{rewriteMdLinks content}}}
                         </div>
@@ -120,7 +120,7 @@
                     </footer>
 
                 </article>
-                
+
             </div>
 
 
@@ -130,5 +130,5 @@
         </script>
 
     </body>
-    
+
 </html>