[Commits] [fluid-project/infusion] 972b8b: FLUID-4938: Radio button styling for themes

GitHub noreply at github.com
Wed Mar 27 12:44:01 EDT 2013


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/infusion
  Commit: 972b8bfe3a5a30967c36471ba1523b157b1343bf
      https://github.com/fluid-project/infusion/commit/972b8bfe3a5a30967c36471ba1523b157b1343bf
  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/FatPanelUIOptionsFrame.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html

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


  Commit: 4733ea762f005e3c85265be472739775af2c703c
      https://github.com/fluid-project/infusion/commit/4733ea762f005e3c85265be472739775af2c703c
  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
    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:
  -----------
  Merge branch 'UIO-justin' into FLUID-4938

Conflicts:
	src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html


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

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

  Log Message:
  -----------
  FLUID-4938: Reverting frame css list in header


  Commit: 2ab01f6101b4bc7a48d6ecf77a3f28019f98a8cd
      https://github.com/fluid-project/infusion/commit/2ab01f6101b4bc7a48d6ecf77a3f28019f98a8cd
  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: Merged Justin's latest, more radio theme styling


  Commit: 1e74e9c43b9fcce6ace64c914c31e374d1524461
      https://github.com/fluid-project/infusion/commit/1e74e9c43b9fcce6ace64c914c31e374d1524461
  Author: heidi valles <hvalles 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:
  -----------
  Merge branch 'FLUID-4938-jon' into FLUID-4938

Conflicts:
	src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css


  Commit: 339631919342193fd77d451ca9427082deda3fa8
      https://github.com/fluid-project/infusion/commit/339631919342193fd77d451ca9427082deda3fa8
  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

  Log Message:
  -----------
  FLUID-4938: Merged jon's


  Commit: 7e169b27e3608fe0987ac90c20435b9d55cd631d
      https://github.com/fluid-project/infusion/commit/7e169b27e3608fe0987ac90c20435b9d55cd631d
  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-layout.html

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


  Commit: d1811ea0ef4188e54e687ebdc399f336b4d813ac
      https://github.com/fluid-project/infusion/commit/d1811ea0ef4188e54e687ebdc399f336b4d813ac
  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

  Log Message:
  -----------
  FLUID-4927: Added media language settingsPanel.


  Commit: d0fdf799dc7430a70151c94e047052da680e088f
      https://github.com/fluid-project/infusion/commit/d0fdf799dc7430a70151c94e047052da680e088f
  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
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/framework/core/js/Fluid.js
    A src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

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

Conflicts:
	src/webapp/components/uiOptions/js/SettingsPanels.js


  Commit: 5b1a550dd5b192496d64d37387c64f99446baaf5
      https://github.com/fluid-project/infusion/commit/5b1a550dd5b192496d64d37387c64f99446baaf5
  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: e6e76fbd69d0999c7b2bbd950555e281fb58dd70
      https://github.com/fluid-project/infusion/commit/e6e76fbd69d0999c7b2bbd950555e281fb58dd70
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    R src/webapp/components/uiOptions/js/Enactors.js
    A src/webapp/components/uiOptions/js/Enactors.js
    R src/webapp/components/uiOptions/js/ModelRelay.js
    A 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/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-4938

Conflicts:
	src/webapp/components/uiOptions/js/SettingsPanels.js


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

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

  Log Message:
  -----------
  FLUID-4938: Need to add arrow to current label


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

  Changed paths:
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    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/tests/component-tests/uiOptions/html/SettingsPanels-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/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  NO-JIRA:Merging jobara's changes.


  Commit: 573751891bec11268e87dc5d47e4b930943799a3
      https://github.com/fluid-project/infusion/commit/573751891bec11268e87dc5d47e4b930943799a3
  Author: heidi valles <hvalles 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/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    R src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    R src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  NO-JIRA: Merge conflicts


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

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


  Commit: cd2238a9b6658386ae00198097d0e4bfc2f05c6e
      https://github.com/fluid-project/infusion/commit/cd2238a9b6658386ae00198097d0e4bfc2f05c6e
  Author: heidi valles <hvalles 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/UIOptionsTemplate-contrast.html
    R src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  NO-JIRA: Merge conflicts


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

  Changed paths:
    A src/webapp/components/uiOptions/js/SettingsPanels.js
    A src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  NO-JIRA: Merging


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

  Changed paths:
    M .project
    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/js/SettingsPanels.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/TextfieldSlider-test.html

  Log Message:
  -----------
  Merge remote-tracking branch 'jon/FLUID-4938' 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


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

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

  Log Message:
  -----------
  FLUID-4938: Radio button theming overrides, reset button


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

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

  Log Message:
  -----------
  FLUID-4938: wired up new reset button in FP UIO

Wired up the new reset button that is on the sliding panel for fat panel UIO. Also fixed up the test to use this reset button now. Some white space fixes and comment removal too.


  Commit: df7bf601fe9f75bce6e53a83007124a56bba10d5
      https://github.com/fluid-project/infusion/commit/df7bf601fe9f75bce6e53a83007124a56bba10d5
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-27 (Wed, 27 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/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4938: theme radio diagonal over default


  Commit: 06096521d4f991142ee7b50a8c45d2c077a88c32
      https://github.com/fluid-project/infusion/commit/06096521d4f991142ee7b50a8c45d2c077a88c32
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-27 (Wed, 27 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/js/FatPanelUIOptions.js
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js

  Log Message:
  -----------
  FLUID-4938: Merge justin's reset work, style tweaking


  Commit: 92f7e427c397ad2c182c9b092961a3bdaa1e116e
      https://github.com/fluid-project/infusion/commit/92f7e427c397ad2c182c9b092961a3bdaa1e116e
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-27 (Wed, 27 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/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4938: Styling tweaks


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

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

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

* heidiv/FLUID-4938:
  FLUID-4938: Styling tweaks
  FLUID-4938: theme radio diagonal over default
  FLUID-4938: wired up new reset button in FP UIO
  FLUID-4938: Radio button theming overrides, reset button
  NO-JIRA: Merging
  NO-JIRA:Merging jobara's changes.
  FLUID-4938: Need to add arrow to current label
  FLUID-4927: Added media language settingsPanel.
  FLUID-4938: Merged jon's
  FLUID-4938: Merged Justin's latest, more radio theme styling
  FLUID-4938: Reverting frame css list in header
  FLUID-4938: Radio button styling for themes

Conflicts:
	src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css


Compare: https://github.com/fluid-project/infusion/compare/350465912d7d...015cfdaf7434


More information about the Commits mailing list