From 1c4028a275b138a89dda15ec8ee6ce1a8821ca91 Mon Sep 17 00:00:00 2001 From: following Date: Sat, 6 Apr 2013 00:14:20 +0200 Subject: [PATCH] text and layout changes - update data license texts - fixed tos lists layout - fixed 24/7 attrib definition --- htdocs/doc/sql/static-data/data.sql | 20 +++++++++---------- htdocs/resource2/ocstyle/css/style_screen.css | 3 ++- .../ocstyle/articles/DE/cacheinfo.tpl | 2 +- .../ocstyle/articles/DE/impressum.tpl | 12 +++++------ .../ocstyle/articles/EN/impressum.tpl | 8 ++++---- htdocs/templates2/ocstyle/newlogpics.tpl | 2 +- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/htdocs/doc/sql/static-data/data.sql b/htdocs/doc/sql/static-data/data.sql index 6e27e04e..5321c139 100644 --- a/htdocs/doc/sql/static-data/data.sql +++ b/htdocs/doc/sql/static-data/data.sql @@ -91,7 +91,7 @@ INSERT INTO `cache_attrib` (`id`, `name`, `icon`, `trans_id`, `group_id`, `selec INSERT INTO `cache_attrib` (`id`, `name`, `icon`, `trans_id`, `group_id`, `selectable`, `category`, `search_default`, `default`, `icon_large`, `icon_no`, `icon_undef`, `html_desc`, `html_desc_trans_id`, `hidden`, `gc_id`, `gc_inc`, `gc_name`) VALUES ('35', 'Without GPS (letterboxes, cistes, compass juggling ...)', 'nogps', '1575', '4', '1', '0', '1', '0', 'resource2/ocstyle/images/attributes/nogps.png', 'resource2/ocstyle/images/attributes/nogps-no.png', 'resource2/ocstyle/images/attributes/nogps-disabled.png', 'This cache can be found without a GPS device. No additional coordinates are used besides of the starting coordinates.', '1645', '0', '135', '1', 'Without GPS'); INSERT INTO `cache_attrib` (`id`, `name`, `icon`, `trans_id`, `group_id`, `selectable`, `category`, `search_default`, `default`, `icon_large`, `icon_no`, `icon_undef`, `html_desc`, `html_desc_trans_id`, `hidden`, `gc_id`, `gc_inc`, `gc_name`) VALUES ('36', 'Access or parking fee', 'fee', '1576', '5', '1', '0', '1', '0', 'resource2/ocstyle/images/attributes/fee.png', 'resource2/ocstyle/images/attributes/fee-no.png', 'resource2/ocstyle/images/attributes/fee-disabled.png', 'You must pay an access or parking fee to access this cache, e.g. if the cache is located within a theme park. If there are alternative free parking areas nearby, please include them in the cache description. Please note our current terms of use regarding \"commercial geocaches\".', '1646', '0', '2', '1', 'Access or parking fee'); INSERT INTO `cache_attrib` (`id`, `name`, `icon`, `trans_id`, `group_id`, `selectable`, `category`, `search_default`, `default`, `icon_large`, `icon_no`, `icon_undef`, `html_desc`, `html_desc_trans_id`, `hidden`, `gc_id`, `gc_inc`, `gc_name`) VALUES ('37', 'Overnight stay necessary', 'overnight', '1577', '5', '1', '0', '0', '0', 'resource2/ocstyle/images/attributes/overnight.png', 'resource2/ocstyle/images/attributes/overnight-no.png', 'resource2/ocstyle/images/attributes/overnight-disabled.png', 'This cache cannot be done within a single day or a single night. You will have to visit the location for more than one time, or you must stay overnight. Preparation time is not included in this calculation, but only the time on site.', '1647', '0', '137', '1', 'Overnight stay necessary'); -INSERT INTO `cache_attrib` (`id`, `name`, `icon`, `trans_id`, `group_id`, `selectable`, `category`, `search_default`, `default`, `icon_large`, `icon_no`, `icon_undef`, `html_desc`, `html_desc_trans_id`, `hidden`, `gc_id`, `gc_inc`, `gc_name`) VALUES ('38', 'Available 24 hours', 'available', '1578', '6', '1', '0', '0', '0', 'resource2/ocstyle/images/attributes/available.png', 'resource2/ocstyle/images/attributes/available-no.png', 'resource2/ocstyle/images/attributes/available-disabled.png', 'This cache can be done both at daylight and at night.', '1605', '0', '13', '1', 'Available at all times'); +INSERT INTO `cache_attrib` (`id`, `name`, `icon`, `trans_id`, `group_id`, `selectable`, `category`, `search_default`, `default`, `icon_large`, `icon_no`, `icon_undef`, `html_desc`, `html_desc_trans_id`, `hidden`, `gc_id`, `gc_inc`, `gc_name`) VALUES ('38', 'Available 24 hours', 'available', '1578', '6', '1', '0', '0', '0', 'resource2/ocstyle/images/attributes/available.png', 'resource2/ocstyle/images/attributes/available-no.png', 'resource2/ocstyle/images/attributes/available-disabled.png', 'This cache can be done both at daylight and at night, and on all weekdays.', '1605', '0', '13', '1', 'Available at all times'); INSERT INTO `cache_attrib` (`id`, `name`, `icon`, `trans_id`, `group_id`, `selectable`, `category`, `search_default`, `default`, `icon_large`, `icon_no`, `icon_undef`, `html_desc`, `html_desc_trans_id`, `hidden`, `gc_id`, `gc_inc`, `gc_name`) VALUES ('39', 'Only available at specified times', 'time', '1579', '6', '1', '0', '0', '0', 'resource2/ocstyle/images/attributes/time.png', 'resource2/ocstyle/images/attributes/time-no.png', 'resource2/ocstyle/images/attributes/time-disabled.png', 'This cache can only be done at certain times of day - see the cache description for more details. For example, the cache may be placed in an area with restricted opening hours.', '1606', '0', '13', '0', 'Available at all times'); INSERT INTO `cache_attrib` (`id`, `name`, `icon`, `trans_id`, `group_id`, `selectable`, `category`, `search_default`, `default`, `icon_large`, `icon_no`, `icon_undef`, `html_desc`, `html_desc_trans_id`, `hidden`, `gc_id`, `gc_inc`, `gc_name`) VALUES ('40', 'by day only', 'day', '1580', '6', '1', '0', '0', '0', 'resource2/ocstyle/images/attributes/day.png', 'resource2/ocstyle/images/attributes/day-no.png', 'resource2/ocstyle/images/attributes/day-disabled.png', 'This cache shoud be attempted during daylight only. For example, the area may be dangerous and contain cliffs or abysses. Or using flashlights may be unfeasable because it would look suspicious within a residential area.', '1607', '0', '14', '0', 'Recommended at night'); INSERT INTO `cache_attrib` (`id`, `name`, `icon`, `trans_id`, `group_id`, `selectable`, `category`, `search_default`, `default`, `icon_large`, `icon_no`, `icon_undef`, `html_desc`, `html_desc_trans_id`, `hidden`, `gc_id`, `gc_inc`, `gc_name`) VALUES ('41', 'Not at high water level', 'tide', '1581', '6', '1', '0', '0', '0', 'resource2/ocstyle/images/attributes/tide.png', 'resource2/ocstyle/images/attributes/tide-no.png', 'resource2/ocstyle/images/attributes/tide-disabled.png', 'This cache can be done only at low or normal water level.', '1608', '0', '142', '1', 'Not at high water level'); @@ -2094,7 +2094,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1601', 'The geo INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1602', 'There are thorns near the cache. Wear appropriate clothes.', '2010-09-12 23:11:48'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1603', 'There are seasonably many ticks in this area. It is recommended to wear long trousers and to check yourself for ticks after geocaching. There are risk maps for tick-borne encephalitis in the internet, e.g. for Germany at sites like www.meningitis.de (look for FSME there).', '2010-09-12 23:11:48'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1604', 'In the water', '2010-09-12 23:18:21'); -INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1605', 'This cache can be done both at daylight and at night.', '2010-09-12 23:27:38'); +INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1605', 'This cache can be done both at daylight and at night, and on all weekdays.', '2010-09-12 23:27:38'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1606', 'This cache can only be done at certain times of day - see the cache description for more details. For example, the cache may be placed in an area with restricted opening hours.', '2010-09-12 23:27:38'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1607', 'This cache shoud be attempted during daylight only. For example, the area may be dangerous and contain cliffs or abysses. Or using flashlights may be unfeasable because it would look suspicious within a residential area.', '2010-09-12 23:27:38'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1608', 'This cache can be done only at low or normal water level.', '2010-09-12 23:27:38'); @@ -2403,7 +2403,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1930', 'Max. %1 INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1940', 'Picture gallery', '2013-02-23 19:00:04'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1941', 'Dates show the date of picture upload, wich can differ from the log date.', '2013-02-23 19:00:04'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1942', 'Maximum one picture per day and user is displayed here. The small gallery on the start page is additionally limited to one picture per cache and day.', '2013-02-23 19:00:04'); -INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1943', 'All pictures are copyrighted. If you want to use them, ask the picture author for permission. From April 7, 2013, the logs including pictures may be used in unchanged form under the terms of the new data license.', '2013-02-23 19:00:04'); +INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1943', 'All pictures are copyrighted and subject to the Opencaching.de data license.', '2013-02-23 19:00:04'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1944', 'Show picture stats and gallery', '2013-02-23 19:00:04'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1945', 'Log pictures', '2013-02-23 19:00:04'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1946', 'Log pictures: %1', '2013-02-23 19:00:04'); @@ -5395,7 +5395,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 ('801', 'DE', 'Benutzerdetails', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('802', 'DE', 'Meine Details', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('803', 'DE', 'Die folgenden Informationen sind in deinem Benutzerprofil gespeichert:', '2010-08-28 11:48:07'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('804', 'DE', 'Markierte Einträge werden anderen Benutzern angezeigt.
\r\nEinträge, die nicht markiert werden können, werden nur für interne Zwecke verwendet und nicht anderen Benutzern angezeigt.', '2010-08-28 11:48:07'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('804', 'DE', 'Markierte Einträge werden anderen Benutzern angezeigt.
\r\nEinträge, die nicht markiert werden können, werden nur für interne Zwecke verwendet und anderen Benutzern nicht angezeigt.', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('805', 'DE', 'Fehler beim Speichern.', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('806', 'DE', 'Ungültige Zeichen gefunden', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('807', 'DE', 'Feldinhalt zu lang.', '2010-08-28 11:48:07'); @@ -5807,7 +5807,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 ('1602', 'DE', 'In er N\ähe des Geocaches gibt es Dornen. Ihr solltet f\ür die Suche entsprechende Handschuhe und Kleidung parat haben.', '2010-09-12 23:12:57'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1603', 'DE', 'Je nach Saison gibt es in dem Gebiet besonders viele Zecken. Es wird daher empfohlen, entsprechend lange Kleidung zu tragen und nach der Cachetour nach Zecken Ausschau zu halten. FSME-Risikogebiete und weitere Informationen zum Thema Zecken k\önnt ihr z.B. auf www.meningitis.de nachsehen.', '2010-09-12 23:12:52'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1604', 'DE', 'Im Wasser', '2010-09-12 23:19:45'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1605', 'DE', 'Dieser Cache ist jederzeit machbar, sowohl am Tage als auch in der Nacht.', '2010-09-12 23:30:34'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1605', 'DE', 'Dieser Cache ist jederzeit machbar, sowohl am Tage als auch in der Nacht und an allen Wochentagen.', '2010-09-12 23:30:34'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1606', 'DE', 'Dieser Cache l\ässt sich nur zu bestimmten Tageszeiten absolvieren. N\äheres ist in der Cachebeschreibung angegeben. Der Cache kann zum Beispiel auf einem Gel\ände mit festgelegten Öffnungszeiten versteckt sein.', '2010-09-12 23:30:39'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1607', 'DE', 'Dieser Cache l\ässt sich nur tags\über angehen. Ein Beispiel w\ären Gebiete mit Klippen oder Abgr\ünden. Ein anderes Beispiel sind Orte, an denen die Suche mit Taschenlampen in der Dunkelheit besonders negativ auffallen w\ürde (z.B. Wohngebiete).', '2010-09-12 23:30:29'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1608', 'DE', 'Der Geocache kann nur bei bei niedrigem oder normalem Wasserstand bzw. bei Ebbe gesucht werden. Bei Hochwasser oder Flut ist er unzugänglich.', '2010-09-12 23:30:43'); @@ -6114,7 +6114,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 ('1940', 'DE', 'Logbildgalerie', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1941', 'DE', 'Es wird jeweils das Datum angezeigt, an dem das Bild hochgeladen wurde, das heißt es kann vom Logdatum abweichen.', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1942', 'DE', 'Es wird höchstens ein Bild pro Tag und Benutzer angezeigt. Die kleine Galerie auf der Startseite ist zusätzlich auf ein Bild pro Cache und Tag beschränkt.', '2013-02-19 05:48:07'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1943', 'DE', 'Alle Bilder sind urheberrechtlich geschützt. Wenn du sie verwenden möchtest, frage den jeweiligen Autor um Erlaubnis. Ab dem 7.\ April 2013 unterliegen die Logs inklusive Bildern der neuen Datenlizenz.', '2013-02-19 05:48:07'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1943', 'DE', 'Alle Bilder sind urheberrechtlich geschützt und unterliegen zusammen mit den Logeinträgen der Opencaching.de-Datenlizenz.', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1944', 'DE', 'Bildstatistik und -galerie anzeigen', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1945', 'DE', 'Logbilder', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1946', 'DE', 'Logbilder: %1', '2013-02-19 05:48:07'); @@ -7337,7 +7337,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 ('1602', 'EN', 'There are thorns near the cache. Wear appropriate clothes.', '2010-09-12 23:12:57'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1603', 'EN', 'There are seasonably many ticks in this area. It is recommended to wear long trousers and to check yourself for ticks after geocaching. There are risk maps for tick-borne encephalitis in the internet, e.g. for Germany at sites like www.meningitis.de (look for FSME there).', '2010-09-12 23:12:52'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1604', 'EN', 'In the water', '2010-09-12 23:19:52'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1605', 'EN', 'This cache can be done both at daylight and at night.', '2010-09-12 23:30:34'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1605', 'EN', 'This cache can be done both at daylight and at night, and on all weekdays.', '2010-09-12 23:30:34'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1606', 'EN', 'This cache can be done at certain times of day - see the cache description for more details. For example, the cache may be placed in an area with restricted opening hours.', '2010-09-12 23:30:39'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1607', 'EN', 'This cache shoud be attempted during daylight only. For example, the area may be dangerous and contain cliffs or abysses. Or using flashlights may be inadvisable because it would look suspicious within a residential area.', '2010-09-12 23:30:29'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1608', 'EN', 'This cache can be done only at low or normal water level. At flood or high-tide it is not accessible.', '2010-09-12 23:30:43'); @@ -7612,7 +7612,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 ('1940', 'EN', 'Picture gallery', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1941', 'EN', 'Dates show the date of picture upload, wich can differ from the log date. Therefore old dates can appear in the list.', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1942', 'EN', 'Maximum one picture per day and user is displayed here. The small gallery on the start page is additionally limited to one picture per cache and day.', '2013-02-19 05:48:07'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1943', 'EN', 'All pictures are copyrighted. If you want to use them, ask the picture author for permission. From April\ 7, 2013, the logs including pictures may be used in unchanged form under the terms of the new data license.', '2013-02-19 05:48:07'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1943', 'EN', 'All pictures are copyrighted and subject to the Opencaching.de data license.', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1944', 'EN', 'Show picture stats and gallery', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1945', 'EN', 'Log pictures', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1946', 'EN', 'Log pictures: %1', '2013-02-19 05:48:07'); @@ -9104,7 +9104,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 ('1940', 'ES', 'Galeria de imagenes', '2013-03-16 17:23:42'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1941', 'ES', 'Calendario de exposiciones de la fecha de la subida de imágenes, cosa que puede diferir de la fecha de registro.', '2013-03-16 17:23:42'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1942', 'ES', 'Máximo una foto por día y usuario se muestra aquí. La pequeña galería en la página de inicio es, además, limitada a una imagen por cache y el día.', '2013-03-16 17:23:42'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1943', 'ES', 'Todas las imágenes tienen derechos de autor. Si desea utilizarlas, pedir al autor de imagen permiso. Del 7 de abril de 2013, incluyendo los registros de imágenes pueden utilizarse en forma inalterada en los términos de la nueva licencia data license.', '2013-03-16 17:23:42'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1943', 'ES', 'Todas las imágenes tienen derechos de autor. Incluyendo los registros de imágenes pueden utilizarse en forma inalterada en los términos de la nueva licencia data license.', '2013-03-16 17:23:42'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1944', 'ES', 'Muéstreles la lámina estadísticas y galería', '2013-03-16 17:23:42'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1945', 'ES', 'Los de imagenes', '2013-03-16 17:23:42'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1946', 'ES', 'Log de las imagenes: %1', '2013-03-16 17:23:42'); @@ -10675,7 +10675,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 ('1940', 'IT', 'Galleria di immagini', '2013-03-14 10:49:58'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1941', 'IT', 'La data visualizza la data del caricamento dell\\\'immagine, che può essere diversa dalla data del log.', '2013-03-19 15:12:21'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1942', 'IT', 'Qui viene visualizzata al massimo una immagine al giorno per utente. La piccola galleria nella pagina di avvio è anche limitata ad una immagine per cache e per giorno.', '2013-03-19 15:12:21'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1943', 'IT', 'Tutte le immagini sono protette da copyright. Se vuoi utilizzarle chiedi il permesso all\'autore. Dal 7 aprile 2013 i log che includono immagini possono essere usati senza alcuna modifica secondo i termini dellla nuova licenza dati.', '2013-03-14 10:49:58'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1943', 'IT', 'Tutte le immagini sono protette da copyright. I log che includono immagini possono essere usati senza alcuna modifica secondo i termini dellla nuova licenza dati.', '2013-03-14 10:49:58'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1944', 'IT', 'Visualizza le immagini di stato e la galleria.', '2013-03-19 15:12:21'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1945', 'IT', 'Log immagini', '2013-03-19 15:12:21'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1946', 'IT', 'Log immagini: %1', '2013-03-19 15:12:21'); diff --git a/htdocs/resource2/ocstyle/css/style_screen.css b/htdocs/resource2/ocstyle/css/style_screen.css index 9d8e3237..f048cf0c 100644 --- a/htdocs/resource2/ocstyle/css/style_screen.css +++ b/htdocs/resource2/ocstyle/css/style_screen.css @@ -305,7 +305,8 @@ p.quote {clear: left; margin: 0em 30px 0.6em 30px; line-height: 120%; font-size: /* Lists */ ul.noindent {margin: 0px 0px 7px 15px; padding: 0px; list-style-type: disc; list-style-position: outside; font-size: 120%;} -ul.indent {margin: 0px 0px 7px 15px; padding: 0px 0px 0px 15px; list-style-type: disc; font-family: arial; font-size: 120%;} +ul.indent {margin: 0px 0px 7px 15px; padding: 0px 0px 0px 15px; list-style-type: disc; font-family: arial; font-size: 11px;} +ul.indent li {margin-bottom:4px} ol {margin: 0px 0px 0px 9px; padding: 0px 0px 0px 25px; list-style-type: decimal; list-style-position: outside; font-size: 120%;} ul.linklist-noindent {margin: -0.3em 0px 0.5em 0px; padding: 0px; list-style-type: none; line-height: 1.2em; font-size: 120%; } ul.linklist-indent {margin: -0.3em 0px 0.5em 0px; padding: 0px 0px 0px 10px; list-style-type: none; line-height: 1.2em; font-size: 120%; } diff --git a/htdocs/templates2/ocstyle/articles/DE/cacheinfo.tpl b/htdocs/templates2/ocstyle/articles/DE/cacheinfo.tpl index 42801585..02b0aadb 100644 --- a/htdocs/templates2/ocstyle/articles/DE/cacheinfo.tpl +++ b/htdocs/templates2/ocstyle/articles/DE/cacheinfo.tpl @@ -139,7 +139,7 @@

Aufwand: Wieviel Zeit und welche Wegstrecke sollte man ab dem Parkplatz/Startpunkt einplanen, um den Cache zu finden und wieder an den Parkplatz/Startpunkt zurück zu kommen? Gehe davon aus, dass der Cacher erfahren ist, aber bei zweideutigen Aufgaben gerne mal auf dem Schlauch steht. Solltest du der Meinung sein, dass man für diesen Cache keine - eindeutige Aussage über den Zeitaufwand machen, lasse einfach 0 h / 0 min stehen und + eindeutige Aussage über den Aufwand machen kann, lasse einfach 0:00 h bzw. 0 km stehen und erläutere den Aufwand in der Cachebeschreibung. Wenn du bei der Schätzung davon ausgehst, dass eine Teilstrecke mit Inline-Skates, dem Fahrrad oder dem Auto zurückgelegt wird, weise ebenfalls in der Beschreibung darauf hin.

diff --git a/htdocs/templates2/ocstyle/articles/DE/impressum.tpl b/htdocs/templates2/ocstyle/articles/DE/impressum.tpl index 347537ad..3691f311 100644 --- a/htdocs/templates2/ocstyle/articles/DE/impressum.tpl +++ b/htdocs/templates2/ocstyle/articles/DE/impressum.tpl @@ -81,7 +81,7 @@

Der geschäftsführende Vorstand besteht aus (Stand 31.08.2012):

-
    +
    • Michael Vaahsen, Vorsitzender
    • Gerald Halbig, stellv. Vorsitzender
    • Maik Bischoff, Kassenwart
      • @@ -175,7 +175,7 @@ Für das Verstecken von Geocaches, die auf Opencaching.de veröffentlicht werden sollen, gilt grundsätzlich:

      -
        +
        • Das Verstecken eines Geocaches geschieht in eigenem Interesse und auf eigene Gefahr - Opencaching.de übernimmt in keinem Fall irgendeine @@ -244,7 +244,7 @@

          Für das Suchen eines Geocaches gilt grundsätzlich:

          -
            +
            • Das Suchen eines Geocaches geschieht in eigenem Interesse und auf eigene Gefahr - Opencaching.de übernimmt in keinem Fall irgendeine @@ -279,11 +279,11 @@

              Creative Commons Lizenzvertrag - Ab dem 7. April 2013 stehen alle durch die Benutzer auf Opencaching.de eingebrachten Inhalte unter + Alle durch die Benutzer auf Opencaching.de eingebrachten Inhalte stehen 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ßt, - Sie dürfen die Inhalte vervielfältigen, verbreiten und öffentlich - zugänglich machen. Dabei ist die Namensnennung des Autors/Rechteinhabers in der + sie dürfen vervielfältigt, verbreitet und öffentlich zugänglich + gemacht werden. Dabei ist die Namensnennung des Autors/Rechteinhabers in der unten angegebenen Form zu wahren. Eine kommerzielle Nutzung der Inhalte ist in jeglicher Form ausgeschlossen, ebenso dürfen keine Veränderungen/Abwandlungen der Inhalte vorgenommen werden. diff --git a/htdocs/templates2/ocstyle/articles/EN/impressum.tpl b/htdocs/templates2/ocstyle/articles/EN/impressum.tpl index fd2d94c7..bd23adb6 100644 --- a/htdocs/templates2/ocstyle/articles/EN/impressum.tpl +++ b/htdocs/templates2/ocstyle/articles/EN/impressum.tpl @@ -64,7 +64,7 @@

              The managing comittee are (as of August 31, 2012):

              -
                +
                • Michael Vaahsen, chairman
                • Gerald Halbig, vice chairman
                • Maik Bischoff, treasurer
                  • @@ -152,7 +152,7 @@ Terms for hiding a geocache and publishing it at Opencaching.de website

                  -
                    +
                    • You will hide the geocache at your own intention and risk – Opencaching.de will not be liably for any damages which may be caused by the cache. The cache @@ -207,7 +207,7 @@ Terms for seeking a geocache

                      -
                        +
                        • You will seek geocaches at your own risk. Opencaching.de will not be liable for any damages caused by seeking a geocache. @@ -240,7 +240,7 @@

                          Creative Commons License Terms - Starting April 7, 2013, all Opencaching.de content which has been contributed by users is licensed under + All Opencaching.de content which has been contributed by users is licensed under the terms of "Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Germany", 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 diff --git a/htdocs/templates2/ocstyle/newlogpics.tpl b/htdocs/templates2/ocstyle/newlogpics.tpl index a68eb1d1..607cb467 100644 --- a/htdocs/templates2/ocstyle/newlogpics.tpl +++ b/htdocs/templates2/ocstyle/newlogpics.tpl @@ -13,5 +13,5 @@

                          {t}Dates show the date of picture upload, wich can differ from the log date.{/t} {t}Maximum one picture per day and user is displayed here. The small gallery on the start page is additionally limited to one picture per cache and day.{/t}

                          -

                          {t}All pictures are copyrighted. If you want to use them, ask the picture author for permission. From April 7, 2013, the logs including pictures may be used in unchanged form under the terms of the new data license.{/t}

                          +

                          {t}All pictures are copyrighted and subject to the Opencaching.de data license.{/t}

                           

                          \ No newline at end of file