[Commits] [fluid-project/infusion] 9721a1: FLUID-5341: Adding new links to overviewPanel

GitHub noreply at github.com
Tue May 13 13:12:50 EDT 2014


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 9721a1a347626d63fce7761de8d99b78cdb06da8
      https://github.com/fluid-project/infusion/commit/9721a1a347626d63fce7761de8d99b78cdb06da8
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M src/components/overviewPanel/css/OverviewPanel.css
    A src/components/overviewPanel/fonts/overviewPanel-icons.eot
    A src/components/overviewPanel/fonts/overviewPanel-icons.ttf
    M src/components/overviewPanel/html/overviewPanelTemplate.html
    M src/components/overviewPanel/js/OverviewPanel.js
    M src/demos/overviewPanel/index.html

  Log Message:
  -----------
  FLUID-5341: Adding new links to overviewPanel
- also some styling enhancements (hover effects for links)
- updated icons


  Commit: cc7b3b990ae661b4ff810e4522d963783c8d55d8
      https://github.com/fluid-project/infusion/commit/cc7b3b990ae661b4ff810e4522d963783c8d55d8
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    R src/demos/fss/base/css/base.css
    R src/demos/fss/base/index.html
    R src/demos/fss/base/json/config.json
    R src/demos/fss/base/withBase.html
    R src/demos/fss/base/withoutBase.html
    R src/demos/fss/clearfix/css/clearfix.css
    R src/demos/fss/clearfix/index.html
    R src/demos/fss/clearfix/js/clearfixDemo.js
    R src/demos/fss/clearfix/json/config.json
    R src/demos/fss/contextual/css/context.css
    R src/demos/fss/contextual/index.html
    R src/demos/fss/contextual/json/config.json
    R src/demos/fss/layout/css/layout.css
    R src/demos/fss/layout/index.html
    R src/demos/fss/layout/json/config.json
    R src/demos/fss/linearize/css/linearize.css
    R src/demos/fss/linearize/images/picture_150.png
    R src/demos/fss/linearize/index.html
    R src/demos/fss/linearize/js/linearizeDemo.js
    R src/demos/fss/linearize/json/config.json
    R src/demos/fss/mobile/buttons/basic.html
    R src/demos/fss/mobile/content/basic.html
    R src/demos/fss/mobile/images/1.jpg
    R src/demos/fss/mobile/images/10.jpg
    R src/demos/fss/mobile/images/11.jpg
    R src/demos/fss/mobile/images/12.jpg
    R src/demos/fss/mobile/images/13.jpg
    R src/demos/fss/mobile/images/14.jpg
    R src/demos/fss/mobile/images/15.jpg
    R src/demos/fss/mobile/images/16.jpg
    R src/demos/fss/mobile/images/17.jpg
    R src/demos/fss/mobile/images/18.jpg
    R src/demos/fss/mobile/images/19.png
    R src/demos/fss/mobile/images/2.jpg
    R src/demos/fss/mobile/images/20.png
    R src/demos/fss/mobile/images/3.jpg
    R src/demos/fss/mobile/images/4.jpg
    R src/demos/fss/mobile/images/5.jpg
    R src/demos/fss/mobile/images/6.jpg
    R src/demos/fss/mobile/images/7.jpg
    R src/demos/fss/mobile/images/8.jpg
    R src/demos/fss/mobile/images/9.jpg
    R src/demos/fss/mobile/index.html
    R src/demos/fss/mobile/js/mobileDemo.js
    R src/demos/fss/mobile/json/config.json
    R src/demos/fss/mobile/nav/basic.html
    R src/demos/fss/mobile/nav/icon.html
    R src/demos/fss/mobile/nav/thumb.html
    R src/demos/fss/mobile/tabs/basic.html
    R src/demos/fss/reset/css/reset.css
    R src/demos/fss/reset/index.html
    R src/demos/fss/reset/json/config.json
    R src/demos/fss/reset/withReset.html
    R src/demos/fss/reset/withoutReset.html
    R src/demos/fss/text/index.html
    R src/demos/fss/text/json/config.json
    R src/demos/fss/themes/index.html
    R src/demos/fss/themes/json/config.json
    M src/framework/preferences/js/Enactors.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/instructionalDemos/framework/preferences/shared/js/panels.js
    M src/tests/component-tests/slidingPanel/js/SlidingPanelTests.js
    M src/tests/framework-tests/preferences/html/Enactors-test.html
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/framework-tests/preferences/js/EnactorsTests.js
    M src/tests/framework-tests/preferences/js/PanelsTests.js
    M src/tests/test-core/jqUnit/js/jqUnit.js

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into FLUID-5341


  Commit: 4319fc6f2908fc94b0f15333b3fd2307ae1778a2
      https://github.com/fluid-project/infusion/commit/4319fc6f2908fc94b0f15333b3fd2307ae1778a2
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M src/components/overviewPanel/js/OverviewPanel.js
    M src/demos/inlineEdit/rich/json/config.json
    M src/demos/inlineEdit/simple/json/config.json
    M src/demos/keyboard-a11y/json/config.json
    M src/demos/pager/json/config.json
    M src/demos/prefsFramework/json/config.json
    M src/demos/progress/json/config.json
    M src/demos/renderer/json/config.json
    M src/demos/reorderer/gridReorderer/json/config.json
    M src/demos/reorderer/imageReorderer/json/config.json
    M src/demos/reorderer/layoutReorderer/json/config.json
    M src/demos/reorderer/listReorderer/json/config.json
    M src/demos/shared/html/overviewPanelTemplate-noDesign.html
    M src/demos/uiOptions/json/config.json
    M src/demos/uploader/json/config.json

  Log Message:
  -----------
  FLUID-5341: Merge w master and updated demo links
