# HG changeset patch
# User fknauft
# Date 1296058637 -3600
# Node ID 75229d2567baa3ade2c6b24a7e4bec7aa06e14b7
# Parent  e76dd62f93fd845c524f7b81de4c290ddcca62ba# Parent  893efd0ac54b719bf16049c66d0d8739acd242f3
Merge with 893efd0ac54b719bf16049c66d0d8739acd242f3

diff -r e76dd62f93fd -r 75229d2567ba RestDbInterface.py
diff -r e76dd62f93fd -r 75229d2567ba gis_gui/intro.pt
--- a/gis_gui/intro.pt	Wed Jan 26 12:58:06 2011 +0100
+++ b/gis_gui/intro.pt	Wed Jan 26 17:17:17 2011 +0100
@@ -1,4 +1,4 @@
-<div class="intro">
+      		<div class="intro">
 	<h2>Welcome!</h2>
 	<div class="left_block" align="left">
 		<p> => This website offers you a platform for geographical representation and analysis of historical data.</p>
@@ -6,21 +6,24 @@
 		<p> => The diagram below shows which functions are already active.</p>
 	</div>
 	<div class="right_block" align="left">
-		<p>=><a href="home">Login</a></p>
+		<p>=><a href="./home">Login</a></p>
 		<p>=> First time here? <br />
 		   Then go to the<a href="#newbie-intro"> end of this page</a>.</p>
 
 	</div>
-	<img src="icons/mappit_state.png" width="600" height="450" />
-	<h3>Introduction for Newbies</h3>
-	<a name="newbie-intro"></a>
-	<div align="left" style="padding-left:40px;">
+</div>
+<div align="center"><img src="./icons/mappit_state.png" width="600" height="450"></div>
+<div class="intro">
+		<h3>Introduction for Newbies</h3>
+		<a name="newbie-intro"></a>
+		<div align="left" style="padding-left:40px;">
 			<p>On this platform you can visualize and analyze the geographical aspects of historical data with spatial references.</p>
 			<p>The system works on the basis of the GoogleMaps API. </p>
 
-			<p>You can display pre-existing data as maps [Song Yingxing example] or input and process your own data <a href="../mappit_samples/upload_sample.xml">[upload sample table for Excel]</a>. 
+			<p>You can display pre-existing data as maps [Song Yingxing example] or input and process your own data <a href= "./upload_sample.xml">[sample table, which can be edited using MS-Excel]</a>. 
 			Select your desired features for geographical analysis and save for future use!</p>
-			<p>In the beta phase, data is accessible to all registered users. To prevent any loss of work, please maintain an external backup.</p> 
-			<p>You can email <a href="mailto:mappit@mpiwg-berlin.mpg.de">mappit@mpiwg-berlin.mpg.de</a> to request a personal login, or use the test account (user: test / password: test) to explore the platform right away</p>
-	</div>
+			<p>In the beta phase, data is accessible to all registered users. To prevent your work from being altered or deleted, please save externally.</p> 
+			<p>To explore the system, <a href="./home">login</a> as user <b>test</b> with the password <b>test</b> and get started now!</p>
+			<p>To use the system with Your own account, please contact us: <a href="mappit@mpiwg-berlin.mpg.de">mappit@mpiwg-berlin.mpg.de</a>
+		</div>
 </div>
