diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_deploy_system.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_deploy_system.vm index 26754d86c76d..8946dcbd2965 100644 --- a/basiclti/basiclti-tool/src/webapp/vm/lti_deploy_system.vm +++ b/basiclti/basiclti-tool/src/webapp/vm/lti_deploy_system.vm @@ -4,8 +4,8 @@ ${includeLatestJQuery} - - + + diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site.vm index 36fa029e6c4b..70d49df23dfe 100644 --- a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site.vm +++ b/basiclti/basiclti-tool/src/webapp/vm/lti_tool_site.vm @@ -4,8 +4,8 @@ ${includeLatestJQuery} - - + + diff --git a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_system.vm b/basiclti/basiclti-tool/src/webapp/vm/lti_tool_system.vm index a5190d72f188..e0bc889c9f0a 100644 --- a/basiclti/basiclti-tool/src/webapp/vm/lti_tool_system.vm +++ b/basiclti/basiclti-tool/src/webapp/vm/lti_tool_system.vm @@ -4,8 +4,8 @@ ${includeLatestJQuery} - - + + diff --git a/citations/citations-impl/impl/src/java/org/sakaiproject/citation/impl/CitationListAccessServlet.java b/citations/citations-impl/impl/src/java/org/sakaiproject/citation/impl/CitationListAccessServlet.java index 6b55149e1cf4..167933eae1d7 100644 --- a/citations/citations-impl/impl/src/java/org/sakaiproject/citation/impl/CitationListAccessServlet.java +++ b/citations/citations-impl/impl/src/java/org/sakaiproject/citation/impl/CitationListAccessServlet.java @@ -323,7 +323,7 @@ protected void handleViewRequest(HttpServletRequest req, HttpServletResponse res + "\n" + "\n" + "\n" - + "\n" + + "\n" + "\n" + "\n" + "\n" diff --git a/citations/citations-servlet/servlet/src/webapp/vm/compact.vm b/citations/citations-servlet/servlet/src/webapp/vm/compact.vm index d969015bf9f2..ae369f682fef 100644 --- a/citations/citations-servlet/servlet/src/webapp/vm/compact.vm +++ b/citations/citations-servlet/servlet/src/webapp/vm/compact.vm @@ -21,7 +21,7 @@ - +
diff --git a/citations/citations-servlet/servlet/src/webapp/vm/servlet.vm b/citations/citations-servlet/servlet/src/webapp/vm/servlet.vm index 89aa108c8ec5..25ffdac03062 100644 --- a/citations/citations-servlet/servlet/src/webapp/vm/servlet.vm +++ b/citations/citations-servlet/servlet/src/webapp/vm/servlet.vm @@ -20,7 +20,7 @@ $tlang.getString( "window.gscholar" ) - + diff --git a/citations/citations-tool/tool/src/webapp/vm/citation/create.vm b/citations/citations-tool/tool/src/webapp/vm/citation/create.vm index 5bceceb65985..9fc0432fd6d9 100644 --- a/citations/citations-tool/tool/src/webapp/vm/citation/create.vm +++ b/citations/citations-tool/tool/src/webapp/vm/citation/create.vm @@ -1,7 +1,7 @@ #set($default = "") #if($!DEFAULT_TEMPLATE)#set($default = "$!DEFAULT_TEMPLATE.identifier")#end - diff --git a/citations/citations-tool/tool/src/webapp/vm/citation/new_resource.vm b/citations/citations-tool/tool/src/webapp/vm/citation/new_resource.vm index d347fc45352c..14b80e5dbaf0 100644 --- a/citations/citations-tool/tool/src/webapp/vm/citation/new_resource.vm +++ b/citations/citations-tool/tool/src/webapp/vm/citation/new_resource.vm @@ -21,15 +21,15 @@ * ********************************************************************************** --> - - - + diff --git a/citations/citations-tool/tool/src/webapp/vm/citation/reorder.vm b/citations/citations-tool/tool/src/webapp/vm/citation/reorder.vm index d761675c2cb7..fc47cf7f80ff 100644 --- a/citations/citations-tool/tool/src/webapp/vm/citation/reorder.vm +++ b/citations/citations-tool/tool/src/webapp/vm/citation/reorder.vm @@ -3,9 +3,9 @@ #citations-sortable li { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em; } #citations-sortable li span { position: absolute; margin-left: -1.3em; } - - - + + +
diff --git a/commons/tool/src/webapp/WEB-INF/bootstrap.jsp b/commons/tool/src/webapp/WEB-INF/bootstrap.jsp index 89f5a621e2a7..5a43799bb083 100644 --- a/commons/tool/src/webapp/WEB-INF/bootstrap.jsp +++ b/commons/tool/src/webapp/WEB-INF/bootstrap.jsp @@ -21,14 +21,14 @@ ${sakaiHtmlHead} - + - - + + diff --git a/delegatedaccess/tool/src/java/org/sakaiproject/delegatedaccess/tool/pages/BasePage.java b/delegatedaccess/tool/src/java/org/sakaiproject/delegatedaccess/tool/pages/BasePage.java index b7779432c491..2297fd4181eb 100644 --- a/delegatedaccess/tool/src/java/org/sakaiproject/delegatedaccess/tool/pages/BasePage.java +++ b/delegatedaccess/tool/src/java/org/sakaiproject/delegatedaccess/tool/pages/BasePage.java @@ -268,11 +268,11 @@ public void renderHead(IHeaderResponse response) { //response.renderJavascriptReference("js/my_tool_javascript.js"); //for jQuery - response.render(JavaScriptHeaderItem.forUrl("/library/webjars/jquery/1.11.3/jquery.min.js")); - response.render(JavaScriptHeaderItem.forUrl("/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js")); + response.render(JavaScriptHeaderItem.forUrl("/library/webjars/jquery/1.12.4/jquery.min.js")); + response.render(JavaScriptHeaderItem.forUrl("/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js")); //for datepicker - response.render(CssHeaderItem.forUrl("/library/webjars/jquery-ui/1.11.3/jquery-ui.css")); + response.render(CssHeaderItem.forUrl("/library/webjars/jquery-ui/1.12.1/jquery-ui.css")); response.render(JavaScriptHeaderItem.forUrl("javascript/jquery.asmselect.js")); response.render(CssHeaderItem.forUrl("css/jquery.asmselect.css")); response.render(JavaScriptHeaderItem.forUrl("/library/js/lang-datepicker/lang-datepicker.js")); diff --git a/feedback/src/webapp/WEB-INF/bootstrap.jsp b/feedback/src/webapp/WEB-INF/bootstrap.jsp index a1bf6f19f9e7..693eafee8047 100644 --- a/feedback/src/webapp/WEB-INF/bootstrap.jsp +++ b/feedback/src/webapp/WEB-INF/bootstrap.jsp @@ -7,7 +7,7 @@ lang="${language}"> - + diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.java index 15b31935efa2..ad0e021af399 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.java +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.java @@ -199,7 +199,7 @@ public void renderHead(final IHeaderResponse response) { response.render( new PriorityHeaderItem( JavaScriptHeaderItem - .forUrl(String.format("/library/webjars/jquery/1.11.3/jquery.min.js?version=%s", version)))); + .forUrl(String.format("/library/webjars/jquery/1.12.4/jquery.min.js?version=%s", version)))); // And pair this instance of jQuery with a Bootstrap version we've tested with response.render( new PriorityHeaderItem( diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java index 5a9765c08983..e115e1dca4c2 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java @@ -480,7 +480,7 @@ public void renderHead(final IHeaderResponse response) { // Drag and Drop/Date Picker (requires jQueryUI) response.render(JavaScriptHeaderItem - .forUrl(String.format("/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js?version=%s", version))); + .forUrl(String.format("/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js?version=%s", version))); // Include Sakai Date Picker response.render(JavaScriptHeaderItem diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/ImportExportPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/ImportExportPage.java index b496cbb365c5..661f96918dbf 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/ImportExportPage.java +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/ImportExportPage.java @@ -30,7 +30,7 @@ public void renderHead(final IHeaderResponse response) { // Include Sakai Date Picker response.render( - JavaScriptHeaderItem.forUrl(String.format("/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js?version=%s", version))); + JavaScriptHeaderItem.forUrl(String.format("/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js?version=%s", version))); response.render(JavaScriptHeaderItem.forUrl(String.format("/library/js/lang-datepicker/lang-datepicker.js?version=%s", version))); // Gradebook Import/Export styles diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.java index ea7390b7ac42..331197f6c869 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.java +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.java @@ -220,7 +220,7 @@ public void renderHead(final IHeaderResponse response) { // Drag and Drop (requires jQueryUI) response.render(JavaScriptHeaderItem - .forUrl(String.format("/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js?version=%s", version))); + .forUrl(String.format("/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js?version=%s", version))); response.render(CssHeaderItem.forUrl(String.format("/gradebookng-tool/styles/gradebook-settings.css?version=%s", version))); response.render( diff --git a/help/help-tool/src/webapp/html/help.html b/help/help-tool/src/webapp/html/help.html index 2d7996bd6e5c..ad31ba8251c0 100644 --- a/help/help-tool/src/webapp/html/help.html +++ b/help/help-tool/src/webapp/html/help.html @@ -9,7 +9,7 @@ - - +