Skip to content

Commit

Permalink
Merge pull request sakaiproject#926 from ottenhoff/SAK-29704
Browse files Browse the repository at this point in the history
SAK-29704 upgrade to use latest Fluid 1.5 release
  • Loading branch information
ottenhoff committed Aug 3, 2015
2 parents 677c779 + db7fb78 commit cc60f40
Show file tree
Hide file tree
Showing 600 changed files with 23,664 additions and 4,672 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script type="text/javascript"
src="/library/js/fluid/1.4/MyInfusion.js"></script>
<script type="text/javascript" src="/library/js/fluid/1.5/MyInfusion.js"></script>
<script type="text/javascript" src="/library/js/reorderer.js"></script>
<div class="portletBody">
#if($menu && $EnabledMenuItemExists)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
##<!-- $Header: Exp $ -->
## Assignments - reorder view
<script type="text/javascript"
src="/library/js/fluid/1.4/MyInfusion.js"></script>
src="/library/js/fluid/1.5/MyInfusion.js"></script>

<script type="text/javascript" src="/library/js/reorderer.js"></script>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## version: $Id: $
<!-- chef_resources_reorder.vm, use with org.sakaiproject.tool.content.ResourcesAction.java -->
<!-- this is the reorder template -->
<script type="text/javascript" src="/library/js/fluid/1.4/MyInfusion.js"></script>
<script type="text/javascript" src="/library/js/fluid/1.5/MyInfusion.js"></script>
<script type="text/javascript" src="/library/js/reorderer.js"></script>

<div class="portletBody specialLink">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
<link rel="stylesheet" href="/messageforums-tool/css/forum_rank.css" type="text/css" />

<h:form id="revise">
<script type="text/javascript">includeLatestJQuery("msgcntr");</script>
<script type="text/javascript" src="/library/js/fluid-latest/InfusionAll.js"></script>
<script type="text/javascript" src="/library/js/fluid/1.5/MyInfusion.js"></script>
<script type="text/javascript" src="/messageforums-tool/js/forum_rank.js"></script>
<script type="text/javascript" src="/messageforums-tool/js/forum.js"></script>

Expand Down
33 changes: 0 additions & 33 deletions reference/library/src/webapp/js/fluid-latest/InfusionAll.js

This file was deleted.

264 changes: 0 additions & 264 deletions reference/library/src/webapp/js/fluid-latest/README.txt

This file was deleted.

This file was deleted.

Loading

0 comments on commit cc60f40

Please sign in to comment.