SAK-31950 upgrade bootstrap to 3.3.7

portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/site.vm

@@ -79,7 +79,7 @@
         if ( needJQuery ) {
             document.write('\x3Cscript src="${pageWebjarsPath}jquery/1.11.3/jquery.min.js$!{portalCDNQuery}">'+'\x3C/script>')
             document.write('\x3Cscript src="${pageWebjarsPath}jquery-migrate/1.4.0/jquery-migrate.min.js$!{portalCDNQuery}">'+'\x3C/script>')
-            document.write('\x3Cscript src="${pageWebjarsPath}bootstrap/3.3.6/js/bootstrap.min.js$!{portalCDNQuery}">'+'\x3C/script>')
+            document.write('\x3Cscript src="${pageWebjarsPath}bootstrap/3.3.7/js/bootstrap.min.js$!{portalCDNQuery}">'+'\x3C/script>')
             document.write('\x3Cscript src="${pageWebjarsPath}jquery-ui/1.11.3/jquery-ui.min.js$!{portalCDNQuery}">'+'\x3C/script>')
             document.write('\x3Clink rel="stylesheet" href="${pageWebjarsPath}jquery-ui/1.11.3/jquery-ui.min.css$!{portalCDNQuery}"/>')
             window.console && console.log('Portal scripts loaded JQ+MI+BS+UI');
@@ -89,7 +89,7 @@
                 window.console && console.log('Portal adding jQuery migrate');
             }
             if ( typeof jQuery.fn.popover == 'undefined') {
-                document.write('\x3Cscript type="text/javascript" src="${pageWebjarsPath}bootstrap/3.3.6/js/bootstrap.min.js$!{portalCDNQuery}">'+'\x3C/script>')
+                document.write('\x3Cscript type="text/javascript" src="${pageWebjarsPath}bootstrap/3.3.7/js/bootstrap.min.js$!{portalCDNQuery}">'+'\x3C/script>')
                 window.console && console.log('Portal adding Bootstrap');
             }
             if (typeof jQuery.ui == 'undefined') {

portal/portal-util/util/src/java/org/sakaiproject/portal/util/PortalUtils.java

@@ -105,7 +105,7 @@ public static String includeLatestJQuery(String where)
                  getWebjarsPath() + "jquery-migrate/1.4.0/jquery-migrate.min.js" + getCDNQuery() + 
                  "\">'+'\\x3C/script>')\n" +
              "   document.write('\\x3Cscript type=\"text/javascript\" src=\"" +
-                 getWebjarsPath() + "bootstrap/3.3.6/js/bootstrap.min.js" + getCDNQuery() + 
+                 getWebjarsPath() + "bootstrap/3.3.7/js/bootstrap.min.js" + getCDNQuery() +
                  "\">'+'\\x3C/script>')\n" +
              "   document.write('\\x3Cscript type=\"text/javascript\" src=\"" +
                  getWebjarsPath() + "jquery-ui/1.11.3/jquery-ui.min.js" + getCDNQuery() + 
@@ -120,7 +120,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=\"" + getWebjarsPath() + "bootstrap/3.3.6/js/bootstrap.min.js" + getCDNQuery() + "\">'+'\\x3C/script>')\n" +
+             "           document.write('\\x3Cscript type=\"text/javascript\" src=\"" + getWebjarsPath() + "bootstrap/3.3.7/js/bootstrap.min.js" + getCDNQuery() + "\">'+'\\x3C/script>')\n" +
              "           window.console && console.log('Adding Bootstrap');\n" +
              "   }\n" +
              "   if (typeof jQuery.ui == 'undefined') {\n" +

reference/library/pom.xml

@@ -18,6 +18,7 @@
 	<inceptionYear>2003</inceptionYear>
 	<packaging>war</packaging>
 	<properties>
+		<bootstrap-version>3.3.7</bootstrap-version>
 		<font-awesome-version>4.7.0</font-awesome-version>
 	</properties>
 	<dependencies>
@@ -110,7 +111,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>bootstrap</artifactId>
-			<version>3.3.6</version>
+			<version>${bootstrap-version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -243,7 +244,7 @@
 											<directory>${basedir}/src/${sakai.skin.source}/font-awesome-sass-${font-awesome-version}/assets/fonts/</directory>
 										</resource>
 										<resource>
-										  <directory>${basedir}/src/${sakai.skin.source}/bootstrap-sass-3.3.6/assets/fonts/</directory>
+										  <directory>${basedir}/src/${sakai.skin.source}/bootstrap-sass-${bootstrap-version}/assets/fonts/</directory>
 										</resource>
 									</resources>
 								</configuration>
@@ -328,7 +329,7 @@
 					       <imgPath>${basedir}/src/${sakai.skin.source}/images/</imgPath>
 					       <inputPath>${basedir}/src/${sakai.skin.source}/sass/</inputPath>
 					       <outputPath>${basedir}/src/webapp/skin/${sakai.skin.target}</outputPath>
-					       <includePath>${basedir}/src/${sakai.skin.source}/bootstrap-sass-3.3.6/assets/stylesheets/${path.separator}${basedir}/src/${sakai.skin.source}/font-awesome-sass-${font-awesome-version}/assets/stylesheets/</includePath>
+					       <includePath>${basedir}/src/${sakai.skin.source}/bootstrap-sass-${bootstrap-version}/assets/stylesheets/${path.separator}${basedir}/src/${sakai.skin.source}/font-awesome-sass-${font-awesome-version}/assets/stylesheets/</includePath>
 					       <sourceMapOutputPath>${basedir}/src/webapp/skin/${sakai.skin.target}</sourceMapOutputPath>
 					   </configuration>
 					</plugin>

reference/library/src/morpheus-master/bootstrap-sass-3.3.6/assets/javascripts/bootstrap-sprockets.js → reference/library/src/morpheus-master/bootstrap-sass-3.3.7/assets/javascripts/bootstrap-sprockets.js

@@ -1,12 +1,12 @@
-//= require ./bootstrap/affix
+//= require ./bootstrap/transition
 //= require ./bootstrap/alert
 //= require ./bootstrap/button
 //= require ./bootstrap/carousel
 //= require ./bootstrap/collapse
 //= require ./bootstrap/dropdown
 //= require ./bootstrap/modal
-//= require ./bootstrap/scrollspy
 //= require ./bootstrap/tab
-//= require ./bootstrap/transition
+//= require ./bootstrap/affix
+//= require ./bootstrap/scrollspy
 //= require ./bootstrap/tooltip
 //= require ./bootstrap/popover