git-svn-id: https://openseamap.svn.sourceforge.net/svnroot/openseamap/website/map@1035 043453e6-25df-4c13-81b0-d6a77d00cc6f

fusionstream · Oct 19, 2012 · 62aef0f · 62aef0f
1 parent b4caf17
commit 62aef0f
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 68 deletions.
diff --git a/harbour.php b/harbour.php
@@ -1,24 +1,32 @@
+<!--updated 2012-06-02-->
 <table border="0" cellpadding="5">
 	<tr>
-		<td><IMG src="./resources/places/harbour_32.png" width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="harbour" src="./resources/places/harbour_32.png" width="32" height="32" border="0"></td>
 		<td><?=$t->tr("harbour")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="./resources/places/marina_32.png" width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="fishing_harbour" src="./resources/places/fishing_harbour_32.png" width="32" height="32" border="0"></td>
+		<td><?=$t->tr("fishing_harbour")?></td>
+	</tr>
+	<tr>
+		<td><img alt="harbour" src="./resources/places/marina_32.png" width="32" height="32" border="0"></td>
 		<td><?=$t->tr("marina")?></td>
 	</tr>
+	<tr>
+		<td><img alt="marina" src="./resources/places/anchorage_32.png" width="32" height="32" border="0"></td>
+		<td><?=$t->tr("anchorage")?></td>
+	</tr>
 	<tr>
 		<td	height="5" class="normal" colspan="2">
 			<hr>
 		</td>
 	</tr>
 	<tr>
-	<tr>
-		<td><IMG src="./resources/places/breakwater.png" width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="breakwater" src="./resources/places/breakwater.png" width="32" height="32" border="0"></td>
 		<td><?=$t->tr("breakwater")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="./resources/places/pier.png"  width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="pier" src="./resources/places/pier.png"  width="32" height="32" border="0"></td>
 		<td><?=$t->tr("pier")?></td>
 	</tr>
 	<tr>
@@ -27,11 +35,11 @@
 		</td>
 	</tr>
 	<tr>
-		<td><IMG src="./resources/places/crane.png" width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="crane" src="./resources/places/crane.png" width="32" height="32" border="0"></td>
 		<td><?=$t->tr("crane")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="./resources/places/slipway.png"  width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="slipway" src="./resources/places/slipway.png"  width="32" height="32" border="0"></td>
 		<td><?=$t->tr("slipway")?></td>
 	</tr>
 	<tr>
@@ -40,7 +48,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td><IMG src="./resources/places/harbour_master.png"  width="28" height="32" align="center" border="0"/></td>
+		<td><img alt="harbour_master" src="./resources/places/harbour_master.png"  width="28" height="32" border="0"></td>
 		<td><?=$t->tr("harbour_master")?></td>
 	</tr>
 	<tr>
@@ -49,7 +57,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td><IMG src="./resources/places/waste_disposal.png"  width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="waste_disposal" src="./resources/places/waste_disposal.png"  width="32" height="32" border="0"></td>
 		<td><?=$t->tr("waste_disposal")?></td>
 	</tr>
 </table>
diff --git a/index.php b/index.php
@@ -9,8 +9,9 @@
 		<title>OpenSeaMap - <?php echo $t->tr("dieFreieSeekarte")?></title>
 		<meta name="AUTHOR" content="Olaf Hannemann">
 		<meta http-equiv="content-type" content="text/html; charset=utf-8">
-		<meta http-equiv="content-language" content="<?= $t->getCurrentLanguage() ?>">
+		<meta http-equiv="content-language" content="<?= $t->getCurrentLanguage()?>">
 		<meta http-equiv="X-UA-Compatible" content="IE=9">
+		<meta name="date" content="2012-06-02">
 		<link rel="SHORTCUT ICON" href="../resources/icons/OpenSeaMapLogo_16.png">
 		<link rel="stylesheet" type="text/css" href="map-full.css">
 		<link rel="stylesheet" type="text/css" href="topmenu.css">
@@ -32,7 +33,6 @@
 		<script type="text/javascript" src="./javascript/bing.js"></script>
 		<script type="text/javascript" src="./javascript/ais.js"></script>
 		<script type="text/javascript" src="./javascript/satpro.js"></script>
