make whole panel title clickable + refactor writeLink

fixes #372
TheCoder4eu · May 8, 2016 · 27f4ccd · 27f4ccd
1 parent 13807cc
commit 27f4ccd
Showing 1 changed file with 17 additions and 20 deletions.
diff --git a/src/main/java/net/bootsfaces/component/panel/PanelRenderer.java b/src/main/java/net/bootsfaces/component/panel/PanelRenderer.java
@@ -145,16 +145,7 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
 					rw.writeAttribute("class", "panel-title", "class");
 				}
 				if (isCollapsible) {
-					rw.startElement("a", panel);
-					rw.writeAttribute("data-toggle", "collapse", "null");
-					rw.writeAttribute("data-target", "#" + jQueryClientID + "content", "null");
-					rw.writeAttribute("href", "javascript:;", "null");
-					if (panel.isCollapsed()) {
-						rw.writeAttribute("class", "collapsed", null);
-					}
-					if(null != accordionParent) {
-						rw.writeAttribute("data-parent", "#" + accordionParent, null);
-					}
+					writeTitleLink(panel, rw, jQueryClientID, accordionParent);
 				}
 
 				rw.writeText(_title, null);
@@ -164,16 +155,7 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
 				rw.endElement("h4");
 			} else {
 				if (isCollapsible) {
-					rw.startElement("a", panel);
-					rw.writeAttribute("data-toggle", "collapse", "null");
-					rw.writeAttribute("data-target", "#" + jQueryClientID + "content", "null");
-					rw.writeAttribute("href", "javascript:;", "null");
-					if (panel.isCollapsed()) {
-						rw.writeAttribute("class", "collapsed", null);
-					}
-					if(null != accordionParent) {
-						rw.writeAttribute("data-parent", "#" + accordionParent, null);
-					}
+					writeTitleLink(panel, rw, jQueryClientID, accordionParent);
 				}
 				head.encodeAll(context);
 				if (isCollapsible) {
@@ -208,6 +190,21 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
 		rw.writeAttribute("class", "panel-body", "class");
 	}
 
+	private void writeTitleLink(Panel panel, ResponseWriter rw, String jQueryClientID, String accordionParent)
+			throws IOException {
+		rw.startElement("a", panel);
+		rw.writeAttribute("data-toggle", "collapse", "null");
+		rw.writeAttribute("data-target", "#" + jQueryClientID + "content", "null");
+		rw.writeAttribute("style", "display: block", "style"); //let the anchor
+		rw.writeAttribute("href", "javascript:;", "null");
+		if (panel.isCollapsed()) {
+			rw.writeAttribute("class", "collapsed", null);
+		}
+		if(null != accordionParent) {
+			rw.writeAttribute("data-parent", "#" + accordionParent, null);
+		}
+	}
+
 	/**
 	 * This methods generates the HTML code of the current b:panel.
 	 * <code>encodeBegin</code> generates the start of the component. After the,