Skip to content
Permalink
Browse files

new logo and page design

  • Loading branch information...
following
following committed Feb 11, 2013
1 parent 6416b42 commit f9a055a08be19229612dc3f561bfd66531ee2a53
Showing with 33 additions and 59 deletions.
  1. +4 −0 doc/license.txt
  2. +1 −0 htdocs/config2/settings-dev.inc.php
  3. +3 −1 htdocs/config2/settings-dist.inc.php
  4. +3 −3 htdocs/doc/sql/static-data/data.sql
  5. +2 −18 htdocs/lang/de/ocstyle/main.tpl.php
  6. +1 −0 htdocs/lib/settings-dev.inc.php
  7. +1 −0 htdocs/lib/settings-dist.inc.php
  8. +1 −0 htdocs/lib2/OcSmarty.class.php
  9. +5 −5 htdocs/resource2/ocstyle/css/style_screen.css
  10. BIN htdocs/resource2/ocstyle/images/head/ocde/estanque_retiro.jpg
  11. +4 −0 htdocs/resource2/ocstyle/images/head/ocde/license.txt
  12. BIN htdocs/resource2/ocstyle/images/head/ocde/palacio_de_cristal.jpg
  13. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0001.jpg
  14. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0002.jpg
  15. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0003.jpg
  16. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0004.jpg
  17. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0005.jpg
  18. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0006.jpg
  19. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0007.jpg
  20. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0008.jpg
  21. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0009.jpg
  22. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0010.jpg
  23. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0011.jpg
  24. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0012.jpg
  25. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0013.jpg
  26. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0014.jpg
  27. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0015.jpg
  28. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0016.jpg
  29. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0017.jpg
  30. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0018.jpg
  31. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0019.jpg
  32. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0020.jpg
  33. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0021.jpg
  34. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0022.jpg
  35. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0023.jpg
  36. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0024.jpg
  37. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0025.jpg
  38. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0026.jpg
  39. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0027.jpg
  40. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0028.jpg
  41. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0029.jpg
  42. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0030.jpg
  43. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0031.jpg
  44. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0032.jpg
  45. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0033.jpg
  46. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0034.jpg
  47. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0035.jpg
  48. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0036.jpg
  49. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0037.jpg
  50. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0038.jpg
  51. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0039.jpg
  52. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0040.jpg
  53. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0041.jpg
  54. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0042.jpg
  55. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0043.jpg
  56. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0044.jpg
  57. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0045.jpg
  58. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0046.jpg
  59. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0047.jpg
  60. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0048.jpg
  61. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0049.jpg
  62. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0050.jpg
  63. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0051.jpg
  64. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0052.jpg
  65. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0053.jpg
  66. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0054.jpg
  67. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0055.jpg
  68. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0056.jpg
  69. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0057.jpg
  70. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0058.jpg
  71. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0059.jpg
  72. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0060.jpg
  73. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0061.jpg
  74. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0062.jpg
  75. BIN htdocs/resource2/ocstyle/images/head/ocde/pano970-0063.jpg
  76. BIN htdocs/resource2/ocstyle/images/head/ocde/panorama-rheinlandpfalz-bingen-nahe-2.jpg
  77. BIN htdocs/resource2/ocstyle/images/head/ocde/panorama-rheinlandpfalz-bingen-nahe.jpg
  78. BIN htdocs/resource2/ocstyle/images/head/ocde/pantano_de_san_juan.jpg
  79. BIN htdocs/resource2/ocstyle/images/head/ocde/parque_lineal_de_manzanares.jpg
  80. BIN htdocs/resource2/ocstyle/images/head/ocde/rheinromantik_panorama1.jpg
  81. +4 −3 htdocs/resource2/ocstyle/images/head/rotator.php
  82. +4 −29 htdocs/templates2/ocstyle/sys_main.tpl
@@ -32,6 +32,10 @@ This license is only valid for the source code and documents stored in the
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, is NOT licensed under GPL. Instead it is subject to a
special license which can be obtained from Opencaching Deutschland.

