Merge branch 'stable'

htdocs/lang/de/ocstyle/main.tpl.php

@@ -62,6 +62,10 @@
 		<meta http-equiv="gallerimg" content="no" />
 		<meta http-equiv="cache-control" content="no-cache" />
 		<link rel="SHORTCUT ICON" href="favicon.ico">
+		<link rel="apple-touch-icon" href="resource2/{style}/images/oclogo/apple-touch-icon-iphone.png" />
+		<link rel="apple-touch-icon" sizes="72x72" href="resource2/{style}/images/oclogo/apple-touch-icon-ipad.png" />
+		<link rel="apple-touch-icon" sizes="114x114" href="resource2/{style}/images/oclogo/apple-touch-icon-iphone-retina.png" />
+		<link rel="apple-touch-icon" sizes="144x144" href="resource2/{style}/images/oclogo/apple-touch-icon-ipad-retina.png" />
 		<link rel="stylesheet" type="text/css" media="screen,projection" href="resource2/{style}/css/style_screen.css?ft={screen_css_time}">
       <script type="text/javascript">
 				<!--
@@ -181,7 +185,7 @@
 						<img src="resource2/{style}/images/head/rotator.php?path=<?php echo $opt['page']['headimagepath']; ?>" class="headerimagecontent" />
 					</div>
 					<div class="headerlogo">
-						<img src="resource2/{style}/images/head/overlay/oc_head_alpha3.png" class="headerimagecontent" />
+						<img src="resource2/{style}/images/oclogo/oc_head_alpha3.png" class="headerimagecontent" />
 					</div>
 				</div>
 

htdocs/resource2/ocstyle/images/head/overlay/license.txt

@@ -1,2 +0,0 @@
-The Opencachig.de logo can be freely distributed, but is not licensed under
-GNU GPL. Please contact Opencaching Deutschland for license conditions.

htdocs/resource2/ocstyle/images/oclogo/license.txt

@@ -0,0 +1,3 @@
+The new Opencachig.de logo (compass-dial style) can be freely distributed,
+but is not licensed under GNU GPL. Please contact Opencaching Deutschland for
+license conditions.

htdocs/templates2/ocstyle/map2.tpl

@@ -2206,7 +2206,7 @@ function toggle_attribselection(bSaveCookies)
 
 	{if $bFullscreen}
 		{* the logo *}
-		<a href="index.php"><img id="oclogo" src="resource2/ocstyle/images/head/overlay/oc_logo_alpha3.png" style="position:absolute; left:32px; top:50px; z-index:2; border:0;"></a>
+		<a href="index.php"><img id="oclogo" src="resource2/ocstyle/images/oclogo/oc_logo_alpha3.png" style="position:absolute; left:32px; top:50px; z-index:2; border:0;"></a>
 
 		{literal}
 		<script language="javascript">

htdocs/templates2/ocstyle/sys_main.tpl

@@ -18,6 +18,10 @@
 		<meta http-equiv="gallerimg" content="no" />
 		<meta http-equiv="cache-control" content="no-cache" />
 		<link rel="SHORTCUT ICON" href="favicon.ico">
+		<link rel="apple-touch-icon" href="resource2/{$opt.template.style}/images/oclogo/apple-touch-icon-iphone.png" />
+		<link rel="apple-touch-icon" sizes="72x72" href="resource2/{$opt.template.style}/images/oclogo/apple-touch-icon-ipad.png" />
+		<link rel="apple-touch-icon" sizes="114x114" href="resource2/{$opt.template.style}/images/oclogo/apple-touch-icon-iphone-retina.png" />
+		<link rel="apple-touch-icon" sizes="144x144" href="resource2/{$opt.template.style}/images/oclogo/apple-touch-icon-ipad-retina.png" />
 		<link rel="stylesheet" type="text/css" media="screen,projection" href="resource2/{$opt.template.style}/css/style_screen.css?ft={$screen_css_time}">
 		<link rel="stylesheet" type="text/css" media="print" href="resource2/{$opt.template.style}/css/style_print.css?ft={$print_css_time}">
 		{literal}
@@ -167,7 +171,7 @@
 					<img src="resource2/{$opt.template.style}/images/head/rotator.php?path={$opt.page.headimagepath}" class="headerimagecontent" />
 				</div>
 				<div class="headerlogo">
-					<img src="resource2/{$opt.template.style}/images/head/overlay/oc_head_alpha3.png" class="headerimagecontent" />
+					<img src="resource2/{$opt.template.style}/images/oclogo/oc_head_alpha3.png" class="headerimagecontent" />
 				</div>
 			</div>