[Commits] [fluid-project/infusion] 61e639: Start of updating UIO design

GitHub noreply at github.com
Wed Mar 27 09:10:33 EDT 2013


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/infusion
  Commit: 61e6399b088f561eded647319413b32ad63c69ab
      https://github.com/fluid-project/infusion/commit/61e6399b088f561eded647319413b32ad63c69ab
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    A src/webapp/components/uiOptions/images/default/fatpanelbg.png

  Log Message:
  -----------
  Start of updating UIO design


  Commit: d36d54a032a1b6312a48baf4f2b1f7d1bc2b6894
      https://github.com/fluid-project/infusion/commit/d36d54a032a1b6312a48baf4f2b1f7d1bc2b6894
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    R src/webapp/components/uiOptions/images/default/fatpanelbg.png
    A src/webapp/components/uiOptions/images/default/fatpanelbg.png

  Log Message:
  -----------
  Implementing new UIO mockups


  Commit: 7bf35e2c2038e8b1b90bf553083b1f20f3ffbca2
      https://github.com/fluid-project/infusion/commit/7bf35e2c2038e8b1b90bf553083b1f20f3ffbca2
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-19 (Tue, 19 Mar 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/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.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
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/framework/renderer/js/RendererUtilities.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
    M src/webapp/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js

  Log Message:
  -----------
  Merged justin's panel component changes


  Commit: 858218a39050ad13f7e92ab527c0be93d34e6136
      https://github.com/fluid-project/infusion/commit/858218a39050ad13f7e92ab527c0be93d34e6136
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

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

  Log Message:
  -----------
  Merged justin's panel component changes


  Commit: 7042fb09c2cb55997fd7465607de769170ff6372
      https://github.com/fluid-project/infusion/commit/7042fb09c2cb55997fd7465607de769170ff6372
  Author: heidi valles <hvalles 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
    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:
  -----------
  Merge remote-tracking branch 'justin/FLUID-4927-b' into FLUID-4938


  Commit: 5971e305060d18efa13626e56d10ac5d7e5563d1
      https://github.com/fluid-project/infusion/commit/5971e305060d18efa13626e56d10ac5d7e5563d1
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.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
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js

  Log Message:
  -----------
  FLUID-4938: Merged Justin & Cindy's panel work, tweaked panel markup, started FatPanel css


  Commit: 4d751e453ceef212c9d40b30637af6a7a8fdae2d
      https://github.com/fluid-project/infusion/commit/4d751e453ceef212c9d40b30637af6a7a8fdae2d
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

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

  Log Message:
  -----------
  FLUID-4938: Slider styling


  Commit: 363032546245d46701ee9e768e0aa79be39af10a
      https://github.com/fluid-project/infusion/commit/363032546245d46701ee9e768e0aa79be39af10a
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.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-4938: Added headers


  Commit: c82a46086965469d349f6e5a9cecb51165b65232
      https://github.com/fluid-project/infusion/commit/c82a46086965469d349f6e5a9cecb51165b65232
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/components/reorderer/js/Reorderer.js
    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/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/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/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/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/html/portal.html
    M src/webapp/tests/all-tests.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/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:
  -----------
  FLUID-4938: Merged justin's branch


  Commit: 6a282b411ef468f6175dc3dd79a0b73084e669bc
      https://github.com/fluid-project/infusion/commit/6a282b411ef468f6175dc3dd79a0b73084e669bc
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

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

  Log Message:
  -----------
  FLUID-4938: First pass at adding a sliding toggle to the Fat Panel. The implementation is not quite valid as divs can not reside inside labels. This should be changed to spans instead. Also the positioning and visibility of the original checkbox needs to be fixed.


  Commit: 81d417ad767251b5eabd98bc145e46913c722745
      https://github.com/fluid-project/infusion/commit/81d417ad767251b5eabd98bc145e46913c722745
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

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

  Log Message:
  -----------
  FLUID-4938: Radio button styling


  Commit: e10100b23efa29b1a9591a44f52a7a63ed351f0b
      https://github.com/fluid-project/infusion/commit/e10100b23efa29b1a9591a44f52a7a63ed351f0b
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Log Message:
  -----------
  Merge branch 'FLUID-4938-heidi', remote-tracking branch 'heidi/FLUID-4938' into FLUID-4938-heidi


  Commit: b8687ded84d58d3caefcbf1f427fbdee4ac0c19e
      https://github.com/fluid-project/infusion/commit/b8687ded84d58d3caefcbf1f427fbdee4ac0c19e
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M src/webapp/components/reorderer/js/Reorderer.js
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.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/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/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/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/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/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/html/portal.html
    M src/webapp/tests/all-tests.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/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 branches 'FLUID-4938-heidi' and 'FLUID-4938' into FLUID-4938


  Commit: 6134b2dc09a49d0cc59d86bd03d66f6f3feaddc9
      https://github.com/fluid-project/infusion/commit/6134b2dc09a49d0cc59d86bd03d66f6f3feaddc9
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

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

  Log Message:
  -----------
  FLUID-4938: Added header to the table of contents option panel. Changed the divs to spans so it will validate. Still have an issue with focus not applying when checkbox has focus.


  Commit: 8afdc372b95ca9a1dc8ae7148551a02c7aafea85
      https://github.com/fluid-project/infusion/commit/8afdc372b95ca9a1dc8ae7148551a02c7aafea85
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

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

  Log Message:
  -----------
  FLUID-4938: Added cross-browser styling for the toggle knob. Moved to label sibling to checkbox (checkbox no longer a child of the label.


  Commit: c4e81b2c60b160c812b1ef85679513d9d6dc46fc
      https://github.com/fluid-project/infusion/commit/c4e81b2c60b160c812b1ef85679513d9d6dc46fc
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

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

  Log Message:
  -----------
  FLUID-4938: Changed font colour to white when TOC checkbox is checked.


  Commit: 11efaf914699f4e371d3d7d59eed2081eafac9cf
      https://github.com/fluid-project/infusion/commit/11efaf914699f4e371d3d7d59eed2081eafac9cf
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

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

  Log Message:
  -----------
  FLUID-4938: Removed some old unused styles.


  Commit: 43a11e99d7c7313bb9405174c0fb3f834ae35c4b
      https://github.com/fluid-project/infusion/commit/43a11e99d7c7313bb9405174c0fb3f834ae35c4b
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

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

  Log Message:
  -----------
  FLUID-4938: Updated prefiexes for table of content style names.


  Commit: ac274872493523f18133445ef6fab3ab4c863d79
      https://github.com/fluid-project/infusion/commit/ac274872493523f18133445ef6fab3ab4c863d79
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 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/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/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/framework/core/js/FluidIoC.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/js/portal.js
    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/PageEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-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/ModelRelayTests.js
    A src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  NO-JIRA: Merged with heidi's branch.


  Commit: a8929300afdb16d0f649c8e17a5ebeac37a3f03d
      https://github.com/fluid-project/infusion/commit/a8929300afdb16d0f649c8e17a5ebeac37a3f03d
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

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

  Log Message:
  -----------
  FLUID-4938: Restyled the toggle to more closely match the wireframe. Added containers to description and checkbos / toggle so it lays out as in the wireframe.


  Commit: 20c495cf5c6d609692e48b57aca01ddb3d5563fe
      https://github.com/fluid-project/infusion/commit/20c495cf5c6d609692e48b57aca01ddb3d5563fe
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

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

  Log Message:
  -----------
  FLUID-4938: Changed title of to 'Simplify'.


  Commit: bc4d5dcda17fd6b7071d1f17ef9df1502398f81a
      https://github.com/fluid-project/infusion/commit/bc4d5dcda17fd6b7071d1f17ef9df1502398f81a
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

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

  Log Message:
  -----------
  NO_JIRA: Merging heidi's updates.


  Commit: a974056e57cea60856f5e29d0eea33c8b8bb2a1f
      https://github.com/fluid-project/infusion/commit/a974056e57cea60856f5e29d0eea33c8b8bb2a1f
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    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
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/framework/core/js/Fluid.js
    A src/webapp/integration-demos/uiOptions/ClimateChange.html
    A src/webapp/integration-demos/uiOptions/images/article_climate_change_1.gif
    A src/webapp/integration-demos/uiOptions/images/article_climate_change_2.gif
    A src/webapp/integration-demos/uiOptions/images/article_climate_change_3.gif
    A src/webapp/integration-demos/uiOptions/images/bg.gif
    A src/webapp/integration-demos/uiOptions/images/climate_change_collection_img.jpg
    A src/webapp/integration-demos/uiOptions/images/feature_stories_bullet.png
    A src/webapp/integration-demos/uiOptions/images/head_commerce.png
    A src/webapp/integration-demos/uiOptions/images/head_title.gif
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet.png
    A src/webapp/integration-demos/uiOptions/images/nav_bar.png
    A src/webapp/integration-demos/uiOptions/images/search_submit.png
    A src/webapp/integration-demos/uiOptions/images/share_this.gif
    A src/webapp/integration-demos/uiOptions/images/tab_left_side.png
    A src/webapp/integration-demos/uiOptions/images/tab_middle_side.png
    A src/webapp/integration-demos/uiOptions/images/tab_right_side.png
    A src/webapp/integration-demos/uiOptions/images/theme_climate_90.gif
    A src/webapp/integration-demos/uiOptions/js/changeClass.js
    A src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
    A src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js
    A src/webapp/integration-demos/uiOptions/main.css
    A src/webapp/integration-demos/uiOptions/templates/FatPanelUIOptions.html
    A src/webapp/integration-demos/uiOptions/templates/UIOptionsTemplate-selfVoicing.html
    A src/webapp/integration-demos/uiOptions/templates/UIOptionsTemplate-simplifiedContent.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/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/FluidIoCTests.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4938

Conflicts:
	src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
	src/webapp/components/uiOptions/js/SettingsPanels.js
	src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
	src/webapp/tests/framework-tests/core/js/FluidIoCTests.js


  Commit: 6ffa8a6f5e0f716f8029024977b40e893e9838ff
      https://github.com/fluid-project/infusion/commit/6ffa8a6f5e0f716f8029024977b40e893e9838ff
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M .project

  Log Message:
  -----------
  FLUID-4938: Reverting the .project file to what is in master.


  Commit: 4c76f22605cba18ee633fa75682e94b24d88d5e4
      https://github.com/fluid-project/infusion/commit/4c76f22605cba18ee633fa75682e94b24d88d5e4
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

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

  Log Message:
  -----------
  FLUID-4938: Reset link was commented out of the fat panel which caused unit tests to fail. For the purposes of the demo, the reset was added back with some styling adjustments. Also fixed tabbing in UIOptionsTemplate-layout.html.


  Commit: 7b27f66c5edb54b37876bb7e3976fc81a16ceaab
      https://github.com/fluid-project/infusion/commit/7b27f66c5edb54b37876bb7e3976fc81a16ceaab
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-03-27 (Wed, 27 Mar 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/FatPanelUIOptions.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/default/fatpanelbg.png
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  Merge remote-tracking branch 'jhung/FLUID-4938' into demo

* jhung/FLUID-4938:
  FLUID-4938: Reset link was commented out of the fat panel which caused unit tests to fail. For the purposes of the demo, the reset was added back with some styling adjustments. Also fixed tabbing in UIOptionsTemplate-layout.html.
  FLUID-4938: Reverting the .project file to what is in master.
  NO_JIRA: Merging heidi's updates.
  FLUID-4938: Changed title of to 'Simplify'.
  FLUID-4938: Restyled the toggle to more closely match the wireframe. Added containers to description and checkbos / toggle so it lays out as in the wireframe.
  NO-JIRA: Merged with heidi's branch.
  FLUID-4938: Updated prefiexes for table of content style names.
  FLUID-4938: Removed some old unused styles.
  FLUID-4938: Changed font colour to white when TOC checkbox is checked.
  FLUID-4938: Added cross-browser styling for the toggle knob. Moved to label sibling to checkbox (checkbox no longer a child of the label.
  FLUID-4938: Added header to the table of contents option panel. Changed the divs to spans so it will validate. Still have an issue with focus not applying when checkbox has focus.
  Merge branch 'FLUID-4938-heidi', remote-tracking branch 'heidi/FLUID-4938' into FLUID-4938-heidi
  FLUID-4938: Radio button styling
  FLUID-4938: First pass at adding a sliding toggle to the Fat Panel. The implementation is not quite valid as divs can not reside inside labels. This should be changed to spans instead. Also the positioning and visibility of the original checkbox needs to be fixed.
  FLUID-4938: Added headers
  FLUID-4938: Slider styling
  FLUID-4938: Merged Justin & Cindy's panel work, tweaked panel markup, started FatPanel css
  Merged justin's panel component changes
  Implementing new UIO mockups
  Start of updating UIO design


Compare: https://github.com/fluid-project/infusion/compare/be0fcf5d75c8...7b27f66c5edb


More information about the Commits mailing list