Mercurial > hg > ChinaGisRestApi
changeset 94:e76dd62f93fd
merge
with 399148bf9b3ad57da913ae440cc5f96e5d1b02bd
author | casties |
---|---|
date | Wed, 26 Jan 2011 12:58:06 +0100 |
parents | c23bcd6030a4 (current diff) 399148bf9b3a (diff) |
children | 75229d2567ba |
files | .project gis_gui/icons/mappit_state.png |
diffstat | 8 files changed, 39 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/.project Wed Jan 26 12:53:25 2011 +0100 +++ b/.project Wed Jan 26 12:58:06 2011 +0100 @@ -7,12 +7,19 @@ </projects> <buildSpec> <buildCommand> - <name>org.python.pydev.PyDevBuilder</name> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> <nature>org.python.pydev.pythonNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> </natures> </projectDescription>
--- 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 @@ <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/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 += "</select>"; 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");
--- 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 @@ <div class="head"> <span style="float:right" tal:content="python:'logged in as %s'%request.get('AUTHENTICATED_USER','')"/> -<h1>Map Points in Time</h1> +<h1><b>map P</b>laces <b>I</b>n <b>T</b>ime</h1> </div> \ No newline at end of file
--- 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(){
--- 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 @@ <div class="intro"> - <h2 >Welcome!</h2> - <div class="left_block"> - <p> 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.</p> - <p> The diagram below shows which functions are already active.</p> + <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> + <p> => The beta version is available for you to test and evaluate.</p> + <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>=> First time here? <br /> + Then go to the<a href="#newbie-intro"> end of this page</a>.</p> + </div> - <div class="right_block"> - <p> First time here?</p> - <a href="./home">Login</a> + <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="../mappit_samples/upload_sample.xml">[upload sample table for 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> </div> -<div align="center"><img src="./icons/mappit_state.png" width="400" height="300" ></div> -<div class="intro"> - <h3>Introduction for Newbies</h3> - <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 [sample table in 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 test the system, register <a href="">here</a> and get started now!</p> - </div> -</div>
--- 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 {