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

nicer header line display

Browse Source 
- all items levelled in one line
- flags better centered in msie and in firefox
- removed three white pixel lines (line 0-2) in firefox
- all flags shown with a bit shadow, instead of only spain [and sweden]
- nicer display of "logged in as <user>"
- all labels in the same font instead of two fonts
- smoother gradient background, espacially in winter

Still not optimally vertical centered in chrome

also fixed print css for some earlier changes to screen css
This commit is contained in:
following 2013-02-27 03:11:00 +01:00
parent eb6ac249f4
commit f9e2dfa9fd
33 changed files with 114 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/config2/locale.inc.php
View File

@ -21,25 +21,25 @@
* *
*/ */
$opt['template']['locales']['DE']['show'] = true; $opt['template']['locales']['DE']['show'] = true;
$opt['template']['locales']['DE']['flag'] = 'images/flag/DE.gif'; $opt['template']['locales']['DE']['flag'] = 'images/flag/DE.png';
$opt['template']['locales']['DE']['name'] = 'Deutsch'; $opt['template']['locales']['DE']['name'] = 'Deutsch';
$opt['template']['locales']['FR']['show'] = true; $opt['template']['locales']['FR']['show'] = true;
$opt['template']['locales']['FR']['flag'] = 'images/flag/FR.gif'; $opt['template']['locales']['FR']['flag'] = 'images/flag/FR.png';
$opt['template']['locales']['FR']['name'] = 'Français'; $opt['template']['locales']['FR']['name'] = 'Français';
$opt['template']['locales']['NL']['show'] = true; $opt['template']['locales']['NL']['show'] = true;
$opt['template']['locales']['NL']['flag'] = 'images/flag/NL.gif'; $opt['template']['locales']['NL']['flag'] = 'images/flag/NL.png';
$opt['template']['locales']['NL']['name'] = 'Nederlands'; $opt['template']['locales']['NL']['name'] = 'Nederlands';
$opt['template']['locales']['EN']['show'] = true; $opt['template']['locales']['EN']['show'] = true;
$opt['template']['locales']['EN']['flag'] = 'images/flag/EN.gif'; $opt['template']['locales']['EN']['flag'] = 'images/flag/EN.png';
$opt['template']['locales']['EN']['name'] = 'English'; $opt['template']['locales']['EN']['name'] = 'English';
$opt['template']['locales']['PL']['show'] = true; $opt['template']['locales']['PL']['show'] = true;
$opt['template']['locales']['PL']['flag'] = 'images/flag/PL.gif'; $opt['template']['locales']['PL']['flag'] = 'images/flag/PL.png';
$opt['template']['locales']['PL']['name'] = 'Polski'; $opt['template']['locales']['PL']['name'] = 'Polski';
$opt['template']['locales']['IT']['show'] = true; $opt['template']['locales']['IT']['show'] = true;
$opt['template']['locales']['IT']['flag'] = 'images/flag/IT.gif'; $opt['template']['locales']['IT']['flag'] = 'images/flag/IT.png';
$opt['template']['locales']['IT']['name'] = 'Italiano'; $opt['template']['locales']['IT']['name'] = 'Italiano';
$opt['template']['locales']['RU']['show'] = true; $opt['template']['locales']['RU']['show'] = true;
$opt['template']['locales']['RU']['flag'] = 'images/flag/RU.gif'; $opt['template']['locales']['RU']['flag'] = 'images/flag/RU.png';
$opt['template']['locales']['RU']['name'] = 'Русский'; $opt['template']['locales']['RU']['name'] = 'Русский';
$opt['template']['locales']['ES']['show'] = true; $opt['template']['locales']['ES']['show'] = true;
$opt['template']['locales']['ES']['flag'] = 'images/flag/ES.png'; $opt['template']['locales']['ES']['flag'] = 'images/flag/ES.png';
@ -48,16 +48,16 @@
$opt['template']['locales']['SV']['flag'] = 'images/flag/SE.png'; $opt['template']['locales']['SV']['flag'] = 'images/flag/SE.png';
$opt['template']['locales']['SV']['name'] = 'Svenska'; $opt['template']['locales']['SV']['name'] = 'Svenska';
$opt['template']['locales']['NO']['show'] = true; // no_NO $opt['template']['locales']['NO']['show'] = true; // no_NO
$opt['template']['locales']['NO']['flag'] = 'images/flags/no.gif'; $opt['template']['locales']['NO']['flag'] = 'images/flags/no.png';
$opt['template']['locales']['NO']['name'] = 'Norsk'; $opt['template']['locales']['NO']['name'] = 'Norsk';
$opt['template']['locales']['DA']['show'] = true; // da_DK $opt['template']['locales']['DA']['show'] = true; // da_DK
$opt['template']['locales']['DA']['flag'] = 'images/flags/dk.gif'; $opt['template']['locales']['DA']['flag'] = 'images/flags/dk.png';
$opt['template']['locales']['DA']['name'] = 'Danske'; $opt['template']['locales']['DA']['name'] = 'Danske';
$opt['template']['locales']['PT']['show'] = true; // pt_PT $opt['template']['locales']['PT']['show'] = true; // pt_PT
$opt['template']['locales']['PT']['flag'] = 'images/flags/pt.gif'; $opt['template']['locales']['PT']['flag'] = 'images/flags/pt.png';
$opt['template']['locales']['PT']['name'] = 'Portuguesa'; $opt['template']['locales']['PT']['name'] = 'Portuguesa';
$opt['template']['locales']['JA']['show'] = true; // ja_JP $opt['template']['locales']['JA']['show'] = true; // ja_JP
$opt['template']['locales']['JA']['flag'] = 'images/flag/JP.gif'; $opt['template']['locales']['JA']['flag'] = 'images/flag/JP.png';
$opt['template']['locales']['JA']['name'] = '日本語'; $opt['template']['locales']['JA']['name'] = '日本語';
// geokrety language key association // geokrety language key association

