Author: sletellier Date: 2011-11-14 10:15:15 +0100 (Mon, 14 Nov 2011) New Revision: 75 Url: http://forge.codelutin.com/repositories/revision/echobase/75 Log: - Fix struts theme, overide some ftl - Fix login and user edition form Added: trunk/echobase-ui/src/main/resources/template/ trunk/echobase-ui/src/main/resources/template/css_xhtml/ trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp Added: trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl (rev 0) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl 2011-11-14 09:15:15 UTC (rev 75) @@ -0,0 +1,86 @@ +<#-- +NOTE: The 'header' stuff that follows is in this one file for checkbox due to the fact +that for checkboxes we do not want the label field to show up as checkboxes handle their own +lables +--> +<#assign hasFieldErrors = fieldErrors?? && fieldErrors[parameters.name]??/> +<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp"> + +<#if hasFieldErrors> +<div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr"> +<#list fieldErrors[parameters.name] as error> + <div<#rt/> + <#if parameters.id??> + errorFor="${parameters.id}"<#rt/> + </#if> + class="errorMessage"> + ${error?html} + </div><#t/> +</#list> +</div><#t/> +</#if> +<#if parameters.labelposition?default("left") == 'left'> +<span <#rt/> +<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> +<label<#t/> +<#if parameters.id??> + for="${parameters.id?html}"<#rt/> +</#if> +<#if hasFieldErrors> + class="checkboxErrorLabel"<#rt/> +<#else> + class="label"<#rt/> +</#if> +>${parameters.label?html} +<#if parameters.tooltip??> + <#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> +</#if> +</label><#rt/> +</span> +</#if> + +<#if parameters.labelposition?default("left") == 'top'> +<div <#rt/> +<#else> +<span <#rt/> +</#if> +<#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/></#if> class="wwctrl"> + +<#if parameters.required?default(false)> + <span class="required">*</span><#t/> +</#if> + +<#include "/${parameters.templateDir}/simple/checkbox.ftl" /> +<#if parameters.labelposition?default("left") != 'left'> +<#if parameters.labelposition?default("left") == 'top'> +</div> <#rt/> +<#else> +</span> <#rt/> +</#if> +<#if parameters.label??> +<#if parameters.labelposition?default("left") == 'top'> +<div <#rt/> +<#else> +<span <#rt/> +</#if> +<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> +<label<#t/> +<#if parameters.id??> + for="${parameters.id?html}"<#rt/> +</#if> +<#if hasFieldErrors> + class="checkboxErrorLabel"<#rt/> +<#else> + class="checkboxLabel"<#rt/> +</#if> +>${parameters.label?html}</label><#rt/> +</#if> +</#if> +<#if parameters.label??> +<#if parameters.labelposition?default("left") == 'top'> +</div> <#rt/> +<#else> +</span> <#rt/> +</#if> +</#if> +</div> Added: trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl (rev 0) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl 2011-11-14 09:15:15 UTC (rev 75) @@ -0,0 +1,51 @@ +<#-- + Only show message if errors are available. + This will be done if ActionSupport is used. +--> +<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> +<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp"> + +<#if hasFieldErrors> +<div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr"> +<#list fieldErrors[parameters.name] as error> + <div<#rt/> + <#if parameters.id??> + errorFor="${parameters.id}"<#rt/> + </#if> + class="errorMessage"> + ${error?html} + </div><#t/> +</#list> +</div><#t/> +</#if> + +<#if parameters.label??> +<#if parameters.labelposition?default("top") == 'top'> +<div <#rt/> +<#else> +<span <#rt/> +</#if> +<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> + <label <#t/> +<#if parameters.id??> + for="${parameters.id?html}" <#t/> +</#if> +<#if hasFieldErrors> + class="errorLabel"<#t/> +<#else> + class="label"<#t/> +</#if> + ><#t/> + + ${parameters.label?html} ${parameters.labelseparator!":"?html} +<#if parameters.required?default(false)> + <span class="required">*</span><#t/> +</#if> +<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> + </label><#t/> +<#if parameters.labelposition?default("top") == 'top'> +</div> <#rt/> +<#else> +</span> <#rt/> +</#if> +</#if> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2011-11-14 08:22:12 UTC (rev 74) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2011-11-14 09:15:15 UTC (rev 75) @@ -55,9 +55,15 @@ <h2><s:text name="echobase.title.login"/></h2> <s:form method="POST" namespace="/user"> - <s:hidden key="redirectAction" label=""/> - <s:textfield name="email" key="echobase.common.email" required="true"/> - <s:password name="password" key="echobase.common.password" required="true"/> + <fieldset> + <legend> + <s:text name="echobase.title.login"/> + </legend> + <s:hidden key="redirectAction" label=""/> + <s:textfield name="email" key="echobase.common.email" required="true"/> + <s:password name="password" key="echobase.common.password" required="true"/> + </fieldset> + <br/> <s:submit action="login" key="echobase.action.login" align="right"/> </s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp 2011-11-14 08:22:12 UTC (rev 74) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp 2011-11-14 09:15:15 UTC (rev 75) @@ -93,7 +93,6 @@ size="40"/> <s:checkbox value="%{user.admin}" key="echobase.common.admin"/> </fieldset> - <p><s:text name="echobase.label.info.changePassword"/></p> <ul class="toolbar floatRight"> <li><s:submit action="userForm" method="doCreateOrUpdate" key="echobase.action.save" theme="simple"/></li>