From 31841aa0b9fdaaf7ebbc96718781d11fb120e9d6 Mon Sep 17 00:00:00 2001 From: following Date: Thu, 8 Aug 2013 12:57:49 +0200 Subject: [PATCH] content2-container and other layout element improvements - removed float:left from content2-container; fixes #204 - changed section icons to paragraph signs in german TOS page - added page title to admin list and DB maintainence - added content2-container to some admin pages, to set right margin --- htdocs/resource2/ocstyle/css/style_print.css | 4 ++-- htdocs/resource2/ocstyle/css/style_screen.css | 4 ++-- htdocs/templates2/ocstyle/adminreports.tpl | 2 ++ htdocs/templates2/ocstyle/admins.tpl | 9 +++++++++ .../templates2/ocstyle/articles/DE/impressum.tpl | 16 ++++++++-------- htdocs/templates2/ocstyle/dbmaintain.tpl | 14 +++++++++----- htdocs/templates2/ocstyle/res_newevents.tpl | 2 +- htdocs/templates2/ocstyle/restorecaches.tpl | 2 ++ htdocs/templates2/ocstyle/search.tpl | 2 +- htdocs/templates2/ocstyle/viewcache.tpl | 4 ++-- 10 files changed, 38 insertions(+), 21 deletions(-) diff --git a/htdocs/resource2/ocstyle/css/style_print.css b/htdocs/resource2/ocstyle/css/style_print.css index 87675968..fd84322c 100644 --- a/htdocs/resource2/ocstyle/css/style_print.css +++ b/htdocs/resource2/ocstyle/css/style_print.css @@ -148,7 +148,7 @@ ul#statmenu { padding: 0px; margin: 0px;} .content2 {float: left; width: 790px; min-height: 500px; margin: 0px; padding: 0px 0px 0px 20px; color: rgb(75,75,75); font-size: 1.0em;} .content3 {float: left; width: 790px; min-height: 500px; margin: 0px; padding: 0px 0px 0px 20px; color: rgb(75,75,75); font-size: 1.0em;} -.content2-container, .content3-container {clear: both; float: left; width: 100%; margin: 0px 0px 15px 0px; padding: 0px;} +.content2-container, .content3-container {clear: both; width: 100%; margin: 0px 0px 15px 0px; padding: 0px;} .content2-container-1col, .content3-container-1col {overflow: hidden; width: 100%; margin: 0px; padding: 0px;} .content2-container-2col {overflow: hidden; width: 272px; margin: 0px; padding: 0px;} .content2-container-2col-left, .content3-container-2col-left {overflow: hidden; float: left; width: 272px; margin: 0px; padding: 0px;} @@ -291,7 +291,7 @@ div.default { /* 7.3 Text colors */ /*------------------*/ .txt-white {color: rgb(255,255,255);} -.txt-black {color: rgb(0,0,0);} +.txt-black {color: rgb(75,75,75);} .txt-grey01 {color: rgb(242,242,242);} .txt-grey02 {color: rgb(230,230,230);} diff --git a/htdocs/resource2/ocstyle/css/style_screen.css b/htdocs/resource2/ocstyle/css/style_screen.css index 6a5ccd66..a2bec581 100644 --- a/htdocs/resource2/ocstyle/css/style_screen.css +++ b/htdocs/resource2/ocstyle/css/style_screen.css @@ -239,7 +239,7 @@ ul#statmenu { padding: 0px; margin: 0px;} .content2 {float: left; width: 790px; min-height: 500px; margin: 0px; padding: 0px 0px 0px 20px; color: rgb(75,75,75); font-size: 1.0em;} .content3 {float: left; width: 790px; min-height: 500px; margin: 0px; padding: 0px 0px 0px 20px; color: rgb(75,75,75); font-size: 1.0em;} -.content2-container, .content3-container {clear: both; float: left; width: 769px; margin: 0px 0px 15px 0px; padding: 0px;} +.content2-container, .content3-container {clear: both; width: 769px; margin: 0px 0px 15px 0px; padding: 0px;} .content2-section-no-p { margin-bottom: 20px !important; } /* use if a section does not contain a

..

to obtain equal spacing to other sections */ .content2-container-1col, .content3-container-1col {overflow: hidden; width: 769px; margin: 0px; padding: 0px;} @@ -470,7 +470,7 @@ a.nooutline:focus { outline: 0; } /* 7.3 Text colors */ /*------------------*/ .txt-white {color: rgb(255,255,255);} -.txt-black {color: rgb(0,0,0);} +.txt-black {color: rgb(75,75,75);} .txt-grey01 {color: rgb(242,242,242);} .txt-grey02 {color: rgb(230,230,230);} diff --git a/htdocs/templates2/ocstyle/adminreports.tpl b/htdocs/templates2/ocstyle/adminreports.tpl index 01e713cf..35621956 100644 --- a/htdocs/templates2/ocstyle/adminreports.tpl +++ b/htdocs/templates2/ocstyle/adminreports.tpl @@ -15,6 +15,7 @@ {t}Reported caches{/t} +
{if $error == 1}

