# HG changeset patch # User casties # Date 1296043086 -3600 # Node ID e76dd62f93fd845c524f7b81de4c290ddcca62ba # Parent c23bcd6030a4ee6ae53f0edcdfb1154ca86109d9# Parent 399148bf9b3ad57da913ae440cc5f96e5d1b02bd merge with 399148bf9b3ad57da913ae440cc5f96e5d1b02bd diff -r c23bcd6030a4 -r e76dd62f93fd .project --- a/.project Wed Jan 26 12:53:25 2011 +0100 +++ b/.project Wed Jan 26 12:58:06 2011 +0100 @@ -7,12 +7,19 @@ - org.python.pydev.PyDevBuilder + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.wst.common.project.facet.core.builder org.python.pydev.pythonNature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.jsdt.core.jsNature diff -r c23bcd6030a4 -r e76dd62f93fd gis_gui/blocks/layer.html.pt --- a/gis_gui/blocks/layer.html.pt Wed Jan 26 12:53:25 2011 +0100 +++ b/gis_gui/blocks/layer.html.pt Wed Jan 26 12:58:06 2011 +0100 @@ -8,11 +8,9 @@ diff -r c23bcd6030a4 -r e76dd62f93fd gis_gui/blocks/tablestructure.js --- a/gis_gui/blocks/tablestructure.js Wed Jan 26 12:53:25 2011 +0100 +++ b/gis_gui/blocks/tablestructure.js Wed Jan 26 12:58:06 2011 +0100 @@ -14,7 +14,7 @@ html += ""; return html; } - var block = this.addBlock(url, baseId, function() { + var block = this.addBlock(url, baseId, null, function() { // function after add block finished var id = block.id; var tbl = $(block.element).find(".datatable"); diff -r c23bcd6030a4 -r e76dd62f93fd gis_gui/head.pt --- a/gis_gui/head.pt Wed Jan 26 12:53:25 2011 +0100 +++ b/gis_gui/head.pt Wed Jan 26 12:58:06 2011 +0100 @@ -1,4 +1,4 @@
-

Map Points in Time

+

map Places In Time

\ No newline at end of file diff -r c23bcd6030a4 -r e76dd62f93fd gis_gui/home.pt --- a/gis_gui/home.pt Wed Jan 26 12:53:25 2011 +0100 +++ b/gis_gui/home.pt Wed Jan 26 12:58:06 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 c23bcd6030a4 -r e76dd62f93fd gis_gui/icons/mappit_state.png Binary file gis_gui/icons/mappit_state.png has changed diff -r c23bcd6030a4 -r e76dd62f93fd gis_gui/intro.pt --- a/gis_gui/intro.pt Wed Jan 26 12:53:25 2011 +0100 +++ b/gis_gui/intro.pt Wed Jan 26 12:58:06 2011 +0100 @@ -1,23 +1,26 @@
-

Welcome!

-
-

This website offers you a platform for geographical representation and analysis of historical data. The beta version is available for you to test and evaluate.

-

The diagram below shows which functions are already active.

+

Welcome!

+
+

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

+

=> The beta version is available for you to test and evaluate.

+

=> The diagram below shows which functions are already active.

+
+
+

=>Login

+

=> First time here?
+ Then go to the end of this page.

+
-
-

First time here?

- Login + +

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]. + 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 any loss of work, please maintain an external backup.

+

You can email mappit@mpiwg-berlin.mpg.de to request a personal login, or use the test account (user: test / password: test) to explore the platform right away

-
-
-

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 [sample table in 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 test the system, register here and get started now!

-
-
diff -r c23bcd6030a4 -r e76dd62f93fd gis_gui/lib/blocks.css --- a/gis_gui/lib/blocks.css Wed Jan 26 12:53:25 2011 +0100 +++ b/gis_gui/lib/blocks.css Wed Jan 26 12:58:06 2011 +0100 @@ -39,7 +39,7 @@ } div.block div.titlebar h1 { - font-size:20px; + font-size:18px; padding-top: 10px; padding-bottom: 10px; margin:0px; @@ -130,8 +130,9 @@ border: 1px solid black; background-color: #fff; text-align: center; + font-size: 14px; align: center; - height:250px; + height:1000px; padding:10px; margin-left:50px; margin-right:50px; @@ -159,6 +160,7 @@ height: 150px; background-color:#bbbbff; text-align: center; + margin-bottom: -120px; } #login {