- Merged with master (removed FSS)
- Updated the links of each infusion demo to use the new links in
overviewPanel.


  Commit: 209cc98f16efa996a2718e2666a6fb40e7c91ff9
      https://github.com/fluid-project/infusion/commit/209cc98f16efa996a2718e2666a6fb40e7c91ff9
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M src/components/overviewPanel/css/OverviewPanel.css

  Log Message:
  -----------
  Merge branch 'FLUID-5299' into FLUID-5341

Conflicts:
	src/components/overviewPanel/css/OverviewPanel.css


  Commit: 19836f57b54457cf46dea56e54451f52a98d3eb0
      https://github.com/fluid-project/infusion/commit/19836f57b54457cf46dea56e54451f52a98d3eb0
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Log Message:
  -----------
  Merge branch 'FLUID-5299' into FLUID-5341

Conflicts:
	src/components/overviewPanel/css/OverviewPanel.css


  Commit: 552cdd42cf8a1064284f0f1c9a85169eb1029f66
      https://github.com/fluid-project/infusion/commit/552cdd42cf8a1064284f0f1c9a85169eb1029f66
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M src/components/overviewPanel/css/OverviewPanel.css
    M src/components/overviewPanel/html/overviewPanelTemplate.html
    M src/demos/shared/html/overviewPanelTemplate-noDesign.html

  Log Message:
  -----------
  Merge branch 'FLUID-5299' into FLUID-5341

Conflicts:
	src/components/overviewPanel/css/OverviewPanel.css


  Commit: d74f9cbe3f12a90c39b3c0e25394b7c76aafdd7e
      https://github.com/fluid-project/infusion/commit/d74f9cbe3f12a90c39b3c0e25394b7c76aafdd7e
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M src/components/overviewPanel/html/overviewPanelTemplate.html
    M src/demos/shared/html/overviewPanelTemplate-noDesign.html

  Log Message:
  -----------
  Merge branch 'FLUID-5299' into FLUID-5341


  Commit: b854d14fda747ccba7535fbaacff17e66dab0833
      https://github.com/fluid-project/infusion/commit/b854d14fda747ccba7535fbaacff17e66dab0833
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M src/components/overviewPanel/css/OverviewPanel.css

  Log Message:
  -----------
  FLUID-5341: Increased size of footer to account for
overlapping text fix in FLUID-5299.


  Commit: 9c4166728c789631041983eb2ace2a80dc18c164
      https://github.com/fluid-project/infusion/commit/9c4166728c789631041983eb2ace2a80dc18c164
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M src/components/overviewPanel/css/OverviewPanel.css
    M src/components/overviewPanel/html/overviewPanelTemplate.html
    M src/demos/shared/html/overviewPanelTemplate-noDesign.html

  Log Message:
  -----------
  FLUID-5299: Merge branch FLUID-5299 and icon changes.

