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

myhome and adoption page layout

Browse Source
This commit is contained in:
following
2013-05-27 12:28:36 +02:00
parent 814aa3d2b8
commit cd53979829
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2472,6 +2472,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2049', 'Page vi
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2050', 'JavaScript is disabled in your browser, you can enter (HTML) text only. To use the editor, please enable JavaScript.', '2013-05-14 13:48:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2051', 'Recommended on', '2013-05-14 13:48:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2052', 'Nature protection', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2053', 'Withdraw adoption offer', '2013-04-25 23:00:00');
-- Table sys_trans_ref
SET NAMES 'utf8';
@ -5506,7 +5507,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('833', 'DE', 'Die Adoption von %1 bestätigen', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('834', 'DE', 'Es werden dir derzeit keine Geocaches zur Adoption angeboten.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('835', 'DE', 'Adoptieren', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('836', 'DE', 'Geocaches, die dir zur Adoption angeboten wurden', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('836', 'DE', 'Geocaches, die dir zur Adoption angeboten werden', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('837', 'DE', 'Ja, ich habe obige Bedingungen gelesen, verstanden und bin damit einverstanden.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('838', 'DE', 'Wenn du einen Benutzer gefunden hast, der deinen Geocache adoptieren möchte, trage bitte unten den Benutzername ein und bestätige den Vorgang. Dem Benutzer wird diesen Geocache dann unter Mein Profil \> Adoptionen angezeigt. Um die Adoption abzuschließen, muss der Benutzer die Nutzungsbedingungen von Opencaching.de akzeptieren und die Adoption bestätigen. Du kannst einen Geocache mehreren Benutzern zur Adoption anbieten. Der erste Benutzer, der die Adoption bestätigt, wird der neue Besitzer des Geocaches. Mit der Adoption gibst du dem Benutzer ein unbeschränktes Recht, urheberrechtlich geschützte Inhalte dieses Geocaches zu nutzen, zu modifizieren und weiterzugeben.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('839', 'DE', '%1 zur Adoption anbieten', '2010-08-28 11:48:07');
@ -6287,6 +6288,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2050', 'DE', 'JavaScript ist bei deinem Browser deaktiviert, du kannst nur (HTML-)Text eingeben. Um den Editor zu verwenden, aktiviere bitte JavaScript.', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2051', 'DE', 'empfohlen am', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2052', 'DE', 'Naturschutz', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2053', 'DE', 'Adoptionsangebot zurückziehen', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'EN', 'Reorder IDs \r', '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');
@ -7832,6 +7834,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2050', 'EN', 'JavaScript is disabled in your browser, you can enter (HTML) text only. To use the editor, please enable JavaScript.', '2013-05-12 22:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2051', 'EN', 'Recommended on', '2013-05-12 22:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2052', 'EN', 'Nature Protection', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2053', 'EN', 'Withdraw adoption offer', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'ES', 'Reordenar ID', '2010-12-09 00:17:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'ES', 'La base de datos no se pudo conectar.', '2010-12-09 00:17:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'ES', 'En pruebas - por favor, no entre.', '2010-12-09 00:17:55');

30
htdocs/templates2/ocstyle/adoptcache.tpl
View File

@ -1,11 +1,11 @@
{***************************************************************************
{***************************************************************************
* You can find the license in the docs directory
*
* Unicode Reminder メモ
***************************************************************************}
{* OCSTYLE *}
{if $action=='listbycache'}
<form method="post" action"adoptcache.php">
<form method="post" action="adoptcache.php">
<input type="hidden" name="action" value="add" />
<input type="hidden" name="submit" value="1" />
@ -15,6 +15,7 @@
</div>
<table class="table">
<tr><td class="spacer"></td></tr>
<tr>
<th align="left">{t}User{/t}</th>
<th align="left">{t}Date{/t}</th>
@ -30,7 +31,7 @@
{$adoptItem.date_created|date_format:$opt.format.date}
</td>
<td>
<a href="adoptcache.php?action=cancel&cacheid={$adoptItem.id}&userid={$adoptItem.userid}">{t}Reject adoption{/t}</a><br />
<a href="adoptcache.php?action=cancel&cacheid={$adoptItem.id}&userid={$adoptItem.userid}">{t}Withdraw adoption offer{/t}</a><br />
</td>
</tr>
{foreachelse}
@ -96,18 +97,21 @@
{t}Geocaches the owner offers you for adoption{/t}
</div>
<table class="table">
<table class="table" width="98%">
<tr><td class="spacer"></td></tr>
<tr>
<th>{t}Name{/t}</th>
<th>{t}Owner{/t}</th>
<th></th>
</tr>
{foreach from=$adoptions item=adoptItem}
<tr>
<td>
<a href="viewcache.php?cacheid={$adoptItem.id}">{$adoptItem.cachename|escape}</a>
{t}by{/t}
<a href="viewprofile.php?userid={$adoptItem.ownerid}">{$adoptItem.ownername|escape}</a>
</td>
<td>
<a href="adoptcache.php?action=commit&cacheid={$adoptItem.id}">{t}Adopt now{/t}</a><br />
</td>
<td>
<td><a href="viewcache.php?cacheid={$adoptItem.id}">{$adoptItem.cachename|escape}</a></td>
<td><a href="viewprofile.php?userid={$adoptItem.ownerid}">{$adoptItem.ownername|escape}</a></td>
<td style="white-space:nowrap">
<a href="adoptcache.php?action=commit&cacheid={$adoptItem.id}">{t}Adopt now{/t}</a>
&nbsp;
<a href="adoptcache.php?action=cancel&cacheid={$adoptItem.id}&userid={$login.userid}">{t}Reject adoption{/t}</a><br />
</td>
</tr>

4
htdocs/templates2/ocstyle/myhome.tpl
View File

@ -28,7 +28,7 @@
{foreach from=$logs item=logItem}
<tr>
<td>{include file="res_logtype.tpl" type=$logItem.type}</td>
<td>{$logItem.date|date_format:$opt.format.datelong}</td>
<td style="white-space:nowrap">{$logItem.date|date_format:$opt.format.datelong}</td>
<td><a href="viewcache.php?wp={$logItem.wp_oc}">{$logItem.name|escape}</a> {t}by{/t} <a href="viewprofile.php?userid={$logItem.userid}">{$logItem.username|escape}</a></td>
</tr>
{foreachelse}
@ -85,7 +85,7 @@
{foreach from=$caches item=cacheItem}
<tr>
<td>{include file="res_cachestatus.tpl" status=$cacheItem.status}</td>
<td nowrap="nowrap">{$cacheItem.date_hidden|date_format:$opt.format.datelong}</td>
<td style="white-space:nowrap">{$cacheItem.date_hidden|date_format:$opt.format.datelong}</td>
<td><a href="viewcache.php?wp={$cacheItem.wp_oc}">{$cacheItem.name|escape}</a></td>
</tr>
{foreachelse}