diff -r e76dd62f93fd -r 75229d2567ba gis_gui/upload_sample.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gis_gui/upload_sample.xml	Wed Jan 26 17:17:17 2011 +0100
@@ -0,0 +1,1 @@
+<?xml version="1.0"?>
<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
 xmlns:o="urn:schemas-microsoft-com:office:office"
 xmlns:x="urn:schemas-microsoft-com:office:excel"
 xmlns:html="http://www.w3.org/TR/REC-html40"
 xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet">
 <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
  <LastAuthor>admin</LastAuthor>
  <Version>11.1287</Version>
 </DocumentProperties>
 <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
  <AllowPNG/>
  <Colors>
   <Color>
    <Index>16</Index>
    <RGB>#9999FF</RGB>
   </Color>
   <Color>
    <Index>17</Index>
    <RGB>#993366</RGB>
   </Color>
   <Color>
    <Index>18</Index>
    <RGB>#FFFFCC</RGB>
   </Color>
   <Color>
    <Index>19</Index>
    <RGB>#CCFFFF</RGB>
   </Color>
   <Color>
    <Index>20</Index>
    <RGB>#660066</RGB>
   </Color>
   <Color>
    <Index>21</Index>
    <RGB>#FF8080</RGB>
   </Color>
   <Color>
    <Index>22</Index>
    <RGB>#0066CC</RGB>
   </Color>
   <Color>
    <Index>23</Index>
    <RGB>#CCCCFF</RGB>
   </Color>
   <Color>
    <Index>24</Index>
    <RGB>#000080</RGB>
   </Color>
   <Color>
    <Index>25</Index>
    <RGB>#FF00FF</RGB>
   </Color>
   <Color>
    <Index>26</Index>
    <RGB>#FFFF00</RGB>
   </Color>
   <Color>
    <Index>27</Index>
    <RGB>#00FFFF</RGB>
   </Color>
   <Color>
    <Index>28</Index>
    <RGB>#800080</RGB>
   </Color>
   <Color>
    <Index>29</Index>
    <RGB>#800000</RGB>
   </Color>
   <Color>
    <Index>30</Index>
    <RGB>#008080</RGB>
   </Color>
   <Color>
    <Index>31</Index>
    <RGB>#0000FF</RGB>
   </Color>
  </Colors>
 </OfficeDocumentSettings>
 <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
  <WindowHeight>9260</WindowHeight>
  <WindowWidth>21460</WindowWidth>
  <WindowTopX>0</WindowTopX>
  <WindowTopY>0</WindowTopY>
  <Date1904/>
  <AcceptLabelsInFormulas/>
  <ProtectStructure>False</ProtectStructure>
  <ProtectWindows>False</ProtectWindows>
 </ExcelWorkbook>
 <Styles>
  <Style ss:ID="Default" ss:Name="Normal">
   <Alignment ss:Vertical="Bottom"/>
   <Borders/>
   <Font ss:FontName="Verdana"/>
   <Interior/>
   <NumberFormat/>
   <Protection/>
  </Style>
  <Style ss:ID="s21">
   <Font ss:FontName="Verdana" ss:Size="8.0"/>
  </Style>
  <Style ss:ID="s22">
   <Borders>
    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
   </Borders>
   <Font ss:FontName="Verdana" ss:Size="8.0"/>
  </Style>
  <Style ss:ID="s23">
   <Borders>
    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
   </Borders>
   <Font ss:FontName="Verdana" ss:Size="8.0"/>
  </Style>
  <Style ss:ID="s24">
   <Borders>
    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
   </Borders>
   <Font ss:FontName="Verdana" ss:Size="8.0"/>
  </Style>
  <Style ss:ID="s25">
   <Borders>
    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
   </Borders>
   <Font ss:FontName="Verdana" ss:Size="8.0"/>
  </Style>
  <Style ss:ID="s26">
   <Borders>
    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
   </Borders>
   <Font ss:FontName="Verdana" ss:Size="8.0"/>
  </Style>
  <Style ss:ID="s27">
   <Borders>
    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
   </Borders>
   <Font ss:FontName="Verdana" ss:Size="8.0"/>
   <NumberFormat ss:Format="#,##0.000000"/>
  </Style>
  <Style ss:ID="s28">
   <Borders>
    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
   </Borders>
   <Font ss:FontName="Verdana" ss:Size="8.0"/>
  </Style>
  <Style ss:ID="s29">
   <Borders>
    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
   </Borders>
   <Font ss:FontName="Verdana" ss:Size="8.0"/>
   <NumberFormat ss:Format="@"/>
  </Style>
  <Style ss:ID="s30">
   <Borders>
    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"
     ss:Color="#000000"/>
   </Borders>
   <Font ss:FontName="Verdana" ss:Size="8.0"/>
   <NumberFormat ss:Format="@"/>
  </Style>
  <Style ss:ID="s31">
   <Font ss:FontName="Verdana" ss:Size="8.0"/>
   <NumberFormat ss:Format="@"/>
  </Style>
 </Styles>
 <Worksheet ss:Name="Tabelle1">
  <Table ss:ExpandedColumnCount="8" ss:ExpandedRowCount="7" x:FullColumns="1"
   x:FullRows="1" ss:StyleID="s21" ss:DefaultRowHeight="11.0">
   <Column ss:StyleID="s21" ss:AutoFitWidth="0" ss:Width="58.0"/>
   <Column ss:StyleID="s21" ss:AutoFitWidth="0" ss:Width="67.0"/>
   <Column ss:StyleID="s21" ss:AutoFitWidth="0" ss:Width="66.0" ss:Span="1"/>
   <Column ss:Index="5" ss:StyleID="s31" ss:AutoFitWidth="0" ss:Width="39.0"/>
   <Column ss:StyleID="s21" ss:AutoFitWidth="0" ss:Width="66.0"/>
   <Column ss:StyleID="s21" ss:AutoFitWidth="0" ss:Width="61.0" ss:Span="1"/>
   <Row ss:AutoFitHeight="0">
    <Cell ss:StyleID="s22"><Data ss:Type="String">External ID</Data></Cell>
    <Cell ss:StyleID="s23"><Data ss:Type="String">Location Name</Data></Cell>
    <Cell ss:StyleID="s23"><Data ss:Type="String">X-Coordinate</Data></Cell>
    <Cell ss:StyleID="s23"><Data ss:Type="String">Y-Coordinate</Data></Cell>
    <Cell ss:StyleID="s29"><Data ss:Type="String">GIS ID</Data></Cell>
    <Cell ss:StyleID="s23"><Data ss:Type="String">Object name</Data></Cell>
    <Cell ss:StyleID="s23"><Data ss:Type="String">Build after</Data></Cell>
    <Cell ss:StyleID="s24"><Data ss:Type="String">Area in sqm</Data></Cell>
   </Row>
   <Row ss:AutoFitHeight="0">
    <Cell ss:StyleID="s25"><Data ss:Type="String">ERD-0815</Data></Cell>
    <Cell ss:StyleID="s26"><Data ss:Type="String">Beijing</Data></Cell>
    <Cell ss:StyleID="s27"><Data ss:Type="Number">39.914722</Data></Cell>
    <Cell ss:StyleID="s27"><Data ss:Type="Number">116.390556</Data></Cell>
    <Cell ss:StyleID="s30"><Data ss:Type="String"> 110000</Data></Cell>
    <Cell ss:StyleID="s26"><Data ss:Type="String">Forbidden City</Data></Cell>
    <Cell ss:StyleID="s26"><Data ss:Type="Number">1406.0</Data></Cell>
    <Cell ss:StyleID="s28"><Data ss:Type="Number">720000.0</Data></Cell>
   </Row>
   <Row ss:AutoFitHeight="0" ss:Span="3"/>
   <Row ss:Index="7" ss:AutoFitHeight="0">
    <Cell ss:Index="3"><Data ss:Type="String">*</Data></Cell>
   </Row>
  </Table>
  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
   <PageSetup>
    <Header x:Margin="0.511805555555556"/>
    <Footer x:Margin="0.511805555555556"/>
    <PageMargins x:Bottom="0.984027777777778" x:Left="0.747916666666667"
     x:Right="0.747916666666667" x:Top="0.984027777777778"/>
   </PageSetup>
   <Unsynced/>
   <Print>
    <ValidPrinterInfo/>
    <PaperSizeIndex>9</PaperSizeIndex>
    <HorizontalResolution>300</HorizontalResolution>
    <VerticalResolution>300</VerticalResolution>
   </Print>
   <Zoom>150</Zoom>
   <PageLayoutZoom>0</PageLayoutZoom>
   <Selected/>
   <Panes>
    <Pane>
     <Number>3</Number>
     <ActiveRow>11</ActiveRow>
     <ActiveCol>1</ActiveCol>
    </Pane>
   </Panes>
   <ProtectObjects>False</ProtectObjects>
   <ProtectScenarios>False</ProtectScenarios>
  </WorksheetOptions>
 </Worksheet>
 <Worksheet ss:Name="Tabelle2">
  <Table ss:ExpandedColumnCount="0" ss:ExpandedRowCount="0" x:FullColumns="1"
   x:FullRows="1" ss:DefaultRowHeight="12.0"/>
  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
   <PageSetup>
    <Header x:Margin="0.511805555555556"/>
    <Footer x:Margin="0.511805555555556"/>
    <PageMargins x:Bottom="0.984027777777778" x:Left="0.747916666666667"
     x:Right="0.747916666666667" x:Top="0.984027777777778"/>
   </PageSetup>
   <Unsynced/>
   <Print>
    <ValidPrinterInfo/>
    <PaperSizeIndex>9</PaperSizeIndex>
    <HorizontalResolution>300</HorizontalResolution>
    <VerticalResolution>300</VerticalResolution>
   </Print>
   <PageLayoutZoom>0</PageLayoutZoom>
   <ProtectObjects>False</ProtectObjects>
   <ProtectScenarios>False</ProtectScenarios>
  </WorksheetOptions>
 </Worksheet>
 <Worksheet ss:Name="Tabelle3">
  <Table ss:ExpandedColumnCount="0" ss:ExpandedRowCount="0" x:FullColumns="1"
   x:FullRows="1" ss:DefaultRowHeight="12.0"/>
  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
   <PageSetup>
    <Header x:Margin="0.511805555555556"/>
    <Footer x:Margin="0.511805555555556"/>
    <PageMargins x:Bottom="0.984027777777778" x:Left="0.747916666666667"
     x:Right="0.747916666666667" x:Top="0.984027777777778"/>
   </PageSetup>
   <Unsynced/>
   <Print>
    <ValidPrinterInfo/>
    <PaperSizeIndex>9</PaperSizeIndex>
    <HorizontalResolution>300</HorizontalResolution>
    <VerticalResolution>300</VerticalResolution>
   </Print>
   <PageLayoutZoom>0</PageLayoutZoom>
   <ProtectObjects>False</ProtectObjects>
   <ProtectScenarios>False</ProtectScenarios>
  </WorksheetOptions>
 </Worksheet>
</Workbook>
\ No newline at end of file