Merge pull request #24 from bouil/master

Add class="controls" for <select> elements in forms + Handing of t:errors, and handle errors after form submit

Author: trsvax

src/main/java/com/trsvax/bootstrap/AbstractFrameworkProvider.java

@@ -38,6 +38,9 @@ public boolean anchor(Element element) {
 	public boolean input(Element element) {
 		return hasName("input", element);
 	}
+	public boolean select(Element element) {
+		return hasName("select", element);
+	}
 	public boolean label(Element element) {
 		return hasName("label", element);
 	}

src/main/java/com/trsvax/bootstrap/services/bootstrapprovider/BootstrapFrameworkVisitor.java

@@ -126,6 +126,9 @@ Visitor beanEditForm() {
 			return new Visitor() {
 
 				public void visit(Element element) {
+					if (div(element) && hasClass("t-error", element)) {
+						element.forceAttributes("class", "alert alert-error");
+					}
 					if (hasClass("t-beaneditor", element)) {
 						pop(element);
 						element.visit(beanEditForm());
@@ -134,6 +137,9 @@ public void visit(Element element) {
 					if (hasClass("t-beaneditor-row", element)) {
 						element.forceAttributes("class", "control-group");
 					}
+					if ( select(element)) {
+						element.wrap("div", "class", "control");
+					}
 					if ( input(element)) {
 
 						String type= element.getAttribute("type");
@@ -832,6 +838,9 @@ boolean anchor(Element element) {
 	boolean input(Element element) {
 		return hasName("input", element);
 	}
+	boolean select(Element element) {
+		return hasName("select", element);
+	}
 	boolean label(Element element) {
 		return hasName("label", element);
 	}

src/main/java/com/trsvax/bootstrap/services/bootstrapprovider/FormProvider.java

@@ -3,6 +3,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.tapestry5.MarkupWriter;
 import org.apache.tapestry5.corelib.components.BeanEditForm;
 import org.apache.tapestry5.dom.Element;
@@ -65,13 +66,19 @@ public void visit(Element element) {
 				element.addClassName(type);
 				return;
 			}
-			
+			if (div(element) && hasClass("t-error", element)) {
+				element.forceAttributes("class", "alert alert-error");
+			}
 			if (hasClass("t-beaneditor", element)) {
 				pop.add(element);
 			}
 			if (hasClass("t-beaneditor-row", element)) {
 				element.forceAttributes("class", "control-group");
 			}
+			if ( select(element)) {
+				controls = element.wrap("div", "class", "controls");
+				markErrors(element);
+			}
 			if ( input(element)) {
 
 				String type= element.getAttribute("type");
@@ -84,10 +91,12 @@ public void visit(Element element) {
 					element.addClassName("btn");
 				} else {
 					controls = element.wrap("div", "class", "controls");
+					markErrors(element);
 				}
 			}
 			if ( textarea(element) ) {
 				element.wrap("div", "class", "controls");
+				markErrors(element);
 			}
 			if ( label(element)) {
 				element.addClassName("control-label");
@@ -96,6 +105,23 @@ public void visit(Element element) {
 				element.moveToBottom(controls);
 			}
 		}
+
+		/**
+		 * If the element is marked as error by Tapesty, add the CSS class "error" to the control-group DIV.
+		 *
+		 * Moves the "help-inline" error message created but the ValidationDecorator as a child of the control DIV.
+		 *
+		 * @param element The input/select element to check for error
+		 */
+		private void markErrors(Element element) {
+			if (hasClass("error", element)){
+				controls.getContainer().addClassName("error");
+				Element helpInline = controls.getContainer().getElementByAttributeValue("class", "help-inline");
+				if (helpInline != null){
+					helpInline.moveAfter(element);
+				}
+			}
+		}
 	}