[Commits] [fluid-project/infusion] cf2eca: FLUID-4927: removed panel config from default uio

GitHub noreply at github.com
Fri Apr 26 13:58:48 EDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: cf2eca0b25bcdd742be5cd48c6ab12685b429457
      https://github.com/fluid-project/infusion/commit/cf2eca0b25bcdd742be5cd48c6ab12685b429457
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-4927: removed panel config from default uio

Removed the setting panel configurations from the default UIO config. These are now specified directly in the configurations for the specific flavours of UIO.


  Commit: 8a0dc7f22babb9b9b1e56240d4b62947d7263585
      https://github.com/fluid-project/infusion/commit/8a0dc7f22babb9b9b1e56240d4b62947d7263585
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-4927: removed preview from default UIO

Also removed the preview subcomponent from the default UIO config. It had been that only one of the three flavours of UIO were actually using the component so most cases were just overriding it.


  Commit: 886457e648f5064ec4abe9f9cc3d34bcfa2a1873
      https://github.com/fluid-project/infusion/commit/886457e648f5064ec4abe9f9cc3d34bcfa2a1873
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: fixing unit tests

Fixed broken unit tests after moving the setting panel and preview subcomponents out of the default UIO configuration.


  Commit: 0c6ec53ae231c1177b37ec0615ec929aed43cf6d
      https://github.com/fluid-project/infusion/commit/0c6ec53ae231c1177b37ec0615ec929aed43cf6d
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Moved default panels config to a grade

Moved the default settings panels configuration into a grade "fluid.uiOptions.defaultSettingsPanels". The intention was to provide this as a gradeName to an instance of UIO that wished to pull in the default settings panels at time of instantiation. However this currently will not work in the framework due to FLUID-4937. In the meantime, since this component itself has fluid.uiOptions as a grade, it is used inplace of fluid.uiOptions when we need the default settings panels. Another possible work around would be to use the dynamically assigned gradeNames that are being worked on in the FLUID-4921 branch.


  Commit: 0a605857dd7e13052ec50d557f4a5d618dd91b77
      https://github.com/fluid-project/infusion/commit/0a605857dd7e13052ec50d557f4a5d618dd91b77
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    R src/webapp/components/uiOptions/html/UIOptionsTemplate-text.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    M src/webapp/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-4927: Split text control panel into 4 individual panels.


  Commit: 44232b6c6d2299b8d67478a99f0f6366c4291b0e
      https://github.com/fluid-project/infusion/commit/44232b6c6d2299b8d67478a99f0f6366c4291b0e
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/FullNoPreviewUIOptions.html
    M src/webapp/components/uiOptions/html/FullPreviewUIOptions.html
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    A src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    M src/webapp/tests/manual-tests/html/SomeKindOfNews.html

  Log Message:
  -----------
  FLUID-4927: Split UIOptions.js into two files. One contains all the settings panel ants and the other is the assembler.


  Commit: 2f34be3834dcdd62e035a19291b29851c3e8f472
      https://github.com/fluid-project/infusion/commit/2f34be3834dcdd62e035a19291b29851c3e8f472
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/FullPreviewUIOptions.html
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js

  Log Message:
  -----------
  FLUID-4927: fixed template for full w/ preview

The template had been missing some closing tags, which resulted in the template being wiped out, probably by the renderer. Also removed the some commented out code.


  Commit: b4e73e6c3f45027cbf1da9378e7edb818bcb4294
      https://github.com/fluid-project/infusion/commit/b4e73e6c3f45027cbf1da9378e7edb818bcb4294
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    A src/webapp/components/uiOptions/js/Enactors.js
    A src/webapp/components/uiOptions/js/ModelRelay.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/html/portal.html
    A src/webapp/tests/component-tests/uiOptions/html/Enactors-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/html/ModelRelay-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/js/EnactorsTests.js
    A src/webapp/tests/component-tests/uiOptions/js/ModelRelayTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/test-core/testTests/html/Testing-test.html
    M src/webapp/tests/test-core/testTests/js/TestingTests.js
    M src/webapp/tests/test-core/utils/js/IoCTestUtils.js

  Log Message:
  -----------
  Merge branch 'FLUID-4908' into FLUID-4927


  Commit: 7e76a011966bda49eb80f123019387d9700bdefa
      https://github.com/fluid-project/infusion/commit/7e76a011966bda49eb80f123019387d9700bdefa
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M src/webapp/components/reorderer/js/Reorderer.js
    M src/webapp/components/uploader/js/DemoUploadManager.js
    M src/webapp/components/uploader/js/FileQueue.js
    M src/webapp/components/uploader/js/FileQueueView.js
    M src/webapp/components/uploader/js/FlashUploaderSupport.js
    M src/webapp/components/uploader/js/HTML5UploaderSupport.js
    M src/webapp/components/uploader/js/MimeTypeExtensions.js
    M src/webapp/components/uploader/js/Uploader.js
    M src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.2.js
    M src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.3.js
    M src/webapp/framework/core/js/DataBinding.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
    M src/webapp/tests/all-tests.html
    M src/webapp/tests/component-tests/uploader/html/DemoUploadManager-test.html
    M src/webapp/tests/component-tests/uploader/html/FileQueue-test.html
    M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
    M src/webapp/tests/framework-tests/core/js/DataBindingTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js
    M src/webapp/tests/framework-tests/enhancement/js/ProgressiveEnhancementTests.js
    M src/webapp/tests/test-core/testTests/html/Testing-test.html
    M src/webapp/tests/test-core/testTests/js/TestingTests.js
    M src/webapp/tests/test-core/utils/js/IoCTestUtils.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4927-b


  Commit: 58faf869d4b6e8a1d41cdaca5e6744efd88959cd
      https://github.com/fluid-project/infusion/commit/58faf869d4b6e8a1d41cdaca5e6744efd88959cd
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

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

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4927-b


  Commit: 90be40c23e11e00908265a3216c87b42ba6e5a67
      https://github.com/fluid-project/infusion/commit/90be40c23e11e00908265a3216c87b42ba6e5a67
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/reorderer/js/Reorderer.js
    M src/webapp/components/uploader/js/DemoUploadManager.js
    M src/webapp/components/uploader/js/FileQueue.js
    M src/webapp/components/uploader/js/FileQueueView.js
    M src/webapp/components/uploader/js/FlashUploaderSupport.js
    M src/webapp/components/uploader/js/HTML5UploaderSupport.js
    M src/webapp/components/uploader/js/MimeTypeExtensions.js
    M src/webapp/components/uploader/js/Uploader.js
    M src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.2.js
    M src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.3.js
    M src/webapp/framework/core/js/DataBinding.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
    M src/webapp/tests/all-tests.html
    M src/webapp/tests/component-tests/uploader/html/DemoUploadManager-test.html
    M src/webapp/tests/component-tests/uploader/html/FileQueue-test.html
    M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
    M src/webapp/tests/framework-tests/core/js/DataBindingTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js
    M src/webapp/tests/framework-tests/enhancement/js/ProgressiveEnhancementTests.js

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


  Commit: 24c0fbf0c81b83deeb1a5d80f8e278d229e190f7
      https://github.com/fluid-project/infusion/commit/24c0fbf0c81b83deeb1a5d80f8e278d229e190f7
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/ModelRelay.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js

  Log Message:
  -----------
  Merge branch 'FLUID-4908' into FLUID-4927


  Commit: 7e68f62d9e151f1b1f34356cbf3bf83d4f842943
      https://github.com/fluid-project/infusion/commit/7e68f62d9e151f1b1f34356cbf3bf83d4f842943
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-4927: Implemented model relay into textSize panel ant so the ant can only work on its own private model.


  Commit: 58b503fe75ba115251ecd37393e11a6c80d84d77
      https://github.com/fluid-project/infusion/commit/58b503fe75ba115251ecd37393e11a6c80d84d77
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/ModelRelay.js

  Log Message:
  -----------
  Merge branch 'FLUID-4908' into FLUID-4927


  Commit: de36729080075f7869d41dbd0c4f0ee009f7ea16
      https://github.com/fluid-project/infusion/commit/de36729080075f7869d41dbd0c4f0ee009f7ea16
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    A src/webapp/components/uiOptions/js/Enactors.js
    A src/webapp/components/uiOptions/js/ModelRelay.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/html/portal.html
    A src/webapp/tests/component-tests/uiOptions/html/Enactors-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/html/ModelRelay-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/js/EnactorsTests.js
    A src/webapp/tests/component-tests/uiOptions/js/ModelRelayTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js

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


  Commit: 43051f77fdcf462d2d600d6759e9a0a39a731ce9
      https://github.com/fluid-project/infusion/commit/43051f77fdcf462d2d600d6759e9a0a39a731ce9
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-4927: modelRelay used in all settings panels