-		<script type="text/javascript" src="./javascript/disaster.js"></script>
 		<script type="text/javascript">
 
 			var map;
@@ -85,7 +85,6 @@
 			var layer_bing_aerial;     // 12
 			var layer_ais;             // 13
 			var layer_satpro;          // 14
-			var layer_disaster;        // 15
 
 			// Select controls
 			var selectControl;
@@ -143,6 +142,7 @@ function readLayerCookies() {
 				if (getCookie("TidalScaleLayerVisible") == "true") {
 					TidalScalesVisible = true;
 					layer_pois.setVisibility(true);
+					refreshTidalScales();
 				}
 				if (getCookie("SportLayerVisible") == "true") {
 					layer_sport.setVisibility(true);
@@ -161,13 +161,7 @@ function readLayerCookies() {
 					map.setBaseLayer(layer_bing_aerial);
 				}
 				if (getCookie("AisLayerVisible") == "true") {
-					layer_ais.setVisibility(true);
-				}
-				if (getCookie("SatProLayerVisible") == "true") {
-					layer_satpro.setVisibility(true);
-				}
-				if (getCookie("DisasterLayerVisible") == "true") {
-					layer_disaster.setVisibility(true);
+					showAis();
 				}
 			}
 
@@ -189,8 +183,7 @@ function resetLayerCheckboxes()
 				document.getElementById("checkLayerWikipediaThumbnails").checked  = (layer_wikipedia.getVisibility() === true && wikipediaThumbs === true);
 				document.getElementById("checkLayerBingAerial").checked           = (map.baseLayer == layer_bing_aerial);
 				document.getElementById("checkLayerAis").checked                  = (layer_ais.getVisibility() === true);
-				document.getElementById("checkLayerSatPro").checked               = (layer_satpro.getVisibility() === true);
-				document.getElementById("checkLayerDisaster").checked             = (layer_disaster.getVisibility() === true);
+				//document.getElementById("checkLayerSatPro").checked               = (layer_satpro.getVisibility() === true);
 			}
 
 			// Show popup window for help
@@ -311,9 +304,11 @@ function correctBingVisibility() {
 			function showAis() {
 				if (layer_ais.visibility) {
 					layer_ais.setVisibility(false);
+					document.getElementById("license_marine_traffic").style.display = 'none';
 					setCookie("AisLayerVisible", "false");
 				} else {
 					layer_ais.setVisibility(true);
+					document.getElementById("license_marine_traffic").style.display = 'inline';
 					setCookie("AisLayerVisible", "true");
 				}
 			}
@@ -636,11 +631,8 @@ function drawmap() {
 				});
 				layer_satpro = satPro.getLayer();
 				// Disaster
