OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

translated and refactored social media section; adjusted sidebar spacings and wp search button

Browse Source
This commit is contained in:
following
2013-08-07 18:50:32 +02:00
parent 1c5b56d049
commit 71d2bc3fff
17 changed files with 61 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
doc/license.txt
View File

@@ -2,11 +2,11 @@
Opencaching Implementation Version 3
August 16, 2012
July 25, 2013
License Information
Copyright (C) 2006-2012 Opencaching Deutschland and Contributors
Copyright (C) 2006-2013 Opencaching Deutschland and Contributors
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -152,7 +152,7 @@ JavaScript libraries
URI : http://www.twinhelix.com/css/iepngfix/
License : LGPL 2.1
5. TinyMCE: JavaScript WYSIWYG Editor
5. TinyMCE JavaScript WYSIWYG Editor
Path : htdocs/resource2/tinymce/
URI : http://tinymce.moxiecode.com/
License : LGPL 2.1
@@ -166,12 +166,12 @@ Icons
URI : http://www.famfamfam.com/lab/icons/flags/
License : Public domain
OKAPI cache icons
2. OKAPI cache icons
Path : htdocs/resource2/ocstyle/images/map/caches2/
URI : http://code.google.com/p/opencaching-pl/source/browse/#svn%2Ftrunk%2Fokapi%2Fstatic%2Ftilemap
License : MIT
2. OpenIcons 'system-help' and 'preferences-other'
3. OpenIcons 'system-help' and 'preferences-other'
Path : htdocs/resource2/ocstyle/images/misc/
htdocs/resource2/ocstyle/images/map/
URI : http://openiconlibrary.sourceforge.net/gallery2/?./Icons/categories/system-help-3.png
@@ -179,7 +179,7 @@ Icons
License : Creative Commons BY-SA 3.0
Author : Oxygen
3. 16x16 Icons 'flag-checker', 'footprints', 'clock select', lock
4. 16x16 Icons 'flag-checker', 'footprints', 'clock select', lock
Path : htdocs/resource2/ocstyle/images/misc/
htdocs/resource2/ocstyle/images/map/caches2/
htdocs/resource2/ocstyle/images/cachestatus/
@@ -187,7 +187,7 @@ Icons
License : Creative Commons BY 3.0
Author : Yusuke Kamiyamane
4. gears and gps-device icons, watched icon
5. gears and gps-device icons, watched icon
Path : htdocs/resource2/ocstyle/images/misc/
htdocs/resource2/ocstyle/images/viewcache/
URI : http://www.softicons.com/free-icons/toolbar-icons/fatcow-hosting-icons-by-fatcow/gear-in-icon
@@ -195,25 +195,25 @@ Icons
License : Creative Commons BY 3.0
Author : FatCow
5. checkmark icon
6. checkmark icon
Path : htdocs/resource2/ocstyle/images/misc/
URI : http://www.softicons.com/free-icons/web-icons/bremen-icons-by-pc.de/check-icon
License : Creative Commons BY 3.0
Author : PC.DE
6. search icon
7. search icon
Path : htdocs/resource2/ocstyle/images/misc/
URI : http://www.softicons.com/free-icons/toolbar-icons/24x24-free-pixel-icons-by-aha-soft/search-icon
License : Creative Commons BY-SA 3.0
Author : Aha-Soft
7. TinyMCE Icons
8. TinyMCE Icons
Path : htdocs/images/icons/
URI : http://tinymce.moxiecode.com/
License : LGPL 2.1
8. Social media icons (feed, google+, facebook, twitter)
Path : htdocs/resource2/ocstyle/images/misc/
9. Social media icons (feed, google+, facebook, twitter)
Path : htdocs/resource2/ocstyle/images/media/
URI : https://github.com/paulrobertlloyd/socialmediaicons
License : Creative Commons BY-SA 3.0
Autor : Paul Robert Lloyd (and other contributors)

255
doc/license.txt~
View File

@@ -1,255 +0,0 @@

