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

added 'social media' menu

Browse Source
This commit is contained in:
flopp
2013-08-07 13:16:16 +02:00
committed by following
parent 30595cad82
commit 1c5b56d049
16 changed files with 322 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/license.txt
+6
View File
@@ -211,6 +211,12 @@ 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/
URI : https://github.com/paulrobertlloyd/socialmediaicons
License : Creative Commons BY-SA 3.0
Autor : Paul Robert Lloyd (and other contributors)
Other resources
doc/license.txt~
+255
View File
@@ -0,0 +1,255 @@
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
htdocs/config2/settings-dev.inc.php
+1
View File
@@ -112,6 +112,7 @@
// other settings
$opt['page']['showdonations'] = true;
$opt['page']['showsocialmedia'] = true;
$opt['page']['headoverlay'] = 'oc_head_alpha3';
$opt['logic']['pictures']['dummy']['replacepic'] = $dev_basepath . $dev_codepath . 'htdocs/images/no_image_license.png';
htdocs/config2/settings-dist.inc.php
+2 -1
View File
@@ -202,7 +202,8 @@
$opt['page']['subtitle1'] = 'Geocaching with Opencaching';
$opt['page']['subtitle2'] = '';
$opt['page']['title'] = 'OPENCACHING';
$opt['page']['showdonations'] = false; // Show donations button
$opt['page']['showdonations'] = false; // Show donations button
$opt['page']['showsocialmedia'] = false;
$opt['page']['absolute_url'] = 'http://devel.opencaching.de/'; // may be overwritten by $opt['domain'][...]['uri']
$opt['page']['develsystem'] = false;
htdocs/config2/settings-sample.inc.php
+2 -1
View File
@@ -155,6 +155,7 @@
$opt['mail']['contact'] = 'contact@opencaching.de';
$opt['page']['showdonations'] = true;
$opt['page']['showsocialmedia'] = true;
function post_config()
@@ -177,4 +178,4 @@ function post_config()
$tpl->redirect($opt['page']['absolute_url'] . 'index.php');
}
}
?>
?>
htdocs/lang/de/ocstyle/main.tpl.php
+28
View File
@@ -261,6 +261,34 @@
}
?>
<!-- Social Media -->
<?php
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>
<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>
</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>
</table>
</div>
<?php
}
?>
<!-- Datalicense -->
{license_disclaimer}
htdocs/lib/settings-dev.inc.php
+3 -2
View File
@@ -80,7 +80,8 @@
$news_approver_email = 'root';
$opt['page']['showdonations'] = true;
$opt['page']['showsocialmedia'] = true;
// date format
$opt['db']['dateformat'] = 'Y-m-d H:i:s';
@@ -187,4 +188,4 @@
// info on nature protection areas
$opt['cms']['npa'] = 'http://wiki.opencaching.de/index.php/Schutzgebiete';
?>
?>
htdocs/lib/settings-dist.inc.php
+1
View File
@@ -72,6 +72,7 @@
$news_approver_email = 'news-approver@devel.opencaching.de';
$opt['page']['showdonations'] = false;
$opt['page']['showsocialmedia'] = false;
$opt['page']['headoverlay'] = 'oc_head_alpha3_generic';
//local database settings
htdocs/resource2/ocstyle/images/misc/16x16-facebook.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 361 B

htdocs/resource2/ocstyle/images/misc/16x16-google+.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 637 B

htdocs/resource2/ocstyle/images/misc/32x32-facebook.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

htdocs/resource2/ocstyle/images/misc/32x32-feed.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

htdocs/resource2/ocstyle/images/misc/32x32-google+.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

htdocs/resource2/ocstyle/images/misc/32x32-twitter.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

htdocs/resource2/ocstyle/images/oclogo/16x16-oc_logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 440 B

htdocs/templates2/ocstyle/sys_main.tpl
+24
View File
@@ -248,6 +248,30 @@
</div>
{/if}
{* <!-- 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>
<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>
</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>
</table>
</div>
{/if}
{if $license_disclaimer != ""}
<!-- Datalicense -->
<p class="sidebar-maintitle">{t}Datalicense{/t}</p>