Merge branch 'better_keeplalive_timeout' into 'master'

Better keeplalive timeout

See merge request !306

code/moya-web/WebContent/resources/templates/primelayout/template.xhtml

@@ -41,9 +41,15 @@
 	<h:body>
 		<!-- Javascript-lokalisaatiolippupuljausta -->
 		<h:form id="conversationKeepaliver">
-			<p:remoteCommand name="cdiKeepalive" onerror="alert('#{i18n['template.keepaliveError']}'); location.reload();" update=":cdiloop" actionListener="#{conversationKeepaliveView.ping()}" />
+			<p:remoteCommand name="cdiKeepalive" onerror="PF('keepAliveDialog').show();" update=":cdiloop" actionListener="#{conversationKeepaliveView.ping()}" />
 		</h:form>
 
+		<p:dialog widgetVar="keepAliveDialog" showEffect="fade" hideEffect="explode" header="#{i18n['template.keepaliveError.title']}" modal="true">
+			<br />#{i18n['template.keepaliveError']}<br /><br />
+
+			<p:commandButton value="OK" type="button" styleClass="ui-confirmdialog-yes" icon="ui-icon-check" onclick="location.reload();" />
+		</p:dialog>
+
 		<script type="text/javascript">
 			$(document)
 					.ready(

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

@@ -549,3 +549,4 @@ 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?
+template.keepaliveError.title=View has been expired

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

@@ -1789,3 +1789,4 @@ 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?
+template.keepaliveError.title=View has been expired

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

@@ -1774,3 +1774,4 @@ 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?
+template.keepaliveError.title=Näkymä on vanhentunut