{t}The report is already assigned to another admin!{/t}

{elseif $error == 2} @@ -109,6 +110,7 @@ {include file=adminhistory.tpl reportdisplay=true showhistory=true} {/if} +
{/strip} diff --git a/htdocs/templates2/ocstyle/admins.tpl b/htdocs/templates2/ocstyle/admins.tpl index c09fd9cd..66cd04b8 100644 --- a/htdocs/templates2/ocstyle/admins.tpl +++ b/htdocs/templates2/ocstyle/admins.tpl @@ -5,6 +5,13 @@ ***************************************************************************} {* OCSTYLE *} +
+ World + {t}OC-Admins{/t} +
+ +
+ {foreach from=$admins item=admin} @@ -18,3 +25,5 @@

 

{t}Admin rights can be granted and revoked by a system administrator with database access.{/t}

+ + diff --git a/htdocs/templates2/ocstyle/articles/DE/impressum.tpl b/htdocs/templates2/ocstyle/articles/DE/impressum.tpl index fa8fd1c5..d54d2fbc 100644 --- a/htdocs/templates2/ocstyle/articles/DE/impressum.tpl +++ b/htdocs/templates2/ocstyle/articles/DE/impressum.tpl @@ -11,7 +11,7 @@

- Lizenz +  §   Zweck des Projektes

@@ -39,7 +39,7 @@

- Lizenz +  §   Betreiber des Internetangebotes

@@ -110,7 +110,7 @@

- Lizenz +  §   Haftungshinweis für externe Links

@@ -128,7 +128,7 @@

- Lizenz +  §   Nutzungsbedingungen

@@ -270,7 +270,7 @@

- Lizenz +  §   Datenlizenz

@@ -309,7 +309,7 @@

- Lizenz +  §   Quellcodelizenz

@@ -337,13 +337,13 @@

- Lizenz +  §   Hinweise zum Datenschutz

- Die Datenschutzbelehrung kann auf folgender Internetseite abgerufen werden:
+ Die Datenschutzbelehrung kann auf folgender Seite abgerufen werden:

http://www.opencaching.de/articles.php?page=dsb

diff --git a/htdocs/templates2/ocstyle/dbmaintain.tpl b/htdocs/templates2/ocstyle/dbmaintain.tpl index 9d6f06cd..33d4d168 100644 --- a/htdocs/templates2/ocstyle/dbmaintain.tpl +++ b/htdocs/templates2/ocstyle/dbmaintain.tpl @@ -3,15 +3,19 @@ * * Unicode Reminder メモ ***************************************************************************} - {* OCSTYLE - ohne Änderungen *} + +
+ + {t}Database maintainance{/t} +
+
{t}ID{/t}{t}Name{/t}{t}Rights{/t}
- - + + - - + {foreach from=$procedures item=procItem} diff --git a/htdocs/templates2/ocstyle/res_newevents.tpl b/htdocs/templates2/ocstyle/res_newevents.tpl index 8b02ff84..ef5581f1 100755 --- a/htdocs/templates2/ocstyle/res_newevents.tpl +++ b/htdocs/templates2/ocstyle/res_newevents.tpl @@ -3,7 +3,7 @@ * * Unicode Reminder メモ ***************************************************************************} -
{t}Database maintainance{/t}
{t}Test for and fix inconsistencies in database tables{/t}
{t}Test for and fix inconsistencies in database tables{/t}.
 
diff --git a/htdocs/templates2/ocstyle/restorecaches.tpl b/htdocs/templates2/ocstyle/restorecaches.tpl index d6af343c..1a32e4ed 100644 --- a/htdocs/templates2/ocstyle/restorecaches.tpl +++ b/htdocs/templates2/ocstyle/restorecaches.tpl @@ -10,6 +10,7 @@ {t}Revert Vandalism{/t} +
{* step 1: select user *} {if $step == 1} @@ -208,3 +209,4 @@ {/if} {/if} +
diff --git a/htdocs/templates2/ocstyle/search.tpl b/htdocs/templates2/ocstyle/search.tpl index ffe32c94..8331c630 100644 --- a/htdocs/templates2/ocstyle/search.tpl +++ b/htdocs/templates2/ocstyle/search.tpl @@ -433,7 +433,7 @@ function switchAttributeCat2() - diff --git a/htdocs/templates2/ocstyle/viewcache.tpl b/htdocs/templates2/ocstyle/viewcache.tpl index 08fd54ea..4a5ec1f4 100644 --- a/htdocs/templates2/ocstyle/viewcache.tpl +++ b/htdocs/templates2/ocstyle/viewcache.tpl @@ -88,7 +88,7 @@ {/if} -
+
{* div height will be wroing without float:left - why *}
    @@ -403,7 +403,7 @@

-
+
{* bottom margin would not work without float:left - why? *} {foreach from=$pictures item=pictureItem}
+