2
htdocs/config2/settings-dist.inc.php
View File

@ -133,7 +133,7 @@
* *
* other parameters may be customized * other parameters may be customized
*/ */
$opt['session']['mode'] = SAVE_COOKIE; $opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly
$opt['session']['cookiename'] = 'oc_devel'; // only with SAVE_COOKIE $opt['session']['cookiename'] = 'oc_devel'; // only with SAVE_COOKIE
$opt['session']['path'] = '/'; $opt['session']['path'] = '/';
$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain'] $opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain']

BIN
htdocs/images/flag/CZ.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 680 B

BIN
htdocs/images/flag/CZ.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 659 B

BIN
htdocs/images/flag/DE.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 655 B

BIN
htdocs/images/flag/DE.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 463 B

BIN
htdocs/images/flag/EN.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
htdocs/images/flag/EN.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
htdocs/images/flag/ES.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 666 B

After

Width:  |  Height:  |  Size: 654 B

BIN
htdocs/images/flag/FR.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 674 B

BIN
htdocs/images/flag/FR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 512 B

BIN
htdocs/images/flag/IT.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 674 B

BIN
htdocs/images/flag/IT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 514 B

BIN
htdocs/images/flag/JA.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 573 B

BIN
htdocs/images/flag/JP.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 639 B

BIN
htdocs/images/flag/NL.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 404 B

BIN
htdocs/images/flag/NL.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 409 B

BIN
htdocs/images/flag/PL.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 390 B

BIN
htdocs/images/flag/PL.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 329 B

BIN
htdocs/images/flag/RU.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 408 B

BIN
htdocs/images/flag/RU.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 387 B

BIN
htdocs/images/flag/SE.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 636 B

After

Width:  |  Height:  |  Size: 690 B

BIN
htdocs/images/flag/US.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 671 B

41
htdocs/lang/de/ocstyle/main.tpl.php
View File

