From e607a3d323839d0fae6287ee93666110b4ae0982 Mon Sep 17 00:00:00 2001 From: following Date: Mon, 25 Feb 2013 01:31:43 +0100 Subject: [PATCH] layout fixes --- htdocs/config2/settings-dev.inc.php | 9 ++- htdocs/doc/sql/static-data/data.sql | 10 ++-- htdocs/lang/de/ocstyle/editlog.tpl.php | 2 +- htdocs/resource2/ocstyle/css/style_print.css | 7 +-- htdocs/resource2/ocstyle/css/style_screen.css | 20 +++++-- htdocs/templates2/ocstyle/adminreports.tpl | 7 +-- htdocs/templates2/ocstyle/adminuser.tpl | 2 +- htdocs/templates2/ocstyle/dbmaintain.tpl | 6 +- htdocs/templates2/ocstyle/garmin.tpl | 11 ++-- htdocs/templates2/ocstyle/garmin_down.tpl | 59 ------------------- htdocs/templates2/ocstyle/htmlprev.tpl | 6 +- htdocs/templates2/ocstyle/viewcache.tpl | 2 +- 12 files changed, 45 insertions(+), 96 deletions(-) delete mode 100644 htdocs/templates2/ocstyle/garmin_down.tpl diff --git a/htdocs/config2/settings-dev.inc.php b/htdocs/config2/settings-dev.inc.php index 27ee3194..62a5d2fc 100644 --- a/htdocs/config2/settings-dev.inc.php +++ b/htdocs/config2/settings-dev.inc.php @@ -110,9 +110,10 @@ $opt['logic']['pictures']['url'] = $opt['page']['absolute_url'] . '/images/uploads'; $opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'] . '/thumbs'; - /* cachemaps + /* maps */ $opt['logic']['cachemaps']['wmsurl'] = 'http://www.opencaching.de/cachemaps.php?wp={wp_oc}'; + $opt['map']['disablefullscreen'] = false; /* cachemaps (new) * how to display the cache map on viewcache.php (200x200 pixel) @@ -142,7 +143,9 @@ * see https://my.garmin.com/api/communicator/key-generator.jsp */ $opt['lib']['garmin']['key'] = '00112233445566778899AABBCCDDEEFF00'; - $opt['lib']['garmin']['url'] = 'http://www.site.org/'; + $opt['lib']['garmin']['domain'] = 'local.opencaching.de'; + $opt['lib']['garmin']['url'] = 'http://local.opencaching.de/'; + $opt['lib']['garmin']['redirect'] = $opt['lib']['garmin']['url'] . 'garmin.php?redirect=1&cacheid={cacheid}'; $opt['template']['default']['style'] = 'ocstyle'; @@ -158,4 +161,4 @@ $opt['template']['locales']['DA']['show'] = false; $opt['template']['locales']['PT']['show'] = false; $opt['template']['locales']['JA']['show'] = false; -?> \ No newline at end of file +?> diff --git a/htdocs/doc/sql/static-data/data.sql b/htdocs/doc/sql/static-data/data.sql index cd670224..cb41020d 100644 --- a/htdocs/doc/sql/static-data/data.sql +++ b/htdocs/doc/sql/static-data/data.sql @@ -808,7 +808,7 @@ INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustrin INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('28', 'MNU_START_PRIVACY', 'Privacy statement', '14', 'Privacy statement', '14', '0', 'articles.php?page=dsb', '0', '1', '12', '', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('29', 'MNU_START_REGISTER_ACTIVATION', 'Activation', '127', 'Activation', '127', '0', 'activation.php', '0', '3', '1', '', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('30', 'MNU_CACHES_USERPROFILE', 'Userprofile', '128', 'Userprofile', '128', '0', 'viewprofile.php', '0', '10', '4', '', '0', NULL); -INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('31', 'MNU_START_NEWS_POST', 'Post some news', '180', 'Post some news', '180', '0', 'newstopic.php', '0', '4', '1', '', '1', NULL); +INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('31', 'MNU_START_NEWS_POST', 'Post some news', '180', 'Post some news', '180', '0', 'newstopic.php', '0', '4', '1', '', '0', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('32', 'MNU_LOGIN', 'Login', '207', 'Login', '207', '0', 'login.php', '0', '0', '8', '#D5D9FF', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('33', 'MNU_CACHES_USERTOPS', 'Show recommendations', '248', 'Show recommendations', '248', '0', 'usertops.php', '0', '10', '5', '', '0', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('34', 'MNU_ERROR', 'Error message', '133', 'Error message', '133', '0', '', '0', '0', '9', '#D5D9FF', '0', NULL); @@ -848,7 +848,7 @@ INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustrin INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('69', 'MNU_START_TEAM', 'Our Team', '907', 'Our Team', '907', '0', 'articles.php?page=team', '1', '1', '7', '', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('70', 'MNU_MAP', 'Map', '1269', 'Map', '1269', '0', 'map2.php', '1', '0', '4', '#FFFFC5', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('85', 'MNU_CACHES_LOG', 'Create a logentry', '1687', 'Create a logentry', '1687', '0', 'log2.php', '0', '10', '10', '', '0', NULL); -INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('86', 'MNU_START_CHANGELOG', 'Changelog', '1797', 'Changelog', '1797', '0', 'articles.php?page=changelog', '0', '0', '10', '', '1', NULL); +INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('86', 'MNU_START_CHANGELOG', 'Changelog', '1797', 'Changelog', '1797', '0', 'articles.php?page=changelog', '0', '1', '10', '', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('87', 'MNU_START_OPERATOR', 'Operator Association', '1798', 'Operator Association', '1798', '0', 'articles.php?page=verein', '1', '1', '8', '', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('88', 'MNU_VERIFY_EMAIL', 'Verify e-mail address', '1824', 'Verify e-mail address', '1824', '0', 'verifyemail.php', '0', '0', '0', '', '0', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('89', 'MNU_ADMIN_ADMINS', 'Admins', '1831', 'Admins', '1831', '1', 'admins.php', '1', '12', '6', '', '0', NULL); @@ -4575,7 +4575,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 ('174', 'DE', 'Go', '2010-08-28 11:48:06'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('175', 'DE', 'Entwicklersystem - nur Testdaten', '2010-08-28 11:48:06'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('176', 'DE', 'Die Datenschutzbelehrung und Nutzungsbedingungen habe ich gelesen und bin damit einverstanden.', '2010-08-28 11:48:06'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('177', 'DE', 'Du willst in deiner Cachebeschreibung einen Teil des Textes fett oder kursiv machen, hast jedoch keine Ahnung von HTML?

