From 651ab43d10ce91ec527f3d1e9c6ea754d9eb99f6 Mon Sep 17 00:00:00 2001
From: "Code Hugger (Matthew Jones)" <jonespm@gmail.com>
Date: Thu, 29 Sep 2016 08:36:37 -0700
Subject: [PATCH] SAK-31618 - Avoid the sole use of device-dependent event
 handlers (#3404)

---
 .../user/jsf/HideDivisionRenderer.java        | 24 +++++--------------
 .../tool/src/webapp/prefs/noti.jsp            |  1 -
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/jsf/HideDivisionRenderer.java b/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/jsf/HideDivisionRenderer.java
index fcfb41901e2e..369acbd85ca0 100644
--- a/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/jsf/HideDivisionRenderer.java
+++ b/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/jsf/HideDivisionRenderer.java
@@ -85,25 +85,13 @@ public void encodeBegin(FacesContext context, UIComponent component)
 		Object tmpFoldStr = RendererUtil.getAttribute(context, component, "hideByDefault");
 		String key = (String)RendererUtil.getAttribute(context, component, "key");
 		
-		boolean foldDiv = tmpFoldStr != null && Boolean.TRUE.equals(tmpFoldStr);
-		String foldImage = foldDiv ? FOLD_IMG_HIDE : FOLD_IMG_SHOW;
-
 		writer.write("<fieldset>");
-		writer.write("<legend style='" + CURSOR + "' onclick=\"javascript:showHideDivBlock('" + id +
-				"', '" +  RESOURCE_PATH + "', '" + key + "');\">");
-		writer.write("  <img id=\"" + id + "__img_hide_division_" + "\" alt=\"" +
-				title + "\"");
-		writer.write("    src=\""   + foldImage + "\" style=\"" + CURSOR + "\" />");
-
-		writer.write( title + "</legend>");
-
-		if(foldDiv) {
-			writer.write("<div style=\"display:none\" " +
-					" id=\"" + id + "__hide_division_" + "\">");
-		} else {
-			writer.write("<div style=\"display:block\" " +
-					" id=\"" + id + "__hide_division_" + "\">");
-		}
+		writer.write("<legend>");
+		writer.write("<a role='button' data-toggle='collapse' aria-expanded='true' aria-target='" + id + "' href='#' data-target=\"[id='" + id + "']\">" + title + "</a>");
+		writer.write("</legend>");
+
+		writer.write("<div class='collapse in' " +
+			" id=\"" + id + "\">");
 	}
 
 
diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/noti.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/noti.jsp
index e6cb5f6e2f06..64cea47dc53b 100644
--- a/user/user-tool-prefs/tool/src/webapp/prefs/noti.jsp
+++ b/user/user-tool-prefs/tool/src/webapp/prefs/noti.jsp
@@ -15,7 +15,6 @@
 
 <f:verbatim>
 <h:outputText value="#{Portal.latestJQuery}" escape="false"/>
-    <script type="text/javascript" src="/library/js/fluid/1.5/MyInfusion.js">//</script>
 	<script type="text/javascript">
 	<!--
 		function removeOverride(cur) {