# HG changeset patch
# User fknauft
# Date 1327662929 -3600
# Node ID 442c1c3e6f8def189bbc3d5bf94d2ddd191200f3
# Parent  f25ee0424ce67d6e95c5c37852b2bc1c4d1823d7
Open Map in new Window

diff -r f25ee0424ce6 -r 442c1c3e6f8d gis_gui/blocks/layer.html.pt
--- a/gis_gui/blocks/layer.html.pt	Fri Jan 27 09:43:40 2012 +0100
+++ b/gis_gui/blocks/layer.html.pt	Fri Jan 27 12:15:29 2012 +0100
@@ -27,6 +27,10 @@
           <th> Layer name </th> 
           <td><input type="text" class="layer_name" tal:attributes="value string:${table}_layer1"/></td>
         </tr>
+	    <tr>
+          <th>  </th> 
+          <td> <input type="button" value="Save layer" class="layer_save_button"/></td>
+        </tr>
 	    <tr> 
           <th> Source table </th> 
           <td> <span tal:content="table"/>  <input type="button" value="Open table" class="layer_open_table_button"/></td>
@@ -40,17 +44,14 @@
 	    <tr> <th> Geometry </th> <td> <select class="layer_geom_select"><option selected>point</option><option>line</option></select></td> </tr>
 	    <tr> <th> Sort by </th> <td> <select class="layer_sort_select"><option selected>ID</option></select></td> </tr>
 	    <tr> <td colspan="2"> <input class="layer_line_checkbox" type="checkbox"/> connect points with a line </td></tr>
-        <tr> <th> Label </th> <td> <select class="layer_label_select"><option>None</option></select> </td> </tr>
+<!--        <tr> <th> Label </th> <td> <select class="layer_label_select"><option>None</option></select> </td> </tr>  --> 
 	    <tr> <th> Point-/Line-Color </th> <td> <select class="layer_linecolor_select"><option selected>red</option><option>red_big</option><option>green</option><option>green_big</option><option>black</option><option>black_big</option><option>violett</option><option>violett_big</option><option>blue</option><option>blue_big</option></select></td> </tr>
 	    <tr> <th> Polygon-Fill-Color </th> <td> <select class="layer_fillcolor_select"><option selected>red</option><option>red_big</option><option>green</option><option>green_big</option><option>black</option><option>black_big</option><option>violett</option><option>violett_big</option><option>blue</option><option>blue_big</option></select></td> </tr>
-	    <tr> <th> Point-Size by </th> <td> <select class="layer_size_select"><option>None</option></select></td> </tr>
-	    <tr> <th> Point-Shape by </th> <td> <select class="layer_shape_select"><option>None</option></select> </td> </tr>
+<!--	    <tr> <th> Point-Size by </th> <td> <select class="layer_size_select"><option>None</option></select></td> </tr>  --> 
+<!--	    <tr> <th> Point-Shape by </th> <td> <select class="layer_shape_select"><option>None</option></select> </td> </tr>  --> 
 	  </table>
 	  <br/>
-	  <input type="button" value="Update layer" class="layer_update_button"/>
-      <br/>
-      <input type="button" value="Save layer" class="layer_save_button"/>
-      <br/>
+	  <input type="button" value="Update layer" class="layer_update_button"/> <br/>
       <input type="button" value="Create map with this layer" class="map_create_button"/>
 	</div>
     </div>
diff -r f25ee0424ce6 -r 442c1c3e6f8d gis_gui/blocks/map.html.pt
--- a/gis_gui/blocks/map.html.pt	Fri Jan 27 09:43:40 2012 +0100
+++ b/gis_gui/blocks/map.html.pt	Fri Jan 27 12:15:29 2012 +0100
@@ -16,21 +16,6 @@
       <!-- Subscreens:  mapping setup, map  -->
       <div class="subscreen main">
       
