Mercurial > hg > ChinaGisRestApi

changeset 90:2bc79c0fba3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changes on intro site
author fknauft
date Wed, 19 Jan 2011 12:46:19 +0100
parents 7be3372156c6
children f1aeb93b22c4
files gis_gui/blocks/layer.html.pt gis_gui/home.pt gis_gui/intro.pt gis_gui/lib/blocks.css
diffstat 4 files changed, 13 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/gis_gui/blocks/layer.html.pt	Thu Jan 13 13:42:45 2011 +0100
+++ b/gis_gui/blocks/layer.html.pt	Wed Jan 19 12:46:19 2011 +0100
@@ -8,11 +8,9 @@
   
   <tal:block metal:fill-slot="menu">
   <ul id="account_menu">
-    <li> Save </li>
-    
+    <li> Save </li>    
     <li> Open </li>
-
-    <li> 
+    <li>  </li>
   </ul>
   </tal:block>
   
--- a/gis_gui/home.pt	Thu Jan 13 13:42:45 2011 +0100
+++ b/gis_gui/home.pt	Wed Jan 19 12:46:19 2011 +0100
@@ -41,7 +41,7 @@
       $(document).ready(function(){
       	var blockContainer = $("#moduleslot").get();
         blocks = new guiBlocks(blockContainer);
-       	blocks.addBlock("blocks/home.html?impermanent=false&title=home", "home");
+       	blocks.addBlock("blocks/home.html?title=home&impermanent=false","home");
        	guiBlocks_init();
         // add menubar
         $('div.menubar').livequery(function(){
--- a/gis_gui/intro.pt	Thu Jan 13 13:42:45 2011 +0100
+++ b/gis_gui/intro.pt	Wed Jan 19 12:46:19 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>
@@ -11,19 +11,17 @@
 		   Then go to the<a href="#newbie-intro"> end of this page</a>.</p>
 
 	</div>
-</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;">
+	<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;">
 			<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="templates/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 [upload sample table for Excel]. 
 			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 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="mailto:mappit@mpiwg-berlin.mpg.de">mappit@mpiwg-berlin.mpg.de</a>
-		</div>
+			<p>To use the system with Your own account, please contact us: <a href="mailto:mappit@mpiwg-berlin.mpg.de">mappit@mpiwg-berlin.mpg.de</a></p>
+	</div>
 </div>
--- a/gis_gui/lib/blocks.css	Thu Jan 13 13:42:45 2011 +0100
+++ b/gis_gui/lib/blocks.css	Wed Jan 19 12:46:19 2011 +0100
@@ -132,7 +132,7 @@
     text-align: center;
     font-size: 14px;
     align: center;
-    height:250px;
+    height:1000px;
     padding:10px;
     margin-left:50px;
     margin-right:50px;
@@ -160,6 +160,7 @@
     height: 150px;
     background-color:#bbbbff;
     text-align: center;
+    margin-bottom: -120px;
 }
 
 #login {