Strabon
diff endpoint/WebContent/query.jsp @ 1337:4dff2f1163d8
Merge with default branch.
| author | Panayiotis Smeros <psmeros@di.uoa.gr> |
|---|---|
| date | Fri May 23 13:37:11 2014 +0300 (2014-05-23) |
| parents | 5e650277cbdf 3d89aafb0ad7 |
| children | 5b6b65340693 |
line diff
1.1 --- a/endpoint/WebContent/query.jsp Mon Aug 19 14:24:43 2013 +0300 1.2 +++ b/endpoint/WebContent/query.jsp Fri May 23 13:37:11 2014 +0300 1.3 @@ -172,10 +172,10 @@ 1.4 var map; 1.5 // create map 1.6 <%if(request.getAttribute("handle").toString().contains("timemap")){ %> 1.7 - map = tm.getNativeMap(); 1.8 - map.setOptions(myOptions); 1.9 + map = tm.getNativeMap(); 1.10 + map.setOptions(myOptions); 1.11 <%} else {%> 1.12 - var map = new google.maps.Map(document.getElementById("map"), myOptions); 1.13 + var map = new google.maps.Map(document.getElementById("map"), myOptions); 1.14 <%}%> 1.15 <% if (request.getAttribute("pathToKML") == null) {%> 1.16 // center at Brahames 1.17 @@ -185,7 +185,7 @@ 1.18 addListener(map); 1.19 1.20 1.21 - <%if ("map_local".equals(request.getAttribute("handle")) || ("timemap_local".equals(request.getAttribute("handle")))) {%> 1.22 + <%if ("map_local".equals(request.getAttribute("handle"))) {%> 1.23 // display using geoxml3 1.24 var myParser = new geoXML3.parser({map: map}); 1.25 myParser.parse(kml); 1.26 @@ -195,7 +195,7 @@ 1.27 <%}%> 1.28 1.29 <%if (("map".equals(request.getAttribute("handle"))) || ("map_local".equals(request.getAttribute("handle"))) 1.30 - || ("timemap".equals(request.getAttribute("handle"))) || ("timemap_local".equals(request.getAttribute("handle")))) {%> 1.31 + || ("timemap".equals(request.getAttribute("handle")))) {%> 1.32 $('html, body').animate({ 1.33 scrollTop: $("#divResultsStart").offset().top 1.34 }, 1500); 1.35 @@ -306,7 +306,7 @@ 1.36 1.37 </script> 1.38 1.39 - </script> 1.40 + 1.41 <link href="js/timemap/examples.css" type="text/css" rel="stylesheet"/> 1.42 <style> 1.43 div#timelinecontainer{ height: 310px; } 1.44 @@ -315,7 +315,7 @@ 1.45 1.46 <!-- jQuery end --> 1.47 1.48 - <title>TELEIOS: Strabon Endpoint</title> 1.49 + <title>Strabon Endpoint</title> 1.50 <!--Load the AJAX API--> 1.51 <script type="text/javascript" src="https://www.google.com/jsapi"></script> 1.52 <script type="text/javascript"> 1.53 @@ -355,7 +355,7 @@ 1.54 <body topmargin="0" leftmargin="0" link="#FFFFFF" vlink="#FFFFFF" alink="#FFFFFF" onload="initialize()"> 1.55 1.56 <!-- include TELEIOS header and description --> 1.57 -<%@ include file="teleios-header.html"%> 1.58 +<%@ include file="header.html"%> 1.59 <!-- include TELEIOS header and description --> 1.60 1.61 <FORM enctype="UTF-8" accept-charset="UTF-8" method="post" action="Query"> 1.62 @@ -438,7 +438,7 @@ 1.63 <tr> 1.64 <td id="output" colspan=2> 1.65 <div style="font-size:13px"> 1.66 - You must be logged in to perform update queries. 1.67 + You must be logged in to perform update queries, or run in localhost. 1.68 </div> 1.69 </td> 1.70 </tr> 1.71 @@ -466,7 +466,6 @@ 1.72 <OPTION value="map"<%= ("map".equals(handle)) ? "selected":""%>>On a map</OPTION> 1.73 <OPTION value="map_local"<%= ("map_local".equals(handle)) ? "selected":""%>>On a map (localhost)</OPTION> 1.74 <OPTION value="timemap"<%= ("timemap".equals(handle)) ? "selected":""%>>On a timemap</OPTION> 1.75 - <OPTION value="timemap_local"<%= ("timemap_local".equals(handle)) ? "selected":""%>>On a timemap (localhost)</OPTION> 1.76 </SELECT> 1.77 </td> 1.78 </tr>