@ -99,31 +99,24 @@
<body> <body>
<div id="overall"> <div id="overall">
<div id="langstripe"> <div id="langstripe">
<!-- Navigation Level 1 --> <!-- Navigation Level 1 -->
<div class="nav1-container"> <table class="nav1" cellspacing=0>
<div class="nav1" style="text-align: right; margin-right: 20px;"> <tr>
{loginbox} <td width="100%">
</div> &nbsp; {loginbox}
</div> </td>
<td><strong>{t}Language:{/t}&nbsp;</strong></td>
<div class="navflag"> <td>
<ul>
<li><strong>{t}Language:{/t}</strong></li>
<?php <?php
$nbsp = "";
foreach ($opt['template']['locales'] AS $k => $lang) foreach ($opt['template']['locales'] AS $k => $lang)
{
if ($lang['show'] == true) if ($lang['show'] == true)
echo '<li>' . $nbsp . '<a style="text-decoration: none;" href="index.php?locale=' . $k . '"><img src="' . $lang['flag'] . '" alt="' . $lang['name'] . '" width="24px" height="24px" /></a></li>'; echo '<a style="text-decoration: none;" href="index.php?locale=' . $k . '"><img src="' . $lang['flag'] . '" alt="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
// insert space between flags to match search.php layout with other pages (see RT ticket #4505);
// reason of different flag spacing is unknown
$nbsp = "&nbsp;";
}
?> ?>
<li>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}</strong></li> </td>
<li> <td>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}&nbsp;</strong></td>
<td>
<select id="usercountry" onclick="javascript:usercountry_change()"> <select id="usercountry" onclick="javascript:usercountry_change()">
<?php <?php
global $tpl_usercountries; global $tpl_usercountries;
@ -148,11 +141,11 @@
echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry==$tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>'; echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry==$tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';
} }
?> ?>
</select> </select>&nbsp;
</li> </td>
</ul> </tr>
</div> </table>
</div> </div>
<div class="page-container-1" style="position: relative;"> <div class="page-container-1" style="position: relative;">
<div id="bg1">&nbsp;</div> <div id="bg1">&nbsp;</div>
<div id="bg2">&nbsp;</div> <div id="bg2">&nbsp;</div>

4
htdocs/lang/de/ocstyle/varset.inc.php
View File

@ -26,8 +26,8 @@
tpl_set_var('runtime', ''); tpl_set_var('runtime', '');
//set up main template specific string //set up main template specific string
$sLoggedOut = '<form action="login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;">' . t('User') . ':&nbsp;<input name="email" size="10" type="text" class="textboxes" value="" />&nbsp;' . t('Password') . ':&nbsp;<input name="password" size="10" type="password" class="textboxes" value="" />&nbsp;<input type="hidden" name="action" value="login" /><input type="hidden" name="target" value="{target}" /><input type="submit" name="LogMeIn" value="' . t('Login') . '" class="formbuttons" style="width: 60px;" /></form>'; $sLoggedOut = '<form action="login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;"><b>' . t('User') . ':</b>&nbsp;&nbsp;<input name="email" size="10" type="text" class="textboxes" value="" />&nbsp;&nbsp;&nbsp;<b>' . t('Password') . ':</b>&nbsp;&nbsp;<input name="password" size="10" type="password" class="textboxes" value="" />&nbsp;<input type="hidden" name="action" value="login" /><input type="hidden" name="target" value="{target}" />&nbsp;<input type="submit" name="LogMeIn" value="' . t('Login') . '" class="formbuttons" style="width: 65px;" /></form>';
$sLoggedIn = "<b>" . t('Logged in as') . ':</b> <a href="myhome.php">{username}</a> - <a href="login.php?action=logout">' . t('Logout') . '</a>'; $sLoggedIn = "<b>" . t('Logged in as') . ' <a href="myhome.php">{username}</a></b> - <a href="login.php?action=logout">' . t('Logout') . '</a>';
// target in Loginbox setzen // target in Loginbox setzen
$target = basename($_SERVER['PHP_SELF']).'?'; $target = basename($_SERVER['PHP_SELF']).'?';

BIN
htdocs/resource2/ocstyle/css/seasons/bg-langstripe-autumn.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 152 B

BIN
htdocs/resource2/ocstyle/css/seasons/bg-langstripe-spring.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 157 B

BIN
htdocs/resource2/ocstyle/css/seasons/bg-langstripe-summer.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 202 B

After

Width:  |  Height:  |  Size: 166 B

BIN
htdocs/resource2/ocstyle/css/seasons/bg-langstripe-winter.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 210 B

55
htdocs/resource2/ocstyle/css/style_print.css
View File

