Skip to content

Commit 0b432c2

Browse files
rstoyanchevrstoyanchev
committed
Fix layout issues in booking-mvc
1 parent e213ca2 commit 0b432c2

File tree

4 files changed

+43
-50
lines changed

4 files changed

+43
-50
lines changed

‎booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<div class="span-4">
3535
<label for="checkinDate">Check In:</label>
3636
</div>
37-
<div class="span-7 last">
37+
<div class="last">
3838
<p><form:input path="checkinDate"/></p>
3939
<script type="text/javascript">
4040
Spring.addDecoration(new Spring.ElementDecoration({
@@ -49,7 +49,7 @@
4949
<div class="span-4">
5050
<label for="checkoutDate">Check Out:</label>
5151
</div>
52-
<div class="span-7 last">
52+
<div class="last">
5353
<p><form:input path="checkoutDate"/></p>
5454
<script type="text/javascript">
5555
Spring.addDecoration(new Spring.ElementDecoration({
@@ -63,7 +63,7 @@
6363
<div class="span-4">
6464
<label for="beds">Room Preference:</label>
6565
</div>
66-
<div class="span-7 last">
66+
<div class="last">
6767
<p>
6868
<form:select id="beds" path="beds">
6969
<form:option label="One king-size bed" value="1"/>
@@ -74,10 +74,10 @@
7474
</div>
7575
</div>
7676
<div>
77-
<div class="label span-4">
78-
Smoking Preference:
77+
<div class="label">
78+
<label for="radio">Smoking Preference:</label>
7979
</div>
80-
<div id="radio" class="span-7 last">
80+
<div id="radio">
8181
<p>
8282
<form:radiobutton id="smoking" path="smoking" label="Smoking" value="true"/>
8383
<form:radiobutton id="non-smoking" path="smoking" label="Non Smoking" value="false"/>
@@ -99,15 +99,13 @@
9999
</div>
100100
</div>
101101
<div>
102-
<div class="label span-4">
103-
Amenities:
102+
<div>
103+
<label for="amenities">Amenities:</label>
104104
</div>
105-
<div id="amenities" class="span-7 last">
105+
<div id="amenities">
106106
<p>
107107
<form:checkbox path="amenities" value="OCEAN_VIEW" label="Ocean View" />
108-
<br />
109108
<form:checkbox path="amenities" value="LATE_CHECKOUT" label="Late Checkout" />
110-
<br />
111109
<form:checkbox path="amenities" value="MINIBAR" label="Minibar" />
112110
</p>
113111
<script type="text/javascript">
@@ -125,7 +123,7 @@
125123
<div class="span-4">
126124
<label for="creditCard">Credit Card #:</label>
127125
</div>
128-
<div class="span-7 last">
126+
<div class="last">
129127
<p><form:input path="creditCard"/></p>
130128
<script type="text/javascript">
131129
Spring.addDecoration(new Spring.ElementDecoration({
@@ -140,7 +138,7 @@
140138
<div class="span-4">
141139
<label for="creditCardName">Credit Card Name:</label>
142140
</div>
143-
<div class="span-7 last">
141+
<div class="last">
144142
<p><form:input path="creditCardName" maxlength="40"/></p>
145143
<script type="text/javascript">
146144
Spring.addDecoration(new Spring.ElementDecoration({
@@ -154,7 +152,7 @@
154152
<div class="span-4">
155153
<label for="creditCardExpiryMonth">Expiration Date:</label>
156154
</div>
157-
<div class="span-7 last">
155+
<div class="last">
158156
<p>
159157
<form:select id="creditCardExpiryMonth" path="creditCardExpiryMonth">
160158
<form:option label="Jan" value="1"/>
@@ -181,10 +179,8 @@
181179
</div>
182180
</div>
183181
<div>
184-
<p>
185182
<button type="submit" id="proceed" name="_eventId_proceed">Proceed</button>
186183
<button type="submit" name="_eventId_cancel" >Cancel</button>
187-
</p>
188184
<script type="text/javascript">
189185
Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));
190186
Spring.addDecoration(new Spring.AjaxEventDecoration({elementId:'proceed',event:'onclick',formId:'booking'}));

‎booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,41 +19,39 @@
1919
<fieldset>
2020
<legend>Confirm Booking Details</legend>
2121
<div>
22-
<div class="span-3">Check In:</div>
23-
<div class="span-8 last">
22+
<div class="span-4">Check In:</div>
23+
<div class="last">
2424
<p><spring:bind path="checkinDate">${status.value}</spring:bind></p>
2525
</div>
2626
</div>
2727
<div>
28-
<div class="span-3">Checkout:</div>
29-
<div class="span-8 last">
28+
<div class="span-4">Checkout:</div>
29+
<div class="last">
3030
<p><spring:bind path="checkoutDate">${status.value}</spring:bind></p>
3131
</div>
3232
</div>
3333
<div>
34-
<div class="span-3">Number of Nights:</div>
35-
<div class="span-8 last">
34+
<div class="span-4">Number of Nights:</div>
35+
<div class="last">
3636
<p><spring:bind path="nights">${status.value}</spring:bind></p>
3737
</div>
3838
</div>
3939
<div>
40-
<div class="span-3">Total Payment:</div>
41-
<div class="span-8 last">
40+
<div class="span-4">Total Payment:</div>
41+
<div class="last">
4242
<p><spring:bind path="total">${status.value}</spring:bind></p>
4343
</div>
4444
</div>
4545
<div>
46-
<div class="span-3">Credit Card #:</div>
47-
<div class="span-8 last">
46+
<div class="span-4">Credit Card #:</div>
47+
<div class="last">
4848
<p>${booking.creditCard}</p>
4949
</div>
5050
</div>
5151
<div>
52-
<p>
53-
<button type="submit" name="_eventId_confirm">Confirm</button>
54-
<button type="submit" name="_eventId_revise" id="revise">Revise</button>
55-
<button type="submit" name="_eventId_cancel">Cancel</button>
56-
</p>
52+
<button type="submit" name="_eventId_confirm">Confirm</button>
53+
<button type="submit" name="_eventId_revise" id="revise">Revise</button>
54+
<button type="submit" name="_eventId_cancel">Cancel</button>
5755
<script type="text/javascript">
5856
Spring.addDecoration(new Spring.AjaxEventDecoration({elementId:'revise',event:'onclick',formId:'confirm'}));
5957
</script>

‎booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,18 @@
99
<form:errors path="*"/>
1010
</span>
1111
<fieldset>
12-
<div class="span-8">
13-
<label for="searchString">Search String:</label>
12+
<div class="span-7">
1413
<form:input id="searchString" path="searchString"/>
1514
<script type="text/javascript">
1615
Spring.addDecoration(new Spring.ElementDecoration({
1716
elementId : "searchString",
1817
widgetType : "dijit.form.ValidationTextBox",
19-
widgetAttrs : { promptMessage : "Search hotels by name, address, city, or zip." }}));
18+
widgetAttrs : { promptMessage : "Name, address, city, or zip." }}));
2019
</script>
2120
</div>
2221
<div class="span-6">
2322
<div>
24-
<label for="pageSize">Maximum results:</label>
23+
<label for="pageSize">Page Size:</label>
2524
<form:select id="pageSize" path="pageSize">
2625
<form:option label="5" value="5"/>
2726
<form:option label="10" value="10"/>

‎booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@
2121
<div id="page" class="container">
2222
<div id="header">
2323
<div id="topbar">
24-
<p>
25-
<security:authorize access="hasRole('ROLE_USER')">
26-
<c:if test="${pageContext.request.userPrincipal != null}">
27-
Welcome, ${pageContext.request.userPrincipal.name} |
28-
</c:if>
29-
<form name="f" action="<c:url value="/logout" />" method="post">
30-
<div>
31-
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
32-
</div>
24+
<security:authorize access="hasRole('ROLE_USER')">
25+
<form action="<c:url value="/logout" />" method="post" class="inline">
26+
<div class="span-4 label">
27+
<c:if test="${pageContext.request.userPrincipal != null}">
28+
Welcome, ${pageContext.request.userPrincipal.name}
29+
</c:if>
30+
</div>
31+
<div class="last">
32+
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
3333
<button id="submit" type="submit">Logout</button>
34-
</form>
35-
</security:authorize>
36-
<security:authorize access="hasRole('ROLE_ANONYMOUS')">
37-
<a href="<c:url value="/login" />">Login</a>
38-
</security:authorize>
39-
</p>
34+
</div>
35+
</form>
36+
</security:authorize>
37+
<security:authorize access="hasRole('ROLE_ANONYMOUS')">
38+
<a href="<c:url value="/login" />">Login</a>
39+
</security:authorize>
4040
</div>
4141
<div id="logo">
4242
<p>

0 commit comments

Comments
 (0)