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

content2-container and other layout element improvements

Browse Source 
- 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
This commit is contained in:
following
2013-08-08 12:57:49 +02:00
parent e665fdcda5
commit 31841aa0b9
10 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/resource2/ocstyle/css/style_print.css
+2 -2
View File
@@ -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;} .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;} .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-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 {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;} .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 */ /* 7.3 Text colors */
/*------------------*/ /*------------------*/
.txt-white {color: rgb(255,255,255);} .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-grey01 {color: rgb(242,242,242);}
.txt-grey02 {color: rgb(230,230,230);} .txt-grey02 {color: rgb(230,230,230);}
htdocs/resource2/ocstyle/css/style_screen.css
+2 -2
View File
@@ -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;} .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;} .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; } .content2-section-no-p { margin-bottom: 20px !important; }
/* use if a section does not contain a <p>..</p> to obtain equal spacing to other sections */ /* use if a section does not contain a <p>..</p> to obtain equal spacing to other sections */
.content2-container-1col, .content3-container-1col {overflow: hidden; width: 769px; margin: 0px; padding: 0px;} .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 */ /* 7.3 Text colors */
/*------------------*/ /*------------------*/
.txt-white {color: rgb(255,255,255);} .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-grey01 {color: rgb(242,242,242);}
.txt-grey02 {color: rgb(230,230,230);} .txt-grey02 {color: rgb(230,230,230);}
htdocs/templates2/ocstyle/adminreports.tpl
+2
View File
@@ -15,6 +15,7 @@
{t}Reported caches{/t} {t}Reported caches{/t}
</div> </div>
<div class="content2-container">
{if $error == 1} {if $error == 1}
<p style="line-height: 1.6em;">{t}The report is already assigned to another admin!{/t}</p> <p style="line-height: 1.6em;">{t}The report is already assigned to another admin!{/t}</p>
{elseif $error == 2} {elseif $error == 2}
@@ -109,6 +110,7 @@
{include file=adminhistory.tpl reportdisplay=true showhistory=true} {include file=adminhistory.tpl reportdisplay=true showhistory=true}
{/if} {/if}
</div>
</form> </form>
{/strip} {/strip}
htdocs/templates2/ocstyle/admins.tpl
+9
View File
@@ -5,6 +5,13 @@
***************************************************************************} ***************************************************************************}
{* OCSTYLE *} {* OCSTYLE *}
<div class="content2-pagetitle">
<img src="resource2/{$opt.template.style}/images/misc/32x32-tools.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="World" />
{t}OC-Admins{/t}
</div>
<div class="content2-container">
<table class="table"> <table class="table">
<tr><th>{t}ID{/t}</th><th>{t}Name{/t}</th><th>{t}Rights{/t}</th></tr> <tr><th>{t}ID{/t}</th><th>{t}Name{/t}</th><th>{t}Rights{/t}</th></tr>
{foreach from=$admins item=admin} {foreach from=$admins item=admin}
@@ -18,3 +25,5 @@
<p>&nbsp;</p> <p>&nbsp;</p>
<p>{t}Admin rights can be granted and revoked by a system administrator with database access.{/t}</p> <p>{t}Admin rights can be granted and revoked by a system administrator with database access.{/t}</p>
</div>
htdocs/templates2/ocstyle/articles/DE/impressum.tpl
+8 -8
View File
@@ -11,7 +11,7 @@
<div class="content2-container bg-blue02"> <div class="content2-container bg-blue02">
<p class="content-title-noshade-size3"> <p class="content-title-noshade-size3">
<img src="resource2/ocstyle/images/misc/32x32-news.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="Lizenz" /> &nbsp;<span class="txt-black">§</span> &nbsp;
Zweck des Projektes Zweck des Projektes
</p> </p>
</div> </div>
@@ -39,7 +39,7 @@
<div class="content2-container bg-blue02"> <div class="content2-container bg-blue02">
<p class="content-title-noshade-size3"> <p class="content-title-noshade-size3">
<img src="resource2/ocstyle/images/misc/32x32-news.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="Lizenz" /> &nbsp;<span class="txt-black">§</span> &nbsp;
Betreiber des Internetangebotes Betreiber des Internetangebotes
</p> </p>
</div> </div>
@@ -110,7 +110,7 @@
<div class="content2-container bg-blue02"> <div class="content2-container bg-blue02">
<p class="content-title-noshade-size3"> <p class="content-title-noshade-size3">
<img src="resource2/ocstyle/images/misc/32x32-news.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="Lizenz" /> &nbsp;<span class="txt-black">§</span> &nbsp;
Haftungshinweis f&uuml;r externe Links Haftungshinweis f&uuml;r externe Links
</p> </p>
</div> </div>
@@ -128,7 +128,7 @@
<div class="content2-container bg-blue02"> <div class="content2-container bg-blue02">
<p class="content-title-noshade-size3"> <p class="content-title-noshade-size3">
<img src="resource2/ocstyle/images/misc/32x32-news.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="Lizenz" /> &nbsp;<span class="txt-black">§</span> &nbsp;
<a name="tos"></a>Nutzungsbedingungen <a name="tos"></a>Nutzungsbedingungen
</p> </p>
</div> </div>
@@ -270,7 +270,7 @@
<div class="content2-container bg-blue02"> <div class="content2-container bg-blue02">
<p class="content-title-noshade-size3"> <p class="content-title-noshade-size3">
<img src="resource2/ocstyle/images/misc/32x32-news.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="Lizenz" /> &nbsp;<span class="txt-black">§</span> &nbsp;
<a name="datalicense"></a>Datenlizenz <a name="datalicense"></a>Datenlizenz
</p> </p>
</div> </div>
@@ -309,7 +309,7 @@
<div class="content2-container bg-blue02"> <div class="content2-container bg-blue02">
<p class="content-title-noshade-size3"> <p class="content-title-noshade-size3">
<img src="resource2/ocstyle/images/misc/32x32-news.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="Lizenz" /> &nbsp;<span class="txt-black">§</span> &nbsp;
<a name="codelicense"></a>Quellcodelizenz <a name="codelicense"></a>Quellcodelizenz
</p> </p>
</div> </div>
@@ -337,13 +337,13 @@
<div class="content2-container bg-blue02"> <div class="content2-container bg-blue02">
<p class="content-title-noshade-size3"> <p class="content-title-noshade-size3">
<img src="resource2/ocstyle/images/misc/32x32-news.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="Lizenz" /> &nbsp;<span class="txt-black">§</span> &nbsp;
Hinweise zum Datenschutz Hinweise zum Datenschutz
</p> </p>
</div> </div>
<div class="content-txtbox-noshade" style="padding-right: 25px;"> <div class="content-txtbox-noshade" style="padding-right: 25px;">
<p> <p>
Die Datenschutzbelehrung kann auf folgender Internetseite abgerufen werden:<br /> Die Datenschutzbelehrung kann auf folgender Seite abgerufen werden:<br />
<br /> <br />
<a href="articles.php?page=dsb">http://www.opencaching.de/articles.php?page=dsb</a> <a href="articles.php?page=dsb">http://www.opencaching.de/articles.php?page=dsb</a>
</p> </p>
htdocs/templates2/ocstyle/dbmaintain.tpl
+9 -5
View File
@@ -3,15 +3,19 @@
* *
* Unicode Reminder メモ * Unicode Reminder メモ
***************************************************************************} ***************************************************************************}
{* OCSTYLE - ohne Änderungen *}
<div class="content2-pagetitle">
<img src="resource2/{$opt.template.style}/images/misc/32x32-tools.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="" />
{t}Database maintainance{/t}
</div>
<form action="dbmaintain.php" method="post"> <form action="dbmaintain.php" method="post">
<table class="table"> <table class="table">
<colgroup> <colgroup>
<col width="150"> <col width="150" />
<col> <col />
</colgroup> </colgroup>
<tr><td class="header" colspan="2"><img src="resource2/{$opt.template.style}/images/misc/32x32-tools.png" border="0" width="32" height="32" align="middle" /><font size="4"> <b>{t}Database maintainance{/t}</b></font></td></tr> <tr><td colspan="2">{t}Test for and fix inconsistencies in database tables{/t}.</td></tr>
<tr><td colspan="2">{t}Test for and fix inconsistencies in database tables{/t}</td></tr>
<tr><td class="spacer" colspan="2">&nbsp;</td></tr> <tr><td class="spacer" colspan="2">&nbsp;</td></tr>
{foreach from=$procedures item=procItem} {foreach from=$procedures item=procItem}
htdocs/templates2/ocstyle/res_newevents.tpl
+1 -1
View File
@@ -3,7 +3,7 @@
* *
* Unicode Reminder メモ * Unicode Reminder メモ
***************************************************************************} ***************************************************************************}
<ul class="nodot" {if !$opt.msie}style="clear:both"{/if}> {* 'clear' is needed because the content2-container above is float:left *} <ul class="nodot">
{foreach name=events from=$events item=eventitem} {foreach name=events from=$events item=eventitem}
<li class="newcache_list_multi" style="margin-bottom: 8px;"> <li class="newcache_list_multi" style="margin-bottom: 8px;">
<table class="null" cellspacing="0" cellpadding="0"><tr> <table class="null" cellspacing="0" cellpadding="0"><tr>
htdocs/templates2/ocstyle/restorecaches.tpl
+2
View File
@@ -10,6 +10,7 @@
{t}Revert Vandalism{/t} {t}Revert Vandalism{/t}
</div> </div>
<div class="content2-container">
{* step 1: select user *} {* step 1: select user *}
{if $step == 1} {if $step == 1}
<form method="post" action="restorecaches.php"> <form method="post" action="restorecaches.php">
@@ -208,3 +209,4 @@
{/if} {/if}
{/if} {/if}
</div>
htdocs/templates2/ocstyle/search.tpl
+1 -1
View File
@@ -433,7 +433,7 @@ function switchAttributeCat2()
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td style="padding-top:0">
<input id="orderRatingFirst" type="checkbox" name="orderRatingFirst" class="checkbox" value="1" onclick="sync_options(this)" {if $orderRatingFirst_checked}checked="checked"{/if} /> <input id="orderRatingFirst" type="checkbox" name="orderRatingFirst" class="checkbox" value="1" onclick="sync_options(this)" {if $orderRatingFirst_checked}checked="checked"{/if} />
<label for="orderRatingFirst">{t}Show recommendation from other users first{/t}</label> <label for="orderRatingFirst">{t}Show recommendation from other users first{/t}</label>
</td> </td>
htdocs/templates2/ocstyle/viewcache.tpl
+2 -2
View File
@@ -88,7 +88,7 @@
{/if} {/if}
<!-- Cachemeta --> <!-- Cachemeta -->
<div class="content2-container line-box"> <div class="content2-container line-box" style="float:left"> {* div height will be wroing without float:left - why *}
<div class=""> <div class="">
<div class="nav4"> <div class="nav4">
<ul id="cachemenu"> <ul id="cachemenu">
@@ -403,7 +403,7 @@
</p> </p>
</div> </div>
<div class="content2-container content2-section-no-p"> <div class="content2-container content2-section-no-p" style="float:left"> {* bottom margin would not work without float:left - why? *}
{foreach from=$pictures item=pictureItem} {foreach from=$pictures item=pictureItem}
<div class="viewcache-pictureblock"> <div class="viewcache-pictureblock">
<div class="img-shadow"> <div class="img-shadow">