- Merged FLUID-5299 changes into FLUID-5341
- Changed the layout of the link icons so
emphasize links does not push contents off screen.


  Commit: 3354adbfb9c3369315d752b145cd27c8b967f0ef
      https://github.com/fluid-project/infusion/commit/3354adbfb9c3369315d752b145cd27c8b967f0ef
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    A src/components/overviewPanel/fonts/OpenSans-Bold.ttf
    R src/components/overviewPanel/fonts/OpenSans-Bold.ttf
    A src/components/overviewPanel/fonts/OpenSans-Regular.ttf
    R src/components/overviewPanel/fonts/OpenSans-Regular.ttf
    A src/components/overviewPanel/fonts/RobotoSlab-Bold.ttf
    R src/components/overviewPanel/fonts/RobotoSlab-Bold.ttf
    A src/components/overviewPanel/fonts/RobotoSlab-Regular.ttf
    R src/components/overviewPanel/fonts/RobotoSlab-Regular.ttf
    M src/components/pager/js/Table.js
    M src/demos/pager/index.html
    M src/demos/pager/js/pagerDemo.js
    M src/demos/prefsFramework/js/SelfVoicingEnactor.js
    M src/demos/prefsFramework/json/config.json
    M src/demos/shared/js/overviewWrapper.js
    M src/framework/core/js/DataBinding.js
    M src/integration-demos/sakai/html/pager-site-setting.html
    M src/integration-demos/sakai/js/site_setting_members.js
    M src/standalone-demos/pager/html/pager.html
    M src/tests/component-tests/pager/html/PagedTable-test.html
    M src/tests/component-tests/pager/js/PagedTableTests.js
    M src/tests/component-tests/uploader/html/HTML5UploaderSupport-test.html
    M src/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js
    M src/tests/framework-tests/enhancement/js/ProgressiveEnhancementTests.js
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into FLUID-5341


  Commit: 7019fea226f4ec212bec7a6a2b353466cd69c3a4
      https://github.com/fluid-project/infusion/commit/7019fea226f4ec212bec7a6a2b353466cd69c3a4
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M src/components/overviewPanel/css/OverviewPanel.css

  Log Message:
  -----------
  NO-JIRA: Merge master and formatting


  Commit: 449433eb79f2d576d5c6aae38273982951f4f365
      https://github.com/fluid-project/infusion/commit/449433eb79f2d576d5c6aae38273982951f4f365
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M src/components/overviewPanel/css/OverviewPanel.css

  Log Message:
  -----------
  FLUID-5341: Fixed focus styling for link list.


  Commit: b731cbaad4cdd03554c87733cc7178cc1a462880
      https://github.com/fluid-project/infusion/commit/b731cbaad4cdd03554c87733cc7178cc1a462880
  Author: jhung <jhung at ocadu.ca>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M src/tests/all-tests.html
    M src/tests/component-tests/overviewPanel/js/OverviewPanelTests.js

  Log Message:
  -----------
  FLUID-5341: Added new tests.
- Added tests for getInfusion link
- Added overviewPanel test to all-tests


  Commit: 1d0c02de3684d705b63f6b98180983326c848a3b
      https://github.com/fluid-project/infusion/commit/1d0c02de3684d705b63f6b98180983326c848a3b
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M src/components/overviewPanel/css/OverviewPanel.css
    A src/components/overviewPanel/fonts/overviewPanel-icons.eot
    A src/components/overviewPanel/fonts/overviewPanel-icons.ttf
    M src/components/overviewPanel/html/overviewPanelTemplate.html
    M src/components/overviewPanel/js/OverviewPanel.js
    M src/demos/inlineEdit/rich/json/config.json
    M src/demos/inlineEdit/simple/json/config.json
    M src/demos/keyboard-a11y/json/config.json
    M src/demos/overviewPanel/index.html
    M src/demos/pager/json/config.json
    M src/demos/prefsFramework/json/config.json
    M src/demos/progress/json/config.json
    M src/demos/renderer/json/config.json
    M src/demos/reorderer/gridReorderer/json/config.json
    M src/demos/reorderer/imageReorderer/json/config.json
    M src/demos/reorderer/layoutReorderer/json/config.json
    M src/demos/reorderer/listReorderer/json/config.json
    M src/demos/shared/html/overviewPanelTemplate-noDesign.html
    M src/demos/uiOptions/json/config.json
    M src/demos/uploader/json/config.json
    M src/tests/all-tests.html
    M src/tests/component-tests/overviewPanel/js/OverviewPanelTests.js

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

* jon/FLUID-5341:
  FLUID-5341: Added new tests. - Added tests for getInfusion link - Added overviewPanel test to all-tests
  FLUID-5341: Fixed focus styling for link list.
  NO-JIRA: Merge master and formatting
  FLUID-5341: Increased size of footer to account for overlapping text fix in FLUID-5299.
  FLUID-5341: Merge w master and updated demo links - Merged with master (removed FSS) - Updated the links of each infusion demo to use the new links in overviewPanel.
  FLUID-5341: Adding new links to overviewPanel - also some styling enhancements (hover effects for links) - updated icons


  Commit: 06e37ce605803d1324e0aaa4fbfc3c54caf3b96f
      https://github.com/fluid-project/infusion/commit/06e37ce605803d1324e0aaa4fbfc3c54caf3b96f
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    A src/components/overviewPanel/fonts/overviewPanel-icons.eot
    R src/components/overviewPanel/fonts/overviewPanel-icons.eot
    A src/components/overviewPanel/fonts/overviewPanel-icons.ttf
    R src/components/overviewPanel/fonts/overviewPanel-icons.ttf

  Log Message:
  -----------
  FLUID-5341: corrected file permissions


Compare: https://github.com/fluid-project/infusion/compare/cbf0d7d7fcee...06e37ce60580


More information about the Commits mailing list