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

redesinged license disclaimer

Browse Source
This commit is contained in:
following
2013-08-08 19:39:45 +02:00
parent 71d2bc3fff
commit a983d1032f
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/config2/locale.inc.php
+4 -4
View File
@@ -106,7 +106,7 @@
$opt['locale']['EN']['page']['subtitle1'] = 'Geocaching with Opencaching';
$opt['locale']['EN']['page']['subtitle2'] = '';
$opt['locale']['EN']['page']['license_url'] = 'http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.en';
$opt['locale']['EN']['page']['license'] = '<a rel="license" href="%1" target="_blank"><img alt="Creative Commons License Terms" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><br />The www.opencaching.de content is licensed under <br /><a rel="license" href=%1" target="_blank">Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Germany</a> License.';
$opt['locale']['EN']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons License Terms" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">The Opencaching.de <a href="articles.php?page=impressum#datalicense">content</a> is licensed under Creative Commons <a rel="license" href=%1" target="_blank">BY-BC-ND 3.0 DE</a>.</div>';
$opt['locale']['DE']['format']['dm'] = '%d.%m.';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
@@ -121,7 +121,7 @@
$opt['locale']['DE']['page']['subtitle1'] = 'Geocaching mit Opencaching';
$opt['locale']['DE']['page']['subtitle2'] = '';
$opt['locale']['DE']['page']['license_url'] = 'http://creativecommons.org/licenses/by-nc-nd/3.0/de/';
$opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1" 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 />Der Inhalt von www.opencaching.de steht unter einer <br /><a rel="license" href="%1" target="_blank">Creative Commons Namensnennung-NichtKommerziell-KeineBearbeitung-3.0-Deutschland</a>-Lizenz.';
$opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Die <a href="articles.php?page=impressum#datalicense">Inhalte</a> von Opencaching.de stehen unter der Creative-Commons-Lizenz <a rel="license" href="%1">BY-NC-ND 3.0 DE</a>.</div>';
$opt['locale']['DE']['helpwiki'] = "http://wiki.opencaching.de/index.php/";
$opt['locale']['IT']['format']['dateshort'] = '%d/%m/%y';
@@ -137,7 +137,7 @@
$opt['locale']['IT']['page']['subtitle1'] = 'Geocaching con Opencaching';
$opt['locale']['IT']['page']['subtitle2'] = '';
$opt['locale']['IT']['page']['license_url'] = 'http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.it';
$opt['locale']['IT']['page']['license'] = '<a rel="license" href="%1" target="_blank"><img alt="Creative Commons License Terms" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><br />Il contenuto di www.opencaching.de è rilasciato sotto <br />Licenza <a rel="license" href="%1" target="_blank">Attribuzione - Non commerciale - Non opere derivate 3.0 Germania</a>.';
$opt['locale']['IT']['page']['license'] = '<a rel="license" href="%1" target="_blank"><img alt="Creative Commons License Terms" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Il <a href="articles.php?page=impressum#datalicense">contenuto</a> di Opencaching.de è rilasciato sotto licenza Creative Commons <a rel="license" href="%1" target="_blank">BY-NC-ND 3.0 DE</a>.</div>';
$opt['locale']['ES']['format']['dateshort'] = '%d/%m/%y';
$opt['locale']['ES']['format']['dm'] = '%d/%m';
@@ -152,7 +152,7 @@
$opt['locale']['ES']['page']['subtitle1'] = 'Geocaching con Opencaching';
$opt['locale']['ES']['page']['subtitle2'] = '';
$opt['locale']['ES']['page']['license_url'] = 'http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.es_ES';
$opt['locale']['ES']['page']['license'] = '<a rel="license" href="%1" target="_blank"><img alt="Creative Commons License Terms" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><br />El contenido está disponible bajo licencia <br/><a rel="license" href="%1" target="_blank">Reconocimiento-NoComercial-SinObraDerivada 3.0 Alemania</a> Licencia.';
$opt['locale']['ES']['page']['license'] = '<a rel="license" href="%1" target="_blank"><img alt="Creative Commons License Terms" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">El <a href="articles.php?page=impressum#datalicense">contenido</a> está disponible bajo Creative Commons <a rel="license" href="%1" target="_blank">BY-NC-ND 3.0 DE</a> licencia.</div>';
$opt['locale']['SV']['format']['dateshort'] = '%y-%m-%d';
$opt['locale']['SV']['format']['dm'] = '%d/%m';
htdocs/lib/common.inc.php
+1 -2
View File
@@ -480,9 +480,8 @@ function __autoload($class_name)
$ld = '<p class="sidebar-maintitle">' .
$translate->t('Datalicense', '', '', 0) .
'</p>' .
'<div style="margin-top:20px;width:100%;text-align:center;">' .
'<div style="margin:20px 0 16px 0; width:100%; text-align:center;">' .
mb_ereg_replace('%1', $lurl, $ltext) .
'<br />&nbsp;' .
'</div>';
tpl_set_var('license_disclaimer', $ld);
}
htdocs/templates2/ocstyle/articles/DE/impressum.tpl
+1 -1
View File
@@ -279,7 +279,7 @@
<div class="content-txtbox-noshade" style="padding-right: 25px;">
<p>
<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/">
<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>
Alle durch die Benutzer auf Opencaching.de eingebrachten Inhalte stehen unter
der Lizenz &bdquo;Creative Commons Attribution-NonCommercial-NoDerivs 3.0&ldquo;, auf Deutsch:
htdocs/templates2/ocstyle/sys_main.tpl
+3 -3
View File
@@ -276,10 +276,8 @@
{if $license_disclaimer != ""}
<!-- Datalicense -->
<p class="sidebar-maintitle">{t}Datalicense{/t}</p>
<div style="margin-top:20px;width:100%;text-align:center;">
<div style="margin:20px 0 16px 0; width:100%; text-align:center;">
{$license_disclaimer}
<br />
&nbsp;
</div>
{/if}
@@ -291,10 +289,12 @@
{if ($opt.template.caching == true)}
{t}Page cached{/t}: {if $sys_cached==true}{t}Yes{/t}{else}{t}No{/t}{/if}<br />
{/if}
{*
{t}DB connected{/t}:
{if $sys_dbconnected==true}{t}Yes{/t}{else}{t}No{/t}{/if}
{if $sys_dbslave==true}, {t}Slave{/t}{/if}
<br />
*}
{/nocache}
{t}Created at{/t}: {"0"|date_format:$opt.format.datetime}
</small>