Skip to content

Commit

Permalink
SAK-29836 - Normalize the location of bootstrap, fix resources tool g…
Browse files Browse the repository at this point in the history
…litch
  • Loading branch information
csev committed Aug 30, 2015
1 parent 6d5fa50 commit 8fad29a
Show file tree
Hide file tree
Showing 19 changed files with 7,711 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
<!-- this is the new list template, which uses the resources type registry -->
<script type="text/javascript">includeLatestJQuery('content');</script>

<script type="text/javascript" src="/library/js/bootstrap/3.1.1/js/bootstrap.min.js">
<!-- // -->
</script>
<link rel="stylesheet" href="/sakai-content-tool/css/content.css" />
<link rel="stylesheet" href="/library/js/bootstrap/3.1.1/css/bootstrap.min.css" />
<link rel="stylesheet" href="/library/js/bootstrap/3.3.5/css/bootstrap.min.css" />
<script type="text/javascript" src="/sakai-content-tool/js/content.js">
<!-- // -->
</script>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## version: $Id$
<link rel="stylesheet" href="/sakai-content-tool/css/content.css" />
<link rel="stylesheet" href="/library/js/bootstrap/3.1.1/css/bootstrap.min.css" />
<link rel="stylesheet" href="/library/js/bootstrap/3.3.5/css/bootstrap.min.css" />

<div class="portletBody specialLink">
<form name="restoreForm" id="restoreForm" action="#toolForm("ResourcesAction")" method="post">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@
if ( needJQuery ) {
document.write('\x3Cscript src="${pageScriptPath}jquery/jquery-1.11.3.min.js$!{portalCDNQuery}">'+'\x3C/script>')
document.write('\x3Cscript src="${pageScriptPath}jquery/jquery-migrate-1.2.1.min.js$!{portalCDNQuery}">'+'\x3C/script>')
document.write('\x3Cscript src="${pageScriptPath}bootstrap/3.3.5/bootstrap.min.js$!{portalCDNQuery}">'+'\x3C/script>')
document.write('\x3Cscript src="${pageScriptPath}bootstrap/3.3.5/js/bootstrap.min.js$!{portalCDNQuery}">'+'\x3C/script>')
document.write('\x3Cscript src="${pageScriptPath}jquery/ui/1.11.3/jquery-ui.min.js$!{portalCDNQuery}">'+'\x3C/script>')
window.console && console.log('Portal scripts loaded JQ+MI+UI+BS');
window.console && console.log('Portal scripts loaded JQ+MI+BS+UI');
} else {
if (typeof jQuery.migrateWarnings == 'undefined') {
document.write('\x3Cscript type="text/javascript" src="${pageScriptPath}jquery/jquery-migrate-1.2.1.min.js$!{portalCDNQuery}">'+'\x3C/script>')
window.console && console.log('Portal adding jQuery migrate');
}
if ( typeof jQuery.fn.popover == 'undefined') {
document.write('\x3Cscript type="text/javascript" src="${pageScriptPath}bootstrap/3.3.5/bootstrap.min.js$!{portalCDNQuery}">'+'\x3C/script>')
document.write('\x3Cscript type="text/javascript" src="${pageScriptPath}bootstrap/3.3.5/js/bootstrap.min.js$!{portalCDNQuery}">'+'\x3C/script>')
window.console && console.log('Portal adding Bootstrap');
}
if (typeof jQuery.ui == 'undefined') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public static String includeLatestJQuery(String where)
getScriptPath() + "jquery/jquery-migrate-1.2.1.min.js" + getCDNQuery() +
"\">'+'\\x3C/script>')\n" +
" document.write('\\x3Cscript type=\"text/javascript\" src=\"" +
getScriptPath() + "bootstrap/3.3.5/bootstrap.min.js" + getCDNQuery() +
getScriptPath() + "bootstrap/3.3.5/js/bootstrap.min.js" + getCDNQuery() +
"\">'+'\\x3C/script>')\n" +
" document.write('\\x3Cscript type=\"text/javascript\" src=\"" +
getScriptPath() + "jquery/ui/1.11.3/jquery-ui.min.js" + getCDNQuery() +
Expand All @@ -112,7 +112,7 @@ public static String includeLatestJQuery(String where)
" window.console && console.log('Adding jQuery migrate');\n" +
" }\n" +
" if ( typeof jQuery.fn.popover == 'undefined') {\n" +
" document.write('\\x3Cscript type=\"text/javascript\" src=\"" + getScriptPath() + "bootstrap/3.3.5/bootstrap.min.js" + getCDNQuery() + "\">'+'\\x3C/script>')\n" +
" document.write('\\x3Cscript type=\"text/javascript\" src=\"" + getScriptPath() + "bootstrap/3.3.5/js/bootstrap.min.js" + getCDNQuery() + "\">'+'\\x3C/script>')\n" +
" window.console && console.log('Adding Bootstrap');\n" +
" }\n" +
" if (typeof jQuery.ui == 'undefined') {\n" +
Expand All @@ -123,7 +123,7 @@ public static String includeLatestJQuery(String where)
"</script>\n" +
"<script type=\"text/javascript\">\n" +
"if ( needJQuery ) {\n" +
" window.console && console.log('"+where+" PortalUtils.includeLatestJquery() loaded jQuery+migrate+UI+Bootstrap '+$.fn.jquery);\n" +
" window.console && console.log('"+where+" PortalUtils.includeLatestJquery() loaded jQuery+migrate+Bootstrap+UI '+$.fn.jquery);\n" +
"}\n" +
"$PBJQ = jQuery;\n" +
"</script>\n";
Expand Down
Loading

0 comments on commit 8fad29a

Please sign in to comment.