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

new data license timing

Browse Source
This commit is contained in:
following 2013-02-16 23:52:39 +01:00
parent 721dc7aeed
commit 449323df14
6 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/doc/sql/tables/data_licenses.sql Normal file
View File

@ -0,0 +1,6 @@
SET NAMES 'utf8';
DROP TABLE IF EXISTS `data_licenses`;
CREATE TABLE `data_licenses` (
`id` tinyint(1) NOT NULL,
`license` varchar(30) NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

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

@ -228,12 +228,14 @@
?>
<!-- Datalicense -->
<!--
<p class="sidebar-maintitle">{t}Datalicense{/t}</p>
<div style="margin-top:20px;width:100%;text-align:center;">
<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/" target="_blank"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><br />{t}The www.opencaching.de content is licensed under <br /><a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/" target="_blank">German Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported</a> License</a>.{/t}
<br />
&nbsp;
</div>
-->
<div class="sidebar-txtbox-noshade">
<p class="content-txtbox-noshade-size5">

1
htdocs/templates2/ocstyle/articles/DE/changelog.tpl
View File

@ -15,6 +15,7 @@
<p><strong>Version 3.0.4</strong> &ndash; <i>in Arbeit</i></p>
<p>Neu:</p>
<ul class="changelog">
<li class="changelogitem"><a href="articles.php?page=impressum#datalicense">Datenlizenz CC-BY-NC-ND</a></li>
<li class="changelogitem">Statistikbilder mit neuem Logo</a></li>
</ul>

2
htdocs/templates2/ocstyle/articles/DE/impressum.tpl
View File

@ -279,7 +279,7 @@
<p>
<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/">
<img alt="Creative Commons Lizenzvertrag" style="border: 0; padding-right: 15px; padding-bottom: 15px; float: left;" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a>
Ab dem x.&nbsp;April 2013 stehen alle durch die Benutzer auf Opencaching.de eingebrachten Inhalte unter
Ab dem 7.&nbsp;April 2013 stehen alle durch die Benutzer auf Opencaching.de eingebrachten Inhalte unter
der Lizenz "Creative Commons Attribution-NonCommercial-NoDerivs 3.0", auf Deutsch
"Namensnennung-NichtKommerziell-KeineBearbeitung 3.0" (CC BY-NC-ND 3.0), das hei&szlig;t,
Sie d&uuml;rfen die Inhalte vervielf&auml;ltigen, verbreiten und &ouml;ffentlich

2
htdocs/templates2/ocstyle/articles/EN/impressum.tpl
View File

@ -240,7 +240,7 @@
<p>
<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/">
<img alt="Creative Commons Licenseagreement" style="border: 0; padding-right: 15px; padding-bottom: 15px; float: left;" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a>
Starting April&nbsp;xx, 2013, all Opencaching.de content which has been contributed by users is licensed under
Starting April&nbsp;7, 2013, all Opencaching.de content which has been contributed by users is licensed under
the terms of "Creative Commons Attribution-NonCommercial-NoDerivs 3.0", which means
that you may reproduce, distribute and publish it. When doing this, the author has to
be named in the form given below. The content must not be used for any commercial

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

@ -203,12 +203,14 @@
{/if}
{* <!-- Datalicense --> *}
{*
<p class="sidebar-maintitle">{t}Datalicense{/t}</p>
<div style="margin-top:20px;width:100%;text-align:center;">
<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/" target="_blank"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><br />{t}The www.opencaching.de content is licensed under <br /><a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/" target="_blank">German Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported</a> License</a>.{/t}
<br />
&nbsp;
</div>
*}
<div class="sidebar-txtbox-noshade">
<p class="content-txtbox-noshade-size5">