Opencaching Implementation Version 3
August 16, 2012
License Information
Copyright (C) 2006-2012 Opencaching Deutschland and Contributors
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
In addition to the GNU GPL:
You have to name and/or link opencaching.de to your customers as
original author of the used parts in your implementation.
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
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.
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 and/or OKAPI the same way
and under the same (or less restrictive) conditions as opencaching.de does;
see http://www.opencaching.de/doc/xml and http://www.opencaching.de/okapi.
A different license may apply to third party components being used.
List of third party components:
PHP libraries
-------------
1. Smarty: Template Engine
Path : htdocs/lib2/smarty/
URI : http://www.smarty.net/
License : LGPL 3.0
2. Smarty Gettext (modified)
Path : htdocs/lib2/smarty/ocplugins/prefilter.t.php
URI : http://sourceforge.net/projects/smarty-gettext
License : LGPL 2.1
3. RFC(2)822 Email Parser
Path : htdocs/lib/common.inc.php
htdocs/lib2/util.inc.php
URI : http://iamcal.com/publish/articles/php/parsing_email
License : CC BY-SA 2.5 / GPL 3.0
Author : Cal Henderson
4. ImageBMP & ImageCreateFromBMP
Path : htdocs/lib2/imagebmp.inc.php
URI: : http://de77.com/php/load-and-save-bmp-in-php-imagecreatefrombmp-imagebmp
http://www.phpclasses.org/package/5991-PHP-Load-and-save-images-in-the-BMP-format.html
License : MIT
5. Coordinate system translations
Path : htdocs/lib2/logic/coordinate.class.php
URI : http://www.helmutheimeier.privat.t-online.de/kt/phpscripts.html
License : MIT
6. Point-in-polygon test
Path : htdocs/lib2/logic/gis.class.php
URI : http://dev.mysql.com/doc/refman/4.1/en/functions-that-test-spatial-relationships-between-geometries.html
License : ??
7. PHP Class: HTML to Plain Text Conversion
Path : htdocs/lib2/html2text.class.php
URI : http://www.chuggnutt.com/html2text.php
License : GPL
8. Automatic Image Rotator
Path : resource2/ocstyle/images/head/rotator.php
URI : http://d.alistapart.com/randomizer/rotate.txt
License : "freely available to all" (http://alistapart.com/about)
9. HTML Purifier
Path : lib/htmlpurifier-4.2.0
htdocs/lib2/HTMLPurifier
URI : http://htmlpurifier.org/
License : LGPL
10. ss_zip class
Path : htdocs/lib2/ss_zip.php
URI : http://smiledsoft.com/demos/phpzip/ (no longer works?)
License : ??
11. OKAPI: Opencaching API
Path : htdocs/okapi/
URI : http://code.google.com/p/opencaching-api/
License : MIT, with exception of okapi/res/attribute icons which
are under Opencaching-GPL license
The following PHP libraries are currently not in use and may be discarded.
Note that they need to be properly licensed as long they are included in
the distrubution!
12. b2evo captcha
Path : htdocs/lib2/b2evo-captcha/
URI : http://sourceforge.net/projects/b2evo-captcha
License : GPL
13. InputFilter (modified)
Path : htdocs/lib2/logic/old/class.inputfilter.php
URI : http://freshmeat.net/projects/inputfilter/
http://cyberai.users.phpclasses.org/package/2189-PHP-Filter-out-unwanted-PHP-Javascript-HTML-tags-.html
License : GPL
JavaScript libraries
--------------------
1. JavaScript, DHTML Tooltips
Path : htdocs/resource2/ocstyle/js/
URI : http://www.walterzorn.de/tooltip/tooltip.htm
License : LGPL
2. Garmin Communicator API
Path : htdocs/resource2/ocstyle/js/
URI : http://developer.garmin.com/web/communicator-api-1.4/
License : Apache 2.0
3. EnlargeIt!: A little Javascript enlarging thumbnail images with a mouse click.
Path : htdocs/resource2/ocstyle/js/enlargeit/
URI : http://enlargeit.timos-welt.de
License : GPL 3.0
4. IE PNG Fix
Path : htdocs/resource2/ocstyle/css/iepngfix.htc
URI : http://www.twinhelix.com/css/iepngfix/
License : LGPL 2.1
5. TinyMCE: JavaScript WYSIWYG Editor
Path : htdocs/resource2/tinymce/
URI : http://tinymce.moxiecode.com/
License : LGPL 2.1
Icons
-----
1. FamFamFam Flags
Path : htdocs/images/flags
URI : http://www.famfamfam.com/lab/icons/flags/
License : Public domain
OKAPI cache icons
Path : htdocs/resource2/ocstyle/images/map/caches2/
URI : http://code.google.com/p/opencaching-pl/source/browse/#svn%2Ftrunk%2Fokapi%2Fstatic%2Ftilemap
License : MIT
2. OpenIcons 'system-help' and 'preferences-other'
Path : htdocs/resource2/ocstyle/images/misc/
htdocs/resource2/ocstyle/images/map/
URI : http://openiconlibrary.sourceforge.net/gallery2/?./Icons/categories/system-help-3.png
http://openiconlibrary.sourceforge.net/gallery2/?./Icons/categories/preferences-other-3.png
License : Creative Commons BY-SA 3.0
Author : Oxygen
3. 16x16 Icons 'flag-checker', 'footprints', 'clock select', lock
Path : htdocs/resource2/ocstyle/images/misc/
htdocs/resource2/ocstyle/images/map/caches2/
htdocs/resource2/ocstyle/images/cachestatus/
URI : http://www.softicons.com/free-icons/toolbar-icons/fugue-16px-additional-icons-2-by-yusuke-kamiyamane
License : Creative Commons BY 3.0
Author : Yusuke Kamiyamane
4. gears and gps-device icons, watched icon
Path : htdocs/resource2/ocstyle/images/misc/
htdocs/resource2/ocstyle/images/viewcache/
URI : http://www.softicons.com/free-icons/toolbar-icons/fatcow-hosting-icons-by-fatcow/gear-in-icon
http://www.softicons.com/free-icons/web-icons/fatcow-hosting-additional-icons-by-fatcow/gps-handheld-icon
License : Creative Commons BY 3.0
Author : FatCow
5. checkmark icon
Path : htdocs/resource2/ocstyle/images/misc/
URI : http://www.softicons.com/free-icons/web-icons/bremen-icons-by-pc.de/check-icon
License : Creative Commons BY 3.0
Author : PC.DE
6. search icon
Path : htdocs/resource2/ocstyle/images/misc/
URI : http://www.softicons.com/free-icons/toolbar-icons/24x24-free-pixel-icons-by-aha-soft/search-icon
License : Creative Commons BY-SA 3.0
Author : Aha-Soft
7. TinyMCE Icons
Path : htdocs/images/icons/
URI : http://tinymce.moxiecode.com/
License : LGPL 2.1
Other resources
---------------
1. In his hands: Font in old OC logo
Path : htdocs/resource2/ocstyle/images/
URI : http://www.fonts4free.net/in-his-hands-font.html
Licence : "Free"
2. DejaVu fonts
Path : htdocs/lib2/fonts/dejavu-fonts/
License : Bitstream
3. MultiFlex-2 CSS Design
Path : htdocs/resource2/ocstyle/css/
URI : http://www.openwebdesign.org/design/2876/MultiFlex21/
License : Public Domain
Data content
------------
see htdocs/doc/sql/static-data/static-data.txt on usage
1. OpenGeoDB
URI : http://sourceforge.net/projects/opengeodb/
License : Public domain
2. NGA GEOnet Names Server (GNS)
Source : http://earth-info.nga.mil/gns/html/
License : Public domain
3. NUTS boundaries
URI : http://epp.eurostat.ec.europa.eu/portal/page/portal/gisco_Geographical_information_maps/popups/references/administrative_units_statistical_units_1
License : noncommercial, attribution
Author : Eurostat
4. Cracklib password list
Path : doc/sql/static-data/pw_dict.bz2
URI : http://pecl.php.net/package/crack
License : PHP

12
htdocs/doc/sql/static-data/data.sql
View File

@@ -2578,6 +2578,12 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2150', 'This ge
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2151', 'Also listed as', '2011-05-20 23:48:29');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2152', 'Loading more log entries ...', '2011-05-20 23:48:29');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2153', 'Auto-load log entries', '2011-05-20 23:48:29');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2155', 'Social media', '2013-08-07 18:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2156', 'Follow us:', '2013-08-07 18:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2157', 'Join discussions:', '2013-08-07 18:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2158', 'Opencaching Forum', '2013-08-07 18:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2159', 'Google+ Community', '2013-08-07 18:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2160', 'Facebook Group', '2013-08-07 18:30:00');
-- Table sys_trans_ref
SET NAMES 'utf8';
@@ -6609,6 +6615,12 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2151', 'DE', 'Auch gelistet als', '2011-05-23 22:18:40');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2152', 'DE', 'Lade weitere Logeinträge ...', '2011-05-23 22:18:40');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2153', 'DE', 'Logeinträge automatisch nachladen', '2011-05-23 22:18:40');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2155', 'DE', 'Soziale Medien', '2013-08-07 18:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2156', 'DE', 'Folge uns:', '2013-08-07 18:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2157', 'DE', 'Diskutiere mit:', '2013-08-07 18:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2158', 'DE', 'Opencaching-Forum', '2013-08-07 18:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2159', 'DE', 'Google+ Community', '2013-08-07 18:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2160', 'DE', 'Facebook-Gruppe', '2013-08-07 18:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'EN', 'Reorder IDs', '2010-09-02 00:15:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'EN', 'The database could not be reconnected.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'EN', 'Testing – please do not login', '2010-08-28 11:48:07');

