Merge branch 'stable'

doc/license.txt

@@ -33,7 +33,7 @@ public Git repository. For data transfer to and from opencaching.de, see
 the legal information at opencaching.de.
 
 The Opencaching Deutschland logo, as it is contained in files like the
-rotator pictures and statistics pictures, is NOT licensed under GPL. 
+statistics pictures and rotator pictures orverlay, is NOT licensed under GPL. 
 Instead it is subject to a special license which can be obtained from 
 Opencaching Deutschland. 
 

htdocs/config2/settings-dev.inc.php

@@ -103,7 +103,6 @@
 	$opt['page']['absolute_url'] = $dev_baseurl;
 	$opt['mail']['from'] = 'root';
 	$opt['mail']['subject'] = '[local.opencaching.de] ';
-	$opt['page']['headimagepath'] = 'ocde';
 
 	/* location of uploaded images
 	 */

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

@@ -161,9 +161,14 @@
 				<?php echo isset($develwarning) ? $develwarning : '' ?>
 
 				<!-- Header banner -->
-				<div class="header" style="height:80px;">
-					<div style="width: 970px; "><img src="resource2/{style}/images/head/rotator.php?path=<?php echo $opt['page']['headimagepath']; ?>" width="970" height="80" alt="" style="border: 0px none ;" /></div>
-				</div>	
+				<div class="header">
+					<div class="headerimage">
+						<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" />
+					</div>
+				</div>
 
 				<!-- Navigation Level 2 -->
 				<div class="nav2">

htdocs/lib/settings-dev.inc.php

@@ -35,7 +35,7 @@
 	$opt['page']['title'] = 'OPENCACHING';
 	$opt['page']['subtitle1'] = 'Geocaching with Opencaching';
 	$opt['page']['subtitle2'] = '';
-	$opt['page']['headimagepath'] = 'ocde';
+	$opt['page']['headimagepath'] = '';
 	
 	//id of the node
 	$oc_nodeid = 4;

htdocs/resource2/ocstyle/css/style_screen.css

@@ -102,9 +102,29 @@ div#bg2 {display: none;}
 /* 2.1 - Sitename, slogan and banner */
 /*-----------------------------------*/
 .header {
-	height:81px;
+	height: 81px;
 }
 
+.headerimage {
+	height: 80px;
+	width: 970px;
+	overflow: hidden;
+	position: absolute;
+	top: 1px;
+	z-index: 1;
+}
+
+.headerlogo {
+	position: absolute;
+	top: 0px;
+	z-index: 2;
+}
+
+.headerimagecontent {
+	border: 0px none;
+}
+
+
 .site-name {
 	width: 300px;
 	height: 60px;
@@ -877,7 +897,7 @@ ul.nodot li {
 
 #suchbox {
 	position: absolute; 
-	top:112px; 
+	top:112px;
 	right: 5px;
 }
 

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

@@ -1,4 +0,0 @@
-The Opencaching Deutschland Logo contained in these files is subject to a special
-license which can be obtained from Opencaching Deutschland. It may be freely
-distributed, but it must be used only under the terms of this special license.
-

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

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

htdocs/templates2/ocstyle/sys_main.tpl

@@ -141,9 +141,12 @@
 
 
 			{* <!-- Header banner --> *}						    		 						
-			<div class="header" style="height:80px;">
-				<div style="width: 970px; ">
-					<img src="resource2/{$opt.template.style}/images/head/rotator.php?path={$opt.page.headimagepath}" width="970" height="80" alt="" style="border: 0px none ;" />
+			<div class="header">
+				<div class="headerimage">
+					<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" />
 				</div>
 			</div>