1.1 --- a/endpoint/WebContent/store.jsp	Wed Jun 27 14:26:41 2012 +0300
     1.2 +++ b/endpoint/WebContent/store.jsp	Wed Jun 27 14:27:05 2012 +0300
     1.3 @@ -93,10 +93,10 @@
     1.4  %>
     1.5  	<tr>
     1.6  	<!--  direct input form -->
     1.7 -		<td style="border: 1px dashed #bbbbbb;">Direct Input:</td>
     1.8 -		<td style="border: 1px dashed #bbbbbb;">
     1.9 +		<td id="output">Direct Input:</td>
    1.10 +		<td id="output>
    1.11  			<textarea name="<%=StoreBean.PARAM_DATA%>" rows="15" cols="100"></textarea></td>
    1.12 -		<td rowspan=4 style="border: 1px dashed #bbbbbb;">
    1.13 +		<td rowspan=4 id="output">
    1.14  			<CENTER>RDF Format:<br/>
    1.15  				<SELECT name="<%=StoreBean.PARAM_FORMAT%>">
    1.16  				<% for (String format : StoreBean.registeredFormats) {%>
    1.17 @@ -107,7 +107,7 @@
    1.18  		</td>
    1.19  	</tr>
    1.20  	<tr>
    1.21 -		<td colspan=2 style="border: 1px dashed #bbbbbb;"><br/>
    1.22 +		<td colspan=2 id="output><br/>
    1.23  		<CENTER>
    1.24  			<input type="submit" value="Store Input" name="<%=StoreBean.SUBMIT_INPUT%>" style="width: 400px"/>
    1.25  		</CENTER><br/>
    1.26 @@ -115,14 +115,14 @@
    1.27  	</tr>
    1.28  	
    1.29  	<tr>
    1.30 -		<td style="border: 1px dashed #bbbbbb;">URI Input:</td>
    1.31 -		<td style="border: 1px dashed #bbbbbb;">
    1.32 +		<td id="output" >URI Input:</td>
    1.33 +		<td id="output">
    1.34  			<textarea name="<%=StoreBean.PARAM_DATA_URL%>" rows="1" cols="100"></textarea>
    1.35  		</td>
    1.36  	</tr>
    1.37  	
    1.38  	<tr>
    1.39 -		<td colspan=2 style="border: 1px dashed #bbbbbb;"><br/>
    1.40 +		<td colspan=2 id="output"><br/>
    1.41  			<CENTER>
    1.42  				<INPUT type="submit" value="Store from URI" name="<%=StoreBean.SUBMIT_URL%>" style="width: 400px"/>
    1.43  			</CENTER><br/>

     2.1 --- a/endpoint/WebContent/style.css	Wed Jun 27 14:26:41 2012 +0300
     2.2 +++ b/endpoint/WebContent/style.css	Wed Jun 27 14:27:05 2012 +0300
     2.3 @@ -2,6 +2,8 @@
     2.4  
     2.5  body {
     2.6  	margin:0px;
     2.7 +	background-color:#EFEDEA;
     2.8 +	color:black;
     2.9  	}
    2.10  	
    2.11  td {
    2.12 @@ -12,7 +14,8 @@
    2.13  
    2.14  form
    2.15  {
    2.16 -border-top: 12px solid #E6A685;
    2.17 +#border-top: 12px solid #E6A685;
    2.18 +padding-top: 5px;
    2.19  }
    2.20  
    2.21  table
    2.22 @@ -20,18 +23,23 @@
    2.23  	background-color:#EFEDEA;
    2.24  }
    2.25  
    2.26 +a
    2.27 +{
    2.28 +	color:black;
    2.29 +}
    2.30  
    2.31 -a {
    2.32 -	color: green;
    2.33 -	}	
    2.34  a:hover 
    2.35  {
    2.36 -	color: green;
    2.37 +	color: #E6A685;
    2.38  	}
    2.39  
    2.40  p {
    2.41  	text-align: justify
    2.42  }
    2.43 +option:hover
    2.44 +{
    2.45 +	background:#E6A685;
    2.46 +}
    2.47  
    2.48  /* ID Styles */
    2.49  
    2.50 @@ -40,6 +48,35 @@
    2.51  border-bottom:10px solid #D1D1BA;
    2.52  }
    2.53  
    2.54 +#intro
    2.55 +{
    2.56 +	background:#D1D1BA;
    2.57 +	border:3px solid #E6A685;
    2.58 +	border-radius:5px;
    2.59 +	padding:5px;
    2.60 +}
    2.61 +#output
    2.62 +{
    2.63 +	border: 1px dashed #bbbbbb;
    2.64 +}
    2.65 +
    2.66 +input[type=submit]
    2.67 +{
    2.68 +	width: 400px;
    2.69 +	background:#D1D1BA;
    2.70 +	border:1px dotted;
    2.71 +	border-radius:5px;
    2.72 +}
    2.73 + input[type=submit]:hover
    2.74 +{
    2.75 +	border: 1px solid #E6A685;
    2.76 +	border-radius:5px;
    2.77 +}
    2.78 +
    2.79 +#twidth
    2.80 +{	
    2.81 +	width:90px;
    2.82 +}
    2.83  
    2.84  #navigation td {
    2.85  	border: 1px dotted #A7A795;
    2.86 @@ -63,6 +100,8 @@
    2.87  	background:#D1D1BA;
    2.88  #	background-color:#B8B894;
    2.89  #	color:#dfe8f0;
    2.90 +	border: 1px solid #E6A685;
    2.91 +	border-radius:5px;
    2.92  	}
    2.93  	
    2.94  .logo 	{

     3.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java	Wed Jun 27 14:26:41 2012 +0300
     3.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java	Wed Jun 27 14:27:05 2012 +0300
     3.3 @@ -478,19 +478,35 @@
     3.4  		out.println("        <table width=\"100%\" border=\"0\">");
     3.5  		out.println("         <tr>");
     3.6  		out.println("            <td width=\"1\"><img src=\"images/nav2_bg.gif\" width=\"1\" height=\"60\"></td>");
     3.7 -		out.println("            <td valign=\"top\" width=\"80px\"><img border=\"0\" src=\"images/teleios_logo.png\"/></td>");
     3.8 +		out.println("            <td valign=\"top\" width=\"80px\"><img border=\"0\" src=\"images/teleios_logo.png\" /></td>");
     3.9  		out.println("            <td valign=\"top\" align=\"left\">");
    3.10 -		out.println("            <span class=\"logo\">Strabon Endpoint</span><br><span class=\"style4\">based on Strabon</span></td>");
    3.11 +		out.println("            <span class=\"logo\"> &nbsp stSPARQL Endpoint</span><br><span class=\"style4\"></span></td>");
    3.12  		out.println("          </tr>");
    3.13  		out.println("        </table> </TD>");
    3.14  		out.println("	</TR>");
    3.15 +		//out.println("	<TR>");
    3.16 +		//out.println("      </TD>");
    3.17 +		//out.println("	</TR>");
    3.18  		out.println("	<TR>");
    3.19 -		out.println("      <TD height=\"21\" >");
    3.20 +		out.println("      <TD height=\"50\" id=\"intro\">");
    3.21 +		out.println("On this page you can execute stSPARQL queries against the Strabon backend. " +
    3.22 +				"The dataset is based on  the following ontologies: " +
    3.23 +				"<a href=\"http://harmonisa.uni-klu.ac.at/content/land-use-land-cover-ontologies\" > Corine Land Cover </a>, " +
    3.24 +				"<a > Greek Administrative Geography(Kallikratis), </a>" +
    3.25 +				"<a href=\"http://labs.mondeca.com/dataset/lov/details/vocabulary_lgdo.html\" > Linked Geodata </a> " +
    3.26 +				" and <a href=\"http://www.geonames.org/search.html?q=ontology&country=\" >  geonames </a>." +
    3.27 +				"We also use the <a href=\"images/graph.png\">NOA ontology</a> we developed for the <a href=\"http://www.space.noa.gr/ \">NOA </a> use case of the European FP7 project " +
    3.28 +				"<a href=\"http://www.earthobservatory.eu/\" >TELEIOS </a>. </br> </br>") ;
    3.29 +		out.println(" In this context NOA has been developing a real-time fire hotspot detection service for effectively monitoring a " +
    3.30 +				"fire-front. The technique is based on the use of acquisitions originating from the SEVIRI (Spinning Enhanced Visible and " +
    3.31 +				"Infrared Imager) sensor, on top of MSG-1 (Meteosat Second Generation satellite, renamed to Meteosat-8) and MSG-2 (renamed to " +
    3.32 +				"Meteosat-9) satellite platforms. Since 2007, NOA operates an MSG/SEVIRI acquisition station, and has been systematically archiving" +
    3.33 +				" raw satellite images on a 5 and 15 minutes basis, the respective temporal resolutions of MSG-1 and MSG-2. The acquired data are then annotated " +
    3.34 +				"using the stRDF model and can be queried using the stSPARQL query language.</br> </br> ");
    3.35 +		out.println("On the left sidebar, some example stSPARQL queries are provided. The NOA use case is described in more detail in the VLDB application paper " +
    3.36 +				"<a href=\"\"> here </a> ");
    3.37  		out.println("      </TD>");
    3.38  		out.println("	</TR>");
    3.39 -		out.println("	<TR>");
    3.40 -		out.println("      <TD height=\"2\" ></TD>");
    3.41 -		out.println("	</TR>");
    3.42  		out.println("</TABLE>");
    3.43  		out.println("<form " +
    3.44  				"enctype=\"UTF-8\" " +
    3.45 @@ -518,15 +534,15 @@
    3.46  
    3.47  		out.println("<table cellspacing=\"5\">");
    3.48  		out.println("<tr>");
    3.49 -		out.println("<td style=\"border: 1px dashed #bbbbbb;\">stSPARQL Query:</td>");
    3.50 -		out.println("<td style=\"border: 1px dashed #bbbbbb;\"><textarea name=\"SPARQLQuery\" title=\"pose your query/update here\" rows=\"15\" cols=\"100\">");
    3.51 +		out.println("<td id=\"output\" \">stSPARQL Query:</td>");
    3.52 +		out.println("<td id=\"output\" \"><textarea name=\"SPARQLQuery\" title=\"pose your query/update here\" rows=\"15\" cols=\"100\">");
    3.53  	}
    3.54  
    3.55  	protected static void appendHTML2(PrintWriter out, String format) {
    3.56  		out.println("</textarea></td>");
    3.57  		//		out.println("<td style=\"border: 1px dashed #bbbbbb;\"><input type=\"radio\" name=\"format\" value=\"KML\">KML<br/>");
    3.58  		//		out.println("<input type=\"radio\" name=\"format\" value=\"HTML\">HTML</td>");
    3.59 -		out.println("<td style=\"border: 1px dashed #bbbbbb;\"><center>Output Format:<br/><select name=\"format\" title=\"select one of the following output format types\">");
    3.60 +		out.println("<td id=\"output\";\"><center>Output Format:<br/><select name=\"format\" title=\"select one of the following output format types\">");
    3.61  		
    3.62  		Map<String, String> selections = new HashMap<String, String>();
    3.63  		selections.put("KMZMAP", "HTML with google maps (kmz)");
    3.64 @@ -553,14 +569,14 @@
    3.65  		out.println("</select></center></td>");
    3.66  		out.println("</tr>");
    3.67  		out.println("<tr>");
    3.68 -		out.println("<td colspan=2 style=\"border: 1px dashed #bbbbbb;\"><br/><center><input type=\"submit\" title=\"execute query\" value=\"Query\" name=\"submit\" style=\"width: 400px\"/><br/><input type=\"submit\" title=\"execute update\" value=\"Update\" name=\"submit\" style=\"width: 400px\"/></center><br/></td>");
    3.69 +		out.println("<td colspan=2 \"><br/><center><input type=\"submit\" title=\"execute query\" value=\"Query\" name=\"submit\" /><br/><input type=\"submit\" title=\"execute update\" value=\"Update\" name=\"submit\" style=\"width: 400px\"/></center><br/></td>");
    3.70  		out.println("</tr>");
    3.71  	}
    3.72  
    3.73  	protected static void appendHTML3(PrintWriter out, String errorMessage) {
    3.74  		out.println("<tr>");
    3.75 -		out.println("<td style=\"border: 1px dashed #bbbbbb;\">Result: </td>");
    3.76 -		out.println("<td style=\"border: 1px dashed #bbbbbb;\">");
    3.77 +		out.println("<td id=\"output\" \">Result: </td>");
    3.78 +		out.println("<td id=\"output\" \">");
    3.79  		out.println(errorMessage);
    3.80  		out.println("</td>");
    3.81  		out.println("</tr>");
    3.82 @@ -577,7 +593,7 @@
    3.83  	}
    3.84  
    3.85  	protected static void appendHTMLQ(PrintWriter out, StrabonBeanWrapper strabonWrapper) throws UnsupportedEncodingException {
    3.86 -		out.println("<tr><td width=\"90\">");
    3.87 +		out.println("<tr><td id=\"twidth\">");
    3.88  		List<Entry> entries = strabonWrapper.getEntries();
    3.89  		Iterator<Entry> it = entries.iterator();
    3.90  		while (it.hasNext()) {