33
htdocs/lang/de/ocstyle/main.tpl.php
View File

@@ -209,7 +209,7 @@
<?php mnu_EchoBreadCrumb($tplname, $pageidx); ?>
</div>
<div id="suchbox">
<form action="searchplugin.php" method="post" style="display:inline;"><b>{t}Waypoint search:{/t}</b><input type="hidden" name="sourceid" value="waypoint-search" /> <input type="text" name="userinput" size="10" /> <input type="submit" value="Go" /></form>
<form action="searchplugin.php" method="post" style="display:inline;"><b>{t}Waypoint search:{/t}</b>&nbsp;<input type="hidden" name="sourceid" value="waypoint-search" /> <input type="text" name="userinput" size="10" /> <input type="submit" name="wpsearch" class="formbutton" style="width:auto" value="&nbsp;{t}Go{/t}&nbsp;" onclick="submitbutton('wpsearch')" /></form>
</div>
</div>
@@ -251,12 +251,12 @@
{
?>
<p class="sidebar-maintitle">{t}Donations{/t}</p>
<div style="margin-top:20px;width:100%;text-align:center;">
<div style="margin-top:16px;width:100%;text-align:center;">
<a href="http://www.opencaching.de/articles.php?page=donations">
<img src="https://www.paypal.com/de_DE/DE/i/btn/btn_donateCC_LG.gif" alt="{t}Donations{/t}" style="border:0px;" />
</a>
</a><br />
&nbsp;
</div>
<p>&nbsp;</p>
<?php
}
?>
@@ -266,23 +266,24 @@
if (isset($opt['page']['showsocialmedia']) && $opt['page']['showsocialmedia'])
{
?>
<p class="sidebar-maintitle">{t}Social Media{/t}</p>
<div style="margin-top: 10px; margin-bottom: 10px; margin-left: auto; margin-right: auto; text-align: center">
<p style="width: 100%">{t}Follow Us{/t}</p>
<p class="sidebar-maintitle">{t}Social media{/t}</p>
<div style="margin-top: 10px; margin-bottom: 12px; margin-left: auto; margin-right: auto; text-align: center">
<table style="margin-left: auto; margin-right: auto;">
<tr>
<td><a href="http://blog.opencaching.de/feed"><img src="resource2/ocstyle/images/misc/32x32-feed.png" /></a></td>
<td><a href="https://twitter.com/opencaching"><img src="resource2/ocstyle/images/misc/32x32-twitter.png" /></a></td>
<td><a href="https://plus.google.com/104950249357104618315"><img src="resource2/ocstyle/images/misc/32x32-google+.png" /></a></td>
<td><a href="https://www.facebook.com/opencaching.de"><img src="resource2/ocstyle/images/misc/32x32-facebook.png" /></a></td>
<td class="smalltext2">{t}Follow us:{/t}</td>
<td><a href="http://blog.opencaching.de/feed"><img src="resource2/{style}/images/media/16x16-feed.png" width="16" height="16" /></a></td>
<td><a href="https://twitter.com/opencaching"><img src="resource2/{style}/images/media/16x16-twitter.png" width="16" height="16" /></a></td>
<td><a href="https://plus.google.com/104950249357104618315"><img src="resource2/{style}/images/media/16x16-google+.png" width="16" height="16" /></a></td>
<td><a href="https://www.facebook.com/opencaching.de"><img src="resource2/{style}/images/media/16x16-facebook.png" width="16" height="16" /></a></td>
</tr>
<tr>
<td class="smalltext2" colspan="5" style="padding-top:0.6em; text-align:left">{t}Join discussions:{/t}</td>
</tr>
</table>
&nbsp;
<p style="width: 100%">{t}Join Discussions{/t}</p>
<table style="margin-left: auto; margin-right: auto;">
<tr><td><a href="http://forum.opencaching-network.org/"><img src="resource2/ocstyle/images/oclogo/16x16-oc_logo.png" /></a></td><td style="text-align: left"><a href="http://forum.opencaching-network.org/">{t}Opencaching Forum{/t}</a></td></tr>
<tr><td><a href="https://plus.google.com/communities/106940399712236494701"><img src="resource2/ocstyle/images/misc/16x16-google+.png" /></a></td><td style="text-align: left"><a href="https://plus.google.com/communities/106940399712236494701">{t}Google+ Community{/t}</a></td></tr>
<tr><td><a href="https://www.facebook.com/groups/198752500146032/"><img src="resource2/ocstyle/images/misc/16x16-facebook.png" /></a></td><td style="text-align: left"><a href="https://www.facebook.com/groups/198752500146032/">{t}Facebook Group{/t}</a></td></tr>
<tr><td><a href="http://forum.opencaching-network.org/"><img src="resource2/{style}/images/oclogo/16x16-oc_logo.png" /></a></td><td style="text-align: left"><a href="http://forum.opencaching-network.org/">{t}Opencaching Forum{/t}</a></td></tr>
<tr><td><a href="https://plus.google.com/communities/106940399712236494701"><img src="resource2/{style}/images/media/16x16-google+.png" /></a></td><td style="text-align: left"><a href="https://plus.google.com/communities/106940399712236494701">{t}Google+ Community{/t}</a></td></tr>
<tr><td><a href="https://www.facebook.com/groups/198752500146032/"><img src="resource2/{style}/images/media/16x16-facebook.png" /></a></td><td style="text-align: left"><a href="https://www.facebook.com/groups/198752500146032/">{t}Facebook Group{/t}</a></td></tr>
</table>
</div>
<?php

3
htdocs/lib2/OcSmarty.class.php
View File

@@ -174,7 +174,8 @@ class OcSmarty extends Smarty
$optn['page']['header_javascript'] = $this->header_javascript;
$optn['page']['body_load'] = $this->body_load;
$optn['page']['body_unload'] = $this->body_unload;
$optn['page']['sponsor'] = $opt['page']['sponsor'];
$optn['page']['sponsor'] = $opt['page']['sponsor'];
$optn['page']['showsocialmedia'] = $opt['page']['showsocialmedia'];
$optn['template']['title'] = $this->title;
$optn['template']['caching'] = $this->caching;
$optn['template']['popup'] = $this->popup;

4
htdocs/resource2/ocstyle/css/style_screen.css
View File

@@ -190,7 +190,7 @@ div#bg2 {display: none;}
.nav3 {overflow: hidden; clear: both; float: left; width: 160px; min-height: 500px; margin: 0px; padding: 0px; color: rgb(75,75,75); font-size: 1.0em; }
.nav3 ul {width: 160px; margin: 0px 0px 20px 0px; padding: 0px; border-bottom: solid 1px rgb(216,206,159); background-color: rgb(219,230,241);}
.nav3 li {list-style: none; margin: 0px; padding: 0px;}
.nav3 li.title {margin: 0px 0px 0px 0px; padding: 3px 5px 2px 15px; background-color: rgb(156,186,214); color: rgb(255,255,255); text-transform: uppercase; font-weight: bold; font-size: 120%;}
.nav3 li.title {margin: 2px 0px 0px 0px; padding: 3px 5px 2px 15px; background-color: rgb(156,186,214); color: rgb(255,255,255); text-transform: uppercase; font-weight: bold; font-size: 120%;}
.nav3 li.group1 a {display: block; min-height: 1.7em; height: auto !important; height: 1.7em; line-height: 1.7em; margin: 0px; padding: 0px 7px 0px 15px; border-top: solid 1px rgb(200,200,200); border-left: solid 7px rgb(219,230,241); color: rgb(75,75,75); font-weight: bold; font-size: 120%;}
.nav3 li.group_active a {border-left: solid 7px rgb(156,186,214); background-color: rgb(156,186,214);}
.nav3 li.group2 a {display: block; min-height: 1.7em; height: auto !important; height: 1.7em; line-height: 1.7em; margin: 0px; padding: 0px 7px 0px 15px; border-top: solid 1px rgb(200,200,200); border-left: solid 14px rgb(219,230,241); color: rgb(75,75,75); font-weight: normal; font-size: 120%;}
@@ -405,7 +405,7 @@ td.default { font-size:12px; }
/* 6.2 - Sidebar Area */
/*--------------------*/
.sidebar {overflow: hidden; float: right; width: 160px; min-height: 500px; margin: 0px; padding: 0px 0px 10px 0px; text-align: left; color: rgb(75,75,75);}
.sidebar-maintitle {margin: 0px 0px 10px 0px; padding: 3px 10px 2px 10px; background-color: rgb(156,186,214); color: rgb(255,255,255); text-transform: uppercase; font-weight: bold; font-size: 120%;}
.sidebar-maintitle {margin:4px 0px 10px 0px; padding: 3px 10px 2px 10px; background-color: rgb(156,186,214); color: rgb(255,255,255); text-transform: uppercase; font-weight: bold; font-size: 120%;}
.sidebar-title-noshade {margin: 0px; padding: 2px 10px 3px 10px; border-top: solid 1px rgb(215,215,215); color: rgb(75,75,75); font-weight: bold; font-size: 120%;}
.sidebar-title-shade {margin: 0px; padding: 2px 10px 3px 10px; background-color: rgb(215,215,215); color: rgb(75,75,75); font-weight: bold; font-size: 120%;}
.sidebar-txtbox-noshade {margin: 0px 0px 10px 0px; padding: 2px 10px 3px 10px;}

0
htdocs/resource2/ocstyle/images/misc/16x16-facebook.png → htdocs/resource2/ocstyle/images/media/16x16-facebook.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 361 B

BIN
htdocs/resource2/ocstyle/images/media/16x16-feed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 579 B

0
htdocs/resource2/ocstyle/images/misc/16x16-google+.png → htdocs/resource2/ocstyle/images/media/16x16-google+.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 637 B

After

Width:  |  Height:  |  Size: 637 B

BIN
htdocs/resource2/ocstyle/images/media/16x16-twitter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 521 B

0
htdocs/resource2/ocstyle/images/misc/22x22-feed-icon.png → htdocs/resource2/ocstyle/images/media/22x22-feed.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
htdocs/resource2/ocstyle/images/misc/32x32-facebook.png → htdocs/resource2/ocstyle/images/media/32x32-facebook.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
htdocs/resource2/ocstyle/images/misc/32x32-feed.png → htdocs/resource2/ocstyle/images/media/32x32-feed.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
htdocs/resource2/ocstyle/images/misc/32x32-google+.png → htdocs/resource2/ocstyle/images/media/32x32-google+.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
htdocs/resource2/ocstyle/images/misc/32x32-twitter.png → htdocs/resource2/ocstyle/images/media/32x32-twitter.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
htdocs/templates2/ocstyle/start.tpl
View File

@@ -28,7 +28,7 @@
</td>
{if "$newsfeed" != ""}
<td style="text-align:right">
<a href="{$newsfeed}"><img src="resource2/ocstyle/images/misc/22x22-feed-icon.png" /></a>
<a href="{$newsfeed}"><img src="resource2/ocstyle/images/media/22x22-feed.png" /></a>
</td>
<td width="4px"></td>
{/if}

27
htdocs/templates2/ocstyle/sys_main.tpl
View File

@@ -203,7 +203,7 @@
<div id="breadcrumb_fullsize">{include file="sys_breadcrumb.tpl" items="$breadcrumb"}</div>
{else}
<div id="breadcrumb">{include file="sys_breadcrumb.tpl" items="$breadcrumb"}</div>
<div id="suchbox"><form action="searchplugin.php" method="post"><b>{t}Waypoint-Search{/t}:</b><input type="hidden" name="sourceid" value="waypoint-search" /> <input type="text" name="userinput" size="10" /> <input type="submit" value="{t}Go{/t}" /></form></div>
<div id="suchbox"><form action="searchplugin.php" method="post"><b>{t}Waypoint-Search{/t}:</b>&nbsp;<input type="hidden" name="sourceid" value="waypoint-search" /> <input type="text" name="userinput" size="10" /> <input type="submit" name="wpsearch" class="formbutton" style="width:auto" value="&nbsp;{t}Go{/t}&nbsp;" onclick="submitbutton('wpsearch')" /></form></div>
{/if}
</div>
@@ -240,7 +240,7 @@
{* <!-- Paypalbutton --> *}
{if $opt.page.showdonations}
<p class="sidebar-maintitle">{t}Donations{/t}</p>
<div style="margin-top:20px;width:100%;text-align:center;">
<div style="margin-top:16px; width:100%; text-align:center;">
<a href="http://www.opencaching.de/articles.php?page=donations">
<img src="resource2/{$opt.template.style}/images/misc/donate.gif" alt="{t}Donations{/t}" style="border:0px;" />
</a><br />
@@ -250,23 +250,24 @@
{* <!-- Social Media --> *}
{if $opt.page.showsocialmedia}
<p class="sidebar-maintitle">{t}Social Media{/t}</p>
<div style="margin-top: 10px; margin-bottom: 10px; margin-left: auto; margin-right: auto; text-align: center">
<p style="width: 100%">{t}Follow Us{/t}</p>
<p class="sidebar-maintitle">{t}Social media{/t}</p>
<div style="margin-top: 10px; margin-bottom: 12px; margin-left: auto; margin-right: auto; text-align: center">
<table style="margin-left: auto; margin-right: auto;">
<tr>
<td><a href="http://blog.opencaching.de/feed"><img src="resource2/{$opt.template.style}/images/misc/32x32-feed.png" /></a></td>
<td><a href="https://twitter.com/opencaching"><img src="resource2/{$opt.template.style}/images/misc/32x32-twitter.png" /></a></td>
<td><a href="https://plus.google.com/104950249357104618315"><img src="resource2/{$opt.template.style}/images/misc/32x32-google+.png" /></a></td>
<td><a href="https://www.facebook.com/opencaching.de"><img src="resource2/{$opt.template.style}/images/misc/32x32-facebook.png" /></a></td>
<td class="smalltext2">{t}Follow us:{/t}</td>
<td><a href="http://blog.opencaching.de/feed"><img src="resource2/{$opt.template.style}/images/media/16x16-feed.png" width="16" height="16" /></a></td>
<td><a href="https://twitter.com/opencaching"><img src="resource2/{$opt.template.style}/images/media/16x16-twitter.png" width="16" height="16" /></a></td>
<td><a href="https://plus.google.com/104950249357104618315"><img src="resource2/{$opt.template.style}/images/media/16x16-google+.png" width="16" height="16" /></a></td>
<td><a href="https://www.facebook.com/opencaching.de"><img src="resource2/{$opt.template.style}/images/media/16x16-facebook.png" width="16" height="16" /></a></td>
</tr>
<tr>
<td class="smalltext2" colspan="5" style="padding-top:0.6em; text-align:left">{t}Join discussions:{/t}</td>
</tr>
</table>
&nbsp;
<p style="width: 100%">{t}Join Discussions{/t}</p>
<table style="margin-left: auto; margin-right: auto;">
<tr><td><a href="http://forum.opencaching-network.org/"><img src="resource2/{$opt.template.style}/images/oclogo/16x16-oc_logo.png" /></a></td><td style="text-align: left"><a href="http://forum.opencaching-network.org/">{t}Opencaching Forum{/t}</a></td></tr>
<tr><td><a href="https://plus.google.com/communities/106940399712236494701"><img src="resource2/{$opt.template.style}/images/misc/16x16-google+.png" /></a></td><td style="text-align: left"><a href="https://plus.google.com/communities/106940399712236494701">{t}Google+ Community{/t}</a></td></tr>
<tr><td><a href="https://www.facebook.com/groups/198752500146032/"><img src="resource2/{$opt.template.style}/images/misc/16x16-facebook.png" /></a></td><td style="text-align: left"><a href="https://www.facebook.com/groups/198752500146032/">{t}Facebook Group{/t}</a></td></tr>
<tr><td><a href="https://plus.google.com/communities/106940399712236494701"><img src="resource2/{$opt.template.style}/images/media/16x16-google+.png" /></a></td><td style="text-align: left"><a href="https://plus.google.com/communities/106940399712236494701">{t}Google+ Community{/t}</a></td></tr>
<tr><td><a href="https://www.facebook.com/groups/198752500146032/"><img src="resource2/{$opt.template.style}/images/media/16x16-facebook.png" /></a></td><td style="text-align: left"><a href="https://www.facebook.com/groups/198752500146032/">{t}Facebook Group{/t}</a></td></tr>
</table>
</div>
{/if}