Merge remote-tracking branch 'acheetham/FLUID-4783' into demo

* acheetham/FLUID-4783: FLUID-4783: Updating the Infusion Readme to document UI Options HTML customizations FLUID-4783: Ensure the basic demo includes the UIO media panel.
michelled · Sep 20, 2012 · 0193a92 · 0193a92
2 parents 3944cd2 + b01e756
commit 0193a92
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/demos/VideoPlayer.html b/demos/VideoPlayer.html
@@ -59,12 +59,19 @@ <h1>Infusion HTML 5 Video Player</h1>
         </div>
 
         <script>
-            var uiOptions = fluid.uiOptions.fatPanel(".flc-uiOptions", {
+            var uiOptions = fluid.uiOptions.fatPanel.withMediaPanel(".flc-uiOptions", {
                 prefix: "../lib/infusion/components/uiOptions/html/",
                 components: {
                     relay: {
                         type: "fluid.videoPlayer.relay"
                     }
+                },
+                templateLoader: {
+                    options: {
+                        templates: {
+                            mediaControls: "../html/UIOptionsTemplate-media.html"
+                        }
+                    }
                 }
             });
 

diff --git a/lib/infusion/README.txt b/lib/infusion/README.txt
@@ -5,3 +5,35 @@ ant customBuild -Dinclude="uiOptions, uploader, tooltip" -lib lib/rhino
 
 Build the un-minified Infusion:
 ant customBuild -Dinclude="uiOptions, uploader, tooltip" -lib lib/rhino -DnoMinify="true"
+
+
+
+Customizations of UI Options
+============================
+
+The following edits have been made to the UI Options HTML files:
+
+FatPanelUIOptions.html:
+9a10
+>             <li><a href="#tab4" class="fl-tab-media">Audio + Video</a></li>
+14c15,16
+<         <div id="tab3" class="flc-uiOptions-links-controls fl-uiOptions-links"></div>
+---
+>         <div id="tab3" class="flc-uiOptions-links-controls fl-uiOptions-links"></div>
+>         <div id="tab4" class="flc-uiOptions-media-controls fl-uiOptions-media"></div>
+
+FatPanelUIOptionsFrame.html:
+24a25,26
+>         <!-- Note that this line differs from the framework version -->
+>         <link rel="stylesheet" type="text/css" href="../../../../../css/UIOptions-media.css" />
+28,35c30
+<         <script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
+<         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.core.js"></script>
+<         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.widget.js"></script>
+<         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.mouse.js"></script>
+<         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.slider.js"></script>
+<         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.tabs.js"></script>
+<         <script type="text/javascript" src="../../../lib/jquery/plugins/ariaTabs/js/ui.ariaTabs.js"></script>          
+<         <script type="text/javascript" src="../../../lib/json/js/json2.js"></script>
+---
+>         <script type="text/javascript" src="../../../MyInfusion.js"></script>