Repository: struts Updated Branches: refs/heads/master 4286d6a9d -> e10658cb3
WW-4547 - Rest showcase does not show the validation result Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e10658cb Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e10658cb Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e10658cb Branch: refs/heads/master Commit: e10658cb3cff6dc7e2df776fb85235337c805ceb Parents: 4286d6a Author: Johannes Geppert <[email protected]> Authored: Thu Sep 10 17:37:41 2015 +0200 Committer: Johannes Geppert <[email protected]> Committed: Thu Sep 10 17:37:41 2015 +0200 ---------------------------------------------------------------------- .../main/webapp/WEB-INF/content/orders-deleteConfirm.jsp | 2 ++ .../src/main/webapp/WEB-INF/content/orders-edit.jsp | 8 ++++++++ .../src/main/webapp/WEB-INF/content/orders-editNew.jsp | 9 ++++++++- .../src/main/webapp/WEB-INF/content/orders-index.jsp | 2 ++ .../src/main/webapp/WEB-INF/content/orders-show.jsp | 2 ++ apps/rest-showcase/src/main/webapp/css/app.css | 5 +++++ 6 files changed, 27 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/e10658cb/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp ---------------------------------------------------------------------- diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp index 4ca2487..98f3c39 100644 --- a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp +++ b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp @@ -8,6 +8,8 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Orders</title> <link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet"> + <link href="${pageContext.request.contextPath}/css/app.css" rel="stylesheet"> + <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!--[if lt IE 9]> http://git-wip-us.apache.org/repos/asf/struts/blob/e10658cb/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp ---------------------------------------------------------------------- diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp index 7036f6d..d410719 100644 --- a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp +++ b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp @@ -8,6 +8,8 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Orders</title> <link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet"> + <link href="${pageContext.request.contextPath}/css/app.css" rel="stylesheet"> + <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!--[if lt IE 9]> @@ -39,12 +41,18 @@ <div class="col-sm-4"> <s:textfield id="clientName" name="clientName" cssClass="form-control"/> </div> + <div class="col-sm-4"> + <s:fielderror fieldName="clientName" /> + </div> </div> <div class="form-group"> <label class="col-sm-2 control-label" for="amount">Amount</label> <div class="col-sm-4"> <s:textfield id="amount" name="amount" cssClass="form-control" /> </div> + <div class="col-sm-4"> + <s:fielderror fieldName="amount" /> + </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-4"> http://git-wip-us.apache.org/repos/asf/struts/blob/e10658cb/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-editNew.jsp ---------------------------------------------------------------------- diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-editNew.jsp b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-editNew.jsp index ce5fbbc..080d79a 100644 --- a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-editNew.jsp +++ b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-editNew.jsp @@ -8,6 +8,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Orders</title> <link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet"> + <link href="${pageContext.request.contextPath}/css/app.css" rel="stylesheet"> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!--[if lt IE 9]> @@ -32,11 +33,17 @@ <div class="col-sm-4"> <s:textfield id="clientName" name="clientName" cssClass="form-control"/> </div> + <div class="col-sm-4"> + <s:fielderror fieldName="clientName" /> + </div> </div> <div class="form-group"> <label class="col-sm-2 control-label" for="amount">Amount</label> <div class="col-sm-4"> - <s:textfield id="amount" name="amount" cssClass="form-control"/> + <s:textfield id="amount" name="amount" cssClass="form-control"/> + </div> + <div class="col-sm-4"> + <s:fielderror fieldName="amount" /> </div> </div> <div class="form-group"> http://git-wip-us.apache.org/repos/asf/struts/blob/e10658cb/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp ---------------------------------------------------------------------- diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp index b0c0632..466699a 100644 --- a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp +++ b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp @@ -8,6 +8,8 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Orders</title> <link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet"> + <link href="${pageContext.request.contextPath}/css/app.css" rel="stylesheet"> + <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!--[if lt IE 9]> http://git-wip-us.apache.org/repos/asf/struts/blob/e10658cb/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp ---------------------------------------------------------------------- diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp index 94d110b..f4b6f04 100644 --- a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp +++ b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp @@ -8,6 +8,8 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Orders</title> <link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet"> + <link href="${pageContext.request.contextPath}/css/app.css" rel="stylesheet"> + <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!--[if lt IE 9]> http://git-wip-us.apache.org/repos/asf/struts/blob/e10658cb/apps/rest-showcase/src/main/webapp/css/app.css ---------------------------------------------------------------------- diff --git a/apps/rest-showcase/src/main/webapp/css/app.css b/apps/rest-showcase/src/main/webapp/css/app.css new file mode 100644 index 0000000..266479a --- /dev/null +++ b/apps/rest-showcase/src/main/webapp/css/app.css @@ -0,0 +1,5 @@ +.form-group .errorMessage { + list-style: none; + font-weight: bold; + color: red; +} \ No newline at end of file
