From ddd27a2c855430a29a9c457ac5904f95dcd22732 Mon Sep 17 00:00:00 2001
From: guido <guido@labos01>
Date: Wed, 29 May 2013 15:55:24 +0200
Subject: [PATCH] [I18n] App name parametrized

-Locanda name is now a property that can be promptly changed for an easy
forking
-Obsolete JSPs removed
---
 src/global.properties                         |  8 ++-
 src/global_es.properties                      |  2 -
 webroot/WEB-INF/jsp/contents/guests_form.jsp  |  2 +-
 webroot/WEB-INF/jsp/createAccount-input.jsp   |  2 +-
 webroot/WEB-INF/jsp/createAccount-output.jsp  |  4 +-
 webroot/WEB-INF/jsp/download.jsp              | 57 -------------------
 webroot/WEB-INF/jsp/footer.jsp                | 26 ---------
 webroot/WEB-INF/jsp/layout/footer.jsp         |  4 +-
 webroot/WEB-INF/jsp/layout/header.jsp         |  2 +-
 webroot/WEB-INF/jsp/layout/header_menu.jsp    |  2 +-
 .../WEB-INF/jsp/online/validationError.jsp    |  2 +-
 webroot/WEB-INF/jsp/online/widget1.jsp        |  2 +-
 webroot/WEB-INF/jsp/online/widget2.jsp        |  2 +-
 webroot/WEB-INF/jsp/online/widget3.jsp        |  2 +-
 webroot/WEB-INF/jsp/online/widget4.jsp        |  2 +-
 webroot/WEB-INF/jsp/online/widget5.jsp        |  2 +-
 16 files changed, 18 insertions(+), 103 deletions(-)
 delete mode 100644 webroot/WEB-INF/jsp/download.jsp
 delete mode 100644 webroot/WEB-INF/jsp/footer.jsp

diff --git a/src/global.properties b/src/global.properties
index c5c7eca3..eb882983 100644
--- a/src/global.properties
+++ b/src/global.properties
@@ -101,9 +101,9 @@ createAccount = Create Account
 
 createAccountSuccess = Account created successfully
 
-createAccountSuccessMessage = Congratulation! Your account has been created successfully. Now you are able to log in to locanda by using the following data
+createAccountSuccessMessage = Congratulation! Your account has been created successfully. Now you are able to log in to <s:text name="title"/> by using the following data
 
-currentVersion = 0.3
+currentVersion = 0.4
 
 customer = Customer
 
@@ -479,7 +479,9 @@ thisFileMandatory = This Field is Mandatory
 
 thursday = Thursday
 
-title = Locanda - The Open Source Booking Software
+title = Locanda
+
+titleExtended = Locanda - The Open Source Booking Software
 
 to = To
 
diff --git a/src/global_es.properties b/src/global_es.properties
index 36f058b2..cbde22b3 100644
--- a/src/global_es.properties
+++ b/src/global_es.properties
@@ -567,8 +567,6 @@ thisFileMandatory = campo obligatorio
 
 thursday = Jueves
 
-title = locanda  reserva de hoteles
-
 to = A
 
 total = Total cuenta
diff --git a/webroot/WEB-INF/jsp/contents/guests_form.jsp b/webroot/WEB-INF/jsp/contents/guests_form.jsp
index 515d987d..0549b089 100644
--- a/webroot/WEB-INF/jsp/contents/guests_form.jsp
+++ b/webroot/WEB-INF/jsp/contents/guests_form.jsp
@@ -48,7 +48,7 @@
 	<link rel="stylesheet" type='text/css' href="css/jquery.fileupload-ui.css" />
 	<link rel="stylesheet" type="text/css" href="css/layout_sliding_door.css" />
 
-	<title>LOCANDA - Open Source Booking Tool</title>
+	<title><s:text name="titleExtended"/></title>
 
 	<!-- (de) Fuegen Sie hier ihre Meta-Daten ein -->
   	<!--[if lte IE 7]>
