[Commits] [fluid-project/infusion] ba9028: FLUID-5161: Renaming (fluid.uiOptions -> fluid.pre...

GitHub noreply at github.com
Tue Oct 8 13:37:36 EDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: ba902850aa4d179ca5bf4b7994ba76d07e317c01
      https://github.com/fluid-project/infusion/commit/ba902850aa4d179ca5bf4b7994ba76d07e317c01
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M src/components/uiOptions/css/ie8.css
    M src/components/uiOptions/js/AuxBuilder.js
    M src/components/uiOptions/js/Builder.js
    M src/components/uiOptions/js/Enactors.js
    M src/components/uiOptions/js/FatPanelUIOptions.js
    M src/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/components/uiOptions/js/FullPreviewUIOptions.js
    M src/components/uiOptions/js/ModelRelay.js
    M src/components/uiOptions/js/Panels.js
    M src/components/uiOptions/js/PrimaryBuilder.js
    M src/components/uiOptions/js/StarterGrades.js
    M src/components/uiOptions/js/StarterSchemas.js
    M src/components/uiOptions/js/Store.js
    M src/components/uiOptions/js/UIEnhancer.js
    M src/components/uiOptions/js/UIOptions.js
    M src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js
    M src/demos/uiOptions/schemaDemo/js/uiOptionsDemo.js
    M src/tests/component-tests/uiOptions/js/AuxBuilderTests.js
    M src/tests/component-tests/uiOptions/js/BuilderTests.js
    M src/tests/component-tests/uiOptions/js/EnactorsTests.js
    M src/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js
    M src/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    M src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/tests/component-tests/uiOptions/js/ModelRelayTests.js
    M src/tests/component-tests/uiOptions/js/PanelsTests.js
    M src/tests/component-tests/uiOptions/js/PrimaryBuilderTests.js
    M src/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/tests/framework-tests/core/js/FluidJSTests.js
    M src/tests/manual-tests/js/someKindOfNews.js
    M src/tests/manual-tests/js/uiOptionsFullPage.js
    M src/tests/manual-tests/js/uiOptionsFullPageSchema.js

  Log Message:
  -----------
  FLUID-5161: Renaming (fluid.uiOptions -> fluid.prefs; fluid.prefs.uiOptions -> fluid.prefs.prefsEditor; uiOptionsLoader -> prefsEditorLoader; fatPanel -> separatedPanel)


  Commit: 3b4ade233329b17d46512df76da57110b37f40c0
      https://github.com/fluid-project/infusion/commit/3b4ade233329b17d46512df76da57110b37f40c0
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    R src/components/uiOptions/css/FatPanelUIOptions.css
    R src/components/uiOptions/css/FatPanelUIOptionsFrame.css
    A src/components/uiOptions/css/SeparatedPanelPrefsEditor.css
    A src/components/uiOptions/css/SeparatedPanelPrefsEditorFrame.css
    R src/components/uiOptions/html/FatPanelUIOptions.html
    R src/components/uiOptions/html/FatPanelUIOptionsFrame.html
    A src/components/uiOptions/html/SeparatedPanelPrefsEditor.html
    A src/components/uiOptions/html/SeparatedPanelPrefsEditorFrame.html
    M src/components/uiOptions/js/Builder.js
    R src/components/uiOptions/js/FatPanelUIOptions.js
    A src/components/uiOptions/js/SeparatedPanelPrefsEditor.js
    M src/components/uiOptions/js/StarterGrades.js
    M src/components/uiOptions/js/StarterSchemas.js
    M src/components/uiOptions/js/UIOptions.js
    M src/components/uiOptions/uiOptionsDependencies.json
    M src/demos/uiOptions/gradesDemo/css/uiOptions.css
    M src/demos/uiOptions/gradesDemo/html/uiOptions.html
    M src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js
    M src/demos/uiOptions/schemaDemo/css/uiOptions.css
    M src/demos/uiOptions/schemaDemo/html/uiOptions.html
    M src/demos/uiOptions/schemaDemo/js/uiOptionsDemo.js
    M src/tests/all-tests.html
    M src/tests/component-tests/uiOptions/all-tests.html
    R src/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/tests/component-tests/uiOptions/html/FatPanelUIOptionsFrame.html
    A src/tests/component-tests/uiOptions/html/SeparatedPanelPrefsEditor-test.html
    M src/tests/component-tests/uiOptions/js/AuxBuilderTests.js
    M src/tests/component-tests/uiOptions/js/BuilderTests.js
    R src/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    A src/tests/component-tests/uiOptions/js/SeparatedPanelPrefsEditorTests.js
    M src/tests/component-tests/uiOptions/js/URLUtilitiesTests.js
    M src/tests/manual-tests/html/SomeKindOfNews.html
    M src/tests/manual-tests/js/someKindOfNews.js

  Log Message:
  -----------
  FLUID-5161: Renamed all occurrences of "FatPanel" in file names to "SeparatedPanel".


  Commit: 11b7d638abbdf6b74b1afe866d7d002a8bf9152b
      https://github.com/fluid-project/infusion/commit/11b7d638abbdf6b74b1afe866d7d002a8bf9152b
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    A src/components/uiOptions/css/FullNoPreviewPrefsEditor.css
    R src/components/uiOptions/css/FullNoPreviewUIOptions.css
    A src/components/uiOptions/css/FullPrefsEditor.css
    A src/components/uiOptions/css/FullPreviewPrefsEditor.css
    R src/components/uiOptions/css/FullPreviewUIOptions.css
    R src/components/uiOptions/css/FullUIOptions.css
    A src/components/uiOptions/css/PrefsEditor.css
    M src/components/uiOptions/css/SeparatedPanelPrefsEditorFrame.css
    R src/components/uiOptions/css/UIOptions.css
    M src/components/uiOptions/css/ie8.css
    A src/components/uiOptions/fonts/InfusionIcons-PrefsEditor.eot
    A src/components/uiOptions/fonts/InfusionIcons-PrefsEditor.ttf
    R src/components/uiOptions/fonts/InfusionIcons-UIOptions.eot
    R src/components/uiOptions/fonts/InfusionIcons-UIOptions.ttf
    A src/components/uiOptions/html/FullNoPreviewPrefsEditor.html
    R src/components/uiOptions/html/FullNoPreviewUIOptions.html
    A src/components/uiOptions/html/FullPreviewPrefsEditor.html
    R src/components/uiOptions/html/FullPreviewUIOptions.html
    A src/components/uiOptions/html/PrefsEditorTemplate-contrast.html
    A src/components/uiOptions/html/PrefsEditorTemplate-layout.html
    A src/components/uiOptions/html/PrefsEditorTemplate-lineSpace.html
    A src/components/uiOptions/html/PrefsEditorTemplate-links.html
    A src/components/uiOptions/html/PrefsEditorTemplate-textFont.html
    A src/components/uiOptions/html/PrefsEditorTemplate-textSize.html
    M src/components/uiOptions/html/SeparatedPanelPrefsEditorFrame.html
    R src/components/uiOptions/html/UIOptionsTemplate-contrast.html
    R src/components/uiOptions/html/UIOptionsTemplate-layout.html
    R src/components/uiOptions/html/UIOptionsTemplate-lineSpace.html
    R src/components/uiOptions/html/UIOptionsTemplate-links.html
    R src/components/uiOptions/html/UIOptionsTemplate-textFont.html
    R src/components/uiOptions/html/UIOptionsTemplate-textSize.html
    R src/components/uiOptions/images/default/fatpanelbg.png
    A src/components/uiOptions/images/default/separatedpanelbg.png
    A src/components/uiOptions/js/FullNoPreviewPrefsEditor.js
    R src/components/uiOptions/js/FullNoPreviewUIOptions.js
    A src/components/uiOptions/js/FullPreviewPrefsEditor.js
    R src/components/uiOptions/js/FullPreviewUIOptions.js
    A src/components/uiOptions/js/PrefsEditor.js
    M src/components/uiOptions/js/StarterGrades.js
    M src/components/uiOptions/js/StarterSchemas.js
    R src/components/uiOptions/js/UIOptions.js
    A src/components/uiOptions/messages/prefsEditor.json
    R src/components/uiOptions/messages/uiOptions.json
    A src/components/uiOptions/prefsEditorDependencies.json
    R src/components/uiOptions/uiOptionsDependencies.json
    M src/demos/uiOptions/gradesDemo/html/uiOptions.html
    M src/demos/uiOptions/schemaDemo/html/uiOptions.html
    M src/tests/all-tests.html
    M src/tests/component-tests/uiOptions/all-tests.html
    M src/tests/component-tests/uiOptions/html/AuxBuilder-test.html
    M src/tests/component-tests/uiOptions/html/Builder-test.html
    R src/tests/component-tests/uiOptions/html/FatPanelUIOptionsFrame.html
    A src/tests/component-tests/uiOptions/html/FullNoPreviewPrefsEditor-test.html
    R src/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    A src/tests/component-tests/uiOptions/html/FullPreviewPrefsEditor-test.html
    R src/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    M src/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    M src/tests/component-tests/uiOptions/html/Panels-test.html
    A src/tests/component-tests/uiOptions/html/PrefsEditor-test.html
    M src/tests/component-tests/uiOptions/html/SeparatedPanelPrefsEditor-test.html
    A src/tests/component-tests/uiOptions/html/SeparatedPanelPrefsEditorFrame.html
    M src/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    R src/tests/component-tests/uiOptions/html/UIOptions-test.html
    M src/tests/component-tests/uiOptions/js/AuxBuilderTests.js
    M src/tests/component-tests/uiOptions/js/BuilderTests.js
    A src/tests/component-tests/uiOptions/js/FullNoPreviewPrefsEditorTests.js
    R src/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js
    A src/tests/component-tests/uiOptions/js/FullPreviewPrefsEditorTests.js
    R src/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    A src/tests/component-tests/uiOptions/js/PrefsEditorTests.js
    R src/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/tests/manual-tests/html/SomeKindOfNews.html
    M src/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/tests/manual-tests/html/uiOptionsFullWithPreviewSchema.html
    M src/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    M src/tests/manual-tests/html/uiOptionsFullWithoutPreviewSchema.html
    M src/tests/manual-tests/js/uiOptionsFullPageSchema.js

  Log Message:
  -----------
  FLUID-5161: Renamed all the file names that contain "fatPanel" and "uiOptions" to "separatedPanel" and "prefsEditor".


  Commit: 31dae5ec487a452c5863f8cd574ff1fb983b7226
      https://github.com/fluid-project/infusion/commit/31dae5ec487a452c5863f8cd574ff1fb983b7226
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    A src/components/slidingPanel/js/SlidingPanel.js
    A src/components/textfieldSlider/js/TextfieldSlider.js
    R src/components/uiOptions/js/SlidingPanel.js
    R src/components/uiOptions/js/TextfieldSlider.js
    A src/tests/component-tests/slidingPanel/html/SlidingPanel-test.html
    A src/tests/component-tests/slidingPanel/js/SlidingPanelTests.js
    A src/tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    A src/tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    R src/tests/component-tests/uiOptions/html/SlidingPanel-test.html
    R src/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    R src/tests/component-tests/uiOptions/js/SlidingPanelTests.js
    R src/tests/component-tests/uiOptions/js/TextfieldSliderTests.js

  Log Message:
  -----------
  FLUID-5161: Moved slidingPanel and textfieldSlider into their own component directories.


  Commit: b2bc945f0552949db6b0e59c6f992dffd892ecde
      https://github.com/fluid-project/infusion/commit/b2bc945f0552949db6b0e59c6f992dffd892ecde
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M .gitignore
    R src/components/uiOptions/css/FullNoPreviewPrefsEditor.css
    R src/components/uiOptions/css/FullPrefsEditor.css
    R src/components/uiOptions/css/FullPreviewPrefsEditor.css
    R src/components/uiOptions/css/PrefsEditor.css
    R src/components/uiOptions/css/SeparatedPanelPrefsEditor.css
    R src/components/uiOptions/css/SeparatedPanelPrefsEditorFrame.css
    R src/components/uiOptions/css/ie8.css
    R src/components/uiOptions/fonts/InfusionIcons-PrefsEditor.eot
    R src/components/uiOptions/fonts/InfusionIcons-PrefsEditor.ttf
    R src/components/uiOptions/html/FullNoPreviewPrefsEditor.html
    R src/components/uiOptions/html/FullPreviewPrefsEditor.html
    R src/components/uiOptions/html/PrefsEditorTemplate-contrast.html
    R src/components/uiOptions/html/PrefsEditorTemplate-layout.html
    R src/components/uiOptions/html/PrefsEditorTemplate-lineSpace.html
    R src/components/uiOptions/html/PrefsEditorTemplate-links.html
    R src/components/uiOptions/html/PrefsEditorTemplate-textFont.html
    R src/components/uiOptions/html/PrefsEditorTemplate-textSize.html
    R src/components/uiOptions/html/SeparatedPanelPrefsEditor.html
    R src/components/uiOptions/html/SeparatedPanelPrefsEditorFrame.html
    R src/components/uiOptions/images/default/separatedpanelbg.png
    R src/components/uiOptions/js/AuxBuilder.js
    R src/components/uiOptions/js/Builder.js
    R src/components/uiOptions/js/Enactors.js
    R src/components/uiOptions/js/FullNoPreviewPrefsEditor.js
    R src/components/uiOptions/js/FullPreviewPrefsEditor.js
    R src/components/uiOptions/js/ModelRelay.js
    R src/components/uiOptions/js/Panels.js
    R src/components/uiOptions/js/PrefsEditor.js
    R src/components/uiOptions/js/PrimaryBuilder.js
    R src/components/uiOptions/js/SeparatedPanelPrefsEditor.js
    R src/components/uiOptions/js/StarterGrades.js
    R src/components/uiOptions/js/StarterSchemas.js
    R src/components/uiOptions/js/Store.js
    R src/components/uiOptions/js/UIEnhancer.js
    R src/components/uiOptions/js/URLUtilities.js
    R src/components/uiOptions/messages/contrast.json
    R src/components/uiOptions/messages/lineSpace.json
    R src/components/uiOptions/messages/links.json
    R src/components/uiOptions/messages/prefsEditor.json
    R src/components/uiOptions/messages/tableOfContents.json
    R src/components/uiOptions/messages/textFont.json
    R src/components/uiOptions/messages/textSize.json
    R src/components/uiOptions/prefsEditorDependencies.json
    A src/framework/preferences/css/FullNoPreviewPrefsEditor.css
    A src/framework/preferences/css/FullPrefsEditor.css
    A src/framework/preferences/css/FullPreviewPrefsEditor.css
    A src/framework/preferences/css/PrefsEditor.css
    A src/framework/preferences/css/SeparatedPanelPrefsEditor.css
    A src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    A src/framework/preferences/css/ie8.css
    A src/framework/preferences/fonts/InfusionIcons-PrefsEditor.eot
    A src/framework/preferences/fonts/InfusionIcons-PrefsEditor.ttf
    A src/framework/preferences/html/FullNoPreviewPrefsEditor.html
    A src/framework/preferences/html/FullPreviewPrefsEditor.html
    A src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    A src/framework/preferences/html/PrefsEditorTemplate-layout.html
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    A src/framework/preferences/html/PrefsEditorTemplate-links.html
    A src/framework/preferences/html/PrefsEditorTemplate-textFont.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    A src/framework/preferences/images/default/separatedpanelbg.png
    A src/framework/preferences/js/AuxBuilder.js
    A src/framework/preferences/js/Builder.js
    A src/framework/preferences/js/Enactors.js
    A src/framework/preferences/js/FullNoPreviewPrefsEditor.js
    A src/framework/preferences/js/FullPreviewPrefsEditor.js
    A src/framework/preferences/js/ModelRelay.js
    A src/framework/preferences/js/Panels.js
    A src/framework/preferences/js/PrefsEditor.js
    A src/framework/preferences/js/PrimaryBuilder.js
    A src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    A src/framework/preferences/js/StarterGrades.js
    A src/framework/preferences/js/StarterSchemas.js
    A src/framework/preferences/js/Store.js
    A src/framework/preferences/js/UIEnhancer.js
    A src/framework/preferences/js/URLUtilities.js
    A src/framework/preferences/messages/contrast.json
    A src/framework/preferences/messages/lineSpace.json
    A src/framework/preferences/messages/links.json
    A src/framework/preferences/messages/prefsEditor.json
    A src/framework/preferences/messages/tableOfContents.json
    A src/framework/preferences/messages/textFont.json
    A src/framework/preferences/messages/textSize.json
    A src/framework/preferences/prefsEditorDependencies.json
    R src/tests/component-tests/uiOptions/all-tests.html
    R src/tests/component-tests/uiOptions/css/test-theme.css
    R src/tests/component-tests/uiOptions/html/AuxBuilder-test.html
    R src/tests/component-tests/uiOptions/html/Builder-test.html
    R src/tests/component-tests/uiOptions/html/CSSGenerator-test.html
    R src/tests/component-tests/uiOptions/html/Enactors-test.html
    R src/tests/component-tests/uiOptions/html/FullNoPreviewPrefsEditor-test.html
    R src/tests/component-tests/uiOptions/html/FullPreviewPrefsEditor-test.html
    R src/tests/component-tests/uiOptions/html/ModelRelay-test.html
    R src/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    R src/tests/component-tests/uiOptions/html/Panels-test.html
    R src/tests/component-tests/uiOptions/html/PrefsEditor-test.html
    R src/tests/component-tests/uiOptions/html/PrimaryBuilder-test.html
    R src/tests/component-tests/uiOptions/html/SeparatedPanelPrefsEditor-test.html
    R src/tests/component-tests/uiOptions/html/SeparatedPanelPrefsEditorFrame.html
    R src/tests/component-tests/uiOptions/html/Store-test.html
    R src/tests/component-tests/uiOptions/html/TestPreviewTemplate.html
    R src/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    R src/tests/component-tests/uiOptions/html/URLUtilities-test.html
    R src/tests/component-tests/uiOptions/js/AuxBuilderTests.js
    R src/tests/component-tests/uiOptions/js/BuilderTests.js
    R src/tests/component-tests/uiOptions/js/CSSGeneratorTests.js
    R src/tests/component-tests/uiOptions/js/EnactorsTests.js
    R src/tests/component-tests/uiOptions/js/FullNoPreviewPrefsEditorTests.js
    R src/tests/component-tests/uiOptions/js/FullPreviewPrefsEditorTests.js
    R src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    R src/tests/component-tests/uiOptions/js/ModelRelayTests.js
    R src/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    R src/tests/component-tests/uiOptions/js/PanelsTests.js
    R src/tests/component-tests/uiOptions/js/PrefsEditorTests.js
    R src/tests/component-tests/uiOptions/js/PrimaryBuilderTests.js
    R src/tests/component-tests/uiOptions/js/SeparatedPanelPrefsEditorTests.js
    R src/tests/component-tests/uiOptions/js/StoreTests.js
    R src/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    R src/tests/component-tests/uiOptions/js/URLUtilitiesTests.js
    A src/tests/framework-tests/preferences/all-tests.html
    A src/tests/framework-tests/preferences/css/test-theme.css
    A src/tests/framework-tests/preferences/html/AuxBuilder-test.html
    A src/tests/framework-tests/preferences/html/Builder-test.html
    A src/tests/framework-tests/preferences/html/CSSGenerator-test.html
    A src/tests/framework-tests/preferences/html/Enactors-test.html
    A src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/ModelRelay-test.html
    A src/tests/framework-tests/preferences/html/PageEnhancer-test.html
    A src/tests/framework-tests/preferences/html/Panels-test.html
    A src/tests/framework-tests/preferences/html/PrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/PrimaryBuilder-test.html
    A src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    A src/tests/framework-tests/preferences/html/Store-test.html
    A src/tests/framework-tests/preferences/html/TestPreviewTemplate.html
    A src/tests/framework-tests/preferences/html/UIEnhancer-test.html
    A src/tests/framework-tests/preferences/html/URLUtilities-test.html
    A src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    A src/tests/framework-tests/preferences/js/BuilderTests.js
    A src/tests/framework-tests/preferences/js/CSSGeneratorTests.js
    A src/tests/framework-tests/preferences/js/EnactorsTests.js
    A src/tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    A src/tests/framework-tests/preferences/js/ModelRelayTests.js
    A src/tests/framework-tests/preferences/js/PageEnhancerTests.js
    A src/tests/framework-tests/preferences/js/PanelsTests.js
    A src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/PrimaryBuilderTests.js
    A src/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/StoreTests.js
    A src/tests/framework-tests/preferences/js/UIEnhancerTests.js
    A src/tests/framework-tests/preferences/js/URLUtilitiesTests.js

  Log Message:
  -----------
  FLUID-5161: Moved directory "components/uiOptions" to "framework/preferences"


  Commit: 5aaed0dd42d97eba72a4ccb8f2968296bfd9f981
      https://github.com/fluid-project/infusion/commit/5aaed0dd42d97eba72a4ccb8f2968296bfd9f981
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M build-scripts/build.properties
    A src/components/slidingPanel/slidingPanelDependencies.json
    A src/components/textfieldSlider/textfieldSliderDependencies.json
    M src/demos/uiOptions/gradesDemo/html/uiOptions.html
    M src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js
    M src/demos/uiOptions/schemaDemo/html/uiOptions.html
    M src/demos/uiOptions/schemaDemo/js/uiOptionsDemo.js
    M src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/framework/preferences/js/StarterSchemas.js
    M src/framework/preferences/prefsEditorDependencies.json
    M src/tests/all-tests.html
    M src/tests/component-tests/slidingPanel/html/SlidingPanel-test.html
    M src/tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    M src/tests/framework-tests/preferences/all-tests.html
    M src/tests/framework-tests/preferences/html/AuxBuilder-test.html
    M src/tests/framework-tests/preferences/html/Builder-test.html
    M src/tests/framework-tests/preferences/html/Enactors-test.html
    M src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/ModelRelay-test.html
    M src/tests/framework-tests/preferences/html/PageEnhancer-test.html
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/html/PrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/PrimaryBuilder-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/tests/framework-tests/preferences/html/Store-test.html
    M src/tests/framework-tests/preferences/html/UIEnhancer-test.html
    M src/tests/framework-tests/preferences/html/URLUtilities-test.html
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M src/tests/manual-tests/html/SomeKindOfNews.html
    M src/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/tests/manual-tests/html/uiOptionsFullWithPreviewSchema.html
    M src/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    M src/tests/manual-tests/html/uiOptionsFullWithoutPreviewSchema.html
    M src/tests/manual-tests/html/uiOptionsPreview.html
    M src/tests/manual-tests/js/someKindOfNews.js
    M src/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-5161: Adjusted all paths used in tests and demo files since uiOptions has been renamed to "prefsEditor" and moved into frameword as well as the relocation of slidingPanel and textfieldSlider.


  Commit: 6437b90758a0663c7464c6639d6e434d0d2eb500
      https://github.com/fluid-project/infusion/commit/6437b90758a0663c7464c6639d6e434d0d2eb500
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M build-scripts/build.properties
    A src/components/slidingPanel/slidingPanelDependencies.json
    A src/components/textfieldSlider/textfieldSliderDependencies.json
    A src/components/uiOptions/uiOptionsDependencies.json
    A src/framework/preferences/preferencesDependencies.json
    R src/framework/preferences/prefsEditorDependencies.json

  Log Message:
  -----------
  FLUID-5161: Updating build resources.

Updated the build resources for the restructuring of the code that had been in uiOptions. Wasn't able to properly test as not all of the file paths have been updated after the moves.


  Commit: cd339995c5f12d0c6ea396e0eeb30fde6c589296
      https://github.com/fluid-project/infusion/commit/cd339995c5f12d0c6ea396e0eeb30fde6c589296
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M src/demos/uiOptions/gradesDemo/html/uiOptions.html
    M src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js
    M src/demos/uiOptions/schemaDemo/html/uiOptions.html
    M src/demos/uiOptions/schemaDemo/js/uiOptionsDemo.js
    M src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/framework/preferences/js/StarterSchemas.js
    M src/framework/preferences/preferencesDependencies.json
    M src/tests/all-tests.html
    M src/tests/component-tests/slidingPanel/html/SlidingPanel-test.html
    M src/tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    M src/tests/framework-tests/preferences/all-tests.html
    M src/tests/framework-tests/preferences/html/AuxBuilder-test.html
    M src/tests/framework-tests/preferences/html/Builder-test.html
    M src/tests/framework-tests/preferences/html/Enactors-test.html
    M src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/ModelRelay-test.html
    M src/tests/framework-tests/preferences/html/PageEnhancer-test.html
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/html/PrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/PrimaryBuilder-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/tests/framework-tests/preferences/html/Store-test.html
    M src/tests/framework-tests/preferences/html/UIEnhancer-test.html
    M src/tests/framework-tests/preferences/html/URLUtilities-test.html
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M src/tests/manual-tests/html/SomeKindOfNews.html
    M src/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/tests/manual-tests/html/uiOptionsFullWithPreviewSchema.html
    M src/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    M src/tests/manual-tests/html/uiOptionsFullWithoutPreviewSchema.html
    M src/tests/manual-tests/html/uiOptionsPreview.html
    M src/tests/manual-tests/js/someKindOfNews.js
    M src/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  Merge remote-tracking branch 'cindy/FLUID-5161' into FLUID-5161

Conflicts:
	src/components/slidingPanel/slidingPanelDependencies.json
	src/components/textfieldSlider/textfieldSliderDependencies.json
	src/framework/preferences/preferencesDependencies.json


  Commit: 05bdca2d08fef787c4d02d1055246cf053e49ad4
      https://github.com/fluid-project/infusion/commit/05bdca2d08fef787c4d02d1055246cf053e49ad4
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M src/demos/uiOptions/gradesDemo/css/uiOptions.css
    M src/demos/uiOptions/gradesDemo/html/uiOptions.html
    M src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js
    M src/demos/uiOptions/schemaDemo/css/uiOptions.css
    M src/demos/uiOptions/schemaDemo/html/uiOptions.html
    M src/framework/preferences/css/FullNoPreviewPrefsEditor.css
    M src/framework/preferences/css/FullPrefsEditor.css
    M src/framework/preferences/css/FullPreviewPrefsEditor.css
    M src/framework/preferences/css/PrefsEditor.css
    M src/framework/preferences/css/SeparatedPanelPrefsEditor.css
    M src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    M src/framework/preferences/css/ie8.css
    M src/framework/preferences/html/FullNoPreviewPrefsEditor.html
    M src/framework/preferences/html/FullPreviewPrefsEditor.html
    M src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    M src/framework/preferences/html/PrefsEditorTemplate-layout.html
    M src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    M src/framework/preferences/html/PrefsEditorTemplate-links.html
    M src/framework/preferences/html/PrefsEditorTemplate-textFont.html
    M src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    M src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    M src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Builder.js
    M src/framework/preferences/js/FullNoPreviewPrefsEditor.js
    M src/framework/preferences/js/FullPreviewPrefsEditor.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M src/framework/preferences/js/UIEnhancer.js
    M src/framework/preferences/prefsEditorDependencies.json
    M src/tests/framework-tests/preferences/html/Builder-test.html
    M src/tests/framework-tests/preferences/html/CSSGenerator-test.html
    M src/tests/framework-tests/preferences/html/Enactors-test.html
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/UIEnhancerTests.js
    M src/tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/tests/manual-tests/html/SomeKindOfNews.html
    M src/tests/manual-tests/html/uiOptionsFullWithPreviewSchema.html
    M src/tests/manual-tests/js/someKindOfNews.js
    M src/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-5161: Renamed the occurrences of "uiOptions" in scripts to 1. "prefs" for namespaces; 2. "prefsEditor" for css selectors and component names.


  Commit: 78c7c5c08292fa316262571a8ecf2c8d3bb5d011
      https://github.com/fluid-project/infusion/commit/78c7c5c08292fa316262571a8ecf2c8d3bb5d011
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M build-scripts/build.properties
    M src/framework/preferences/preferencesDependencies.json

  Log Message:
  -----------
  FLUID-5161: Fixed some issues with the build


  Commit: f2a6a6922d2344eee88c3e2b06c24845891b3bd3
      https://github.com/fluid-project/infusion/commit/f2a6a6922d2344eee88c3e2b06c24845891b3bd3
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M src/tests/manual-tests/ReadMe.txt
    A src/tests/manual-tests/css/PrefsEditorFullPage.css
    R src/tests/manual-tests/css/UIOptionsFullPage.css
    A src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    A src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    A src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    A src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    A src/tests/manual-tests/html/prefsEditorPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithPreviewSchema.html
    R src/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithoutPreviewSchema.html
    R src/tests/manual-tests/html/uiOptionsPreview.html
    A src/tests/manual-tests/js/prefsEditorFullPage.js
    A src/tests/manual-tests/js/prefsEditorFullPageSchema.js
    R src/tests/manual-tests/js/uiOptionsFullPage.js
    R src/tests/manual-tests/js/uiOptionsFullPageSchema.js

  Log Message:
  -----------
  FLUID-5161: Renamed full page demos to use "prefsEditor" rather than "uiOptions" in file names.


  Commit: ee3bfe6866354d2dcf3339b42199b3263bc7f57a
      https://github.com/fluid-project/infusion/commit/ee3bfe6866354d2dcf3339b42199b3263bc7f57a
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M build-scripts/build.properties
    M src/components/slidingPanel/slidingPanelDependencies.json
    M src/components/textfieldSlider/textfieldSliderDependencies.json
    A src/components/uiOptions/uiOptionsDependencies.json
    A src/framework/preferences/preferencesDependencies.json
    R src/framework/preferences/prefsEditorDependencies.json

  Log Message:
  -----------
  Merge remote-tracking branch 'justin/FLUID-5161' into FLUID-5161

Conflicts:
	src/framework/preferences/preferencesDependencies.json


  Commit: 26cad6bf1e64469942bb51a6baf2148f42651f0f
      https://github.com/fluid-project/infusion/commit/26cad6bf1e64469942bb51a6baf2148f42651f0f
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M build-scripts/build.xml
    A build-scripts/prefsFramework/js/BrowserStylesheetHandler.js
    A build-scripts/prefsFramework/js/CSSGenerator.js
    A build-scripts/prefsFramework/js/RhinoStylesheetHandler.js
    A build-scripts/prefsFramework/js/StylesheetImportant.js
    R build-scripts/uiOptions/js/BrowserStylesheetHandler.js
    R build-scripts/uiOptions/js/CSSGenerator.js
    R build-scripts/uiOptions/js/RhinoStylesheetHandler.js
    R build-scripts/uiOptions/js/StylesheetImportant.js
    M src/tests/framework-tests/preferences/html/CSSGenerator-test.html

  Log Message:
  -----------
  FLUID-5161: Renamed uiOptions dir in build-scripts


  Commit: 6e382cdeb2b5f8408bb62242c7dd606a3afeb9ea
      https://github.com/fluid-project/infusion/commit/6e382cdeb2b5f8408bb62242c7dd606a3afeb9ea
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M src/demos/uiOptions/gradesDemo/css/uiOptions.css
    M src/demos/uiOptions/gradesDemo/html/uiOptions.html
    M src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js
    M src/demos/uiOptions/schemaDemo/css/uiOptions.css
    M src/demos/uiOptions/schemaDemo/html/uiOptions.html
    M src/framework/preferences/css/FullNoPreviewPrefsEditor.css
    M src/framework/preferences/css/FullPrefsEditor.css
    M src/framework/preferences/css/FullPreviewPrefsEditor.css
    M src/framework/preferences/css/PrefsEditor.css
    M src/framework/preferences/css/SeparatedPanelPrefsEditor.css
    M src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    M src/framework/preferences/css/ie8.css
    M src/framework/preferences/html/FullNoPreviewPrefsEditor.html
    M src/framework/preferences/html/FullPreviewPrefsEditor.html
    M src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    M src/framework/preferences/html/PrefsEditorTemplate-layout.html
    M src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    M src/framework/preferences/html/PrefsEditorTemplate-links.html
    M src/framework/preferences/html/PrefsEditorTemplate-textFont.html
    M src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    M src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    M src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Builder.js
    M src/framework/preferences/js/FullNoPreviewPrefsEditor.js
    M src/framework/preferences/js/FullPreviewPrefsEditor.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M src/framework/preferences/js/UIEnhancer.js
    M src/tests/framework-tests/preferences/html/Builder-test.html
    M src/tests/framework-tests/preferences/html/Enactors-test.html
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/UIEnhancerTests.js
    M src/tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/tests/manual-tests/ReadMe.txt
    A src/tests/manual-tests/css/PrefsEditorFullPage.css
    R src/tests/manual-tests/css/UIOptionsFullPage.css
    M src/tests/manual-tests/html/SomeKindOfNews.html
    A src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    A src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    A src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    A src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    A src/tests/manual-tests/html/prefsEditorPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithPreviewSchema.html
    R src/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithoutPreviewSchema.html
    R src/tests/manual-tests/html/uiOptionsPreview.html
    A src/tests/manual-tests/js/prefsEditorFullPage.js
    A src/tests/manual-tests/js/prefsEditorFullPageSchema.js
    M src/tests/manual-tests/js/someKindOfNews.js
    R src/tests/manual-tests/js/uiOptionsFullPage.js
    R src/tests/manual-tests/js/uiOptionsFullPageSchema.js

  Log Message:
  -----------
  Merge remote-tracking branch 'cindy/FLUID-5161' into FLUID-5161

Conflicts:
	src/tests/framework-tests/preferences/html/CSSGenerator-test.html


  Commit: 13e7e7923a844dad50a39d1936bb3d0aaba1a81b
      https://github.com/fluid-project/infusion/commit/13e7e7923a844dad50a39d1936bb3d0aaba1a81b
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M src/framework/preferences/css/PrefsEditor.css
    M src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    M src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/framework/preferences/js/FullNoPreviewPrefsEditor.js
    M src/framework/preferences/js/FullPreviewPrefsEditor.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/tests/framework-tests/preferences/all-tests.html
    M src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/PrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/tests/framework-tests/preferences/html/TestPreviewTemplate.html
    M src/tests/framework-tests/preferences/html/URLUtilities-test.html
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    M src/tests/manual-tests/ReadMe.txt
    M src/tests/manual-tests/html/SomeKindOfNews.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorPreview.html
    M src/tests/manual-tests/js/prefsEditorFullPage.js
    M src/tests/manual-tests/js/someKindOfNews.js

  Log Message:
  -----------
  FLUID-5161: Replaced all occurrences of "UI Options" or "User Interface Options" with "Preferences Editor", except "demos/uiOptions/" directory.


  Commit: e3cb3bcabeb5b7ba5dacb1ea7c6d281885a4309b
      https://github.com/fluid-project/infusion/commit/e3cb3bcabeb5b7ba5dacb1ea7c6d281885a4309b
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M build-scripts/build.xml
    A build-scripts/prefsFramework/js/BrowserStylesheetHandler.js
    A build-scripts/prefsFramework/js/CSSGenerator.js
    A build-scripts/prefsFramework/js/RhinoStylesheetHandler.js
    A build-scripts/prefsFramework/js/StylesheetImportant.js
    R build-scripts/uiOptions/js/BrowserStylesheetHandler.js
    R build-scripts/uiOptions/js/CSSGenerator.js
    R build-scripts/uiOptions/js/RhinoStylesheetHandler.js
    R build-scripts/uiOptions/js/StylesheetImportant.js
    M src/tests/framework-tests/preferences/html/CSSGenerator-test.html

  Log Message:
  -----------
  Merge remote-tracking branch 'justin/FLUID-5161' into FLUID-5161


  Commit: 8565295a4843ace3d9efd77f52c95058697aa4b5
      https://github.com/fluid-project/infusion/commit/8565295a4843ace3d9efd77f52c95058697aa4b5
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M src/tests/framework-tests/preferences/html/Enactors-test.html

  Log Message:
  -----------
  FLUID-5161: Fixed unit tests.


  Commit: 684520f21f1a757e2f3cc79c523d393e4a97f04b
      https://github.com/fluid-project/infusion/commit/684520f21f1a757e2f3cc79c523d393e4a97f04b
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M build-scripts/build.properties
    M build-scripts/build.xml
    R src/components/uiOptions/uiOptionsDependencies.json

  Log Message:
  -----------
  FLUID-5161: Removed "components/uiOptions" and modified build scripts accordingly.


  Commit: 54379103d337c9ff9aebce76de722a4bc093e585
      https://github.com/fluid-project/infusion/commit/54379103d337c9ff9aebce76de722a4bc093e585
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/PrimaryBuilder.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M src/tests/manual-tests/html/SomeKindOfNews.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    M src/tests/manual-tests/js/prefsEditorFullPage.js
    M src/tests/manual-tests/js/someKindOfNews.js

  Log Message:
  -----------
  FLUID-5161: Renamed occurrences of "uiOptions" in files to "prefsEditor".


  Commit: 0235bccf67ceac9aff2486eb6ca3499661da6aeb
      https://github.com/fluid-project/infusion/commit/0235bccf67ceac9aff2486eb6ca3499661da6aeb
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M src/demos/index.html
    M src/demos/portal/js/demoAssets.js
    A src/demos/uiOptions/css/uiOptions.css
    A src/demos/uiOptions/demo.html
    R src/demos/uiOptions/gradesDemo/css/uiOptions.css
    R src/demos/uiOptions/gradesDemo/demo.html
    R src/demos/uiOptions/gradesDemo/html/uiOptions.html
    R src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js
    A src/demos/uiOptions/html/uiOptions.html
    A src/demos/uiOptions/js/uiOptionsDemo.js
    R src/demos/uiOptions/schemaDemo/css/uiOptions.css
    R src/demos/uiOptions/schemaDemo/demo.html
    R src/demos/uiOptions/schemaDemo/html/uiOptions.html
    R src/demos/uiOptions/schemaDemo/js/uiOptionsDemo.js
    M src/framework/preferences/js/StarterSchemas.js
    M src/tests/manual-tests/html/prefsEditorPreview.html
    A src/tests/manual-tests/html/prefsEditorSeparatedPanel.html
    A src/tests/manual-tests/js/prefsEditorSeparatedPanel.js

  Log Message:
  -----------
  FLUID-5161: Moved UIO demo that uses schemas as the default UIO demo. Also moved the UIO demo that uses grade components into manual tests.


  Commit: be6339a9e85f303dcb374a976bc862f301533215
      https://github.com/fluid-project/infusion/commit/be6339a9e85f303dcb374a976bc862f301533215
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M build-scripts/build.xml

  Log Message:
  -----------
  FLUID-5161: renamed ant build task

Renamed the ant build task for generating the style sheets needed for the preferences framework.


  Commit: 49344f420701ee8d74e9d9063f43d5e5e43637ff
      https://github.com/fluid-project/infusion/commit/49344f420701ee8d74e9d9063f43d5e5e43637ff
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M build-scripts/prefsFramework/js/StylesheetImportant.js
    M src/demos/uiOptions/html/uiOptions.html
    M src/framework/preferences/css/PrefsEditor.css
    M src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    M src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/PanelsTests.js
    M src/tests/framework-tests/preferences/js/UIEnhancerTests.js
    M src/tests/manual-tests/html/SomeKindOfNews.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorPreview.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanel.html

  Log Message:
  -----------
  FLUID-5161: modified generated styles.

Changed the style prefix from using uio to prefsEditor also changed the files suffix to be -prefsEditor.css


  Commit: 1476c0904a13cf4a31833f7f3cb6dc2255244de3
      https://github.com/fluid-project/infusion/commit/1476c0904a13cf4a31833f7f3cb6dc2255244de3
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js

  Log Message:
  -----------
  FLUID-5161: fixed contrast panel.

It appears that the dynamic flag on the style invoker for the contrast panel was lost in a merge. Adding it back has fixed the contrast panel.


  Commit: 704060382443be90fe7d86543a2277f7d2c9b6c9
      https://github.com/fluid-project/infusion/commit/704060382443be90fe7d86543a2277f7d2c9b6c9
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M build-scripts/build.xml
    M src/demos/index.html
    M src/demos/portal/css/portal.css
    A src/demos/portal/images/prefsEditor.png
    R src/demos/portal/images/uiOptions.png
    M src/demos/portal/js/demoAssets.js
    A src/demos/prefsEditor/css/prefsEditor.css
    A src/demos/prefsEditor/demo.html
    A src/demos/prefsEditor/fonts/Lato-Black.ttf
    A src/demos/prefsEditor/fonts/Lato-Light.ttf
    A src/demos/prefsEditor/fonts/Lato-LightItalic.ttf
    A src/demos/prefsEditor/fonts/Lato-Regular.ttf
    A src/demos/prefsEditor/fonts/LoveYaLikeASister.ttf
    A src/demos/prefsEditor/html/prefsEditor.html
    A src/demos/prefsEditor/images/arrow_left.png
    A src/demos/prefsEditor/images/arrow_right.png
    A src/demos/prefsEditor/images/background_texture.png
    A src/demos/prefsEditor/images/photo_apple.png
    A src/demos/prefsEditor/images/photo_orange.png
    A src/demos/prefsEditor/js/prefsEditorDemo.js
    R src/demos/uiOptions/css/uiOptions.css
    R src/demos/uiOptions/demo.html
    R src/demos/uiOptions/fonts/Lato-Black.ttf
    R src/demos/uiOptions/fonts/Lato-Light.ttf
    R src/demos/uiOptions/fonts/Lato-LightItalic.ttf
    R src/demos/uiOptions/fonts/Lato-Regular.ttf
    R src/demos/uiOptions/fonts/LoveYaLikeASister.ttf
    R src/demos/uiOptions/html/uiOptions.html
    R src/demos/uiOptions/images/arrow_left.png
    R src/demos/uiOptions/images/arrow_right.png
    R src/demos/uiOptions/images/background_texture.png
    R src/demos/uiOptions/images/photo_apple.png
    R src/demos/uiOptions/images/photo_orange.png
    R src/demos/uiOptions/js/uiOptionsDemo.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/manual-tests/html/prefsEditorPreview.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanel.html
    M src/tests/manual-tests/js/prefsEditorSeparatedPanel.js

  Log Message:
  -----------
  FLUID-5161: Renaming "uiOptions" to "prefsEditor", "UI Options" to "Preferences Editor" and "initSeparatedPanel" to "initPrefsEditor".


  Commit: 54e4e6e6ccca315ab0222aad0224ac8c84b23861
      https://github.com/fluid-project/infusion/commit/54e4e6e6ccca315ab0222aad0224ac8c84b23861
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M build-scripts/build.xml
    M build-scripts/prefsFramework/js/StylesheetImportant.js
    M src/demos/prefsEditor/html/prefsEditor.html
    M src/framework/preferences/css/PrefsEditor.css
    M src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    M src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/PanelsTests.js
    M src/tests/framework-tests/preferences/js/UIEnhancerTests.js
    M src/tests/manual-tests/html/SomeKindOfNews.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorPreview.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanel.html

  Log Message:
  -----------
  Merge remote-tracking branch 'justin/FLUID-5161' into FLUID-5161

Conflicts:
	build-scripts/build.xml


  Commit: c932023889397ad3a65037923e74e388ea33d1d9
      https://github.com/fluid-project/infusion/commit/c932023889397ad3a65037923e74e388ea33d1d9
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M src/demos/prefsEditor/css/prefsEditor.css
    M src/demos/prefsEditor/html/prefsEditor.html
    M src/demos/prefsEditor/js/prefsEditorDemo.js
    M src/framework/preferences/css/PrefsEditor.css
    M src/framework/preferences/css/SeparatedPanelPrefsEditor.css
    M src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    M src/framework/preferences/css/ie8.css
    M src/framework/preferences/js/Builder.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/framework-tests/preferences/js/PanelsTests.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M src/tests/manual-tests/html/prefsEditorPreview.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanel.html
    M src/tests/manual-tests/js/prefsEditorFullPageSchema.js

  Log Message:
  -----------
  FLUID-5161: Renamed the appearances of "UIO".


  Commit: a6efda80ea269e4c59c57895fc22b56bf3f169ac
      https://github.com/fluid-project/infusion/commit/a6efda80ea269e4c59c57895fc22b56bf3f169ac
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M src/demos/prefsEditor/css/prefsEditor.css
    M src/demos/prefsEditor/html/prefsEditor.html
    M src/framework/preferences/css/SeparatedPanelPrefsEditor.css
    M src/framework/preferences/css/ie8.css
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Builder.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    M src/tests/manual-tests/html/SomeKindOfNews.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanel.html

  Log Message:
  -----------
  FLUID-5161: Removed dependencies on tabs; split ie8 css file for prefs editor demo out of the framework code; renamed the "fluid.prefs" to "fluid.prefs.prefsEditor" etc.


  Commit: 0bc7033ad8dd5e1a348d6bdaebab5889133a8a2c
      https://github.com/fluid-project/infusion/commit/0bc7033ad8dd5e1a348d6bdaebab5889133a8a2c
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    A src/demos/prefsEditor/css/ie8.css

  Log Message:
  -----------
  FLUID-5161: Committed ie8.css that was missed from the last commit for prefs editor demos .


  Commit: b765352310401fd04607922489b5f5c64538a809
      https://github.com/fluid-project/infusion/commit/b765352310401fd04607922489b5f5c64538a809
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M src/tests/all-tests.html

  Log Message:
  -----------
  FLUID-5161: Removed the relocated test files from src/tests/all-tests.html


  Commit: 443454235c8f8e40b6959ed3acc02b7b72344ad8
      https://github.com/fluid-project/infusion/commit/443454235c8f8e40b6959ed3acc02b7b72344ad8
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M src/framework/core/js/FluidIoC.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-5161


  Commit: ce50b4ade8a2374e033783188814aa542983ee3b
      https://github.com/fluid-project/infusion/commit/ce50b4ade8a2374e033783188814aa542983ee3b
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Enactors.js

  Log Message:
  -----------
  FLUID-5171: Fixed the line-height and text size

The line-height and text size changes were not being applied to the panel because their invokers needed to be dynamic. This has been done.


  Commit: ed21c6aea1a2600a735c3e21eeb1f16f6a09000f
      https://github.com/fluid-project/infusion/commit/ed21c6aea1a2600a735c3e21eeb1f16f6a09000f
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M src/demos/index.html
    M src/demos/prefsEditor/demo.html
    M src/demos/prefsEditor/html/prefsEditor.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanel.html

  Log Message:
  -----------
  FLUID-5161: Renamed "User Interface Options" to "Preferences Editor".


  Commit: c306d5842ea6a59fcb2c70eaaa0185dc46e34ec4
      https://github.com/fluid-project/infusion/commit/c306d5842ea6a59fcb2c70eaaa0185dc46e34ec4
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js

  Log Message:
  -----------
  FLUID-5123: removed onIframeVisible event.


  Commit: 97b57fed8c30cc584c3c8401333814a4a908fdc1
      https://github.com/fluid-project/infusion/commit/97b57fed8c30cc584c3c8401333814a4a908fdc1
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js

  Log Message:
  -----------
  Merge remote-tracking branch 'justin/FLUID-5161' into FLUID-5161


  Commit: 97cae2c642a1eb8fc0452b14e580be969a334aec
      https://github.com/fluid-project/infusion/commit/97cae2c642a1eb8fc0452b14e580be969a334aec
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M src/demos/prefsEditor/html/prefsEditor.html
    M src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    M src/framework/preferences/js/Enactors.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M src/tests/manual-tests/ReadMe.txt
    M src/tests/manual-tests/html/prefsEditorSeparatedPanel.html

  Log Message:
  -----------
  FLUID-5161: Replaced appearances of "fat panel" with "separated panel".


  Commit: 034c54728d273f357f62462e2f8f3cad78c9bc87
      https://github.com/fluid-project/infusion/commit/034c54728d273f357f62462e2f8f3cad78c9bc87
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M src/demos/index.html

  Log Message:
  -----------
  FLUID-5161: Pointed the wiki page url to preference framework rather than UIO.


  Commit: b4422d732612a84ba429f3866b97786e627d8fb1
      https://github.com/fluid-project/infusion/commit/b4422d732612a84ba429f3866b97786e627d8fb1
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M .gitignore
    M build-scripts/build.properties
    M build-scripts/build.xml
    A build-scripts/prefsFramework/js/BrowserStylesheetHandler.js
    A build-scripts/prefsFramework/js/CSSGenerator.js
    A build-scripts/prefsFramework/js/RhinoStylesheetHandler.js
    A build-scripts/prefsFramework/js/StylesheetImportant.js
    R build-scripts/uiOptions/js/BrowserStylesheetHandler.js
    R build-scripts/uiOptions/js/CSSGenerator.js
    R build-scripts/uiOptions/js/RhinoStylesheetHandler.js
    R build-scripts/uiOptions/js/StylesheetImportant.js
    A src/components/slidingPanel/js/SlidingPanel.js
    A src/components/slidingPanel/slidingPanelDependencies.json
    A src/components/textfieldSlider/js/TextfieldSlider.js
    A src/components/textfieldSlider/textfieldSliderDependencies.json
    R src/components/uiOptions/css/FatPanelUIOptions.css
    R src/components/uiOptions/css/FatPanelUIOptionsFrame.css
    R src/components/uiOptions/css/FullNoPreviewUIOptions.css
    R src/components/uiOptions/css/FullPreviewUIOptions.css
    R src/components/uiOptions/css/FullUIOptions.css
    R src/components/uiOptions/css/UIOptions.css
    R src/components/uiOptions/css/ie8.css
    R src/components/uiOptions/fonts/InfusionIcons-UIOptions.eot
    R src/components/uiOptions/fonts/InfusionIcons-UIOptions.ttf
    R src/components/uiOptions/html/FatPanelUIOptions.html
    R src/components/uiOptions/html/FatPanelUIOptionsFrame.html
    R src/components/uiOptions/html/FullNoPreviewUIOptions.html
    R src/components/uiOptions/html/FullPreviewUIOptions.html
    R src/components/uiOptions/html/UIOptionsTemplate-contrast.html
    R src/components/uiOptions/html/UIOptionsTemplate-layout.html
    R src/components/uiOptions/html/UIOptionsTemplate-lineSpace.html
    R src/components/uiOptions/html/UIOptionsTemplate-links.html
    R src/components/uiOptions/html/UIOptionsTemplate-textFont.html
    R src/components/uiOptions/html/UIOptionsTemplate-textSize.html
    R src/components/uiOptions/images/default/fatpanelbg.png
    R src/components/uiOptions/js/AuxBuilder.js
    R src/components/uiOptions/js/Builder.js
    R src/components/uiOptions/js/Enactors.js
    R src/components/uiOptions/js/FatPanelUIOptions.js
    R src/components/uiOptions/js/FullNoPreviewUIOptions.js
    R src/components/uiOptions/js/FullPreviewUIOptions.js
    R src/components/uiOptions/js/ModelRelay.js
    R src/components/uiOptions/js/Panels.js
    R src/components/uiOptions/js/PrimaryBuilder.js
    R src/components/uiOptions/js/SlidingPanel.js
    R src/components/uiOptions/js/StarterGrades.js
    R src/components/uiOptions/js/StarterSchemas.js
    R src/components/uiOptions/js/Store.js
    R src/components/uiOptions/js/TextfieldSlider.js
    R src/components/uiOptions/js/UIEnhancer.js
    R src/components/uiOptions/js/UIOptions.js
    R src/components/uiOptions/js/URLUtilities.js
    R src/components/uiOptions/messages/contrast.json
    R src/components/uiOptions/messages/lineSpace.json
    R src/components/uiOptions/messages/links.json
    R src/components/uiOptions/messages/tableOfContents.json
    R src/components/uiOptions/messages/textFont.json
    R src/components/uiOptions/messages/textSize.json
    R src/components/uiOptions/messages/uiOptions.json
    R src/components/uiOptions/uiOptionsDependencies.json
    M src/demos/index.html
    M src/demos/portal/css/portal.css
    A src/demos/portal/images/prefsEditor.png
    R src/demos/portal/images/uiOptions.png
    M src/demos/portal/js/demoAssets.js
    A src/demos/prefsEditor/css/ie8.css
    A src/demos/prefsEditor/css/prefsEditor.css
    A src/demos/prefsEditor/demo.html
    A src/demos/prefsEditor/fonts/Lato-Black.ttf
    A src/demos/prefsEditor/fonts/Lato-Light.ttf
    A src/demos/prefsEditor/fonts/Lato-LightItalic.ttf
    A src/demos/prefsEditor/fonts/Lato-Regular.ttf
    A src/demos/prefsEditor/fonts/LoveYaLikeASister.ttf
    A src/demos/prefsEditor/html/prefsEditor.html
    A src/demos/prefsEditor/images/arrow_left.png
    A src/demos/prefsEditor/images/arrow_right.png
    A src/demos/prefsEditor/images/background_texture.png
    A src/demos/prefsEditor/images/photo_apple.png
    A src/demos/prefsEditor/images/photo_orange.png
    A src/demos/prefsEditor/js/prefsEditorDemo.js
    R src/demos/uiOptions/fonts/Lato-Black.ttf
    R src/demos/uiOptions/fonts/Lato-Light.ttf
    R src/demos/uiOptions/fonts/Lato-LightItalic.ttf
    R src/demos/uiOptions/fonts/Lato-Regular.ttf
    R src/demos/uiOptions/fonts/LoveYaLikeASister.ttf
    R src/demos/uiOptions/gradesDemo/css/uiOptions.css
    R src/demos/uiOptions/gradesDemo/demo.html
    R src/demos/uiOptions/gradesDemo/html/uiOptions.html
    R src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js
    R src/demos/uiOptions/images/arrow_left.png
    R src/demos/uiOptions/images/arrow_right.png
    R src/demos/uiOptions/images/background_texture.png
    R src/demos/uiOptions/images/photo_apple.png
    R src/demos/uiOptions/images/photo_orange.png
    R src/demos/uiOptions/schemaDemo/css/uiOptions.css
    R src/demos/uiOptions/schemaDemo/demo.html
    R src/demos/uiOptions/schemaDemo/html/uiOptions.html
    R src/demos/uiOptions/schemaDemo/js/uiOptionsDemo.js
    A src/framework/preferences/css/FullNoPreviewPrefsEditor.css
    A src/framework/preferences/css/FullPrefsEditor.css
    A src/framework/preferences/css/FullPreviewPrefsEditor.css
    A src/framework/preferences/css/PrefsEditor.css
    A src/framework/preferences/css/SeparatedPanelPrefsEditor.css
    A src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    A src/framework/preferences/css/ie8.css
    A src/framework/preferences/fonts/InfusionIcons-PrefsEditor.eot
    A src/framework/preferences/fonts/InfusionIcons-PrefsEditor.ttf
    A src/framework/preferences/html/FullNoPreviewPrefsEditor.html
    A src/framework/preferences/html/FullPreviewPrefsEditor.html
    A src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    A src/framework/preferences/html/PrefsEditorTemplate-layout.html
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    A src/framework/preferences/html/PrefsEditorTemplate-links.html
    A src/framework/preferences/html/PrefsEditorTemplate-textFont.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    A src/framework/preferences/images/default/separatedpanelbg.png
    A src/framework/preferences/js/AuxBuilder.js
    A src/framework/preferences/js/Builder.js
    A src/framework/preferences/js/Enactors.js
    A src/framework/preferences/js/FullNoPreviewPrefsEditor.js
    A src/framework/preferences/js/FullPreviewPrefsEditor.js
    A src/framework/preferences/js/ModelRelay.js
    A src/framework/preferences/js/Panels.js
    A src/framework/preferences/js/PrefsEditor.js
    A src/framework/preferences/js/PrimaryBuilder.js
    A src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    A src/framework/preferences/js/StarterGrades.js
    A src/framework/preferences/js/StarterSchemas.js
    A src/framework/preferences/js/Store.js
    A src/framework/preferences/js/UIEnhancer.js
    A src/framework/preferences/js/URLUtilities.js
    A src/framework/preferences/messages/contrast.json
    A src/framework/preferences/messages/lineSpace.json
    A src/framework/preferences/messages/links.json
    A src/framework/preferences/messages/prefsEditor.json
    A src/framework/preferences/messages/tableOfContents.json
    A src/framework/preferences/messages/textFont.json
    A src/framework/preferences/messages/textSize.json
    A src/framework/preferences/preferencesDependencies.json
    M src/tests/all-tests.html
    A src/tests/component-tests/slidingPanel/html/SlidingPanel-test.html
    A src/tests/component-tests/slidingPanel/js/SlidingPanelTests.js
    A src/tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    A src/tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    R src/tests/component-tests/uiOptions/all-tests.html
    R src/tests/component-tests/uiOptions/css/test-theme.css
    R src/tests/component-tests/uiOptions/html/AuxBuilder-test.html
    R src/tests/component-tests/uiOptions/html/Builder-test.html
    R src/tests/component-tests/uiOptions/html/CSSGenerator-test.html
    R src/tests/component-tests/uiOptions/html/Enactors-test.html
    R src/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/FatPanelUIOptionsFrame.html
    R src/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/ModelRelay-test.html
    R src/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    R src/tests/component-tests/uiOptions/html/Panels-test.html
    R src/tests/component-tests/uiOptions/html/PrimaryBuilder-test.html
    R src/tests/component-tests/uiOptions/html/SlidingPanel-test.html
    R src/tests/component-tests/uiOptions/html/Store-test.html
    R src/tests/component-tests/uiOptions/html/TestPreviewTemplate.html
    R src/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    R src/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    R src/tests/component-tests/uiOptions/html/UIOptions-test.html
    R src/tests/component-tests/uiOptions/html/URLUtilities-test.html
    R src/tests/component-tests/uiOptions/js/AuxBuilderTests.js
    R src/tests/component-tests/uiOptions/js/BuilderTests.js
    R src/tests/component-tests/uiOptions/js/CSSGeneratorTests.js
    R src/tests/component-tests/uiOptions/js/EnactorsTests.js
    R src/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    R src/tests/component-tests/uiOptions/js/ModelRelayTests.js
    R src/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    R src/tests/component-tests/uiOptions/js/PanelsTests.js
    R src/tests/component-tests/uiOptions/js/PrimaryBuilderTests.js
    R src/tests/component-tests/uiOptions/js/SlidingPanelTests.js
    R src/tests/component-tests/uiOptions/js/StoreTests.js
    R src/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
    R src/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    R src/tests/component-tests/uiOptions/js/UIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/URLUtilitiesTests.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/framework-tests/core/js/FluidJSTests.js
    A src/tests/framework-tests/preferences/all-tests.html
    A src/tests/framework-tests/preferences/css/test-theme.css
    A src/tests/framework-tests/preferences/html/AuxBuilder-test.html
    A src/tests/framework-tests/preferences/html/Builder-test.html
    A src/tests/framework-tests/preferences/html/CSSGenerator-test.html
    A src/tests/framework-tests/preferences/html/Enactors-test.html
    A src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/ModelRelay-test.html
    A src/tests/framework-tests/preferences/html/PageEnhancer-test.html
    A src/tests/framework-tests/preferences/html/Panels-test.html
    A src/tests/framework-tests/preferences/html/PrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/PrimaryBuilder-test.html
    A src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    A src/tests/framework-tests/preferences/html/Store-test.html
    A src/tests/framework-tests/preferences/html/TestPreviewTemplate.html
    A src/tests/framework-tests/preferences/html/UIEnhancer-test.html
    A src/tests/framework-tests/preferences/html/URLUtilities-test.html
    A src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    A src/tests/framework-tests/preferences/js/BuilderTests.js
    A src/tests/framework-tests/preferences/js/CSSGeneratorTests.js
    A src/tests/framework-tests/preferences/js/EnactorsTests.js
    A src/tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    A src/tests/framework-tests/preferences/js/ModelRelayTests.js
    A src/tests/framework-tests/preferences/js/PageEnhancerTests.js
    A src/tests/framework-tests/preferences/js/PanelsTests.js
    A src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/PrimaryBuilderTests.js
    A src/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/StoreTests.js
    A src/tests/framework-tests/preferences/js/UIEnhancerTests.js
    A src/tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/tests/manual-tests/ReadMe.txt
    A src/tests/manual-tests/css/PrefsEditorFullPage.css
    R src/tests/manual-tests/css/UIOptionsFullPage.css
    M src/tests/manual-tests/html/SomeKindOfNews.html
    A src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    A src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    A src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    A src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    A src/tests/manual-tests/html/prefsEditorPreview.html
    A src/tests/manual-tests/html/prefsEditorSeparatedPanel.html
    R src/tests/manual-tests/html/uiOptionsFullWithPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithPreviewSchema.html
    R src/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithoutPreviewSchema.html
    R src/tests/manual-tests/html/uiOptionsPreview.html
    A src/tests/manual-tests/js/prefsEditorFullPage.js
    A src/tests/manual-tests/js/prefsEditorFullPageSchema.js
    A src/tests/manual-tests/js/prefsEditorSeparatedPanel.js
    M src/tests/manual-tests/js/someKindOfNews.js
    R src/tests/manual-tests/js/uiOptionsFullPage.js
    R src/tests/manual-tests/js/uiOptionsFullPageSchema.js

  Log Message:
  -----------
  Merge remote-tracking branch 'cindy/FLUID-5161'

* cindy/FLUID-5161: (29 commits)
  FLUID-5161: Pointed the wiki page url to preference framework rather than UIO.
  FLUID-5161: Replaced appearances of "fat panel" with "separated panel".
  FLUID-5123: removed onIframeVisible event.
  FLUID-5161: Renamed "User Interface Options" to "Preferences Editor".
  FLUID-5171: Fixed the line-height and text size
  FLUID-5161: Removed the relocated test files from src/tests/all-tests.html
  FLUID-5161: Committed ie8.css that was missed from the last commit for prefs editor demos .
  FLUID-5161: Removed dependencies on tabs; split ie8 css file for prefs editor demo out of the framework code; renamed the "fluid.prefs" to "fluid.prefs.prefsEditor" etc.
  FLUID-5161: Renamed the appearances of "UIO".
  FLUID-5161: Renaming "uiOptions" to "prefsEditor", "UI Options" to "Preferences Editor" and "initSeparatedPanel" to "initPrefsEditor".
  FLUID-5161: fixed contrast panel.
  FLUID-5161: modified generated styles.
  FLUID-5161: renamed ant build task
  FLUID-5161: Moved UIO demo that uses schemas as the default UIO demo. Also moved the UIO demo that uses grade components into manual tests.
  FLUID-5161: Renamed occurrences of "uiOptions" in files to "prefsEditor".
  FLUID-5161: Removed "components/uiOptions" and modified build scripts accordingly.
  FLUID-5161: Fixed unit tests.
  FLUID-5161: Replaced all occurrences of "UI Options" or "User Interface Options" with "Preferences Editor", except "demos/uiOptions/" directory.
  FLUID-5161: Renamed uiOptions dir in build-scripts
  FLUID-5161: Renamed full page demos to use "prefsEditor" rather than "uiOptions" in file names.
  ...


Compare: https://github.com/fluid-project/infusion/compare/04a85a490a05...b4422d732612


More information about the Commits mailing list