From ba50a4dda4267fa0297031f51b4e0e46cb252ae2 Mon Sep 17 00:00:00 2001
From: m.veroni <m.veroni@edf0334f-4afc-450a-8f92-fe1409970e7d>
Date: Fri, 27 Jun 2014 15:36:56 +0000
Subject: [PATCH] Aggiunta pagina su home servizio

---
 WebContent/form/upload.jsp            | 41 +++++++++++++++++++++--------------------
 WebContent/index.jsp                  | 41 +++++++++++++++++++++++++++++++++++++++++
 conf/ADT/test-liliana/WEB-INF/web.xml |  4 ++--
 conf/ADT/test-liliana/version.xml     |  4 ++--
 conf/version.properties               |  6 +++---
 5 files changed, 69 insertions(+), 27 deletions(-)
 create mode 100644 WebContent/index.jsp
diff --git a/WebContent/form/upload.jsp b/WebContent/form/upload.jsp
index ee28d3e..2fab3fd 100644
--- a/WebContent/form/upload.jsp
+++ b/WebContent/form/upload.jsp
@@ -12,6 +12,26 @@
 	<meta http-equiv="expires" content="-1">
 	<meta http-equiv="pragma" content="no-cache">
 	<meta http-equiv="cache-control" content="no-cache">
+	<style>
+		HTML,BODY {
+			margin-top: 5px;
+			margin-left: 5px;
+			margin-right: 5px;
+			margin-bottom: 5px;
+			/* http://www.google.com/fonts */
+			font-family: 'Source Sans Pro', Frutiger, Arial, Helvetica, sans-serif; 
+			/* font-family: Frutiger, Arial, Helvetica, sans-serif; */
+			font-size: 14px;
+			font-weight: 400;
+			background-color: white;
+			color: black;
+			height: 100%
+		}
+		
+		.tabella {border:solid 1px #DDDDEE; color:#2b2b2b; }
+		.cella {padding:5px;color:#2b2b2b; background-color:#DDDDEE; font-face:verdana; font-size:14px;}
+		.cellaIntestazione {padding:5px;color:#2b2b2b; background-color:#DDDDEE; font-face:verdana; font-size:14px; font-weight:bold;}
+	</style>
 	<script>
 		function sendData() {
 			var xmlhttp;
@@ -44,26 +64,7 @@
   			document.dati.FIELD_RESPONSE.value=risposta;
 		}
 	</script>
-	<style>
-		HTML,BODY {
-			margin-top: 5px;
-			margin-left: 5px;
-			margin-right: 5px;
-			margin-bottom: 5px;
-			/* http://www.google.com/fonts */
-			font-family: 'Source Sans Pro', Frutiger, Arial, Helvetica, sans-serif; 
-			/* font-family: Frutiger, Arial, Helvetica, sans-serif; */
-			font-size: 14px;
-			font-weight: 400;
-			background-color: white;
-			color: black;
-			height: 100%
-		}
-		
-		.tabella {border:solid 1px #DDDDEE; color:#2b2b2b; }
-		.cella {padding:5px;color:#2b2b2b; background-color:#DDDDEE; font-face:verdana; font-size:14px;}
-		.cellaIntestazione {padding:5px;color:#2b2b2b; background-color:#DDDDEE; font-face:verdana; font-size:14px; font-weight:bold;}
-	</style>
+	
 </head>
 <body>
 	<form name="dati">
diff --git a/WebContent/index.jsp b/WebContent/index.jsp
new file mode 100644
index 0000000..ca23132
--- /dev/null
+++ b/WebContent/index.jsp
@@ -0,0 +1,41 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ page import="it.softecspa.portal.Parameters"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<%
+	Parameters parameters = Parameters.getInstance();
+	String title = parameters.getChannelInfo().getApplicationTitle();
+%>
+<head>
+	<title>Test page</title>
+	<meta http-equiv="expires" content="-1">
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<style>
+		HTML,BODY {
+			margin-top: 5px;
+			margin-left: 5px;
+			margin-right: 5px;
+			margin-bottom: 5px;
+			/* http://www.google.com/fonts */
+			font-family: 'Source Sans Pro', Frutiger, Arial, Helvetica, sans-serif; 
+			/* font-family: Frutiger, Arial, Helvetica, sans-serif; */
+			font-size: 14px;
+			font-weight: 400;
+			background-color: white;
+			color: black;
+			height: 100%
+		}
+		
+		.tabella {border:solid 1px #DDDDEE; color:#2b2b2b; }
+		.cella {padding:5px;color:#2b2b2b; background-color:#DDDDEE; font-face:verdana; font-size:14px;}
+		.cellaIntestazione {padding:5px;color:#2b2b2b; background-color:#DDDDEE; font-face:verdana; font-size:14px; font-weight:bold;}
+	</style>
+</head>
+<body>
+<div id="main">
+<a href="proxy-services/statement">Click here</a> to check if system is working!
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/conf/ADT/test-liliana/WEB-INF/web.xml b/conf/ADT/test-liliana/WEB-INF/web.xml
index aa29a1c..a379f4f 100644
--- a/conf/ADT/test-liliana/WEB-INF/web.xml
+++ b/conf/ADT/test-liliana/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>FileProxy 1.0.0 (6) - ADT/test-liliana [25/06/2014 14:56]</display-name>
+	<display-name>FileProxy 1.0.0 (7) - ADT/test-liliana [27/06/2014 17:20]</display-name>
 	<!-- Ultime modifiche del 23/06/2014 -->
 	
 	<!-- Configurazione per New Relic -->
@@ -9,7 +9,7 @@
 		  <param-value>FileProxyServer ADT (test)</param-value>
 	</context-param>	
 	
-	<!-- ADT/test-liliana - 25/06/2014 14:56 -->
+	<!-- ADT/test-liliana - 27/06/2014 17:20 -->
 	<!-- Configurazioni obbligatorie -->
 	<context-param>
 		<param-name>ErrorPage</param-name>
diff --git a/conf/ADT/test-liliana/version.xml b/conf/ADT/test-liliana/version.xml
index 5bb83c7..bc5d9ed 100644
--- a/conf/ADT/test-liliana/version.xml
+++ b/conf/ADT/test-liliana/version.xml
@@ -5,8 +5,8 @@
 
 	<entry key="version.number">1.0.0</entry> 				
 	<entry key="version.release"></entry>
-	<entry key="build.number">6</entry> 			
-	<entry key="build.date">25/06/2014 14:56</entry>
+	<entry key="build.number">7</entry> 			
+	<entry key="build.date">27/06/2014 17:20</entry>
 	<entry key="build.installation">ADT/test-liliana</entry>
 	
 </properties>
diff --git a/conf/version.properties b/conf/version.properties
index 07abd93..c24ae1c 100644
--- a/conf/version.properties
+++ b/conf/version.properties
@@ -1,6 +1,6 @@
 #Build Number for ANT. Do not edit!
-#Wed Jun 25 14:56:57 CEST 2014
-build.number=7
+#Fri Jun 27 17:20:50 CEST 2014
+build.number=8
 version.release=
-build.date=25/06/2014 14\:56
+build.date=27/06/2014 17\:20
 version.number=1.0.0
--
libgit2 0.21.4