diff --git a/webroot/WEB-INF/jsp/createAccount-input.jsp b/webroot/WEB-INF/jsp/createAccount-input.jsp
index dfc82e93..f7e3f58c 100644
--- a/webroot/WEB-INF/jsp/createAccount-input.jsp
+++ b/webroot/WEB-INF/jsp/createAccount-input.jsp
@@ -24,7 +24,7 @@
 <s:url action="createAccount" var="url_createAccount"></s:url>
 <jsp:include page="layout/header.jsp" />
 <div id="home">
-	<h1>Locanda - <s:text name="createAccount"/></h1>
+	<h1><s:text name="title"/> - <s:text name="createAccount"/></h1>
 	<p><s:text name="homeWelcomeMessage"/>.</p>
 	<s:actionerror/><s:fielderror></s:fielderror>
 
diff --git a/webroot/WEB-INF/jsp/createAccount-output.jsp b/webroot/WEB-INF/jsp/createAccount-output.jsp
index a2d6cab4..a09d432b 100644
--- a/webroot/WEB-INF/jsp/createAccount-output.jsp
+++ b/webroot/WEB-INF/jsp/createAccount-output.jsp
@@ -23,11 +23,11 @@
 <s:url action="createAccount" var="url_createAccount"></s:url>
 <jsp:include page="layout/header.jsp"/>
       <div id="home">
-      	<h1>Locanda - <s:text name="createAccountSuccess"/></h1>
+      	<h1><s:text name="title"/> - <s:text name="createAccountSuccess"/></h1>
       	<p><s:text name="createAccountSuccessMessage"/>:</p>
       	<p>
       	Email: <s:property value="user.email" /><br></br>
-      	Password: locanda
+      	Password: <s:text name="title"/>
       	</p>
       	<p id="home_images"></p>
       </div>
diff --git a/webroot/WEB-INF/jsp/download.jsp b/webroot/WEB-INF/jsp/download.jsp
deleted file mode 100644
index eec74dd2..00000000
--- a/webroot/WEB-INF/jsp/download.jsp
+++ /dev/null
@@ -1,57 +0,0 @@
-<%--
- *
- *  Copyright 2011 - Sardegna Ricerche, Distretto ICT, Pula, Italy
- *
- * Licensed under the EUPL, Version 1.1.
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- *
- *  http://www.osor.eu/eupl
- *
- * Unless required by applicable law or agreed to in  writing, software distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and limitations under the Licence.
- * In case of controversy the competent court is the Court of Cagliari (Italy).
---%>
-<?xml version="1.0" encoding="UTF-8" ?>
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="/struts-tags" prefix="s" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-		
-
-<s:url action="download" var="url_download"></s:url>
-<jsp:include page="layout/header.jsp"/>
-      <div id="home">
-      	<h1>Locanda - Download</h1>
-      	<p><s:text name="homeWelcomeMessage"/>.</p>
-      	<form role="application" class="yform" action="<s:property value="url_download"/>" method="post">
-            <fieldset>
-              <legend>Inserisci i tuoi dati</legend>
-              <div class="type-text">
-                <label for="firstname">Nome</label>
-                <input type="text" size="20" id="firstname" name="name" class="required" />
-              </div>
-              <div class="type-text">
-                <label for="firstname">Cognome</label>
-                <input type="text" size="20" id="firstname" name="surname" class="required" />
-              </div>
-              <div class="type-text">
-                <label for="email">E-Mail <sup title="<s:text name="thisFileMandatory"/>.">*</sup></label>
-                <input type="text" aria-required="true" size="20" id="email" name="email" class="required"/>
-              </div>
-                <div class="type-text">
-                <label for="phone">Telefono <sup title="<s:text name="thisFileMandatory"/>.">*</sup></label>
-                <input type="text" aria-required="true" size="20" id="phone" name="phone" class="required"/>
-              </div>
-            </fieldset>
-            <div class="type-button">
-              <button><img  src="images/download.png" alt="download"/></button>
-            </div>
-          </form>
-      	
-      	
-      	<p id="home_images">
-      	</p>
-      </div>
-<jsp:include page="layout/footer.jsp" />     
\ No newline at end of file
diff --git a/webroot/WEB-INF/jsp/footer.jsp b/webroot/WEB-INF/jsp/footer.jsp
deleted file mode 100644
index e4308e3c..00000000
--- a/webroot/WEB-INF/jsp/footer.jsp
+++ /dev/null
@@ -1,26 +0,0 @@
-<%--
- *
- *  Copyright 2011 - Sardegna Ricerche, Distretto ICT, Pula, Italy
- *
- * Licensed under the EUPL, Version 1.1.
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- *
- *  http://www.osor.eu/eupl
- *
- * Unless required by applicable law or agreed to in  writing, software distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and limitations under the Licence.
- * In case of controversy the competent court is the Court of Cagliari (Italy).
---%>
-<!-- begin: #footer -->
-	<div id="footer" role="contentinfo">
-        <img src="images/labos-small.png" alt="Laboratorio Open Source" class="left" />
-        <img src="images/sardegna_ricerche.png" alt="Sardegna Ricerche" class="left" />
-        <img src="images/regione.gif" alt="Regione Autonoma della Sardegna" class="right" />
-        <img src="images/governo.gif" alt="Repubblica Italiana" class="right" />
-        <img src="images/unione_europea.gif" alt="Unione Europea" class="right" />
-        <span class="center">Locanda<br />
-        Open Source Booking Software<br /><br /></span>
-    </div>
-<!-- end: #footer -->
\ No newline at end of file
diff --git a/webroot/WEB-INF/jsp/layout/footer.jsp b/webroot/WEB-INF/jsp/layout/footer.jsp
index 82d7aa75..a1f842be 100644
--- a/webroot/WEB-INF/jsp/layout/footer.jsp
+++ b/webroot/WEB-INF/jsp/layout/footer.jsp
@@ -30,9 +30,7 @@
 					<img src="images/european_union.png" id="eu" alt="European Union" class="right" height="7%" width="7%" /> 
 					<img src="images/repubblica.png" alt="Repubblica Italiana" class="right" height="7%" width="7%"/> 
 					<img src="images/regione_sardegna.png" alt="Regione Autonoma della Sardegna" class="right" height="7%" width=7%/> 