@ -17,7 +17,7 @@ div#map_canvas img { behavior: none; }
div#cacheinfo { background-color: blue;} div#cacheinfo { background-color: blue;}
body {font-size: 62.5%; margin: 0px auto; padding: 0px; background-color: #ffffff; font-family: arial, sans-serif, Tahoma, Verdana;} body {font-size: 62.5%; margin: 0px auto; padding: 0px; background-color: #ffffff; font-family: arial, sans-serif, Tahoma, Verdana;}
.page-container-1 { margin: 0px auto; padding: 0px; background-color:#ffffff; border: solid 1px rgb(100,100,100);} .page-container-1 { margin: 29px auto auto auto; padding: 0px; background-color:#ffffff; border: solid 1px rgb(100,100,100);}
/*************************************/ /*************************************/
/* SECTION 2 - HEADER AND NAVIGATION */ /* SECTION 2 - HEADER AND NAVIGATION */
@ -31,7 +31,29 @@ body {font-size: 62.5%; margin: 0px auto; padding: 0px; background-color: #fffff
/*-----------------------------------*/ /*-----------------------------------*/
/* 2.1 - Sitename, slogan and banner */ /* 2.1 - Sitename, slogan and banner */
/*-----------------------------------*/ /*-----------------------------------*/
.header {height:81px;} .header {
height: 81px;
}
.headerimage {
height: 80px;
width: 970px;
overflow: hidden;
position: absolute;
top: 1px;
z-index: 1;
}
.headerlogo {
position: absolute;
top: 0px;
z-index: 2;
}
.headerimagecontent {
border: 0px none;
}
.mapa {background-image: url(../../../images/celownik.png); height:180px; width:180px;} .mapa {background-image: url(../../../images/celownik.png); height:180px; width:180px;}
.site-name {width: 300px; height: 45px; top: 12px; position: absolute; z-index: 4; overflow: hidden; margin: 0px; padding-left: 80px;} .site-name {width: 300px; height: 45px; top: 12px; position: absolute; z-index: 4; overflow: hidden; margin: 0px; padding-left: 80px;}
@ -54,26 +76,19 @@ body {font-size: 62.5%; margin: 0px auto; padding: 0px; background-color: #fffff
.site-slogan a {color: rgb(234,239,247); text-decoration: underline;} .site-slogan a {color: rgb(234,239,247); text-decoration: underline;}
.site-slogan a:hover {text-decoration: none; color: rgb(50,50,50);} .site-slogan a:hover {text-decoration: none; color: rgb(50,50,50);}
/*--------------------------*/
/* 2.2 - Navigation - Flags */
/*--------------------------*/
.navflag-container { top: 14px; position: absolute; z-index: 2; background-color: transparent;}
.navflag {margin: 0px; padding: 0px; font-size: 1.0em;}
.navflag ul {float: right; margin: 0px; padding: 0px 20px 0px 0px;}
.navflag li {display: inline; list-style: none; margin: 0px; padding: 0px;}
.navflag li a {margin: 0px; padding: 0px 0px 0px 1px;}
.navflag a:hover {color: rgb(0,0,0); text-decoration: none;}
.img-navflag {display: inline; height: 14px; margin: 0px; padding: 0px; border: none;}
/*----------------------------*/ /*----------------------------*/
/* 2.3 - Navigation - Level 1 */ /* 2.3 - Navigation - Level 1 */
/*----------------------------*/ /*----------------------------*/
.nav1-container { top: 35px; position: absolute; z-index: 3; background: transparent;} .nav1 {
.nav1 {margin: 0px; padding: 0px; font-family: verdana, arial, sans serif; font-size: 1.0em;} height:29px;
.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;} }
.nav1 li {display: inline; list-style: none; margin: 0px; padding: 0px;}
.nav1 li a {display: block; float: left; margin: 0px; padding: 2px 5px 2px 5px; border-right: solid 1px rgb(115,162,182); color: rgb(115,162,182); text-decoration: none; font-size: 10px;} .nav1 td {
.nav1 a:hover, .nav2 a.selected {color: rgb(50,50,50); text-decoration: none;} font-family: verdana, arial, sans serif;
font-size: 1.0em;
vertical-align: middle;
white-space:nowrap;
}
/*----------------------------*/ /*----------------------------*/
/* 2.4 - Navigation - Level 2 */ /* 2.4 - Navigation - Level 2 */
@ -130,6 +145,7 @@ ul#statmenu { padding: 0px; margin: 0px;}
.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;} .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;}
.errormsg {color: rgb(240,100,100); font-weight: bold;} .errormsg {color: rgb(240,100,100); font-weight: bold;}
.okmsg {color: rgb(0,191,0); font-weight: bold;}
#cache_name_block { width: 670px; padding-left: 5px; padding-top: 5px;} #cache_name_block { width: 670px; padding-left: 5px; padding-top: 5px;}
@ -461,6 +477,7 @@ input { border:1px solid black; background-color:white; padding:1px; font-size:1
*.input120 {width:120px;} /* emailadress */ *.input120 {width:120px;} /* emailadress */
*.input200 {width:200px;} *.input200 {width:200px;}
*.input300 {width:300px;} *.input300 {width:300px;}
*.input350 {width:350px;} /* overwrite saved query */
*.input400 {width:400px;} /* short cachedescription */ *.input400 {width:400px;} /* short cachedescription */
input.checkbox {width:12px; height:12px; font-size:12px; border:0;} input.checkbox {width:12px; height:12px; font-size:12px; border:0;}

33
htdocs/resource2/ocstyle/css/style_screen.css
View File

@ -46,8 +46,8 @@ div#langstripe {
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
padding-top: 3px; padding-top: 0;
height: 28px; height: 31px;
background: #707070 url(../images/bg-langstripe.png) 0 100% repeat-x; background: #707070 url(../images/bg-langstripe.png) 0 100% repeat-x;
color: black; color: black;
z-index: 5; z-index: 5;
@ -124,7 +124,6 @@ div#bg2 {display: none;}
border: 0px none; border: 0px none;
} }
.site-name { .site-name {
width: 300px; width: 300px;
height: 60px; height: 60px;
@ -160,28 +159,20 @@ div#bg2 {display: none;}
.site-slogan a {color: rgb(234,239,247); text-decoration: underline;} .site-slogan a {color: rgb(234,239,247); text-decoration: underline;}
.site-slogan a:hover {text-decoration: none; color: rgb(50,50,50);} .site-slogan a:hover {text-decoration: none; color: rgb(50,50,50);}
/*--------------------------*/
/* 2.2 - Navigation - Flags */
/*--------------------------*/
.navflag-container {width: 970px; top: 14px; position: absolute; z-index: 2; background-color: transparent;}
.navflag {margin: 0px; padding: 0px; font-size: 1.0em; }
.navflag ul {float: right; margin: 0px; padding: 0px 20px 0px 0px;}
.navflag li {display: inline; list-style: none; margin: 0px; padding: 0px;}
.navflag li a {margin: 0px; padding: 0px 0px 0px 1px;}
.navflag a:hover {color: rgb(0,0,0); text-decoration: none;}
.img-navflag {display: inline; height: 14px; margin: 0px; padding: 0px; border: none;}
/*----------------------------*/ /*----------------------------*/
/* 2.3 - Navigation - Level 1 */ /* 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 {margin: 3px; padding: 0px; font-family: verdana, arial, sans serif; font-size: 1.0em;} .nav1 {
.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;} height:29px;
.nav1 li {display: inline; list-style: none; margin: 0px; padding: 0px;} }
.nav1 li a {display: block; float: left; margin: 0px; padding: 2px 5px 2px 5px; border-right: solid 1px rgb(115,162,182); color: rgb(115,162,182); text-decoration: none; font-size: 10px;}
.nav1 a:hover, .nav2 a.selected {color: rgb(50,50,50); text-decoration: none;} .nav1 td {
font-family: verdana, arial, sans serif;
font-size: 1.0em;
vertical-align: middle;
white-space:nowrap;
}
/*----------------------------*/ /*----------------------------*/
/* 2.4 - Navigation - Level 2 */ /* 2.4 - Navigation - Level 2 */

4
htdocs/resource2/ocstyle/js/session.js
View File

@ -5,6 +5,10 @@
* *
* Unicode Reminder メモ * Unicode Reminder メモ
***************************************************************************/ ***************************************************************************/
// implementation incomplete in sys_main.tpl and missing in main.tpl
// therefore not in use
var nSessionTimeout = 30; // in minutes (default 30) var nSessionTimeout = 30; // in minutes (default 30)
nSessionTimeout -= 3; // tolerance nSessionTimeout -= 3; // tolerance

59
htdocs/templates2/ocstyle/sys_main.tpl
View File

@ -78,32 +78,35 @@
<div id="langstripe"> <div id="langstripe">
{* <!-- Navigation Level 1 --> *} {* <!-- Navigation Level 1 --> *}
<div class="nav1-container"> <table class="nav1" cellspacing=0>
{if $opt.session.url==true} <tr>
<div id="sessionWarn"> {if $opt.session.url==true}
Automatische Abmeldung in <div id="sessionTimout">0</div>&nbsp;Minuten - <a href="#" onclick="cancelSessionTimeout()">Abbrechen</a> <div id="sessionWarn">
</div> {* message is not properly formated and displays always 0
{/if} don't enable this feature until this is fixed and tested *}
<div class="nav1" style="text-align: right;"> Automatische Abmeldung in <div id="sessionTimout">0</div>&nbsp;Minuten - <a href="#" onclick="cancelSessionTimeout()">Abbrechen</a>
{nocache} </div>
{if ($login.userid==0)} {/if}
<b><form action="login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;">{t}User{/t}:&nbsp;<input name="email" size="10" type="text" class="textboxes" value="" />&nbsp;{t}Password{/t}:&nbsp;<input name="password" size="10" type="password" class="textboxes" value="" />&nbsp;<input type="hidden" name="action" value="login" /><input type="hidden" name="target" value="{$opt.page.target|escape}" /><input name="LogMeIn" value="{t}Login{/t}" class="formbuttons" style="width: 60px;" type="submit"></form></b> <td width="100%">
{else} {nocache}
<b>{t}Logged in as{/t}:</b> <a href="myhome.php">{$login.username|escape}</a> - <a href="login.php?action=logout">{t}Logout{/t}</a>&nbsp; &nbsp;
{/if} {if $login.userid==0}
{/nocache} <b><form action="login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;">{t}User{/t}:&nbsp;&nbsp;<input name="email" size="10" type="text" class="textboxes" value="" />&nbsp;&nbsp;&nbsp;{t}Password{/t}:&nbsp;&nbsp;<input name="password" size="10" type="password" class="textboxes" value="" />&nbsp;<input type="hidden" name="action" value="login" /><input type="hidden" name="target" value="{$opt.page.target|escape}" />&nbsp;<input name="LogMeIn" value="{t}Login{/t}" class="formbuttons" style="width: 65px;" type="submit"></form></b>
</div> {else}
</div> <b>{t}Logged in as{/t} <a href="myhome.php">{$login.username|escape}</a></b> - <a href="login.php?action=logout">{t}Logout{/t}</a>
<div class="navflag"> {/if}
<ul> {/nocache}
<li><strong>{t}Language:{/t}</strong></li> </td>
{foreach from=$opt.template.locales key=localeKey item=localeItem} <td><strong>{t}Language:{/t}&nbsp;</strong></td>
{if $localeItem.show} <td>
<li><a style="text-decoration: none;" href="index.php?locale={$localeKey}"><img src="{$localeItem.flag}" alt="{$localeItem.name|escape}" width="24px" height="24px" /></a></li> {foreach from=$opt.template.locales key=localeKey item=localeItem}
{if $localeItem.show}
<a style="text-decoration: none;" href="index.php?locale={$localeKey}"><img src="{$localeItem.flag}" alt="{$localeItem.name|escape}" width="24px" height="18px" /></a>
{/if} {/if}
{/foreach} {/foreach}
<li>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}</strong></li> </td>
<li> <td>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}&nbsp;</strong></td>
<td>
<select id="usercountry" onclick="javascript:usercountry_change()"> <select id="usercountry" onclick="javascript:usercountry_change()">
{foreach from=$opt.template.usercountrieslist item=countryItem name=userCountryList} {foreach from=$opt.template.usercountrieslist item=countryItem name=userCountryList}
{if $countryItem.begin_group==1 || $smarty.foreach.userCountryList.first} {if $countryItem.begin_group==1 || $smarty.foreach.userCountryList.first}
@ -121,10 +124,10 @@
{/if} {/if}
<option value="{$countryItem.country|escape}"{if $opt.template.country==$countryItem.country} selected="selected"{/if}>{$countryItem.name|escape}</option> <option value="{$countryItem.country|escape}"{if $opt.template.country==$countryItem.country} selected="selected"{/if}>{$countryItem.name|escape}</option>
{/foreach} {/foreach}
</select> </select>&nbsp;
</li> </td>
</ul> </tr>
</div> </table>
</div> </div>
<div class="page-container-1" style="position: relative;"> <div class="page-container-1" style="position: relative;">