-      <!--
-      <span jstcache="0" style="display: none;" id="view_rss"> 
-      <a jstcache="0" href="javascript:void(0)" id="view_rss_link">  <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon view-as-rss">  <span jstcache="0" class="link-text">RSS</span> </a> 
-      <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon-divider bar-divider"> </span>
-      <span jstcache="0" style="display: none;" id="view_kml"> 
-      <a jstcache="0" href="javascript:void(0)" id="view_kml_link"> <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon view-as-kml"> <span jstcache="0" class="link-text">In Google Earth anzeigen</span> </a> 
-      <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon-divider bar-divider"> </span> 
-      <a jstcache="0" style="display: none;" href="http://www.google.com/mapmaker?ll=51.151786,10.415039&amp;spn=19.842079,51.899414&amp;t=h&amp;z=5&amp;source=gm_el" id="mapmaker-link" jsaction="rmi.open-mapmaker"> <img jstcache="0" class="bar-icon" src="http://maps.gstatic.com/mapfiles/gw_link.png"> <span jstcache="0" class="link-text">Bearbeiten</span> </a> 
-      <img jstcache="0" style="display: none;" id="mapmaker-link-sep" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon-divider bar-divider"> 
-      <a jstcache="0" href="javascript:void(0);" jsaction="print.show" id="print"> <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon bar-icon-print2"> <span jstcache="0" class="link-text">Drucken</span> </a> 
-      <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon-divider bar-divider"> 
-      <a jstcache="0" id="showsendtox" href="javascript:void(0);" jsaction="stx.show"> <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon bar-icon-email2"> <span jstcache="0" class="link-text">Senden</span> </a>  
-      <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon-divider bar-divider"> 
-      <a jstcache="0" href="http://maps.google.de/?ie=UTF8&amp;ll=51.151786,10.415039&amp;spn=19.842079,51.899414&amp;t=h&amp;z=5" jsaction="link.show" id="link"> <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon bar-icon-link2"> <span jstcache="0" class="link-text">Link</span> </a> 
-	  -->
 	  
       <div class="map_box">[loading...]</div>
 
@@ -51,11 +36,17 @@
           <th>layer name</th>
         </tr>
       </table>
-      <p><input type="button" class="layer_add_button" value="Add layer" /></p>
-      <p><input type="button" class="map_update_button" value="Update map" /></p>
-      <p><input type="button" class="map_newwindow_button" value="New Window" /></p>
-      <p><input type="button" class="map_e4D_button" value="Europeana4D" /></p>
-        
+      <br/>
+     <table width="100%" class="map_layer_table">
+        <tr >
+          <td><input type="button" class="layer_add_button" value="Add layer" /></td>
+          <td><input type="button" class="map_newwindow_button" value="New Window" /></td>
+        </tr>
+        <tr >
+          <td><input type="button" class="map_update_button" value="Update map" /></td>
+          <td><input type="button" class="map_e4D_button" value="Europeana4D" /></td>
+        </tr>
+      </table>        
       </div>
 
       </div>
diff -r f25ee0424ce6 -r 442c1c3e6f8d gis_gui/head.pt
--- a/gis_gui/head.pt	Fri Jan 27 09:43:40 2012 +0100
+++ b/gis_gui/head.pt	Fri Jan 27 12:15:29 2012 +0100
@@ -4,5 +4,5 @@
 <span style="float: left; width: 250px;" ><img align="left" width="100%" src="http://www.mpiwg-berlin.mpg.de/en/images/title.png" /><br/>
                                           <img align="left" width="50%" src="http://mappit.mpiwg-berlin.mpg.de/mappit/icons/mpdl_logo.png" /></span>
 <font size=5 style="margin-left:-120px;"><b>map P</b>laces <b>I</b>n <b>T</b>ime</font>
-<br/><a style="float:right" href="https://it-dev.mpiwg-berlin.mpg.de/tracs/GIS/wiki/WikiStart">Manual</a>
+<br/><a style="float:right" href="https://it-dev.mpiwg-berlin.mpg.de/tracs/GIS/wiki/Manual">Manual</a>
 </div>
\ No newline at end of file