From b2e3e66604e517f794c03ddac9b3547e98dcc9fc Mon Sep 17 00:00:00 2001 From: following Date: Sat, 23 Feb 2013 21:40:27 +0100 Subject: [PATCH] switched ocde head logo display to alpha-channel png, fixed layout new pictures are crisp and sharp again ... --- doc/license.txt | 2 +- htdocs/config2/settings-dev.inc.php | 1 - htdocs/lang/de/ocstyle/main.tpl.php | 11 ++++++++--- htdocs/lib/settings-dev.inc.php | 2 +- htdocs/resource2/ocstyle/css/style_screen.css | 8 ++++---- .../images/head/ocde/estanque_retiro.jpg | Bin 39245 -> 0 bytes .../ocstyle/images/head/ocde/license.txt | 4 ---- .../images/head/ocde/palacio_de_cristal.jpg | Bin 42607 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0001.jpg | Bin 38598 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0002.jpg | Bin 40275 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0003.jpg | Bin 28003 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0004.jpg | Bin 34060 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0005.jpg | Bin 38998 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0006.jpg | Bin 36262 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0007.jpg | Bin 42984 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0008.jpg | Bin 32142 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0009.jpg | Bin 25516 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0010.jpg | Bin 29352 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0011.jpg | Bin 28938 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0012.jpg | Bin 28728 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0013.jpg | Bin 32246 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0014.jpg | Bin 36815 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0015.jpg | Bin 31985 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0016.jpg | Bin 28817 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0017.jpg | Bin 29913 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0018.jpg | Bin 31107 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0019.jpg | Bin 28445 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0020.jpg | Bin 28792 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0021.jpg | Bin 27248 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0022.jpg | Bin 28438 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0023.jpg | Bin 25490 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0024.jpg | Bin 30139 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0026.jpg | Bin 34729 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0027.jpg | Bin 38189 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0028.jpg | Bin 38964 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0029.jpg | Bin 36653 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0030.jpg | Bin 35148 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0031.jpg | Bin 29254 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0033.jpg | Bin 34444 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0034.jpg | Bin 30266 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0035.jpg | Bin 37876 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0036.jpg | Bin 35775 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0037.jpg | Bin 37835 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0038.jpg | Bin 37973 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0039.jpg | Bin 36799 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0040.jpg | Bin 35794 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0041.jpg | Bin 39677 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0042.jpg | Bin 42035 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0043.jpg | Bin 33557 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0044.jpg | Bin 35818 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0045.jpg | Bin 33083 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0046.jpg | Bin 33677 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0047.jpg | Bin 42324 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0048.jpg | Bin 32561 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0049.jpg | Bin 29558 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0050.jpg | Bin 35834 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0051.jpg | Bin 26272 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0052.jpg | Bin 29074 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0053.jpg | Bin 30842 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0054.jpg | Bin 28849 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0055.jpg | Bin 38501 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0056.jpg | Bin 25543 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0057.jpg | Bin 28527 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0058.jpg | Bin 33317 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0059.jpg | Bin 27609 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0060.jpg | Bin 35117 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0061.jpg | Bin 41091 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0062.jpg | Bin 39477 -> 0 bytes .../ocstyle/images/head/ocde/pano970-0063.jpg | Bin 36579 -> 0 bytes .../images/head/ocde/pano970-f01-crumstadt.jpg | Bin 39252 -> 0 bytes .../images/head/ocde/pano970-f02-la-palma.jpg | Bin 42430 -> 0 bytes .../head/ocde/pano970-f03-port-elizabeth.jpg | Bin 44303 -> 0 bytes .../images/head/ocde/pano970-f04-woerrstadt.jpg | Bin 44889 -> 0 bytes .../images/head/ocde/pano970-f05-bodenheim.jpg | Bin 50226 -> 0 bytes .../images/head/ocde/pano970-f06-essenheim.jpg | Bin 31305 -> 0 bytes .../images/head/ocde/pano970-f07-nackenheim.jpg | Bin 39422 -> 0 bytes .../images/head/ocde/pano970-f08-mainz.jpg | Bin 40220 -> 0 bytes .../head/ocde/pano970-f09-wilderndess.jpg | Bin 42800 -> 0 bytes .../images/head/ocde/pano970-f10-teide.jpg | Bin 39198 -> 0 bytes .../images/head/ocde/pano970-f11-norderney.jpg | Bin 35179 -> 0 bytes .../images/head/ocde/pano970-f12-norderney.jpg | Bin 46104 -> 0 bytes .../panorama-rheinlandpfalz-bingen-nahe-2.jpg | Bin 40577 -> 0 bytes .../panorama-rheinlandpfalz-bingen-nahe.jpg | Bin 48595 -> 0 bytes .../images/head/ocde/pantano_de_san_juan.jpg | Bin 34231 -> 0 bytes .../head/ocde/parque_lineal_de_manzanares.jpg | Bin 37208 -> 0 bytes .../head/ocde/rheinromantik_panorama1.jpg | Bin 34559 -> 0 bytes .../ocstyle/images/head/overlay/license.txt | 2 ++ .../images/head/overlay/oc_head_alpha3.png | Bin 0 -> 15611 bytes htdocs/templates2/ocstyle/sys_main.tpl | 9 ++++++--- 89 files changed, 22 insertions(+), 17 deletions(-) delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/estanque_retiro.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/license.txt delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/palacio_de_cristal.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0001.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0002.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0003.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0004.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0005.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0006.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0007.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0008.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0009.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0010.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0011.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0012.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0013.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0014.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0015.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0016.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0017.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0018.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0019.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0020.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0021.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0022.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0023.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0024.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0026.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0027.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0028.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0029.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0030.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0031.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0033.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0034.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0035.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0036.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0037.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0038.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0039.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0040.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0041.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0042.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0043.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0044.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0045.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0046.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0047.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0048.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0049.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0050.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0051.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0052.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0053.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0054.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0055.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0056.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0057.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0058.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0059.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0060.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0061.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0062.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-0063.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-f01-crumstadt.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-f02-la-palma.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-f03-port-elizabeth.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-f04-woerrstadt.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-f05-bodenheim.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-f06-essenheim.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-f07-nackenheim.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-f08-mainz.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-f09-wilderndess.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-f10-teide.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-f11-norderney.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pano970-f12-norderney.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/panorama-rheinlandpfalz-bingen-nahe-2.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/panorama-rheinlandpfalz-bingen-nahe.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/pantano_de_san_juan.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/parque_lineal_de_manzanares.jpg delete mode 100644 htdocs/resource2/ocstyle/images/head/ocde/rheinromantik_panorama1.jpg create mode 100644 htdocs/resource2/ocstyle/images/head/overlay/license.txt create mode 100644 htdocs/resource2/ocstyle/images/head/overlay/oc_head_alpha3.png diff --git a/doc/license.txt b/doc/license.txt index b9dc5b1c..2fe4a4fc 100644 --- a/doc/license.txt +++ b/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. diff --git a/htdocs/config2/settings-dev.inc.php b/htdocs/config2/settings-dev.inc.php index 4d80486a..27ee3194 100644 --- a/htdocs/config2/settings-dev.inc.php +++ b/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 */ diff --git a/htdocs/lang/de/ocstyle/main.tpl.php b/htdocs/lang/de/ocstyle/main.tpl.php index 91d6d5a1..8833ea4a 100644 --- a/htdocs/lang/de/ocstyle/main.tpl.php +++ b/htdocs/lang/de/ocstyle/main.tpl.php @@ -161,9 +161,14 @@ -
-
-
+
+
+
+
+
+ +
+