Kein Problem, mit dieser Anleitung wird das zum Kinderspiel!

', '2010-08-28 11:48:06'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('177', 'DE', 'Du willst in deiner Cachebeschreibung einen Teil des Textes fett oder kursiv machen, hast jedoch keine Ahnung von HTML? Kein Problem, mit dieser Anleitung wird das zum Kinderspiel!

', '2010-08-28 11:48:06'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('178', 'DE', 'Hier siehst du den HTML Code deines Textes. Wenn du ein Wort oder Satz fett schreiben möchtest, füge vor den Satz ein \<b\> und hinter den Satz ein \</b\>.', '2010-08-28 11:48:06'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('179', 'DE', 'Wallis und Futuna', '2010-08-28 11:48:06'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('180', 'DE', 'Neuen Newseintrag erstellen', '2010-08-28 11:48:06'); @@ -5256,7 +5256,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 ('869', 'DE', 'Benutzeraccount Details anzeigen', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('870', 'DE', 'Benutzeraccount Details', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('871', 'DE', 'E-Mail:', '2010-08-28 11:48:07'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('872', 'DE', 'Wegpunkt Download', '2010-08-28 11:48:07'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('872', 'DE', 'Wegpunkt-Download', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('873', 'DE', 'Newseinträge', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('874', 'DE', 'Ausblenden', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('875', 'DE', 'Gelände', '2010-08-28 11:48:07'); @@ -5770,7 +5770,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 ('1776', 'DE', 'Wegpunkt Typ:', '2011-07-10 18:12:33'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1777', 'DE', 'Bitte auswählen', '2011-07-10 18:12:44'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1778', 'DE', 'Koordinaten:', '2011-07-10 18:13:02'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1779', 'DE', 'Download GPX Datei (max. 500)', '2011-07-10 18:13:23'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1779', 'DE', 'Download GPX-Datei (max. 500 Caches)', '2011-07-10 18:13:23'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1780', 'DE', 'Wegpunkt hinzufügen', '2011-07-10 20:16:17'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1781', 'DE', 'Hinzufügen', '2011-07-10 20:17:11'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1782', 'DE', 'Wegpunkt Löschen', '2011-07-10 20:17:25'); diff --git a/htdocs/lang/de/ocstyle/editlog.tpl.php b/htdocs/lang/de/ocstyle/editlog.tpl.php index 66ad32a3..3c780709 100644 --- a/htdocs/lang/de/ocstyle/editlog.tpl.php +++ b/htdocs/lang/de/ocstyle/editlog.tpl.php @@ -105,7 +105,7 @@ function _chkFound () { {rating_message} - +
diff --git a/htdocs/resource2/ocstyle/css/style_print.css b/htdocs/resource2/ocstyle/css/style_print.css index 58c72e6c..f0c1c267 100644 --- a/htdocs/resource2/ocstyle/css/style_print.css +++ b/htdocs/resource2/ocstyle/css/style_print.css @@ -49,7 +49,7 @@ body {font-size: 62.5%; margin: 0px auto; padding: 0px; background-color: #fffff .site-slogan p.text {clear: both; float: right; width: 300px; margin: 10px 0px 0px 0px; padding: 10px; color: rgb(234,239,247); background-color: rgb(127,162,202); font-family: arial, sans serif; text-align: right; font-weight: bold; line-height: 1.0em; font-size: 140%;} -.site-slogan p.search {clear: both; float: right; padding: 0px; color: rgb(255,255,255); font-family: arial, sans serif; text-align: right; font-weight: none; line-height: 1.0em; font-size: 9px; white-space: nowrap;} +.site-slogan p.search {clear: both; float: right; padding: 0px; color: rgb(255,255,255); font-family: arial, sans serif; text-align: right; line-height: 1.0em; font-size: 9px; white-space: nowrap;} .site-slogan a {color: rgb(234,239,247); text-decoration: underline;} .site-slogan a:hover {text-decoration: none; color: rgb(50,50,50);} @@ -243,7 +243,7 @@ ul.linklist-indent {margin: -0.3em 0px 0.5em 0px; padding: 0px 0px 0px 10px; lis /*----------------------------*/ .box-on {float: left; min-width: 0.3em; margin-right: 0.2em; padding: 0px 0.2em 0px 0.3em;} .box-off {display: none;} -/* html box-on {width: 1%;} /* IE6-Hack for min-width. Also compliant with IE7-Beta2 */ */ +/* html box-on {width: 1%;} /* IE6-Hack for min-width. Also compliant with IE7-Beta2 */ /*-----------------------------*/ /* 7.2 - Horizontal alignments */ @@ -379,7 +379,6 @@ ul.linklist-indent {margin: -0.3em 0px 0.5em 0px; padding: 0px 0px 0px 10px; lis /*---------------------------*/ /* 7.5 Bottom border colors */ /*---------------------------*/ -.box-blue {padding: 15px 9px 5px 10px; margin:10 10 10 10;border-top:1px solid rgb(88,144,168);border-left:1px solid rgb(88,144,168);border-right:1px solid rgb(88,144,168);border-bottom:1px solid rgb(88,144,168);} .line-box {border-bottom: solid 1px rgb(200,200,200); padding-bottom: 7px; margin: 0px 0px 15px 0px;} .line-white {border-bottom: solid 1px rgb(255,255,255); padding-bottom: 2px; margin: 0px 0px 1px 0px;} @@ -532,7 +531,7 @@ div.viewcache_log-content { margin-left: 20px } div.viewlogs-logpictures span.info { font-weight: bold; font-size: 120%;display: block;} div.viewlogs-logpictures div.logimage { float: left; } div.viewlogs-logpictures div.allimages { background-color: rgb(219,230,241);padding: 5px; max-width: 750px; float: left;} -div.viewlogs-logpictures span.desc { vertical-align: center; display: block; float: right; width: 112px; margin-top: 5px; padding-left: 3px;} /* should fit 4 images */ +div.viewlogs-logpictures span.desc { vertical-align: middle; display: block; float: right; width: 112px; margin-top: 5px; padding-left: 3px;} /* should fit 4 images */ div.viewlogs-logpictures img { max-width: 64px; max-height: 64px; vertical-align: top;} div.viewlogs-logpictures span.removepic { display: block; } diff --git a/htdocs/resource2/ocstyle/css/style_screen.css b/htdocs/resource2/ocstyle/css/style_screen.css index cb8b6111..9ef20dc0 100644 --- a/htdocs/resource2/ocstyle/css/style_screen.css +++ b/htdocs/resource2/ocstyle/css/style_screen.css @@ -175,7 +175,7 @@ div#bg2 {display: none;} /* 2.3 - Navigation - Level 1 */ /*----------------------------*/ /* .nav1-container {width: 970px; top: 35px; position: absolute; z-index: 3; background: transparent;} */ -.nav1-container {top: 10x; left: 5px; background: transparent; position: absolute; float: left;} +.nav1-container {left: 5px; background: transparent; position: absolute; float: left;} .nav1 {margin: 3px; padding: 0px; font-family: verdana, arial, sans serif; font-size: 1.0em;} .nav1 ul {float: right; margin: 0px; padding: 0px 20px 0px 0px; border-left: solid 1px rgb(115,162,182); background-color: rgb(255,255,255); font-weight: bold;} @@ -234,7 +234,7 @@ ul#statmenu { padding: 0px; margin: 0px;} /******************************************************/ /* SECTION 4 - SPECIFIC CLASSES FOR LAYOUTS #2 and #3 */ /******************************************************/ -.notice {overflow: hidden; width: 735px; height: 24px; margin: 0px 0px 0px 0px; padding: 0px 16px 12px 20px; color: rgb(88,144,168); font-weight: italic; font-size: 11px; background-image: url(../images/misc/16x16-info.png); background-position: top left; background-repeat:no-repeat;behavior: url(resource2/ocstyle/css/iepngfix.htc);} +.notice {overflow: hidden; width: 735px; height: 24px; margin: 0px 0px 0px 0px; padding: 0px 16px 12px 20px; color: rgb(88,144,168); font-style: italic; font-size: 11px; background-image: url(../images/misc/16x16-info.png); background-position: top left; background-repeat:no-repeat;behavior: url(resource2/ocstyle/css/iepngfix.htc);} .warning {overflow: hidden; width: 735px; height: 24px; border: 1px solid black; background-color: rgb(240,100,100); margin: 0px 0px 0px 0px; padding: 8px 0px 0px 32px; color: rgb(50,50,50); font-weight: bold; font-size: 12px; background-image: url(../images/misc/32x32-impressum.png); background-position: top left; background-repeat:no-repeat;behavior: url(resource2/ocstyle/css/iepngfix.htc);} .errormsg {color: rgb(240,100,100); font-weight: bold;} @@ -319,6 +319,12 @@ ul.linklist-indent {margin: -0.3em 0px 0.5em 0px; padding: 0px 0px 0px 10px; lis .table th {margin: 0px; background-color: rgb(127,162,202); padding: 2px 7px 2px 7px; border: solid 0px rgb(150,150,150); empty-cells: show; text-align: left; font-size: 120%; color: rgb(255,255,255); } .table-caption {margin: 0.5em 0px 1.0em 30px; padding: 0px; clear: both; text-align: left; font-size: 120%;} +.narrowtable {font-size: 10px; line-height: 2.0em; clear: left; padding: 0px; margin: 0.5em 0px 0.2em 0px; border: solid 0px rgb(150,150,150); empty-cells: show; border-collapse: collapse; background-color: rgb(255,255,255);} +.narrowtable tr {margin: 0px; padding: 0px;} +.narrowtable td {padding: 0 7px 0 7px; border: solid 0px rgb(150,150,150); text-align: left; font-size: 120%;} +.narrowtable th {margin: 0px; background-color: rgb(127,162,202); padding: 0 7px 0 7px; border: solid 0px rgb(150,150,150); empty-cells: show; text-align: left; font-size: 120%; color: rgb(255,255,255); } +.narrowtable-caption {margin: 0.5em 0px 1.0em 30px; padding: 0px; clear: both; text-align: left; font-size: 120%;} + /* Images */ .img-left-noborder-notopmargin {float: left; margin: 0px 10px 0px 0px;} .img-left-noborder-topmargin {float: left; margin: 3px 10px 0px 0px;} @@ -365,7 +371,7 @@ ul.linklist-indent {margin: -0.3em 0px 0.5em 0px; padding: 0px 0px 0px 10px; lis /*----------------------------*/ .box-on {float: left; min-width: 0.3em; margin-right: 0.2em; padding: 0px 0.2em 0px 0.3em;} .box-off {display: none;} -/* html box-on {width: 1%;} /* IE6-Hack for min-width. Also compliant with IE7-Beta2 */ */ +/* html box-on {width: 1%;} /* IE6-Hack for min-width. Also compliant with IE7-Beta2 */ /*-----------------------------*/ /* 7.2 - Horizontal alignments */ @@ -502,7 +508,6 @@ ul.linklist-indent {margin: -0.3em 0px 0.5em 0px; padding: 0px 0px 0px 10px; lis /*---------------------------*/ /* 7.5 Bottom border colors */ /*---------------------------*/ -.box-blue {width:750px; padding: 15px 9px 5px 10px; margin:10 10 10 10;border-top:1px solid rgb(88,144,168);border-left:1px solid rgb(88,144,168);border-right:1px solid rgb(88,144,168);border-bottom:1px solid rgb(88,144,168);} .line-box {width:769px; border-bottom: solid 1px rgb(200,200,200); padding-bottom: 7px; margin: 0px 0px 15px 0px;} .line-white {border-bottom: solid 1px rgb(255,255,255); padding-bottom: 2px; margin: 0px 0px 1px 0px;} @@ -656,7 +661,7 @@ div.viewcache_log-content { margin-left: 20px } div.viewlogs-logpictures span.info { font-weight: bold; font-size: 120%;display: block;} div.viewlogs-logpictures div.logimage { float: left; } div.viewlogs-logpictures div.allimages { background-color: rgb(219,230,241);padding: 5px; max-width: 750px; float: left;} -div.viewlogs-logpictures span.desc { vertical-align: center; display: block; float: right; width: 112px; margin-top: 5px; padding-left: 3px;font-size: 12px;} /* should fit 4 images */ +div.viewlogs-logpictures span.desc { vertical-align: middle; display: block; float: right; width: 112px; margin-top: 5px; padding-left: 3px;font-size: 12px;} /* should fit 4 images */ div.viewlogs-logpictures img { max-width: 64px; max-height: 64px; vertical-align: top;} div.viewlogs-logpictures span.removepic { display: block; font-size: 12px;} @@ -1083,7 +1088,6 @@ td.mapsearch-c { background: #ccc; color:#000; cursor:pointer; - width: 70; height:30px; margin:0; vertical-align:top; @@ -1206,3 +1210,7 @@ div#havefound { * html div#havefound {top: 160px;} *+html div#havefound {top: 160px;} + +.garmintext { + font-size: 1.1em; +} \ No newline at end of file diff --git a/htdocs/templates2/ocstyle/adminreports.tpl b/htdocs/templates2/ocstyle/adminreports.tpl index d4745636..9f6abc20 100644 --- a/htdocs/templates2/ocstyle/adminreports.tpl +++ b/htdocs/templates2/ocstyle/adminreports.tpl @@ -26,13 +26,13 @@ {/if} {if $list == true} -
{t}Log-entry:{/t}
+
{assign var="otheradmins" value=0} {foreach from=$reportedcaches item=rc} {if $rc.otheradmin > $otheradmins} - {assign var="otheradmins" value=$rc.otheradmin} @@ -49,9 +49,8 @@ {/foreach}
{t}ID{/t}{t}Name{/t}{t}Owner{/t}{t}Reporter{/t}{t}Date{/t}

{t}(*) New reports{/t}

+

{t}(*) New reports{/t}

{t}ID{/t}{t}Name{/t}{t}Owner{/t}{t}Reporter{/t}{t}Admin{/t}{t}Date{/t}
{t}No reported caches{/t}
- {if $reportedcaches != NULL and $otheradmins==0} -

{t}(*) New reports{/t}

+

{t}(*) New reports{/t}

{/if} {else}

{t}Details for report of {/t} {$cachename|escape} {t} by {/t} {$usernick|escape}

diff --git a/htdocs/templates2/ocstyle/adminuser.tpl b/htdocs/templates2/ocstyle/adminuser.tpl index 8400fb33..a5c89213 100644 --- a/htdocs/templates2/ocstyle/adminuser.tpl +++ b/htdocs/templates2/ocstyle/adminuser.tpl @@ -34,7 +34,7 @@ {t}Useraccount details{/t} - +
diff --git a/htdocs/templates2/ocstyle/dbmaintain.tpl b/htdocs/templates2/ocstyle/dbmaintain.tpl index 1932b7a9..ae75d1f4 100644 --- a/htdocs/templates2/ocstyle/dbmaintain.tpl +++ b/htdocs/templates2/ocstyle/dbmaintain.tpl @@ -5,7 +5,7 @@ ***************************************************************************} {* OCSTYLE - ohne Änderungen *} -
{t}Username:{/t} {$user.username|escape}
+
@@ -22,9 +22,9 @@ {/if} - + - + diff --git a/htdocs/templates2/ocstyle/garmin.tpl b/htdocs/templates2/ocstyle/garmin.tpl index dbc5904f..cef7685e 100644 --- a/htdocs/templates2/ocstyle/garmin.tpl +++ b/htdocs/templates2/ocstyle/garmin.tpl @@ -16,8 +16,8 @@ {t}Waypoint{/t}: {$cache.wpoc} @@ -28,24 +28,25 @@ {include file="res_cacheicon.tpl" cachetype=$cache.type status=$cache.status} - +
{t 1=$proc|escape 2=$count}%1 corrected: %2 entries{/t}
 
   - {if $opt.page.sponsor.popup!=''} - {$opt.page.sponsor.popup} + {if $opt.page.sponsor.popup!=''} + {$opt.page.sponsor.popup} {/if}
{$cache.name|escape}
-  {t}by{/t} {$cache.username|escape}
+ {t}by{/t} {$cache.username|escape}
{if $cache.shortdesc!=''} {$cache.shortdesc|escape} {/if} + 		+ {t}Difficulty{/t}: {t 1=$cache.difficulty*0.5|sprintf:'%01.1f'}Difficulty: %1 of 5.0{/t}
{t}Terrain{/t}: {t 1=$cache.terrain*0.5|sprintf:'%01.1f'}Terrain: %1 of 5.0{/t}

{t}Waypoint download{/t}
-

{t}Waypoint download{/t}

diff --git a/htdocs/templates2/ocstyle/garmin_down.tpl b/htdocs/templates2/ocstyle/garmin_down.tpl deleted file mode 100644 index 1f59e4c9..00000000 --- a/htdocs/templates2/ocstyle/garmin_down.tpl +++ /dev/null @@ -1,59 +0,0 @@ -{*************************************************************************** -* You can find the license in the docs directory -* -* Unicode Reminder メモ -***************************************************************************} -{* OCSTYLE *} - - - - -
- - - - - - - -
- - - {t}Waypoint{/t}: {$cache.wpoc} - - - Unterstützt und gefördert durch
- die Deutsche Wanderjugend - - 		- -
- - - - - - - -
- {include file="res_cacheicon.tpl" cachetype=$cache.type status=$cache.status} - - {$cache.name|escape}
-  {t}by{/t} {$cache.username|escape}
- {if $cache.shortdesc!=''} - {$cache.shortdesc|escape}
- {/if} - - {if $cache.type==6} - {t}List of participants{/t} - {/if} - 		- {t}Difficulty{/t}: - {t 1=$cache.difficulty*0.5|sprintf:'%01.1f'}Difficulty: %1 of 5.0{/t}
- {t}Terrain{/t}: - {t 1=$cache.terrain*0.5|sprintf:'%01.1f'}Terrain: %1 of 5.0{/t} -
-
- -

{t}Waypoint download{/t}

-
\ No newline at end of file diff --git a/htdocs/templates2/ocstyle/htmlprev.tpl b/htdocs/templates2/ocstyle/htmlprev.tpl index a2450788..5d55592f 100644 --- a/htdocs/templates2/ocstyle/htmlprev.tpl +++ b/htdocs/templates2/ocstyle/htmlprev.tpl @@ -3,7 +3,7 @@ * * Unicode Reminder メモ ***************************************************************************} - +
- - diff --git a/htdocs/templates2/ocstyle/viewcache.tpl b/htdocs/templates2/ocstyle/viewcache.tpl index 6f36e0c3..c8fd06d2 100644 --- a/htdocs/templates2/ocstyle/viewcache.tpl +++ b/htdocs/templates2/ocstyle/viewcache.tpl @@ -187,7 +187,7 @@

- +   

{t}HTML preview{/t} @@ -27,9 +27,7 @@
 
- +