From cd53979829e77f6c8a3ba39c8e76fc8471ab7799 Mon Sep 17 00:00:00 2001 From: following Date: Mon, 27 May 2013 12:28:36 +0200 Subject: [PATCH] myhome and adoption page layout --- htdocs/doc/sql/static-data/data.sql | 5 +++- htdocs/templates2/ocstyle/adoptcache.tpl | 30 ++++++++++++++---------- htdocs/templates2/ocstyle/myhome.tpl | 4 ++-- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/htdocs/doc/sql/static-data/data.sql b/htdocs/doc/sql/static-data/data.sql index 29277bba..1877bc89 100644 --- a/htdocs/doc/sql/static-data/data.sql +++ b/htdocs/doc/sql/static-data/data.sql @@ -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'); diff --git a/htdocs/templates2/ocstyle/adoptcache.tpl b/htdocs/templates2/ocstyle/adoptcache.tpl index 67a3fe13..64b1fa7d 100644 --- a/htdocs/templates2/ocstyle/adoptcache.tpl +++ b/htdocs/templates2/ocstyle/adoptcache.tpl @@ -1,11 +1,11 @@ -{*************************************************************************** +{*************************************************************************** * You can find the license in the docs directory * * Unicode Reminder メモ ***************************************************************************} {* OCSTYLE *} {if $action=='listbycache'} -
+ @@ -15,6 +15,7 @@ + @@ -30,7 +31,7 @@ {$adoptItem.date_created|date_format:$opt.format.date} {foreachelse} @@ -96,18 +97,21 @@ {t}Geocaches the owner offers you for adoption{/t} -
{t}User{/t} {t}Date{/t} - {t}Reject adoption{/t}
+ {t}Withdraw adoption offer{/t}
+
+ + + + + + + {foreach from=$adoptions item=adoptItem} - - - + + diff --git a/htdocs/templates2/ocstyle/myhome.tpl b/htdocs/templates2/ocstyle/myhome.tpl index 9aa148b8..e9f4c0c4 100644 --- a/htdocs/templates2/ocstyle/myhome.tpl +++ b/htdocs/templates2/ocstyle/myhome.tpl @@ -28,7 +28,7 @@ {foreach from=$logs item=logItem} - + {foreachelse} @@ -85,7 +85,7 @@ {foreach from=$caches item=cacheItem} - + {foreachelse}
{t}Name{/t}{t}Owner{/t}
- {$adoptItem.cachename|escape} - {t}by{/t} - {$adoptItem.ownername|escape} - - {t}Adopt now{/t}
- 		+ {$adoptItem.cachename|escape}{$adoptItem.ownername|escape} + {t}Adopt now{/t} +   {t}Reject adoption{/t}
{include file="res_logtype.tpl" type=$logItem.type}{$logItem.date|date_format:$opt.format.datelong}{$logItem.date|date_format:$opt.format.datelong} {$logItem.name|escape} {t}by{/t} {$logItem.username|escape}
{include file="res_cachestatus.tpl" status=$cacheItem.status}{$cacheItem.date_hidden|date_format:$opt.format.datelong}{$cacheItem.date_hidden|date_format:$opt.format.datelong} {$cacheItem.name|escape}