Author: jcouteau Date: 2014-10-20 15:19:50 +0200 (Mon, 20 Oct 2014) New Revision: 443 Url: http://forge.chorem.org/projects/chorem/repository/revisions/443 Log: Fix form style Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-10-20 08:58:44 UTC (rev 442) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-10-20 13:19:50 UTC (rev 443) @@ -185,7 +185,7 @@ protected void inputBinary(JspWriter output, String contextPath, String name, Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException { - /*{<input type="file" name="<%=name%>" <%=getDynamicAttribute()%>/>}*/ + /*{<input type="file" class="form-control" name="<%=name%>" <%=getDynamicAttribute()%>/>}*/ } protected void inputBoolean(JspWriter output, String contextPath, String name, @@ -212,22 +212,22 @@ if (date != null) { value = DateFormatUtils.format(date, "MM/yyyy"); } - /*{<input class="monthpicker" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + /*{<input class="monthpicker form-control" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ } else if ("time".equals(field.getTagValue("subtype"))) { if (date != null) { value = DateFormatUtils.format(date, "HH:mm"); } - /*{<input class="timepicker" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + /*{<input class="timepicker form-control" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ } else if ("datetime".equals(field.getTagValue("subtype"))) { if (date != null) { value = DateFormatUtils.format(date, "dd/MM/yyyy HH:mm"); } - /*{<input class="datetimepicker" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + /*{<input class="datetimepicker form-control" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ } else { if (date != null) { value = DateFormatUtils.format(date, "dd/MM/yyyy"); } - /*{<input class="datepicker" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ + /*{<input class="datepicker form-control" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ } } @@ -239,7 +239,7 @@ value= wikitty.getFieldAsBigDecimal(extName, fieldName); NumberFormat formatter = NumberFormat.getNumberInstance(); String formattedValue = formatter.format(value); - /*{<input type="text" name="<%=name%>" value="<%=formattedValue%>"<%=getDynamicAttribute()%>/>}*/ + /*{<input type="text" class="form-control" name="<%=name%>" value="<%=formattedValue%>"<%=getDynamicAttribute()%>/>}*/ } protected void inputString(JspWriter output, String contextPath, String name, @@ -252,7 +252,7 @@ fieldValue = wikitty.getFieldAsString(extName, fieldName); String value = fieldValue !=null ? fieldValue : ""; if ("monoline".equalsIgnoreCase(field.getSubtype())) { - /*{<input id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ + /*{<input id="text-<%=id%>" class="form-control" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ if (field.hasChoiceQuery()) { String url = contextPath + "/wikitty-json/searchField?q=" + field.getChoiceQuery(); /*{ @@ -267,7 +267,7 @@ }*/ } } else { - /*{<textarea name="<%=name%>"<%=getDynamicAttribute()%>><%=value%></textarea>}*/ + /*{<textarea class="form-control" name="<%=name%>"<%=getDynamicAttribute()%>><%=value%></textarea>}*/ } } @@ -278,7 +278,7 @@ String value = ""; if(!emptyField) value = wikitty.getFieldAsString(extName, fieldName); - /*{<select id="text-<%=id%>" name="<%=name%>" <%=getDynamicAttribute()%> }*/ + /*{<select class="form-control" id="text-<%=id%>" name="<%=name%>" <%=getDynamicAttribute()%> }*/ if (field.isCollection()) { /*{ multiple="multiple" }*/ } @@ -303,7 +303,7 @@ value = wikitty.getFieldAsList(extName, fieldName, String.class); if ("monoline".equalsIgnoreCase(field.getSubtype())) { - /*{<input id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ + /*{<input class="form-control" id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ if (field.hasChoiceQuery()) { String url = contextPath + "/wikitty-json/searchField?q=" + field.getChoiceQuery(); /*{ @@ -368,7 +368,7 @@ }); </script> -<input type="text" id="text-<%=id%>" value="<%=wlabel%>"<%=getDynamicAttribute()%>/> +<input type="text" class="form-control" id="text-<%=id%>" value="<%=wlabel%>"<%=getDynamicAttribute()%>/> <input type="hidden" id="hidden-<%=id%>" name="<%=name%>" value="<%=wid%>"/> }*/ } @@ -417,7 +417,7 @@ }); </script> -<input type="text" id="text-<%=id%>" name="<%=name%>"<%=getDynamicAttribute()%>/> +<input type="text" class="form-control" id="text-<%=id%>" name="<%=name%>"<%=getDynamicAttribute()%>/> }*/ } Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp 2014-10-20 08:58:44 UTC (rev 442) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp 2014-10-20 13:19:50 UTC (rev 443) @@ -38,9 +38,9 @@ <legend>${ext.name}</legend> <input type="hidden" name="extension" value="${ext.name}"> <c:forEach var="fieldName" items="${ext.fieldNames}"> - <div class="control-group"> - <label class="control-label">${fieldName}</label> - <div class="controls"> + <div class="form-group"> + <label class="control-label col-sm-2">${fieldName}</label> + <div class="col-sm-3"> <w:input wikitty="${wikitty}" fqfield="${ext.name}.${fieldName}"/> </div> </div>