# HG changeset patch # User fknauft # Date 1303994433 -7200 # Node ID 0a1dee5076129ddf5e73aa37bf93063ad75593d6 # Parent b636b0417aab7ee14f5c36be8bc3c56fc38f53d6 general commit diff -r b636b0417aab -r 0a1dee507612 gis_gui/blocks/layer.js --- a/gis_gui/blocks/layer.js Fri Apr 01 10:53:06 2011 +0200 +++ b/gis_gui/blocks/layer.js Thu Apr 28 14:40:33 2011 +0200 @@ -124,7 +124,7 @@ paramstr += "&connect_line="+params.connect_line; } var layerurl = "../db/RESTdb/db/public/" + escape(params.table) + "?" + paramstr; - //alert(layerurl); + alert(layerurl); jQuery.get(layerurl, function(data, textStatus, XMLHttpRequest) { // function after load kml url finished console.debug("kml url loaded! this=", this, " data=", data, " ("+typeof(data)+")"); @@ -153,9 +153,9 @@ }); function showInContentWindow(text) { - var orig_html=$(elem).find(".mapping_info").html(); + var orig_obj=$(elem).find(".mapping_info").html(); $(elem).find(".mapping_info").html(text); - $(elem).find(".mapping_info").one("click",function(){$(elem).find(".mapping_info").html(orig_html);}); + $(elem).find(".mapping_info").one("click",function(){$(elem).find(".mapping_info").html(orig_obj);}); } console.debug("new marker layer=",newMarker); diff -r b636b0417aab -r 0a1dee507612 gis_gui/blocks/map.html.pt --- a/gis_gui/blocks/map.html.pt Fri Apr 01 10:53:06 2011 +0200 +++ b/gis_gui/blocks/map.html.pt Thu Apr 28 14:40:33 2011 +0200 @@ -16,6 +16,23 @@
+ + +
[loading...]
@@ -35,8 +52,11 @@

+


-

+

+ +

diff -r b636b0417aab -r 0a1dee507612 gis_gui/blocks/map.js --- a/gis_gui/blocks/map.js Fri Apr 01 10:53:06 2011 +0200 +++ b/gis_gui/blocks/map.js Thu Apr 28 14:40:33 2011 +0200 @@ -35,6 +35,13 @@ params = block.readMapParams(); block.updateMap(be,params); }); + // new window button + $(be).find(".map_newwindow_button").click(function () { + console.debug("map in new window"); + params = block.readMapParams(); + var newWindow = window.open("blocks/map_newwindow.html"); + block.updateMap(newWindow.document.getElementById("map_box"),params); + }); // save button $(be).find(".map_save_button").click(function () { console.debug("map save. this=",this," block=",block); @@ -129,7 +136,12 @@ }; guiBlocks.Block.prototype.updateMap = function(elem,map_params) { - if (elem == null) { + + //************ + alert("bin in updateMap:" + elem + ", " + map_params) + //************* + + if (elem == null) { elem = this.element; } if (map_params == null) { @@ -138,6 +150,7 @@ // update and draw the google map var le = $(elem).find(".map_box").get(0); // create empty map + if (google != null) { var latlng = new google.maps.LatLng(29, 116); var mapOpts = { diff -r b636b0417aab -r 0a1dee507612 gis_gui/blocks/map_newwindow.html.pt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gis_gui/blocks/map_newwindow.html.pt Thu Apr 28 14:40:33 2011 +0200 @@ -0,0 +1,15 @@ + + + Map Points in Time + + + + + + + + + +
[loading...]
+ + \ No newline at end of file diff -r b636b0417aab -r 0a1dee507612 gis_gui/home.pt --- a/gis_gui/home.pt Fri Apr 01 10:53:06 2011 +0200 +++ b/gis_gui/home.pt Thu Apr 28 14:40:33 2011 +0200 @@ -1,6 +1,8 @@ - ChinaGIS + Mappit, Map Places in Time, Mappit by MPI for the History of Scinces + + diff -r b636b0417aab -r 0a1dee507612 gis_gui/intro.out.xml diff -r b636b0417aab -r 0a1dee507612 gis_gui/intro.pt --- a/gis_gui/intro.pt Fri Apr 01 10:53:06 2011 +0200 +++ b/gis_gui/intro.pt Thu Apr 28 14:40:33 2011 +0200 @@ -25,6 +25,6 @@

You can display pre-existing data as maps [Song Yingxing example] or input and process your own data [sample table, which can be edited using MS-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: guest / password: test) to explore the platform right away

+

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

