Repository: struts Updated Branches: refs/heads/master 0a71c5c9a -> 6070b57f7
WW-4505 Add plugin to support bean validation Move links to validation examples to dropdown submenu Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/53962a05 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/53962a05 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/53962a05 Branch: refs/heads/master Commit: 53962a053115551660e3d9b8e6bec5e305a3bd67 Parents: b6afefe Author: Johannes Geppert <joh...@gmail.com> Authored: Wed May 27 21:08:50 2015 +0200 Committer: Johannes Geppert <joh...@gmail.com> Committed: Wed May 27 21:08:50 2015 +0200 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/decorators/main.jsp | 24 +++++++++- .../main/webapp/WEB-INF/validation/index.jsp | 49 -------------------- 2 files changed, 23 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/53962a05/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp ---------------------------------------------------------------------- diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp index 1479f18..391d0c8 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -195,7 +195,29 @@ <li><s:a value="/skill/index.html">CRUD</s:a></li> <li><s:a value="/wait/index.html">Execute & Wait</s:a></li> <li><s:a value="/token/index.html">Token</s:a></li> - <li><s:a value="/validation/index.action">Validation</s:a></li> + <li class="dropdown-submenu"> + <a href="#">Validation</a> + <ul class="dropdown-menu"> + + <s:url var="quizBasic" namespace="/validation" action="quizBasic" method="input"/> + <s:url var="quizClient" namespace="/validation" action="quizClient" method="input"/> + <s:url var="quizClientCss" namespace="/validation" action="quizClientCss" method="input"/> + <s:url var="fieldValidatorUrl" action="showFieldValidatorsExamples" namespace="/validation"/> + <s:url var="nonFieldValidatorUrl" action="showNonFieldValidatorsExamples" namespace="/validation"/> + <s:url var="visitorValidatorUrl" action="showVisitorValidatorsExamples" namespace="/validation"/> + <s:url var="clientSideValidationUrl" action="clientSideValidationExample" namespace="/validation"/> + <s:url var="backToShowcase" action="showcase" namespace="/"/> + <s:url var="storeMessageAcrossRequestExample" namespace="/validation" action="storeErrorsAcrossRequestExample"/> + <li><s:a href="%{fieldValidatorUrl}">Field Validators</s:a></li> + <li><s:a href="%{clientSideValidationUrl}">Field Validators with client-side JavaScript</s:a></li> + <li><s:a href="%{nonFieldValidatorUrl}">Non Field Validator</s:a></li> + <li><s:a href="%{storeMessageAcrossRequestExample}">Store across request using MessageStoreInterceptor (Example)</s:a></li> + <li><s:a href="%{quizBasic}">Validation (basic)</s:a></li> + <li><s:a href="%{quizClient}">Validation (client)</s:a></li> + <li><s:a href="%{quizClientCss}">Validation (client using css_xhtml theme)</s:a></li> + <li><s:a href="%{visitorValidatorUrl}">Visitor Validator</s:a></li> + </ul> + </li> <li><s:url var="url" namespace="/modelDriven" action="modelDriven"/><s:a href="%{url}">Model Driven</s:a></li> </ul> http://git-wip-us.apache.org/repos/asf/struts/blob/53962a05/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp ---------------------------------------------------------------------- diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp deleted file mode 100644 index cca10f1..0000000 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp +++ /dev/null @@ -1,49 +0,0 @@ -<%-- - index.jsp - - @author tm_jee - @version $Date$ $Id$ ---%> - -<%@taglib prefix="s" uri="/struts-tags" %> - -<html> -<head> - <title>Struts2 Showcase - Validation</title> -</head> -<body> - -<div class="page-header"> - <h1>Validation Examples</h1> -</div> - -<div class="container-fluid"> - <div class="row-fluid"> - <div class="span12"> - - <s:url var="quizBasic" namespace="/validation" action="quizBasic" method="input"/> - <s:url var="quizClient" namespace="/validation" action="quizClient" method="input"/> - <s:url var="quizClientCss" namespace="/validation" action="quizClientCss" method="input"/> - <s:url var="fieldValidatorUrl" action="showFieldValidatorsExamples" namespace="/validation"/> - <s:url var="nonFieldValidatorUrl" action="showNonFieldValidatorsExamples" namespace="/validation"/> - <s:url var="visitorValidatorUrl" action="showVisitorValidatorsExamples" namespace="/validation"/> - <s:url var="clientSideValidationUrl" action="clientSideValidationExample" namespace="/validation"/> - <s:url var="backToShowcase" action="showcase" namespace="/"/> - <s:url var="storeMessageAcrossRequestExample" namespace="/validation" action="storeErrorsAcrossRequestExample"/> - - <ul> - <li><s:a href="%{fieldValidatorUrl}">Field Validators</s:a></li> - <li><s:a href="%{clientSideValidationUrl}">Field Validators with client-side JavaScript</s:a></li> - <li><s:a href="%{nonFieldValidatorUrl}">Non Field Validator</s:a></li> - <li><s:a href="%{storeMessageAcrossRequestExample}">Store across request using MessageStoreInterceptor (Example)</s:a></li> - <li><s:a href="%{quizBasic}">Validation (basic)</s:a></li> - <li><s:a href="%{quizClient}">Validation (client)</s:a></li> - <li><s:a href="%{quizClientCss}">Validation (client using css_xhtml theme)</s:a></li> - <li><s:a href="%{visitorValidatorUrl}">Visitor Validator</s:a></li> - </ul> - </div> - </div> -</div> -</body> -</html> -