-				disaster = new Disaster(map, selectControl, {
-					layerId: 15
-				});
-				layer_disaster = disaster.getLayer();
-				map.addLayers([layer_mapnik, layer_bing_aerial, layer_gebco_deepshade, layer_gebco_deeps_gwc, layer_seamark, layer_grid, layer_pois, layer_wikipedia, layer_nautical_route, layer_sport, layer_ais, layer_satpro, layer_disaster, layer_download]);
+
+				map.addLayers([layer_mapnik, layer_bing_aerial, layer_gebco_deepshade, layer_gebco_deeps_gwc, layer_seamark, layer_grid, layer_pois, layer_wikipedia, layer_nautical_route, layer_sport, layer_ais, layer_satpro, layer_download]);
 
 				layer_mapnik.events.register("loadend", null, function(evt) {
 					// The Bing layer will only be displayed correctly after the
@@ -664,18 +656,8 @@ function drawmap() {
 				// Activate select control
 				map.addControl(selectControl);
 				selectControl.activate();
-
-//testZoom.divEvents.register("mouseover", '', test_mouseover);
-//OpenLayers.Control.PanZoomBar.divEvents.register("mouseout", feature,  test_mouseout);
-
 			}
 
-/*function test_mouseover(ev) {
-alert(ev.getMousePosition()); //4=welt 8=Übersicht 12=Umgebung 18=details
-} 
-function test_mouseout() {
-
-}*/
 			function clearPoiLayer() {
 				harbours.clear();
 				arrayTidalScales.clear();
@@ -794,15 +776,16 @@ function addDownloadlayer(xmlMaps) {
 
 		</script>
 	</head>
-	<body onload=init();>
+	<body onload="init();">
 		<div id="map" style="position:absolute; bottom:0px; left:0px;"></div>
 		<div style="position:absolute; bottom:48px; left:12px; cursor:pointer;">
-			<img src="../resources/icons/OSM-Logo-32px.png" height="32px" title="<?=$t->tr("SomeRights")?>" onClick="showMapKey('license')"/>
-			<img src="../resources/icons/somerights20.png" height="30px" title="<?=$t->tr("SomeRights")?>" onClick="showMapKey('license')"/>
-			<a id="license_bing" href="http://wiki.openseamap.org/wiki/Bing" target="_blank" style="display:none"><img src="../resources/icons/bing.png" height="29px"/></a>
+			<a id="license_osm"  onClick="showMapKey('license')"><img alt="OSM-Logo" src="../resources/icons/OSM-Logo-32px.png" height="32px" title="<?=$t->tr("SomeRights")?>"></a>
+			<a id="license_ccbysa" onClick="showMapKey('license')"><img alt="CC by SA" src="../resources/icons/somerights20.png" height="30px" title="<?=$t->tr("SomeRights")?>"></a>
+			<a id="license_bing" href="http://wiki.openseamap.org/wiki/Bing" target="_blank" style="display:none"><img alt="bing" src="../resources/icons/bing.png" height="29px"></a>
+			<a id="license_marine_traffic" onClick="showMapKey('license')" style="display:none"><img alt="Marine Traffic" src="../resources/icons/MarineTrafficLogo.png" height="30px"></a>
 		</div>
 		<div id="actionDialog">
-			<br/>&nbsp;not found&nbsp;<br/>&nbsp;
+			<br>&nbsp;not found&nbsp;<br>&nbsp;
 		</div>
 		<? include('../classes/topmenu.inc'); ?>
 	</body>

diff --git a/legend.php b/legend.php
@@ -9,14 +9,14 @@
 $p->addPage("light",$t->tr("Leuchtfeuer"),"light.php");
 $p->addPage("lock",$t->tr("BrückenSchleusen"),"lock.php");
 $p->addPage("divider2", "<b>".$t->tr("help")."</b>------------------------------","");
-$p->addPage("help-online-editor", $t->tr("help-oe"),"./map_key_pages/help-online-editor_".$t->tr("langCode").".php");
 $p->addPage("help-josm",$t->tr("help-josm"),"./map_key_pages/help-josm_".$t->tr("langCode").".php");
 $p->addPage("help-tidal-scale",$t->tr("help-tidal-scale"),"./map_key_pages/help-tidal-scale_".$t->tr("langCode").".php");
 $p->addPage("help-trip-planner",$t->tr("tripPlanner"),"./map_key_pages/help-trip-planner_".$t->tr("langCode").".php");
 $p->addPage("help-website",$t->tr("help-website-int"),"./map_key_pages/help-web-integr_".$t->tr("langCode").".php");
+$p->addPage("help-online",$t->tr("help-online"),"./map_key_pages/help-online_".$t->tr("langCode").".php");
 $p->addPage("divider3", "------------------------------------","");
 $p->addPage("license",$t->tr("license"),"./map_key_pages/license_".$t->tr("langCode").".php");
-//$p->addPage("about",$t->tr("about"),"./map_key_pages/about_".$t->tr("langCode").".php");
+$p->addPage("about",$t->tr("about"),"./map_key_pages/about_".$t->tr("langCode").".php");
 $p->setDefaultPage("harbour");
 
 ?>
@@ -25,11 +25,12 @@
        "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 	<head>
-	<title>OSW -<?=$t->tr('nautical_chart')?>: <?=$t->tr("Legende")?> - <?=$p->getCurrentPageName()?></title>
-		<meta name="AUTHOR" content="Olaf Hannemann" />
-		<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-		<meta http-equiv="content-language" content="<?= $t->getCurrentLanguage() ?>" />
-		<link rel="SHORTCUT ICON" href="../resources/icons/logo.png"/>
+		<title>OSW -<?=$t->tr('nautical_chart')?>: <?=$t->tr("Legende")?> - <?=$p->getCurrentPageName()?></title>
+		<meta name="AUTHOR" content="Olaf Hannemann">
+		<meta http-equiv="content-type" content="text/html; charset=utf-8">
+		<meta http-equiv="content-language" content="<?= $t->getCurrentLanguage()?>">
+		<meta name="date" content="2012-06-02">
+		<link rel="SHORTCUT ICON" href="../resources/icons/logo.png">
 		<link rel="stylesheet" type="text/css" href="map-legend.css">
 	</head>
 

diff --git a/light.php b/light.php
@@ -1,6 +1,7 @@
+<!--updated 2012-06-02-->
 <table border="0" cellpadding="5">
 	<tr>
-		<td><IMG src="resources/light/Lighthouse_Major.png"  width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="lighthouse" src="resources/light/Lighthouse_Major.png"  width="32" height="32" border="0"></td>
 		<td><?=$t->tr("lighthouse")?></td>
 	</tr>
 	<tr>
@@ -9,15 +10,15 @@
 		</td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/light/Light_Beacon_Green.png" width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="beacon_green" src="resources/light/Light_Beacon_Green.png" width="32" height="32" border="0"></td>
 		<td><?=$t->tr("beacon_green")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/light/Light_Beacon_Red.png"  width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="beacon_red" src="resources/light/Light_Beacon_Red.png"  width="32" height="32" border="0"></td>
 		<td><?=$t->tr("beacon_red")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/light/Light_Beacon_White.png"  width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="beacon_white" src="resources/light/Light_Beacon_White.png"  width="32" height="32" border="0"></td>
 		<td><?=$t->tr("beacon_white")?></td>
 	</tr>
 </table>

diff --git a/lock.php b/lock.php
@@ -1,10 +1,11 @@
+<!--updated 2012-06-02-->
 <table border="0" cellpadding="5">
 	<tr>
-		<td><IMG src="resources/places/lock_gate.png"  width="18" height="32" align="center" border="0"/></td>
+		<td><img alt="lock_gate" src="resources/places/lock_gate.png"  width="18" height="32" border="0"></td>
 		<td><?=$t->tr("lock_gate")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/places/lock.png"  width="28" height="32" align="center" border="0"/></td>
+		<td><img alt="lock" src="resources/places/lock.png"  width="28" height="32" border="0"></td>
 		<td><?=$t->tr("lock")?></td>
 	</tr>
 	<tr>
@@ -13,11 +14,11 @@
 		</td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/places/wier_small.png"  width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="wier_small" src="resources/places/wier_small.png"  width="32" height="32" border="0"></td>
 		<td><?=$t->tr("wier_small")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/places/wier_big.png"  width="32" height="32" align="center" border="0"/></td>
+		<td><img alt="wier_big" src="resources/places/wier_big.png"  width="32" height="32" border="0"></td>
 		<td><?=$t->tr("wier_big")?></td>
 	</tr>
 </table>

diff --git a/seamark.php b/seamark.php
@@ -1,22 +1,23 @@
+<!--updated 2012-06-02-->
 <table border="0" cellpadding="5">
 	<tr>
-		<td><IMG src="resources/lateral/Lateral_SafeWater.png" width="30" height="36" align="center" border="0"/></td>
+		<td><img alt="safe_water" src="resources/lateral/Lateral_SafeWater.png" width="30" height="36" border="0"></td>
 		<td><?=$t->tr("safe_water")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/lateral/Lateral_Green.png" width="30" height="36" align="center" border="0"/></td>
+		<td><img alt="lateral_starboard" src="resources/lateral/Lateral_Green.png" width="30" height="36" border="0"></td>
 		<td><?=$t->tr("lateral_starboard")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/lateral/Lateral_Red.png" width="30" height="36" align="center" border="0"/></td>
+		<td><img alt="lateral_port" src="resources/lateral/Lateral_Red.png" width="30" height="36" border="0"></td>
 		<td><?=$t->tr("lateral_port")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/lateral/Lateral_Pref_Starboard.png" width="30" height="36" align="center" border="0"/></td>
+		<td><img alt="lateral_pref_starboard" src="resources/lateral/Lateral_Pref_Starboard.png" width="30" height="36" border="0"></td>
 		<td><?=$t->tr("lateral_pref_starboard")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/lateral/Lateral_Pref_Port.png" width="30" height="36" align="center" border="0"/></td>
+		<td><img alt="lateral_pref_port" src="resources/lateral/Lateral_Pref_Port.png" width="30" height="36" border="0"></td>
 		<td><?=$t->tr("lateral_pref_port")?></td>
 	</tr>
 	<tr>
@@ -25,23 +26,23 @@
 		</td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/cardinal/Cardinal_North.png" width="30" height="36" align="center" border="0"/></td>
+		<td><img alt="cardinal_north" src="resources/cardinal/Cardinal_North.png" width="30" height="36" border="0"></td>
 		<td><?=$t->tr("cardinal_north")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/cardinal/Cardinal_East.png" width="30" height="36" align="center" border="0"/></td>
+		<td><img alt="cardinal_east" src="resources/cardinal/Cardinal_East.png" width="30" height="36" border="0"></td>
 		<td><?=$t->tr("cardinal_east")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/cardinal/Cardinal_South.png" width="30" height="36" align="center" border="0"/></td>
+		<td><img alt="cardinal_south" src="resources/cardinal/Cardinal_South.png" width="30" height="36" border="0"></td>
 		<td><?=$t->tr("cardinal_south")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/cardinal/Cardinal_West.png" width="30" height="36" align="center" border="0"/></td>
+		<td><img alt="cardinal_west" src="resources/cardinal/Cardinal_West.png" width="30" height="36" border="0"></td>
 		<td><?=$t->tr("cardinal_west")?></td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/cardinal/Cardinal_Single.png" width="30" height="36" align="center" border="0"/></td>
+		<td><img alt="isolated_danger" src="resources/cardinal/Cardinal_Single.png" width="30" height="36" border="0"></td>
 		<td><?=$t->tr("isolated_danger")?></td>
 	</tr>
 	<tr>
@@ -50,7 +51,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td><IMG src="resources/special_purpose/Special_Purpose.png" width="30" height="36" align="center" border="0"/></td>
+		<td><img alt="special_purpose" src="resources/special_purpose/Special_Purpose.png" width="30" height="36" border="0"></td>
 		<td><?=$t->tr("special_purpose")?></td>
 	</tr>
 </table>

diff --git a/weather.php b/weather.php
@@ -593,10 +593,11 @@ function clearSignificantWaveHeightLayerVisibility() {
 		<div id="map" style="position:absolute; bottom:0px; left:0px;"></div>
 		<div style="position:absolute; bottom:10px; left:12px; width:700px;">
 			<img src="../resources/icons/somerights20.png" height="30px" title="<?=$t->tr("SomeRights")?>" onClick="window.open('http://creativecommons.org/licenses/by-sa/2.0')" />
+			<img src="../resources/icons/OpenPortGuideLogo_32.png" height="32px" title="<?=$t->tr("OpenPortGuide")?>" onClick="window.open('http://openportguide.org/wiki_/Main_Page')" />
 		</div>
 		<div id="topmenu" style="position:absolute; top:10px; left:12px;">
 			<ul>
-				<li onClick="window.location.href='./index.php?lang=<?=$t->getCurrentLanguage()?>'"><IMG src="../resources/icons/OpenSeaMapLogo_88.png" width="24" height="24" align="center" border="0"><?=$t->tr("Seekarte")?></img></li>
+				<li onClick="window.location.href='./index.php?lang=<?=$t->getCurrentLanguage()?>'"><IMG src="../resources/icons/OpenSeaMapLogo_88.png" width="24" height="24" align="center" border="0"><?=$t->tr("SeaChart")?></img></li>
 				<li>&nbsp;|&nbsp;</li>
 				<li id="buttonWind" onClick="showWind()" onMouseover="this.style.background='#ADD8E6'" onMouseout="if(!showWindLayer) {this.style.background='#FFFFFF'} else {this.style.background='#ADD8E6'}"><input type="checkbox" id="checkWind"/><IMG src="./resources/map/WindIcon.png" width="24" height="24" align="center" border="0"><?=$t->tr("wind")?>&nbsp;</img></li>
 				<li>&nbsp;&nbsp;</li>