diff -r b636b0417aab -r 0a1dee507612 gis_gui/lib/mpiwgstyles.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gis_gui/lib/mpiwgstyles.css Thu Apr 28 14:40:33 2011 +0200 @@ -0,0 +1,1016 @@ +body { + margin: 15px 0 0 20px; + font-family: Verdana, Arial, sans-serif; + background: #FCF2DF; + } + +img { + border: none; + } + +a { + color: #EA8500; + text-decoration: none; + } + +a:hover { + text-decoration: underline; + } + +/* header with link looks like header */ +h1 a { + color: inherit; + font-weight: inherit; + text-decoration: none; +} + +span.bold { + font-weight: bold; + } + +div.bg { + position: absolute; + left: 0px; + top: 0px; + z-index: -1000; + } + +div.wrapper { + width: 900px; + text-align: left; + } + +/* Header */ + +div.header { + float: left; + width: 900px; + margin: 0 0 10px 0; + } + +div.title { + float: left; + width: 661px; + margin: 21px 0 0 0; + } + +div.logo { + float: right; + width: 87px; + } + +/* Main Navigation */ + +div.mainnav_home { + float: left; + width: 900px; + font-size: 12px; + background: url(../images/header.gif) repeat-x; + margin-bottom: 35px; + } + +div.mainnav { + float: left; + width: 900px; + font-size: 12px; + background: url(../images/header.gif) repeat-x; + margin-bottom: 20px; + } + + div.mn_off { + float: left; + border-top: 8px solid #FAB775; + padding-top: 5px; + } + + .mn_off a, .mn_language a { + color: #666666; + outline: none; + } + + .mn_off a:hover { + color: #000000; + border-top: 8px solid #ea8500; + padding-top: 5px; + text-decoration: none; + } + + div.mn_on { + float: left; + border-top: 8px solid #EA8500; + padding-top: 5px; + /* text-align:center; */ + } + + .mn_on a { + color: #EA8500; + outline: none; + font-weight: bold; + } + + div.mn_buffer { + float: left; + width: 35px; + border-top: 8px solid #FAB775; + } + + + div.mn_language { + float: right; + border-top: 8px solid #FAB775; + background: url(../images/arr_lan.gif) no-repeat; + padding: 5px 0 0 15px; + } + + +/* Search */ + +div.search_home { + float: right; + width: 220px; + height: 25px; + } + +div.search { + float: left; + width: 900px; + height: 25px; + } + + div.searchform { + float: right; + } + + .searchinput { + width: 211px; + padding-left: 18px; + border: 1px solid #dccbae; + background: url(../images/search.gif) no-repeat #FFFFFF; + color: #EA8500; + } + +/* Breadcrumbs & Quicklinks */ + +div.quicklinks_home { + float: right; + width: 220px; + color: #EA8500; + } + +div.quicklinks { + float: left; + width: 900px; + border-bottom: 3px solid #dccbae; + color: #EA8500; + } + + div.breadcrumbs { + float: left; + font-size: 10px; + color: #6a4d3c; + } + + .breadcrumbs a { + color: #6a4d3c; + text-decoration: none; + } + + .selected { + color: #6a4d3c; + font-weight: bold; + } + + div.quickfinder { + float: right; + width: 212px; + background: url(../images/arr_qf.gif) no-repeat #FDD5AB; + padding: 3px 0 3px 20px; + color: #EA8500; + font-size: 11px; + } + +/* Content */ + +/* Home */ + +div.feature, div.thumbnails { + float: left; + width: 650px; + margin-right: 20px; + } + + + div.thumb { + float: left; + width: 129px; + margin-right: 1px; + margin-bottom: 1px; + } + +div.feature_image { + float: left; + width: 650px; + margin-bottom: 15px; + } + +div.feature h1 { + color: #485297; + font-size: 15px; + font-weight: bold; + margin: 2px; + margin-top:10px; +} + +div.feature h2 { + color: #485297; + font-size: 15px; + font-weight:normal; + margin: 2px; +} + +div.feature p { + font-size: 12px; + line-height: 22px; +} + +div.feature .caption { + text-align: right; + font-size: 10px; + color: #b69f7b; + margin-top: 5px; +} + + +div.banner_large .caption { + font-size: 10px; + color: #b69f7b; + margin-top: 5px; +} + + + +/* Regular pages */ + +div.content { + float: left; + width: 900px; + } + div.leftbox { + float: left; + width: 170px; +} + div.subnav { + float: left; + width: 170px; + font-size: 11px; + line-height: 14px; + } + + div.sn_off { + float: left; + width: 164px; + border-bottom: 1px solid #dccbae; + padding: 3px 6px 6px 0; + } + + div.sn_on { + float: left; + width: 158px; + border-bottom: 1px solid #dccbae; + padding: 3px 6px 6px 6px; + background: #EA8500; + } + + .sn_on a { + color: #FCF2DF; + font-weight: bold; + } + + div.sn_off span.dept { + font-style: italic; + color: #b69f7b; + } + + div.sn_on span.dept { + font-style: italic; + color: #f9f4e1; + } + + div.subnavbox { + float: left; + width: 170px; + font-size: 11px; + line-height: 14px; + margin-top: 30px; + } + +div.subnavbox h2 { + float: left; + width: 170px; + height: 20px; + font-size: 11px; + color: #b69f7b; + margin-bottom: 0px; + padding-bottom: 3px; + margin-top: 20px; + background: transparent url(../images/side.gif) repeat-x; + } + + div.main { + float: left; + width: 730px; + background-color: #FFFFFF; + margin-bottom: 10px; + } + + div.center { + float: left; + width: 460px; + padding: 20px; + font-size: 12px; + } + + div.center_wide { + float: left; + width: 710px; + padding: 20px 0 0 20px; + font-size: 12px; + } + + + div.fullwidth { + float: left; + padding: 20px; + } + /* research classes */ + + div.dept_row { + float: left; + margin-bottom: 30px; + } + + div.dept_block { + float: left; + width: 221px; + padding-bottom: 5px; + border-top: 2px solid #979CE0; + } + + div.dept_block_wide { + float: left; + width: 460px; + padding-bottom: 5px; + /* border-top: 2px solid #979CE0; */ + } + + .dept_title { + margin: 0 0 5px 0; + font-size: 13px; + color: #485297; + } + + .dept_title_wide { + margin: 0 0 5px 0; + font-size: 16px; + color: #485297; + } + + + .dept_headline { + font-size: 13px; + font-weight: bold; + color: #485297; + } + + .dept_headline_wide { + font-size: 16px; + font-weight: bold; + color: #485297; + } + + .dept_title a, .dept_headline a { + color: #485297; + } + + p.dept_leader, p.dept_summary { + font-size: 11px; + } + + + div.spacer { + float: left; + width: 18px; + } + + + + .pic_large { + margin-bottom: 20px; + } + + .pic_inline_container { + float: left; + width: 220px; + margin: 5px 15px 0 0; + } + + .pic_inline_container_people { + float: left; + width: 165px; + margin: 5px 20px 10px 0; + } + + .pic_inline { + float: left; + width: 220px; + } + + .pic_inline_people { + float: left; + width: 180px; + } + + .caption_inline { + float: left; + width: 208px; + font-size: 9px; + color: #b69f7b; + margin-top: 5px; + } + + .caption_resize { + float: left; + width: 12px; + margin-top: 5px; + } + + + + + .mainhead { + color: #485297; + font-size: 15px; + font-weight: bold; + display: block; + } + + .subhead { + color: #485297; + font-size: 15px; + display: block; + } + + p.maintext { + font-size: 12px; + line-height: 22px; + } + + p.maintext_authors { + font-size: 12px; + font-weight: bold; + } + + p.maintext_more { + font-size: 12px; + margin-top: -10px; + padding-left: 15px; + background: url(../images/arr_more.gif) no-repeat; + } + + /* changes by cmielack */ + div.center, div.fullwidth { + font-size: 12px; + } + + /*div.center p, */div.fullwidth p { + font-size: 12px; + line-height: 22px; + } + + /* div.center h1, div.fullwidth h1 { */ + div.main h1 { + color: #485297; + font-size: 15px; + font-weight: bold; + display: block; + margin:2px; + margin-top:10px; + } + + div.center h2, div.fullwidth h2 { + color: #485297; + font-size: 15px; + font-weight:normal; + display: block; + margin: 2px; + } + div.center h3, div.fullwidth h3 { + color: #485297; + font-size: 13px; + font-weight:normal; + display: block; + margin: 2px; + } + + p.bio_section_header { + color: #485297; + padding-bottom: 5px; + margin-bottom: 5px; + border-bottom-width: 1px; + border-bottom-style: solid; + border-bottom-color: #dccbae; + } + + /* changes ending here */ + + + /* people list */ + + div.list_disclaimer { + float: left; + width: 180px; + font-size: 10px; + margin-right: 20px; + } + + div.letters { + float: left; + margin-right: 10px; + color: #EA8500; + } + div.letters a { + margin-left: 0.2em; + margin-right: 0.2em; + } + + div.letter { + float: left; + width: 700px; + margin-top: 20px; + padding-bottom: 3px; + border-bottom: 3px solid #dccbae; + font-weight: bold; + font-size: 13px; + color: #dccbae; + } + div.top { + float: left; + width: 700px; + } + div.listrow { + float: left; + width: 700px; + border-bottom: 1px solid #dccbae; + margin-top: 5px; + padding-bottom: 7px; + } + + .listrow ul { + list-style-image: url(../images/arr_more.gif); + margin-left: 0; + padding-left: 25px; + } + + div.listname { + float: left; + width: 200px; + font-size: 11px; + } + + .listname a { + color: #485297; + } + + div.listfunction { + float: left; + width: 500px; + font-size: 11px; + } + + .listfunction a { + color: #485297; + } + + /* bios */ + + p.name { + color: #485297; + font-size: 16px; + margin: 0; + font-weight: bold; + } + + p.function { + color: #485297; + margin: 0; + } + + p.bio_section_header { + color: #485297; + padding-bottom: 5px; + margin-bottom: 5px; + border-bottom: 1px solid #dccbae; + } + + .center ul { + list-style: none; + margin-left: 0; + padding: 0; + } + + .center li { + margin-bottom: 10px; + } + + + + div.sidebar_home { + float: left; + width: 230px; + } + + div.sidebar { + float: left; + width: 220px; + } + + div.up { + float: left; + width: 194px; + background: url(../images/arr_up.gif) no-repeat #f9f4e1; + padding: 6px 6px 6px 20px; + margin: 20px 0 10px 0; + color: #666666; + font-size: 10px; + } + + div.sideblock_home { + float: left; + width: 230px; + font-size: 10px; + line-height: 16px; + } + + div.sideblock { + float: left; + width: 220px; + font-size: 10px; + line-height: 16px; + border-bottom: 1px solid #dccbae; + } + + div.sideblockprojects, div.sideblockpublications, div.sideblockitem { + background-color:#ffffff; + float: left; + width: 220px; + font-size: 10px; + line-height: 16px; + } + + div.sideblockheader_home { + float: left; + width: 230px; + height: 20px; + padding-bottom: 3px; + margin-top: 20px; + background: transparent url(../images/side.gif) repeat-x; + } + + div.sideblockheader { + float: left; + width: 220px; + height: 20px; + padding-bottom: 3px; + margin-top: 20px; + background: transparent url(../images/side.gif) repeat-x; + } + + div.sideblockhead { + float: left; + font-size: 12px; + color: #485297; + } + + div.sideblockheader h2 { + float: left; + margin: 0px; + font-size: 12px; + color: #485297; + font-weight: normal; + } + div.sideblocknews { + float: left; + line-height: 16px; + margin: 5px 0 0 0; + padding: 0 0 5px 0; + border-bottom: 1px solid #dccbae; + } + div.sideblockheader_home { + float: left; + width: 230px; + height: 20px; + padding-bottom: 3px; + margin-top: 20px; + background: transparent url(../images/side.gif) repeat-x; + } + + div.sideblockmenu { + float: right; + font-size: 10px; + color: #b69f7b; + font-weight: bold; + padding-top: 2px + } + + div.sideblocktxt { + float: left; + line-height: 16px; + margin: 5px 0 10px 0; + } + + div.sideblocknews { + float: left; + line-height: 16px; + margin: 5px 0 0 0; + padding: 0 0 5px 0; + border-bottom: 1px solid #dccbae; + } + + div.sideblocklisttxt { + float: left; + width: 220px; + line-height: 16px; + margin-top: 5px; + padding-bottom: 10px; + border-bottom: 1px solid #dccbae; + } + + div.sideblocklink { + float: left; + line-height: 16px; + width: 200px; + margin-top: 5px; + padding: 0 0 10px 20px; + background: url(../images/arr_more.gif) no-repeat; + border-bottom: 1px solid #dccbae; + } + + div.sideblocklinksite { + float: left; + line-height: 16px; + width: 200px; + margin-top: 5px; + padding: 0 0 10px 20px; + background: url(../images/external.gif) no-repeat; + border-bottom: 1px solid #dccbae; + } + + div.sideblocklinkvid { + float: left; + line-height: 16px; + width: 200px; + margin-top: 5px; + padding: 0 0 10px 20px; + background: url(../images/vid.gif) no-repeat; + border-bottom: 1px solid #dccbae; + } + + div.sideblocklinkaudio { + float: left; + line-height: 16px; + width: 200px; + margin-top: 5px; + padding: 0 0 10px 20px; + background: url(../images/audio.gif) no-repeat; + border-bottom: 1px solid #dccbae; + } + + div.sideblocklinkpdf { + float: left; + line-height: 16px; + width: 200px; + margin-top: 5px; + padding: 0 0 10px 20px; + background: url(../images/download.gif) no-repeat; + border-bottom: 1px solid #dccbae; + } + + .sideblocklisttxt a { + font-weight: bold; + } + + div.sideblockprojectact { + float: left; + width: 194px; + background: url(../images/arr_right.gif) no-repeat #f5daaf; + padding: 6px 6px 6px 20px; + border-bottom: 1px solid #f3be7c; + } + + div.sideblockprojectinact { + float: left; + width: 194px; + background: url(../images/arr_right.gif) no-repeat #f6e6cc; + padding: 6px 6px 6px 20px; + border-bottom: 1px solid #f3be7c; + } + + .sideblockmenuinact a, .sideblockmenuact a, + .sideblockprojectact a, .sideblockprojectinact a, div.up a { + color: #333; + } + + div.sideblockpreview { + float: left; + width: 220px; + margin-bottom: 15px; + } + + div.sideblockthumb { + float: left; + width: 80px; + margin-right: 10px; + } + + div.sideblockabstract { + width: 130px; + float: left; + font-size: 10px; + } + + .sideblockabstract a { + font-weight: bold; + } + + div.footer_home { + float: left; + width: 900px; + margin: 0 10px 20px 20px; + border-top: 1px solid #dccbae; + } + + div.footer { + float: left; + width: 700px; + background-color: #FFFFFF; + margin: 0 10px 20px 20px; + /* border-top: 1px solid #544c9c; */ + border-top: 1px solid #485297; + } + + div.services { + float: right; + font-size: 11px; + margin-top: 5px; + } + + .services a { + color: #485297; + } + + div.serviceprint { + float: left; + margin-left: 20px; + padding-left: 20px; + height: 25px; + background: url(../images/print.gif) no-repeat; + } + + div.serviceforward { + float: left; + margin-left: 20px; + padding-left: 20px; + height: 25px; + background: url(../images/forward.gif) no-repeat; + } + + div.servicepdf { + float: left; + margin-left: 20px; + padding-left: 20px; + height: 25px; + background: url(../images/pdf.gif) no-repeat; + } + + div.boilerplate_home { + float: left; + margin: 30px 0 50px 0px; + width: 900px; + border-top: 1px solid #dccbae; + padding-top: 10px; + } + + div.boilerplate { + float: left; + margin: 0 0 50px 170px; + width: 730px; + } + + div.legal { + float: left; + font-size: 11px; + color: #EA8500; + } + + div.signet { + float: right; + } + +/* MISC */ + +#Header4 h1 { + line-height:70px; + padding-left:100px; + background:transparent url("trawna.gif") no-repeat; + border:0; /* some said that this might fix NN4, but no such luck */ +} + +.quickfind { + width: 230px; + height: 20px; + padding: 2px 2px 2px 2px; + padding-left:18px; + /* padding-right:-10px; */ + /* text-indent:8px; */ + float: right; + color: #EA8500; + font-size: 11px; + /* vertical-align:middle; */ + border: none; + background: url(../images/arr_qf.gif) no-repeat #f4daae; +} + + +/* new link-classes (with icons) */ + +a.internal { + background: url(../images/arr_more.gif) no-repeat; + padding-left:12px; + /* padding-top:1px; */ +} +.sidebar_home a.internal { + background: url(../images/arr_more.gif) no-repeat; + padding-left:12px; + padding-top:1px; +} +.sideblockhead a.internal { + font-size:10px; +} +a.download { + background: url(../images/download.gif) no-repeat; + padding-left:17px; + /* padding-top:1px; */ +} + +a.external { + background: url(../images/external.gif) no-repeat; + padding-left:15px; + /* padding-top:1px; */ +} +a.audio { + background: url(../images/audio.gif) no-repeat; + padding-left:15px; + /* padding-top:1px; */ +} + + + +div.event { + border-bottom: 3px solid #dccbae; + margin-bottom: 24px; +} + +div.eventdate{ + font-style:italic; + /* font-size:13px; */ +} + +div.event div.eventtitle { + /* font-weight:bold; */ + margin-top:32px; + font-size:15px; +} + +/* div.event div.eventinfo p.indent{ */ + /* margin-bottom:112px; */ +/* } */ + + +div.dept_block_sitemap { + float: left; + width: 221px; + font-size: 11px; +} + +.dept_title_sitemap { + margin: 0 0 5px 0; + font-size: 13px; + color: #485297; + width: 221px; + padding-top: 5px; + border-top: 2px solid #979CE0; +} + +.dept_title a, .dept_title_sitemap a, .dept_headline a { + color: #485297; +} \ No newline at end of file