-					<span class="center">Locanda<br/> 
-						Open Source Booking<br/><br/>
-					</span>
+					<span class="center"><s:text name="titleExtended"/><br/><br/><br/></span>
 				</div>
 				<!-- end: #footer -->
 			</div>
diff --git a/webroot/WEB-INF/jsp/layout/header.jsp b/webroot/WEB-INF/jsp/layout/header.jsp
index 0b950729..9941378c 100644
--- a/webroot/WEB-INF/jsp/layout/header.jsp
+++ b/webroot/WEB-INF/jsp/layout/header.jsp
@@ -24,7 +24,7 @@
 	<link type='text/css' href='css/south-street/jquery-ui-1.8.9.custom.css' rel='stylesheet' />
 	<link type="text/css" href="css/layout_sliding_door.css" rel="stylesheet"  />
   	<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png">
-  	<title>LOCANDA - Open Source Booking Tool</title><!-- (en) Add your meta data here -->
+  	<title><s:text name="titleExtended"/></title><!-- (en) Add your meta data here -->
   	
   	<!-- (de) Fuegen Sie hier ihre Meta-Daten ein -->
   	<!--[if lte IE 7]>
diff --git a/webroot/WEB-INF/jsp/layout/header_menu.jsp b/webroot/WEB-INF/jsp/layout/header_menu.jsp
index bf3a8566..f003e926 100644
--- a/webroot/WEB-INF/jsp/layout/header_menu.jsp
+++ b/webroot/WEB-INF/jsp/layout/header_menu.jsp
@@ -31,7 +31,7 @@
 	<link rel="stylesheet" type='text/css' href="css/jquery.fileupload-ui.css" />
 	<link rel="stylesheet" type="text/css" href="css/layout_sliding_door.css" />
   	<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png">
-	<title>LOCANDA - Open Source Booking Tool</title>
+	<title><s:text name="titleExtended"/></title>
 
 	<!-- (de) Fuegen Sie hier ihre Meta-Daten ein -->
   	<!--[if lte IE 7]>