Updated the rest of the settings panels to use the modelRelay.


  Commit: 061af520fd30815df67df81ad9403f25871223fe
      https://github.com/fluid-project/infusion/commit/061af520fd30815df67df81ad9403f25871223fe
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-4927: Moved out templateLoader references

Removed the templateLoader references from the settings panels defaults and put them to the grade instead. The defaults now use a URL to reference their templates. This is more inline with component defaults when they are used on their own.


  Commit: 9464c2031196560cd74693cdb6765cac9456b00d
      https://github.com/fluid-project/infusion/commit/9464c2031196560cd74693cdb6765cac9456b00d
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-4927: Removed classname map from some panels

Removed classname map from settingsPanels which don't use it.


  Commit: 541391ab13ea0bab15d27bdf50154d811b1eb1a0
      https://github.com/fluid-project/infusion/commit/541391ab13ea0bab15d27bdf50154d811b1eb1a0
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4927: removed some model munging

Removed the code that pulls in the options for the names and values of a selection from the options block into the model. Rather we now reference the options directly in the produce tree.


  Commit: b7c3b38f1a809c02a6f138430b37d545caf245b0
      https://github.com/fluid-project/infusion/commit/b7c3b38f1a809c02a6f138430b37d545caf245b0
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-4927: Removed defaultModel

Removed the defaultModel and contributeDefaultModel code. This didn't actually seem to do anything, and now that each of the settingsPanels has its own model, I've put the default into there.


  Commit: 7786d07b8de0d77bb6342a9d330c456240ea3d4f
      https://github.com/fluid-project/infusion/commit/7786d07b8de0d77bb6342a9d330c456240ea3d4f
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-4927: moved lateRefreshViewBinder

Moved the lateRefreshViewBinder to the SettingsPanel file as it was only used there.


  Commit: 57c58fd7816f6d57b3c1d70c37b5e73c954555be
      https://github.com/fluid-project/infusion/commit/57c58fd7816f6d57b3c1d70c37b5e73c954555be
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-4927: cleaned up the settingsPanel grade