If you are using this source code to establish a geocache listing service
or some sort of service which can be compared with it, you agree to
publish your geocaching data via XML Interface the same way and under the same
@@ -102,6 +102,7 @@
$opt['page']['absolute_url'] = $dev_baseurl;
$opt['mail']['from'] = 'root';
$opt['mail']['subject'] = '[local.opencaching.de] ';
$opt['page']['headimagepath'] = 'ocde';
/* location of uploaded images
*/
@@ -197,8 +197,10 @@
// sponsor link on e.g. print preview and garmin-plugin
$opt['page']['sponsor']['popup'] = '';
$opt['page']['sponsor']['bottom'] = 'Driven by the Opencaching Community';
// directory of rotator pictures and script, relative to head images dir
$opt['page']['headimagepath'] = '';
/* disable or enable https access to the main site
* if false and connection is https, redirect to $opt['page']['absolute_url']
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('79', 'DE', 'Isländisch', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('80', 'DE', 'Startseite', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('81', 'DE', 'Was finde ich auf dieser Website?', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'DE', 'Hier findest du alles rund um Geocaching - egal ob du ein Anfänger bist oder schon ein richtiger Profi - vom einfachen Geocaching-ABC bis zum Forum, in dem du mit anderen Geocachern diskutieren kannst.', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'DE', 'Hier findest du Geocaches aus der ganzen Welt, mit Schwerpunkt Deutschland, \Österreich, Schweiz, Italien und Spanien. Au\ßerdem gibt es Informationsangebote rund ums Geocaching, und ein Forum und einen Chat zum Austausch mit Gleichgesinnten.', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('83', 'DE', 'Bei der Dateiübertragung ist ein Fehler aufgetreten.', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('84', 'DE', 'Die Datei war zu groß. Es sind maximal 150 kB erlaubt.', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('85', 'DE', 'Kein Bild angegeben.', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('172', 'DE', 'Jemen', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('173', 'DE', 'Samoa', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('174', 'DE', 'Go', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('175', 'DE', 'Entwicklersystem - nur Testdaten!', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('175', 'DE', 'Entwicklersystem - nur Testdaten', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('176', 'DE', 'Die <a target=\"_blank\" href=\"articles.php?page=dsb\">Datenschutzbelehrung</a> und <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Nutzungsbedingungen</a> habe ich gelesen und bin damit einverstanden.', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('177', 'DE', 'Du willst in deiner Cachebeschreibung einen Teil des Textes <b>fett</b> oder <i>kursiv</i> machen, hast jedoch keine Ahnung von HTML?<br /><p>Kein Problem, mit dieser Anleitung wird das zum Kinderspiel!</p>', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('178', 'DE', 'Hier siehst du den HTML Code deines Textes. Wenn du ein Wort oder Satz <b>fett</b> schreiben möchtest, füge vor den Satz ein \&lt;b\&gt; und hinter den Satz ein \&lt;/b\&gt;.', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('79', 'EN', 'Icelandic', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('80', 'EN', 'Home', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('81', 'EN', 'Welcome to opencaching.de', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'EN', 'Dear international visitors,<br />\r\n <br />\r\nwelcome to the english version of opencaching.de. We created these pages to make it easier for you to use the opencaching platform. Actually you may find or even list caches worldwide on opencaching.de, although the primary focus is the german speaking part of europe until now. Please be aware that today there are only few users which use opencaching.de for worldwide caching, but you may help opencaching to spread across more countries with your international listings and logs. If you have any questions about the usage of the opencaching platform, feel free to get in contact with us.<br />\r\n <br />\r\nDue to the fact that opencaching.de is a non-profit project run by volunteers, unfortunately we do not really have the capacity to run a worldwide caching plattform or provide full international user support on our own. We need your help to build a real worldwide opencaching network. If you want to support our project, you may host your own opencaching node for your country. The idea is to have several opencaching nodes for different countries around the world with a synchronized database of users and caches. If you want to launch an new opencaching site in your country, please get in contact with us. We will provide you with the necessary source code and some support for the first setup. Besides that, you may support us by translating the opencaching software into your language or by offering email support for your country. We will implement your translation on opencaching.de until a native node will be available in your area.<br />\r\n <br />\r\nBest Regards,<br />\r\n <br />\r\nThe opencaching.de Team<br />\r\n ', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'EN', 'On this page you will find Geocaches from all over the world, with focus on Germany, Austria, Switzerland, Italy and Spain. We also offer information on miscellaneous geocaching topics, and a forum (message board) and chat for communicating with other cachers.<br /><br />If you would like to propagate geocaching in your own country, you may run your own Opencaching site in your own language, using our <a href=\"https://github.com/OpencachingDeutschland/oc-server3\" target="\_blank\">software</a> and known-how. Please contact us in our international forum for more information.', '2013-02-11 14:25:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('83', 'EN', 'The file was not uploaded correctly.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('84', 'EN', 'The file was too big. The maximum file size is 150 KB.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('85', 'EN', 'No picture file given.', '2010-08-28 11:48:07');
@@ -158,27 +158,11 @@ function usercountry_change()
<div id="bg2">&nbsp;</div>
<!-- HEADER -->
<!-- OC-Logo -->
<div><img src="resource2/{style}/images/oc_logo.png" alt="" style="margin-top: 5px; margin-left: 3px;" /></div>
<!-- Sitename -->
<div class="site-name">
<a href="index.php">
<p class="title">{opt_page_title}</p>
<p class="subtitle1">{opt_page_subtitle1}</p>
<p class="subtitle2">{opt_page_subtitle2}</p>
</a>
</div>
<!-- Site slogan -->
<div class="site-slogan-container">
{sponsortopright}
</div>
<?php echo isset($develwarning) ? $develwarning : '' ?>
<!-- Header banner -->
<div class="header" style="height:81px;">
<div style="width: 970px; padding-top: 1px;"><img src="resource2/{style}/images/head/rotator.php" width="970" height="80" alt="" style="border: 0px none ;" /></div>
<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>
<!-- Navigation Level 2 -->
@@ -35,6 +35,7 @@
$opt['page']['title'] = 'OPENCACHING';
$opt['page']['subtitle1'] = 'Geocaching with Opencaching';
$opt['page']['subtitle2'] = '';
$opt['page']['headimagepath'] = 'ocde';
//id of the node
$oc_nodeid = 4;
@@ -151,6 +151,7 @@
$opt['page']['title'] = 'OPENCACHING';
$opt['page']['subtitle1'] = 'Geocaching with Opencaching';
$opt['page']['subtitle2'] = '';
$opt['page']['headimagepath'] = '';
/* Sponsoring advertisements
* (plain HTML)
@@ -159,6 +159,7 @@ function display($dummy1=null, $dummy2=null, $dummy3=null)
$optn['template']['country'] = $login->getUserCountry();
$optn['page']['subtitle1'] = isset($opt['locale'][$opt['template']['locale']]['page']['subtitle1']) ? $opt['locale'][$opt['template']['locale']]['page']['subtitle1'] : $opt['page']['subtitle1'];
$optn['page']['subtitle2'] = isset($opt['locale'][$opt['template']['locale']]['page']['subtitle2']) ? $opt['locale'][$opt['template']['locale']]['page']['subtitle2'] : $opt['page']['subtitle2'];
$optn['page']['headimagepath'] = $opt['page']['headimagepath'];
$optn['page']['max_logins_per_hour'] = $opt['page']['max_logins_per_hour'];
$optn['page']['absolute_url'] = $opt['page']['absolute_url'];
$optn['page']['target'] = $this->target;
@@ -828,7 +828,7 @@ a.info:hover span{ /*the span will display just on :hover state*/
#breadcrumb
{
position: absolute;
top:180px;
top:110px;
right: 250px;
left: 180px;
color:#505050;
@@ -844,7 +844,7 @@ a.info:hover span{ /*the span will display just on :hover state*/
#breadcrumb_fullsize
{
position: absolute;
top:180px;
top:110px;
right: 20px;
left: 180px;

@@ -873,7 +873,7 @@ ul.nodot li {

#suchbox {
position: absolute;
top:182px;
top:112px;
right: 5px;
}

@@ -944,8 +944,8 @@ div.attribgroup table {

#debugoc {
position: absolute;
left: 20px;
top: 75px;
left: 305px;
top: 4px;
border: solid 3px red;
padding: 15px;
z-index: 2;
Binary file not shown.
@@ -0,0 +1,4 @@
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.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -104,9 +104,10 @@
*/
$folder = '.';
if (!empty($_REQUEST["path"]))
$folder = basename($_REQUEST["path"]); // strip dirs for security reasons
else
$folder = '.';
/*
@@ -131,32 +131,7 @@
<div id="bg1">&nbsp;</div>
<div id="bg2">&nbsp;</div>
{* <!-- HEADER --> *}
{* <!-- OC-Logo --> *}
<div><img src="resource2/{$opt.template.style}/images/oc_logo.png" alt="" style="margin-top: 5px; margin-left: 3px;" /></div>
{* <!-- Sitename --> *}
<div class="site-name">
<a href="index.php">
<p class="title">{$opt.page.title|escape}</p>
<p class="subtitle1">{$opt.page.subtitle1|escape}</p>
<p class="subtitle2">{$opt.page.subtitle2|escape}</p>
</a>
</div>
{* <!-- Site slogan --> *}
<div class="site-slogan-container">
{if $opt.page.sponsor.topright!=''}
{$opt.page.sponsor.topright}
{else}
<div class="site-slogan" style="border-width:0px;">
<div style="width: 100%; text-align: left;">
<p class="search">&nbsp;<br />&nbsp;</p>
</div>
</div>
{/if}
</div>
{* <!-- HEADER --> *}
{* <!-- Debugschalter hier wieder einsetzen --> *}
{if ($opt.debug & DEBUG_DEVELOPER) == DEBUG_DEVELOPER}
<div id="debugoc"><font size="5" face="arial" color="red"><center>{t}Developer system - only testing{/t}</center></font></div>
@@ -166,9 +141,9 @@
{* <!-- Header banner --> *}
<div class="header" style="height:81px;">
<div style="width: 970px; padding-top: 1px;">
<img src="resource2/{$opt.template.style}/images/head/rotator.php" width="970" height="80" alt="" style="border: 0px none ;" />
<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>
</div>

0 comments on commit f9a055a

Please sign in to comment.
You can’t perform that action at this time.