diff --git a/webroot/WEB-INF/jsp/online/validationError.jsp b/webroot/WEB-INF/jsp/online/validationError.jsp
index 739d5ba3..5cb72209 100644
--- a/webroot/WEB-INF/jsp/online/validationError.jsp
+++ b/webroot/WEB-INF/jsp/online/validationError.jsp
@@ -18,7 +18,7 @@
 	  </div><!-- /content -->
 
 	  <div data-role="footer">
-		<h4>Locanda <s:text name="onlineWidget"/></h4>
+		<h4><s:text name="title"/> <s:text name="onlineWidget"/></h4>
 	  </div><!-- /header -->
 	  
     </div><!-- /page -->
\ No newline at end of file
diff --git a/webroot/WEB-INF/jsp/online/widget1.jsp b/webroot/WEB-INF/jsp/online/widget1.jsp
index e38f8809..b07cd83d 100644
--- a/webroot/WEB-INF/jsp/online/widget1.jsp
+++ b/webroot/WEB-INF/jsp/online/widget1.jsp
@@ -73,6 +73,6 @@
       </div><!-- /content -->
       
 	  <div data-role="footer">
-        <h4>Locanda <s:text name="onlineWidget"/></h4>
+        <h4><s:text name="title"/> <s:text name="onlineWidget"/></h4>
       </div><!-- /header -->
     </div><!-- /page -->
\ No newline at end of file
diff --git a/webroot/WEB-INF/jsp/online/widget2.jsp b/webroot/WEB-INF/jsp/online/widget2.jsp
index 9b08226a..36d9156f 100644
--- a/webroot/WEB-INF/jsp/online/widget2.jsp
+++ b/webroot/WEB-INF/jsp/online/widget2.jsp
@@ -59,6 +59,6 @@
   </div><!-- /content -->
   
   <div data-role="footer">
-    <h4>Locanda <s:text name="onlineWidget"/></h4>
+    <h4><s:text name="title"/> <s:text name="onlineWidget"/></h4>
   </div><!-- /header -->
 </div>
\ No newline at end of file
diff --git a/webroot/WEB-INF/jsp/online/widget3.jsp b/webroot/WEB-INF/jsp/online/widget3.jsp
index 47b9275c..3d8ddc8e 100644
--- a/webroot/WEB-INF/jsp/online/widget3.jsp
+++ b/webroot/WEB-INF/jsp/online/widget3.jsp
@@ -44,6 +44,6 @@
 	  </div><!-- /content -->
 
 	  <div data-role="footer">
-		<h4>Locanda <s:text name="onlineWidget"/></h4>
+		<h4><s:text name="title"/> <s:text name="onlineWidget"/></h4>
 	  </div><!-- /header -->
 	</div><!-- /page -->
\ No newline at end of file
diff --git a/webroot/WEB-INF/jsp/online/widget4.jsp b/webroot/WEB-INF/jsp/online/widget4.jsp
index a7f337e7..9d7ee27b 100644
--- a/webroot/WEB-INF/jsp/online/widget4.jsp
+++ b/webroot/WEB-INF/jsp/online/widget4.jsp
@@ -70,6 +70,6 @@
   </div><!-- /content -->
   
   <div data-role="footer">
-    <h4>Locanda <s:text name="onlineWidget"/></h4>
+    <h4><s:text name="title"/> <s:text name="onlineWidget"/></h4>
   </div><!-- /header -->
 </div><!-- /page -->
\ No newline at end of file
diff --git a/webroot/WEB-INF/jsp/online/widget5.jsp b/webroot/WEB-INF/jsp/online/widget5.jsp
index 466d3952..2801ee3b 100644
--- a/webroot/WEB-INF/jsp/online/widget5.jsp
+++ b/webroot/WEB-INF/jsp/online/widget5.jsp
@@ -72,6 +72,6 @@
     </div>
   </div><!-- /content -->
   <div data-role="footer">
-    <h4>Locanda <s:text name="onlineWidget"/></h4>
+    <h4><s:text name="title"/> <s:text name="onlineWidget"/></h4>
   </div><!-- /header -->
 </div><!-- /page -->
\ No newline at end of file