# HG changeset patch # User fknauft # Date 1295437579 -3600 # Node ID 2bc79c0fba3c22713b10275f0eae54be5a5a7a03 # Parent 7be3372156c62368dae9ccd927c00c445d38ac09 changes on intro site diff -r 7be3372156c6 -r 2bc79c0fba3c gis_gui/blocks/layer.html.pt --- 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 @@ diff -r 7be3372156c6 -r 2bc79c0fba3c gis_gui/home.pt --- 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(){ diff -r 7be3372156c6 -r 2bc79c0fba3c gis_gui/intro.pt --- 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 @@ -
+

Welcome!

=> This website offers you a platform for geographical representation and analysis of historical data.

@@ -11,19 +11,17 @@ Then go to the end of this page.

-
-
-
-

Introduction for Newbies

- -
+ +

Introduction for Newbies

+ +

On this platform you can visualize and analyze the geographical aspects of historical data with spatial references.

The system works on the basis of the GoogleMaps API.

-

You can display pre-existing data as maps [Song Yingxing example] or input and process your own data [upload sample table for Excel]. +

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!

In the beta phase, data is accessible to all registered users. To prevent your work from being altered or deleted, please save externally.

To explore the system, login as user test with the password test and get started now!

-

To use the system with Your own account, please contact us: mappit@mpiwg-berlin.mpg.de -

+

To use the system with Your own account, please contact us: mappit@mpiwg-berlin.mpg.de

+
diff -r 7be3372156c6 -r 2bc79c0fba3c gis_gui/lib/blocks.css --- 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 {