Cleaned up the settingsPanel grade to remove the UIO specific calls. These are now moved to the defaultSettingsPanels grade which is guaranteed to have a uiOptions reference. We could also have put this in a demands block, and may still do so at a later time.


  Commit: 689b11307b661de6b3574d286e52d04d7365312a
      https://github.com/fluid-project/infusion/commit/689b11307b661de6b3574d286e52d04d7365312a
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-03-21 (Thu, 21 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4927: Renamed settingsPanels grade to settingsPanel.


  Commit: fe5d7f16f793aac804031becc188e7594a664947
      https://github.com/fluid-project/infusion/commit/fe5d7f16f793aac804031becc188e7594a664947
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-03-21 (Thu, 21 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4927: Updated settingsPanel grade's refreshView declaration and removed a pre init function.


  Commit: c99445bef88a39d8ef35cf1efe54d3cc8776d527
      https://github.com/fluid-project/infusion/commit/c99445bef88a39d8ef35cf1efe54d3cc8776d527
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-03-21 (Thu, 21 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4927: added working proto tree for radio buttons (contrast).


  Commit: 58e67357450ba03d3351ddece53d58b2a215a99b
      https://github.com/fluid-project/infusion/commit/58e67357450ba03d3351ddece53d58b2a215a99b
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-03-21 (Thu, 21 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4927: Added style invoker for the contrast that renders labels.


  Commit: 1ea88071e53bd98697e90a9123d523201c991c41
      https://github.com/fluid-project/infusion/commit/1ea88071e53bd98697e90a9123d523201c991c41
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-03-21 (Thu, 21 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/ModelRelay.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js

  Log Message:
  -----------
  FLUID-4927: Fixed fat panel uioptions tests. Only uioptions tests to go.


  Commit: c29f7c7a7249572889de0aebf818216f548d16cc
      https://github.com/fluid-project/infusion/commit/c29f7c7a7249572889de0aebf818216f548d16cc
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/uiOptionsDependencies.json

  Log Message:
  -----------
  FLUID-4927: Added in SettingsPanels to dependency

Added the SettingPanels.js file to the json dependency file for UIO.


  Commit: 4b7a2be4a9d5607f829156af30cc3564ec775b9c
      https://github.com/fluid-project/infusion/commit/4b7a2be4a9d5607f829156af30cc3564ec775b9c
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html

  Log Message:
  -----------
  FLUID-4927: Moved textfieldSlider to its own file


  Commit: f25b4870ed873f517a138bf2411c67154b05bd78
      https://github.com/fluid-project/infusion/commit/f25b4870ed873f517a138bf2411c67154b05bd78
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    A src/webapp/components/uiOptions/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-4927: added missing TextFieldSlider.js file

Forgot to add the new file. Adding it now.


  Commit: cf919eea65c05edbdb11b57bb0bc84572e08ef8c
      https://github.com/fluid-project/infusion/commit/cf919eea65c05edbdb11b57bb0bc84572e08ef8c
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

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

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4927-b


  Commit: 16ca1a81a547b71a70254e7211b670832f25cbef
      https://github.com/fluid-project/infusion/commit/16ca1a81a547b71a70254e7211b670832f25cbef
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/Enactors.js
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/ModelRelay.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/js/portal.js
    A src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    A src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  Merge branch 'FLUID-4908' into FLUID-4927


  Commit: 2b302dedbcbc4cf77d2dbff914379f5c92b8a433
      https://github.com/fluid-project/infusion/commit/2b302dedbcbc4cf77d2dbff914379f5c92b8a433
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Fixed UIOptions unit tests.


  Commit: 1cb97c78cfc9368dd8c28eb4c9e8c08174971b07
      https://github.com/fluid-project/infusion/commit/1cb97c78cfc9368dd8c28eb4c9e8c08174971b07
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/TextfieldSlider.js
    M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js

  Log Message:
  -----------
  FLUID-4927: refactored TextfieldSlider

Refactored textfieldSlider to use invokers, have an afterRender event, and added a rednerOnInit option. The tests stll all pass and added a couple more to test the afterRender event.


  Commit: c1b686fabf5ba9c787e5f09d10fe36dc47362ed3
      https://github.com/fluid-project/infusion/commit/c1b686fabf5ba9c787e5f09d10fe36dc47362ed3
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/Enactors.js
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/ModelRelay.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/js/portal.js
    A src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    A src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

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


  Commit: cb30b3b2effa761ebcd1ba9ca95a3022885faaa4
      https://github.com/fluid-project/infusion/commit/cb30b3b2effa761ebcd1ba9ca95a3022885faaa4
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/uiOptionsDependencies.json

  Log Message:
  -----------
  FLUID-4927: added textfieldSlider to dependencies

Added TextfieldSlider.js to the UIO dependency file.


  Commit: 5f8360795660893dd38361abfe80ec5c10601152
      https://github.com/fluid-project/infusion/commit/5f8360795660893dd38361abfe80ec5c10601152
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/ModelRelay.js

  Log Message:
  -----------
  Merge branch 'FLUID-4908' into FLUID-4927


  Commit: 9f0841d33af25b5e8154726b186caf902c0e5a03
      https://github.com/fluid-project/infusion/commit/9f0841d33af25b5e8154726b186caf902c0e5a03
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/ModelRelay.js

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


  Commit: d844d27bc643c4ff867d7c5f6ba6017b6f115557
      https://github.com/fluid-project/infusion/commit/d844d27bc643c4ff867d7c5f6ba6017b6f115557
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/ModelRelay.js
    M src/webapp/tests/component-tests/uiOptions/js/ModelRelayTests.js

  Log Message:
  -----------
  Merge branch 'FLUID-4908' into FLUID-4927


  Commit: 36d87af98aaf6c9de37d745133e0d43a70425a66
      https://github.com/fluid-project/infusion/commit/36d87af98aaf6c9de37d745133e0d43a70425a66
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/ModelRelay.js
    M src/webapp/tests/component-tests/uiOptions/js/ModelRelayTests.js

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


  Commit: 81be990d02f6a7b24c3dabaab0a973e5959c7628
      https://github.com/fluid-project/infusion/commit/81be990d02f6a7b24c3dabaab0a973e5959c7628
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  Merge branch 'FLUID-4908' into FLUID-4927


  Commit: 85fa24b5384492442207b6c4ef27e53a03ee2762
      https://github.com/fluid-project/infusion/commit/85fa24b5384492442207b6c4ef27e53a03ee2762
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    A src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html

  Log Message:
  -----------
  FLUID-4927: Added the html file for settings panels unit tests.


  Commit: 640acc793522c2c29fcc5402244f475d8e3e2920
      https://github.com/fluid-project/infusion/commit/640acc793522c2c29fcc5402244f475d8e3e2920
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Added uiOptions tests for non-default uioptions.


  Commit: e5c88436ed05770709d390a81253293f0c1e0294
      https://github.com/fluid-project/infusion/commit/e5c88436ed05770709d390a81253293f0c1e0294
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html

  Log Message:
  -----------
  FLUID-4927: Fixed text field slider non-declarative settings. Tests pass.


  Commit: 39bff3e350c37fb6016fb9bd45d99a1b68fc6ab1
      https://github.com/fluid-project/infusion/commit/39bff3e350c37fb6016fb9bd45d99a1b68fc6ab1
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4927: Added back in the class name styles

Added back in the contrast class names to the contrast styles.


  Commit: 1422f69853b88f014bbea4734c0b4d48c220e10f
      https://github.com/fluid-project/infusion/commit/1422f69853b88f014bbea4734c0b4d48c220e10f
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4927: Moved contrast class to label

The contrast class had been placed on the span within the label, but needed to be on the label itself.


  Commit: a12de2aef223b33edcb2368bdf0b1db9386bc3ea
      https://github.com/fluid-project/infusion/commit/a12de2aef223b33edcb2368bdf0b1db9386bc3ea
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    A src/webapp/components/uiOptions/js/Enactors.js
    R src/webapp/components/uiOptions/js/Enactors.js
    A src/webapp/components/uiOptions/js/ModelRelay.js
    R src/webapp/components/uiOptions/js/ModelRelay.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4927-b


  Commit: e22f514bea82cc0e229d56d2f79cf363d542688a
      https://github.com/fluid-project/infusion/commit/e22f514bea82cc0e229d56d2f79cf363d542688a
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    A src/webapp/components/uiOptions/js/Enactors.js
    R src/webapp/components/uiOptions/js/Enactors.js
    A src/webapp/components/uiOptions/js/ModelRelay.js
    R src/webapp/components/uiOptions/js/ModelRelay.js

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


  Commit: ca50b2d6e435f2455fc58ce3e237e3fce19a0ae5
      https://github.com/fluid-project/infusion/commit/ca50b2d6e435f2455fc58ce3e237e3fce19a0ae5
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js

  Log Message:
  -----------
  FLUID-4927: using the defaults as a grade

Now that FLUID-4939 has been fixed, I've switched from using the defaults as the type of UIO to the a grade for UIO.


  Commit: 7c206df2e1ceb53b9fb1aba831c49de7ed435f20
      https://github.com/fluid-project/infusion/commit/7c206df2e1ceb53b9fb1aba831c49de7ed435f20
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

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


  Commit: ba7585945b37d6e3628f646ee1a8ff8291bd9715
      https://github.com/fluid-project/infusion/commit/ba7585945b37d6e3628f646ee1a8ff8291bd9715
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'yura/FLUID-4927-b' into FLUID-4927-b


  Commit: 877049103ba229771e48b2db709371af55638d7a
      https://github.com/fluid-project/infusion/commit/877049103ba229771e48b2db709371af55638d7a
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    A src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js

  Log Message:
  -----------
  FLUID-4927: Started on the unit tests for uiOptions.textFont which does not work yet in this commit.


  Commit: 9a0afc9c08b8336e1f8b5a0e0aa627ba97fd5f70
      https://github.com/fluid-project/infusion/commit/9a0afc9c08b8336e1f8b5a0e0aa627ba97fd5f70
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    A src/webapp/components/uiOptions/css/fonts/OpenSans-LICENSE.txt
    A src/webapp/components/uiOptions/css/fonts/OpenSans-Light.ttf
    A src/webapp/components/uiOptions/css/fonts/UIO.eot
    A src/webapp/components/uiOptions/css/fonts/UIO.ttf
    A src/webapp/components/uiOptions/css/fonts/UIO.woff

  Log Message:
  -----------
  FLUID-4970: Adding OpenSans Light and custom UIO icon fonts.


  Commit: 4043bc992cc58d2a32e81f16242e8c619d04ef51
      https://github.com/fluid-project/infusion/commit/4043bc992cc58d2a32e81f16242e8c619d04ef51
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/demos/uiOptions/html/uiOptions.html

  Log Message:
  -----------
  FLUID-4970: Added styles related to show/hide and reset tabs. Updated the demo HTML file to use the new tab layout and included TextfieldSlider.js and SettingsPanels.js.


  Commit: 73a330ea13acdecb0f91fc81e6d7c99ddfbbc04f
      https://github.com/fluid-project/infusion/commit/73a330ea13acdecb0f91fc81e6d7c99ddfbbc04f
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/UIOptions.css

  Log Message:
  -----------
  FLUID-4970: Added new Fat Panel styles and icon font styles.


  Commit: d8ab045ef73b42530f1bad809022d5a2da1dbb4b
      https://github.com/fluid-project/infusion/commit/d8ab045ef73b42530f1bad809022d5a2da1dbb4b
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html

  Log Message:
  -----------
  FLUID-4970: Changed markup to use panels instead of tabs.


  Commit: 78f893636fa5550c5e03de47ae77605e9d531f69
      https://github.com/fluid-project/infusion/commit/78f893636fa5550c5e03de47ae77605e9d531f69
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    M src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js

  Log Message:
  -----------
  FLUID-4827: Added unit tests for textFont panel.


  Commit: 16f9ac901ce42df339b34ec9ef784cb809beae06
      https://github.com/fluid-project/infusion/commit/16f9ac901ce42df339b34ec9ef784cb809beae06
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/FullNoPreviewUIOptions.html
    M src/webapp/components/uiOptions/html/FullPreviewUIOptions.html

  Log Message:
  -----------
  FLUID-4970: Added support for panel components to markup.


  Commit: 73a4383c457e802ffb588776cb576dc45018e9f2
      https://github.com/fluid-project/infusion/commit/73a4383c457e802ffb588776cb576dc45018e9f2
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html

  Log Message:
  -----------
  FLUID-4970: Adding new templates for contrast, line spacing, font style, and text size.


  Commit: 5eac161c7a0d764b64255696d9d1196ae709a2ce
      https://github.com/fluid-project/infusion/commit/5eac161c7a0d764b64255696d9d1196ae709a2ce
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-text.html
    A src/webapp/components/uiOptions/images/default/fatpanelbg.png

  Log Message:
  -----------
  FLUID-4970: Updated existing templates to use new panel components. Added background image for the fatpanel.


  Commit: 1d4a851279ff708300205d84b4b83ff55b859f78
      https://github.com/fluid-project/infusion/commit/1d4a851279ff708300205d84b4b83ff55b859f78
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

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


  Commit: c62a779a9925093997d61ff74d301b302298e5a1
      https://github.com/fluid-project/infusion/commit/c62a779a9925093997d61ff74d301b302298e5a1
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M src/webapp/demos/uiOptions/css/uiOptions.css
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html

  Log Message:
  -----------
  FLUID-4970: Added support for new fat panel UIO to demo.


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

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    M src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js
    M src/webapp/tests/test-core/testTests/js/TestingTests.js

  Log Message:
  -----------
  FLUID-4927: Added more unit tests for settings panels as well as jslinting TestingTests.js


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

  Changed paths:
    A src/webapp/tests/component-tests/uiOptions/all-tests.html
    M src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js

  Log Message:
  -----------
  FLUID-4927: Fixed the failing tests in IE9 and added all-tests.html for running all uiOptions unit tests at one shot.


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

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Refactored the repetition code in uiOptionsTests.


  Commit: 225cbc632ccebe43d59fcd54214bc09408a46422
      https://github.com/fluid-project/infusion/commit/225cbc632ccebe43d59fcd54214bc09408a46422
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4927: added comments about the default model

Added comments about the default models for the settingsPanels. The comments describe what the defaults are for and that they aren't contributed out.


  Commit: 65f9287d64988327fe6963a044f0ddf7f5c873a7
      https://github.com/fluid-project/infusion/commit/65f9287d64988327fe6963a044f0ddf7f5c873a7
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Brought in "preview" component only at testing preview rather than having "preview" with all unit tests. This is a step to fix IE failing of "iframe document is null or undefined" with some tests .


  Commit: 45a9498c1d35dd32ae4df635eae09bafed02b4e2
      https://github.com/fluid-project/infusion/commit/45a9498c1d35dd32ae4df635eae09bafed02b4e2
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/FullPreviewUIOptions.html
    R src/webapp/components/uiOptions/html/UIOptionsTemplate-text.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    A src/webapp/components/uiOptions/js/SettingsPanels.js
    A src/webapp/components/uiOptions/js/TextfieldSlider.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    A src/webapp/tests/component-tests/uiOptions/all-tests.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    A src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/manual-tests/html/SomeKindOfNews.html
    M src/webapp/tests/test-core/testTests/js/TestingTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'justin/FLUID-4927-b' into FLUID-4970

Conflicts:
	src/webapp/components/uiOptions/html/FatPanelUIOptions.html
	src/webapp/components/uiOptions/html/FullNoPreviewUIOptions.html
	src/webapp/components/uiOptions/html/FullPreviewUIOptions.html
	src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
	src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
	src/webapp/components/uiOptions/html/UIOptionsTemplate-text.html
	src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
	src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
	src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html


  Commit: dcbde68bed23f083f8829fface453bd7398ab70c
      https://github.com/fluid-project/infusion/commit/dcbde68bed23f083f8829fface453bd7398ab70c
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html

  Log Message:
  -----------
  FLUID-4970: Merged in branch 'justin/FLUID-4927-b'


  Commit: baed84c4709c549e9defac0a4fe43aa873178743
      https://github.com/fluid-project/infusion/commit/baed84c4709c549e9defac0a4fe43aa873178743
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4970: Icon fonts removed


  Commit: 4c0a1439ec8a1eecbaf6787bf9ba33d2546824fd
      https://github.com/fluid-project/infusion/commit/4c0a1439ec8a1eecbaf6787bf9ba33d2546824fd
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Fixed the IE failure at testing UIO preview component.


  Commit: d8979cad96bf7b883b62efc2af25303e173cc642
      https://github.com/fluid-project/infusion/commit/d8979cad96bf7b883b62efc2af25303e173cc642
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Fixed the full preview UIO integration test that fails in IE.


  Commit: 387b3dadaf5475a92fd95e57484e648c8a397ddb
      https://github.com/fluid-project/infusion/commit/387b3dadaf5475a92fd95e57484e648c8a397ddb
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    A src/webapp/components/uiOptions/images/bw/uio_icon_button.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_indicator.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_lineSpace.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_list.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_textStyle.png
    A src/webapp/components/uiOptions/images/by/uio_icon_button.png
    A src/webapp/components/uiOptions/images/by/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/by/uio_icon_indicator.png
    A src/webapp/components/uiOptions/images/by/uio_icon_lineSpace.png
    A src/webapp/components/uiOptions/images/by/uio_icon_list.png
    A src/webapp/components/uiOptions/images/by/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/by/uio_icon_textStyle.png
    A src/webapp/components/uiOptions/images/default/uio_icon_button.png
    A src/webapp/components/uiOptions/images/default/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/default/uio_icon_indicator.png
    A src/webapp/components/uiOptions/images/default/uio_icon_lineSpace.png
    A src/webapp/components/uiOptions/images/default/uio_icon_list.png
    A src/webapp/components/uiOptions/images/default/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/default/uio_icon_textStyle.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_button.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_indicator.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_lineSpace.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_list.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_textStyle.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_button.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_indicator.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_lineSpace.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_list.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_textStyle.png
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4970: Added images for header icons and contrast indicator arrow


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

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

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


  Commit: 3687924d3d52cc1edb36ce139d2ac1f8dbc9ee7d
      https://github.com/fluid-project/infusion/commit/3687924d3d52cc1edb36ce139d2ac1f8dbc9ee7d
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4970: Added font, slider colour, style tweaks


  Commit: 828ac988574a16e3eefb36f5670497890c2aef20
      https://github.com/fluid-project/infusion/commit/828ac988574a16e3eefb36f5670497890c2aef20
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M src/webapp/demos/uiOptions/css/uiOptions.css

  Log Message:
  -----------
  FLUID-4970: Demo style tweaks


  Commit: 254f9584abe98ba72b184938784cd5959915593c
      https://github.com/fluid-project/infusion/commit/254f9584abe98ba72b184938784cd5959915593c
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    R src/webapp/components/uiOptions/css/fonts/UIO.eot
    R src/webapp/components/uiOptions/css/fonts/UIO.ttf
    R src/webapp/components/uiOptions/css/fonts/UIO.woff

  Log Message:
  -----------
  FLUID-4970: Fonts


  Commit: b83136f596d799b057fbf02aa03e7353e0b4c5c2
      https://github.com/fluid-project/infusion/commit/b83136f596d799b057fbf02aa03e7353e0b4c5c2
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    M src/webapp/components/uiOptions/images/bw/uio_icon_lineSpace.png
    M src/webapp/components/uiOptions/images/by/uio_icon_lineSpace.png
    M src/webapp/components/uiOptions/images/default/uio_icon_lineSpace.png
    M src/webapp/components/uiOptions/images/wb/uio_icon_lineSpace.png
    M src/webapp/components/uiOptions/images/yb/uio_icon_lineSpace.png
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js

  Log Message:
  -----------
  FLUID-4970: Replaced line space icons, ie9 scrolling fix, bg image scaling


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

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Converted fluid.uiOptions.inline into an auto-init component. The fat panel unit test still fails in this commit.


  Commit: d47ab89d381996209179e96f6f951d16aed7dcd2
      https://github.com/fluid-project/infusion/commit/d47ab89d381996209179e96f6f951d16aed7dcd2
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    A src/webapp/lib/modernizr/js/modernizr.custom.js
    A src/webapp/lib/modernizr/modernizr-LICENSE.txt

  Log Message:
  -----------
  FLUID-4970: Added modernizr, reworked on/off control


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

  Changed paths:
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Get rid of nested expander as well as replacing the manual manipulation of the staticEnvironment with the new progressiveEnhancement API.


  Commit: a3b847de00da0a8871ca20bbc075088ab0016ddf
      https://github.com/fluid-project/infusion/commit/a3b847de00da0a8871ca20bbc075088ab0016ddf
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css

  Log Message:
  -----------
  FLUID-4970: graceful degradation for on/off in IE8


  Commit: aaa07ae8018a8b85c3c38f26ef37e9d1411c1376
      https://github.com/fluid-project/infusion/commit/aaa07ae8018a8b85c3c38f26ef37e9d1411c1376
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css

  Log Message:
  -----------
  FLUID-4970: graceful degradation for on/off in IE8


  Commit: 7f6bf2f343b9d512802884d1c2d171563e7a776f
      https://github.com/fluid-project/infusion/commit/7f6bf2f343b9d512802884d1c2d171563e7a776f
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/UIOptions.css

  Log Message:
  -----------
  FLUID-4966, FLUID-4970: Added the fix for the horizontal scrolling.


  Commit: 87173af5bfe9e64879d1387231a43d27faf5af9b
      https://github.com/fluid-project/infusion/commit/87173af5bfe9e64879d1387231a43d27faf5af9b
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    A src/webapp/components/uiOptions/css/ie8.css
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    R src/webapp/lib/modernizr/js/modernizr.custom.js
    R src/webapp/lib/modernizr/modernizr-LICENSE.txt

  Log Message:
  -----------
  FLUID-4970: Removed modernizr - buggy. IE8 css for now


  Commit: 5ea1a101a6f8df5adda30663c44bc8d4af5188ae
      https://github.com/fluid-project/infusion/commit/5ea1a101a6f8df5adda30663c44bc8d4af5188ae
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/UIOptions.css

  Log Message:
  -----------
  Merge remote-tracking branch 'jon/FLUID-4970' into FLUID-4970


  Commit: 1303f387a78dbdf6ff146103e71d2229337ed63d
      https://github.com/fluid-project/infusion/commit/1303f387a78dbdf6ff146103e71d2229337ed63d
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js

  Log Message:
  -----------
  FLUID-4974: Wired up the reset button in FP UIO

The fatpanel UIO will now also look for a reset button to attach to. This is to allow it to add a reset button on the sliding panel. The styling/markup additions for this will come as part of the FLUID-4970 work.


  Commit: d831ec1a763d2cab709371e58f68caff52dde77f
      https://github.com/fluid-project/infusion/commit/d831ec1a763d2cab709371e58f68caff52dde77f
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

  Changed paths:
    M src/webapp/demos/uiOptions/html/uiOptions.html

  Log Message:
  -----------
  FLUID-4970: Fixed the panel so the show/hide panel doesn't change sizes when used.


  Commit: 5a2d7751e252f787c0f67073433c8a0be18cdcd6
      https://github.com/fluid-project/infusion/commit/5a2d7751e252f787c0f67073433c8a0be18cdcd6
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

  Log Message:
  -----------
  Merge branch 'FLUID-4927-b-jobara' into FLUID-4970


  Commit: b3ffd335213f8b8b21d946c01c97b026a4cde548
      https://github.com/fluid-project/infusion/commit/b3ffd335213f8b8b21d946c01c97b026a4cde548
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/demos/uiOptions/css/uiOptions.css

  Log Message:
  -----------
  FLUID-4970: Fixed formatting on the show/hide tab. Added styling which should allow horizontal scrolling without specifying a width.


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

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js

  Log Message:
  -----------
  FLUID-4974: removed console.log


  Commit: 9051722f0ab7423692d651ff6984cc94ea781f20
      https://github.com/fluid-project/infusion/commit/9051722f0ab7423692d651ff6984cc94ea781f20
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js

  Log Message:
  -----------
  Merge remote-tracking branch 'justin/FLUID-4927-b' into FLUID-4970


  Commit: 6267852f7c0ec93e6f3f035f50f755accd436228
      https://github.com/fluid-project/infusion/commit/6267852f7c0ec93e6f3f035f50f755accd436228
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js

  Log Message:
  -----------
  Merge branch 'FLUID-4927-b-jobara' into FLUID-4970


  Commit: d1b993d88b800f3a9c69c0618d68094af4c09815
      https://github.com/fluid-project/infusion/commit/d1b993d88b800f3a9c69c0618d68094af4c09815
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js

  Log Message:
  -----------
  FLUID-4927: Jslinted fatPanelUIOptions.js


  Commit: 23389af2bc2da4895ca4be3d4c1cb84d44a0d695
      https://github.com/fluid-project/infusion/commit/23389af2bc2da4895ca4be3d4c1cb84d44a0d695
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Log Message:
  -----------
  Merge remote-tracking branch 'jon/FLUID-4970' into FLUID-4970


  Commit: 98ae4e07fe867476b7df6e93ce804a90290791c5
      https://github.com/fluid-project/infusion/commit/98ae4e07fe867476b7df6e93ce804a90290791c5
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html

  Log Message:
  -----------
  FLUID-4970: Over-riding html: overflow set in fss-global, to fix scrolling bug in chrome


  Commit: af8ec7b2a71d820e82a995f4d8ac16e3a80cb8cc
      https://github.com/fluid-project/infusion/commit/af8ec7b2a71d820e82a995f4d8ac16e3a80cb8cc
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css

  Log Message:
  -----------
  FLUID-4970: Over-riding html: overflow set in fss-global, to fix scrolling bug in chrome


  Commit: 1f929ceb391e12a19a5ef98437f81a09d06d35b1
      https://github.com/fluid-project/infusion/commit/1f929ceb391e12a19a5ef98437f81a09d06d35b1
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css

  Log Message:
  -----------
  FLUID-4970: Over-riding html: overflow set in fss-global, to fix scrolling bug in chrome


  Commit: f2b5f0ba4df456410e4254334e591678d363bce2
      https://github.com/fluid-project/infusion/commit/f2b5f0ba4df456410e4254334e591678d363bce2
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M src/webapp/demos/uiOptions/css/uiOptions.css

  Log Message:
  -----------
  FLUID-4970: Tweak to keep right border between reset/show-hide for themes


  Commit: 36540c669dd1d4cea253e9d2ad59e636068559b6
      https://github.com/fluid-project/infusion/commit/36540c669dd1d4cea253e9d2ad59e636068559b6
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html

  Log Message:
  -----------
  FLUID-4927: Fixed the gap above the UIO panel in the fat panel view.


  Commit: 079a33e9db35aa054aa4c4a7cdc8da0e18eccf5d
      https://github.com/fluid-project/infusion/commit/079a33e9db35aa054aa4c4a7cdc8da0e18eccf5d
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js

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


  Commit: c0bb47017653f6ff58315f82af23d64cc71ab1f2
      https://github.com/fluid-project/infusion/commit/c0bb47017653f6ff58315f82af23d64cc71ab1f2
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js

  Log Message:
  -----------
  FLUID-4970: More changes to scrolling/overflow issue. Moved hard-coded overflow styles out of js


  Commit: 52e41fa04fd07dea16d101decdca3f50e04c0fda
      https://github.com/fluid-project/infusion/commit/52e41fa04fd07dea16d101decdca3f50e04c0fda
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: A intermittent commit with a half refactored fat panel integration tests.


  Commit: 3042d8f63d0b3cf457012ae8ac3755d80886761b
      https://github.com/fluid-project/infusion/commit/3042d8f63d0b3cf457012ae8ac3755d80886761b
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

  Log Message:
  -----------
  FLUID-4974: refactored jqFn to fluid.bind

Moved fluid.uiOptions.fatPanel.jqFn to fluid.bind and set it up as a general that-ist binding function. Added tests.


  Commit: 2777dd27929b57d0480fce6170bc36d88376260d
      https://github.com/fluid-project/infusion/commit/2777dd27929b57d0480fce6170bc36d88376260d
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: More progress at rewriting fat panel unit tests.


  Commit: ba7cad0189dc4959410adc6c3e896942215b588e
      https://github.com/fluid-project/infusion/commit/ba7cad0189dc4959410adc6c3e896942215b588e
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js

  Log Message:
  -----------
  FLUID-4927: Refactored the first fat panel integration test to use IoC test utility. Another integration test for options munging is coming.


  Commit: 6126695ed247093086eb3e297e6be15f757ee6ee
      https://github.com/fluid-project/infusion/commit/6126695ed247093086eb3e297e6be15f757ee6ee
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

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


  Commit: 0472cd2cb79bd26bd99e66a1579caec9c6d90ea5
      https://github.com/fluid-project/infusion/commit/0472cd2cb79bd26bd99e66a1579caec9c6d90ea5
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js

  Log Message:
  -----------
  FLUID-4927: Refactored munging integration tests.


  Commit: ec1ff6fd995bdad84aa90de484c03bd99407c6bf
      https://github.com/fluid-project/infusion/commit/ec1ff6fd995bdad84aa90de484c03bd99407c6bf
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js

  Log Message:
  -----------
  Merge remote-tracking branch 'yura/FLUID-4927-temp' into FLUID-4927


  Commit: e1ea7e287df29855ccd52032580f645e0d5a0e51
      https://github.com/fluid-project/infusion/commit/e1ea7e287df29855ccd52032580f645e0d5a0e51
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js

  Log Message:
  -----------
  FLUID-4927: Fixed restarting tests in munging integration tests.


  Commit: 8601159b8a4c4ab9cdc852e22e36b945dc7c57a6
      https://github.com/fluid-project/infusion/commit/8601159b8a4c4ab9cdc852e22e36b945dc7c57a6
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js

  Log Message:
  -----------
  Merge remote-tracking branch 'yura/FLUID-4927-temp' into FLUID-4927


  Commit: d842b7467b67d05aaa823934d7a2dd99b028940f
      https://github.com/fluid-project/infusion/commit/d842b7467b67d05aaa823934d7a2dd99b028940f
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Grouped each integration tests.


  Commit: ca3454e7647ea619620b0176e4c665deeff79897
      https://github.com/fluid-project/infusion/commit/ca3454e7647ea619620b0176e4c665deeff79897
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/Enactors.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/tests/component-tests/uiOptions/html/Enactors-test.html
    M src/webapp/tests/component-tests/uiOptions/js/EnactorsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

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


  Commit: d6cd3e1e16befc38001656a5e7c174ff681e59ca
      https://github.com/fluid-project/infusion/commit/d6cd3e1e16befc38001656a5e7c174ff681e59ca
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js

  Log Message:
  -----------
  FLUID-4927: Completed re-writing fat panel integration tests with IoC utility.


  Commit: 01320f1cdf429a0a6fc53a636d2ea81c253c6675
      https://github.com/fluid-project/infusion/commit/01320f1cdf429a0a6fc53a636d2ea81c253c6675
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Fixed the IE8 failure with UIOptions "preview URL" test.


  Commit: f142f343476d6eb92858c13a199e8f2e73bdfe75
      https://github.com/fluid-project/infusion/commit/f142f343476d6eb92858c13a199e8f2e73bdfe75
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

  Changed paths:
    R src/webapp/components/uiOptions/css/fonts/OpenSans-LICENSE.txt
    R src/webapp/components/uiOptions/css/fonts/OpenSans-Light.ttf
    A src/webapp/lib/fonts/OpenSans-LICENSE.txt
    A src/webapp/lib/fonts/OpenSans-Light.ttf

  Log Message:
  -----------
  FLUID-4970: Moved fonts directory into /lib directory. Updated ReleaseNotes.txt with OpenSans Light license info.


  Commit: c4d7ec497b6a7dcc83d3d22558492a6cb5dd7f67
      https://github.com/fluid-project/infusion/commit/c4d7ec497b6a7dcc83d3d22558492a6cb5dd7f67
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

  Changed paths:
    M ReleaseNotes.txt

  Log Message:
  -----------
  FLUID-4970: Updated ReleaseNotes.txt with OpenSans Light license info.


  Commit: ca901c33b448711cec49ed5f2f948a57a725eff6
      https://github.com/fluid-project/infusion/commit/ca901c33b448711cec49ed5f2f948a57a725eff6
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/TextfieldSlider.js
    M src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html

  Log Message:
  -----------
  FLUID-4927: Use html5 doctype for new html files.


  Commit: 297d99f0f1b6f83632af06cedfdcd76cbff56595
      https://github.com/fluid-project/infusion/commit/297d99f0f1b6f83632af06cedfdcd76cbff56595
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js

  Log Message:
  -----------
  FLUID-4927: Get rid of the nested expander in fat panel.


  Commit: 57ed0ccb83028222b6f95544a599daf208875518
      https://github.com/fluid-project/infusion/commit/57ed0ccb83028222b6f95544a599daf208875518
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Removed the old fat panel integration tests which have been re-written with IoC utility.


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

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/manual-tests/html/SomeKindOfNews.html
    M src/webapp/tests/manual-tests/js/someKindOfNews.js

  Log Message:
  -----------
  FLUID-4927: Re-organized settings panel grades; created an empty template loader and a default template loader grade for UIO default settings panels.


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

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4927: Extracted shared options that are to connect default settings panels with uiOptions into another grade "defaultSettingsPanel".


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

  Changed paths:
    A src/webapp/components/uiOptions/js/Enactor.js
    R src/webapp/components/uiOptions/js/Enactors.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/html/portal.html
    A src/webapp/tests/component-tests/uiOptions/html/Enactor-test.html
    R src/webapp/tests/component-tests/uiOptions/html/Enactors-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/js/EnactorTests.js
    R src/webapp/tests/component-tests/uiOptions/js/EnactorsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js

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


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

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/all-tests.html
    M src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    M src/webapp/tests/manual-tests/html/SomeKindOfNews.html

  Log Message:
  -----------
  FLUID-4927: Comply to the renaming of enactors to enactor.


  Commit: 9b53522bd397b580e951fc5d1408c982613c4f12
      https://github.com/fluid-project/infusion/commit/9b53522bd397b580e951fc5d1408c982613c4f12
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/ie8.css

  Log Message:
  -----------
  FLUID-4970: CSS validated.


  Commit: 0bdc275a166eb3b58c728f15a5677a9c80e10824
      https://github.com/fluid-project/infusion/commit/0bdc275a166eb3b58c728f15a5677a9c80e10824
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    M src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js

  Log Message:
  -----------
  FLUID-4927: code clean up.


  Commit: c9134d618aed59a51fa3412817f7fbed9eaed95e
      https://github.com/fluid-project/infusion/commit/c9134d618aed59a51fa3412817f7fbed9eaed95e
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

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

  Log Message:
  -----------
  FLUID-4927: Added the uiOptions "all-tests.html" into the main "all-tests.html" in the root.


  Commit: c100a960592d4a8e87d67743c5875f9e6609c719
      https://github.com/fluid-project/infusion/commit/c100a960592d4a8e87d67743c5875f9e6609c719
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js

  Log Message:
  -----------
  FLUID-4927: Simplified the retrieving of original uiEnhancer options.


  Commit: 05071431ca150a58c595f2181bd7a52ae27ae92e
      https://github.com/fluid-project/infusion/commit/05071431ca150a58c595f2181bd7a52ae27ae92e
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/html/FullNoPreviewUIOptions.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html

  Log Message:
  -----------
  FLUID-4970: Added end line to templates, changed on/off switch to use data-attribs for content, rearranged vendor/standard css


  Commit: 838e186258bc74ef26edc92789d1a9c9b2fb7593
      https://github.com/fluid-project/infusion/commit/838e186258bc74ef26edc92789d1a9c9b2fb7593
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4927: Fixed typo.


  Commit: 61324401709e4b81e764ecaeda0508c9076828f0
      https://github.com/fluid-project/infusion/commit/61324401709e4b81e764ecaeda0508c9076828f0
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js

  Log Message:
  -----------
  FLUID-4927: Implemented the grade component "originalEnhancerOptions" for pageEnhancer to keep track of the original user options so that the retrieval of those options for uiEnhancers used in iframes no longer needs to reference to {uiEnhancer} which is also referenced by the main page itself. This reduces the risk of ambiguity.


  Commit: 69a0f72ef0b4ea33e4ddd271da4bc6057f008f60
      https://github.com/fluid-project/infusion/commit/69a0f72ef0b4ea33e4ddd271da4bc6057f008f60
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4927: Improvements on settingsPanel  and selectDecorator.


  Commit: 567550f8a51ba75b18164c53d45e485b6de97f1c
      https://github.com/fluid-project/infusion/commit/567550f8a51ba75b18164c53d45e485b6de97f1c
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/UIEnhancer.js

  Log Message:
  -----------
  FLUID-4927: Removed the unnecessary copy of original uiEnhancer options.


  Commit: fa0d0c9e1995c6a02de1e552552d12f9904ca604
      https://github.com/fluid-project/infusion/commit/fa0d0c9e1995c6a02de1e552552d12f9904ca604
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-4927: Replaced "finalInit" function for textfieldSlider.slider with "onCreate" listener.


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

  Changed paths:
    M src/webapp/components/uiOptions/js/TextfieldSlider.js
    M src/webapp/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-4927: Moved some finalInit processes into onCreate listeners.


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

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js

  Log Message:
  -----------
  FLUID-4927: Used the reset button on the fat panel test html rather than the template for the integration test since the reset button is removed from the template in the new styling design.


  Commit: 6b19e2e0b8781cedd9570774d2e95be94d1f83a0
      https://github.com/fluid-project/infusion/commit/6b19e2e0b8781cedd9570774d2e95be94d1f83a0
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/components/uiOptions/html/FullNoPreviewUIOptions.html
    M src/webapp/components/uiOptions/html/FullPreviewUIOptions.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    R src/webapp/components/uiOptions/html/UIOptionsTemplate-text.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    A src/webapp/components/uiOptions/js/SettingsPanels.js
    A src/webapp/components/uiOptions/js/TextfieldSlider.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/tests/all-tests.html
    A src/webapp/tests/component-tests/uiOptions/all-tests.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    A src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/manual-tests/html/SomeKindOfNews.html
    M src/webapp/tests/manual-tests/js/someKindOfNews.js
    M src/webapp/tests/test-core/testTests/js/TestingTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'cindyli/FLUID-4927'

* cindyli/FLUID-4927:
  FLUID-4927: Used the reset button on the fat panel test html rather than the template for the integration test since the reset button is removed from the template in the new styling design.
  FLUID-4927: Moved some finalInit processes into onCreate listeners.
  FLUID-4927: Replaced "finalInit" function for textfieldSlider.slider with "onCreate" listener.
  FLUID-4927: Removed the unnecessary copy of original uiEnhancer options.
  FLUID-4927: Improvements on settingsPanel  and selectDecorator.
  FLUID-4927: Implemented the grade component "originalEnhancerOptions" for pageEnhancer to keep track of the original user options so that the retrieval of those options for uiEnhancers used in iframes no longer needs to reference to {uiEnhancer} which is also referenced by the main page itself. This reduces the risk of ambiguity.
  FLUID-4927: Fixed typo.
  FLUID-4927: Simplified the retrieving of original uiEnhancer options.
  FLUID-4927: Added the uiOptions "all-tests.html" into the main "all-tests.html" in the root.
  FLUID-4927: code clean up.
  FLUID-4927: Comply to the renaming of enactors to enactor.
  FLUID-4927: Extracted shared options that are to connect default settings panels with uiOptions into another grade "defaultSettingsPanel".
  FLUID-4927: Re-organized settings panel grades; created an empty template loader and a default template loader grade for UIO default settings panels.
  FLUID-4927: Removed the old fat panel integration tests which have been re-written with IoC utility.
  FLUID-4927: Get rid of the nested expander in fat panel.
  FLUID-4927: Use html5 doctype for new html files.
  FLUID-4927: Fixed the IE8 failure with UIOptions "preview URL" test.
  FLUID-4927: Completed re-writing fat panel integration tests with IoC utility.
  FLUID-4927: Grouped each integration tests.
  FLUID-4927: Fixed restarting tests in munging integration tests.
  FLUID-4927: Refactored munging integration tests.
  FLUID-4927: Refactored the first fat panel integration test to use IoC test utility. Another integration test for options munging is coming.
  FLUID-4927: More progress at rewriting fat panel unit tests.
  FLUID-4974: refactored jqFn to fluid.bind
  FLUID-4927: A intermittent commit with a half refactored fat panel integration tests.
  FLUID-4927: Fixed the gap above the UIO panel in the fat panel view.
  FLUID-4927: Jslinted fatPanelUIOptions.js
  FLUID-4974: removed console.log
  FLUID-4974: Wired up the reset button in FP UIO
  FLUID-4927: Get rid of nested expander as well as replacing the manual manipulation of the staticEnvironment with the new progressiveEnhancement API.
  FLUID-4927: Converted fluid.uiOptions.inline into an auto-init component. The fat panel unit test still fails in this commit.
  FLUID-4927: Fixed the full preview UIO integration test that fails in IE.
  FLUID-4927: Fixed the IE failure at testing UIO preview component.
  FLUID-4927: Brought in "preview" component only at testing preview rather than having "preview" with all unit tests. This is a step to fix IE failing of "iframe document is null or undefined" with some tests .
  FLUID-4927: added comments about the default model
  FLUID-4927: Refactored the repetition code in uiOptionsTests.
  FLUID-4927: Fixed the failing tests in IE9 and added all-tests.html for running all uiOptions unit tests at one shot.
  FLUID-4927: Added more unit tests for settings panels as well as jslinting TestingTests.js
  FLUID-4827: Added unit tests for textFont panel.
  FLUID-4927: Started on the unit tests for uiOptions.textFont which does not work yet in this commit.
  FLUID-4927: using the defaults as a grade
  FLUID-4927: Moved contrast class to label
  FLUID-4927: Added back in the class name styles
  FLUID-4927: Fixed text field slider non-declarative settings. Tests pass.
  FLUID-4927: Added uiOptions tests for non-default uioptions.
  FLUID-4927: Added the html file for settings panels unit tests.
  FLUID-4927: added textfieldSlider to dependencies
  FLUID-4927: refactored TextfieldSlider
  FLUID-4927: Fixed UIOptions unit tests.
  FLUID-4927: added missing TextFieldSlider.js file
  FLUID-4927: Moved textfieldSlider to its own file
  FLUID-4927: Added in SettingsPanels to dependency
  FLUID-4927: Fixed fat panel uioptions tests. Only uioptions tests to go.
  FLUID-4927: Added style invoker for the contrast that renders labels.
  FLUID-4927: added working proto tree for radio buttons (contrast).
  FLUID-4927: Updated settingsPanel grade's refreshView declaration and removed a pre init function.
  FLUID-4927: Renamed settingsPanels grade to settingsPanel.
  FLUID-4927: cleaned up the settingsPanel grade
  FLUID-4927: moved lateRefreshViewBinder
  FLUID-4927: Removed defaultModel
  FLUID-4927: removed some model munging
  FLUID-4927: Removed classname map from some panels
  FLUID-4927: Moved out templateLoader references
  FLUID-4927: modelRelay used in all settings panels
  FLUID-4927: Implemented model relay into textSize panel ant so the ant can only work on its own private model.
  FLUID-4927: fixed template for full w/ preview
  FLUID-4927: Split UIOptions.js into two files. One contains all the settings panel ants and the other is the assembler.
  FLUID-4927: Split text control panel into 4 individual panels.
  FLUID-4927: Moved default panels config to a grade
  FLUID-4927: fixing unit tests
  FLUID-4927: removed preview from default UIO
  FLUID-4927: removed panel config from default uio


  Commit: b8c2e1b33361d0cbb89186581a6de6243a6ad2c2
      https://github.com/fluid-project/infusion/commit/b8c2e1b33361d0cbb89186581a6de6243a6ad2c2
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M ReleaseNotes.txt
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    A src/webapp/components/uiOptions/css/ie8.css
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/components/uiOptions/html/FullNoPreviewUIOptions.html
    M src/webapp/components/uiOptions/html/FullPreviewUIOptions.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    A src/webapp/components/uiOptions/images/bw/uio_icon_button.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_indicator.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_lineSpace.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_list.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_textStyle.png
    A src/webapp/components/uiOptions/images/by/uio_icon_button.png
    A src/webapp/components/uiOptions/images/by/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/by/uio_icon_indicator.png
    A src/webapp/components/uiOptions/images/by/uio_icon_lineSpace.png
    A src/webapp/components/uiOptions/images/by/uio_icon_list.png
    A src/webapp/components/uiOptions/images/by/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/by/uio_icon_textStyle.png
    A src/webapp/components/uiOptions/images/default/fatpanelbg.png
    A src/webapp/components/uiOptions/images/default/uio_icon_button.png
    A src/webapp/components/uiOptions/images/default/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/default/uio_icon_indicator.png
    A src/webapp/components/uiOptions/images/default/uio_icon_lineSpace.png
    A src/webapp/components/uiOptions/images/default/uio_icon_list.png
    A src/webapp/components/uiOptions/images/default/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/default/uio_icon_textStyle.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_button.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_indicator.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_lineSpace.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_list.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/wb/uio_icon_textStyle.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_button.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_indicator.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_lineSpace.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_list.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/yb/uio_icon_textStyle.png
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/demos/uiOptions/css/uiOptions.css
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    A src/webapp/lib/fonts/OpenSans-LICENSE.txt
    A src/webapp/lib/fonts/OpenSans-Light.ttf

  Log Message:
  -----------
  Merge remote-tracking branch 'heidiv/FLUID-4970'

* heidiv/FLUID-4970:
  FLUID-4970: Added end line to templates, changed on/off switch to use data-attribs for content, rearranged vendor/standard css
  FLUID-4970: CSS validated.
  FLUID-4970: Updated ReleaseNotes.txt with OpenSans Light license info.
  FLUID-4970: Moved fonts directory into /lib directory. Updated ReleaseNotes.txt with OpenSans Light license info.
  FLUID-4970: More changes to scrolling/overflow issue. Moved hard-coded overflow styles out of js
  FLUID-4970: Tweak to keep right border between reset/show-hide for themes
  FLUID-4970: Over-riding html: overflow set in fss-global, to fix scrolling bug in chrome
  FLUID-4970: Over-riding html: overflow set in fss-global, to fix scrolling bug in chrome
  FLUID-4970: Over-riding html: overflow set in fss-global, to fix scrolling bug in chrome
  FLUID-4970: Fixed formatting on the show/hide tab. Added styling which should allow horizontal scrolling without specifying a width.
  FLUID-4970: Fixed the panel so the show/hide panel doesn't change sizes when used.
  FLUID-4970: Removed modernizr - buggy. IE8 css for now
  FLUID-4966, FLUID-4970: Added the fix for the horizontal scrolling.
  FLUID-4970: graceful degradation for on/off in IE8
  FLUID-4970: graceful degradation for on/off in IE8
  FLUID-4970: Added modernizr, reworked on/off control
  FLUID-4970: Replaced line space icons, ie9 scrolling fix, bg image scaling
  FLUID-4970: Fonts
  FLUID-4970: Demo style tweaks
  FLUID-4970: Added font, slider colour, style tweaks
  FLUID-4970: Added images for header icons and contrast indicator arrow
  FLUID-4970: Icon fonts removed
  FLUID-4970: Merged in branch 'justin/FLUID-4927-b'
  FLUID-4970: Added support for new fat panel UIO to demo.
  FLUID-4970: Updated existing templates to use new panel components. Added background image for the fatpanel.
  FLUID-4970: Adding new templates for contrast, line spacing, font style, and text size.
  FLUID-4970: Added support for panel components to markup.
  FLUID-4970: Changed markup to use panels instead of tabs.
  FLUID-4970: Added new Fat Panel styles and icon font styles.
  FLUID-4970: Added styles related to show/hide and reset tabs. Updated the demo HTML file to use the new tab layout and included TextfieldSlider.js and SettingsPanels.js.
  FLUID-4970: Adding OpenSans Light and custom UIO icon fonts.

Conflicts:
	src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html


Compare: https://github.com/fluid-project/infusion/compare/1f2bbbefc881...b8c2e1b33361


More information about the Commits mailing list