bugfixing

code/moya-web/WebContent/info/placeReservation.xhtml

@@ -45,31 +45,36 @@
 			<h:outputScript target="head" library="seatjs" name="seatmap.js"/>
 			<h:outputStylesheet library="seatjs" name="placemap.css"/>
 
-			<h:form id="selectedPlaces">
-				<h2>#{i18n['placeReservation.selectedPlaces']}</h2>
-				<div style="min-height: 150px; border: solid red  1px;">
-					<p:dataTable id="selectedPlacesTable" tableStyle="width: auto;" var="place" value="#{incomingPlaceshopView.selectedPlaces}">
-						<p:column headerText=" ">
-							<h:outputText value="#{place.product.name}"/>
-						</p:column>
-						<p:column headerText=" ">
-							<h:outputText value="#{place.name}"/>
-						</p:column>
-					</p:dataTable>
-				</div>
-			</h:form>
 
 
+			<p>#{i18n['placeReservation.mapMultiuserNote']}</p>
+			<svg id="seatmap" style="margin: auto; border: 1px solid black;" width="#{ajaxMapView.map.width}px" height="#{ajaxMapView.map.height}px"/>
 
 			<h:form id="placeselectform">
-				<p:commandButton update="placeselectform" onclick="$(window).unbind('beforeunload');"  oncomplete="updateLastPlace();" value="#{i18n['shop.buyForuser']}" actionListener="#{incomingPlaceshopView.reserveSelectedPlaces}" />
+				<p:commandButton update="successText" onclick="$(window).unbind('beforeunload');"  oncomplete="updateLastPlace();" value="#{i18n['shop.buyForUser']}" actionListener="#{incomingPlaceshopView.reserveSelectedPlaces}" >
+					<p:confirm header="#{i18n['placeReservation.buyConfirm.title']}" message="#{i18n['placeReservation.buyConfirm.content']}" icon="ui-icon-alert" />
+				</p:commandButton>
+
+				<p:outputPanel id="successText">
+					<h:outputText styleClass="success" value="#{i18n['shop.buyForUser.success']}"  rendered="#{incomingPlaceshopView.userMustGoAway}"/>
+				</p:outputPanel>
+			</h:form>
+			<br /><br />
 
-				<h:outputText id="successText" styleClass="success" value="#{i18n['shop.buyForuser.success']}"  rendered="#{incomingPlaceshopView.userMustGoAway}"/>
+			<h:form id="selectedPlaces">
+				<h2>#{i18n['placeReservation.selectedPlaces']}</h2>
+				<p:dataTable id="selectedPlacesTable" tableStyle="width: auto;" var="place" value="#{incomingPlaceshopView.selectedPlaces}">
+					<p:column headerText=" ">
+						<h:outputText value="#{place.product.name}"/>
+					</p:column>
+					<p:column headerText=" ">
+						<h:outputText value="#{place.name}"/>
+					</p:column>
+				</p:dataTable>
 			</h:form>
 
 
-			<p>#{i18n['placeReservation.mapMultiuserNote']}</p>
-			<svg id="seatmap" style="margin: auto; border: 1px solid black;" width="#{ajaxMapView.map.width}px" height="#{ajaxMapView.map.height}px"/>
+
 
 
 			<script type="text/javascript">

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties

@@ -547,3 +547,5 @@ shop.buyForUser.success=Ostettu k\u00E4ytt\u00E4j\u00E4lle onnistuneesti
 submenu.info.placeReservation=Paikanvaraus
 placeReservation.selectedPlaces=Valitut paikat
 placeReservation.mapMultiuserNote=Jos sama k\u00E4ytt\u00E4j\u00E4 k\u00E4ytt\u00E4\u00E4 karttaa monelta koneelta, n\u00E4kyv\u00E4t kaikkien koneiden klikkailut kartassa sinisell\u00E4.
+placeReservation.buyConfirm.content=Haluatko varmasti ostaa valitut paikat k\u00E4ytt\u00E4j\u00E4lle, t\u00E4t\u00E4 ei voi peruuttaa?
+placeReservation.buyConfirm.title=Ostetaanko paikat k\u00E4ytt\u00E4j\u00E4lle?

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties

@@ -1787,3 +1787,5 @@ shop.buyForUser.success=Places buyd successfully for user\!
 submenu.info.placeReservation=Placereservation
 placeReservation.selectedPlaces=Selected places
 placeReservation.mapMultiuserNote=If same user uses map from multible computers, you see all computers selections on blue.
+placeReservation.buyConfirm.content=Are you sure, this is hard to cancel?
+placeReservation.buyConfirm.title=Buy places for user?

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties

@@ -1772,3 +1772,5 @@ shop.buyForUser.success=Paikat on ostettu onnistuneesti k\u00E4ytt\u00E4j\u00E4l
 submenu.info.placeReservation=Paikanvaraus
 placeReservation.selectedPlaces=Valitut paikat
 placeReservation.mapMultiuserNote=Jos sama k\u00E4ytt\u00E4j\u00E4 k\u00E4ytt\u00E4\u00E4 karttaa monelta koneelta, n\u00E4kyv\u00E4t kaikkien koneiden klikkailut kartassa sinisell\u00E4.
+placeReservation.buyConfirm.content=Oletko varma, t\u00E4t\u00E4 on vaikea peruuttaa?
+placeReservation.buyConfirm.title=Ostetaanko paikat k\u00E4ytt\u00E4j\u00E4lle?