resolved merge conflict

htdocs/config2/locale.inc.php

@@ -21,25 +21,25 @@
 	 *
 	 */
 	$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']['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']['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']['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']['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']['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']['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']['ES']['show'] = true;
 	$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']['name'] = 'Svenska';
 	$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']['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']['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']['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'] = '日本語';
 
 	// geokrety language key association

htdocs/config2/settings-dist.inc.php

@@ -133,7 +133,7 @@
 	 * 
 	 * 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']['path'] = '/';
 	$opt['session']['domain'] = '';    // may be overwritten by $opt['domain'][...]['cookiedomain']

htdocs/lang/de/ocstyle/main.tpl.php

@@ -62,7 +62,7 @@
 		<meta http-equiv="gallerimg" content="no" />
 		<meta http-equiv="cache-control" content="no-cache" />
 		<link rel="SHORTCUT ICON" href="favicon.ico">
-		<link rel="stylesheet" type="text/css" media="screen,projection" href="resource2/{style}/css/style_screen.css">
+		<link rel="stylesheet" type="text/css" media="screen,projection" href="resource2/{style}/css/style_screen.css?ft={screen_css_time}">
       <script type="text/javascript">
 				<!--
 <?php
@@ -108,38 +108,31 @@
 				}
 				//-->
       </script>
-  	<link rel="stylesheet" type="text/css" media="print" href="resource2/{style}/css/style_print.css">
+		<link rel="stylesheet" type="text/css" media="print" href="resource2/{style}/css/style_print.css?ft={print_css_time}">
 		<script type="text/javascript" src="resource2/{style}/js/enlargeit.js"></script>
 		{htmlheaders}
 	</head>
 
 	<body>
 		<div id="overall">
-				<div id="langstripe">
+			<div id="langstripe">
 
 				<!-- Navigation Level 1 -->
-				<div class="nav1-container">
-					<div class="nav1" style="text-align: right; margin-right: 20px;">
-						{loginbox}
-					</div>
-				</div>
-
-					<div class="navflag">
-						<ul>
-							<li><strong>{t}Language:{/t}</strong></li>
+				<table class="nav1" cellspacing=0>
+					<tr>
+						<td width="100%">
+							&nbsp; {loginbox}
+						</td>
+						<td><strong>{t}Language:{/t}&nbsp;</strong></td>
+						<td>
 <?php
-							$nbsp = "";
 							foreach ($opt['template']['locales'] AS $k => $lang)
-							{
 								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>';
-								// 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;";
-							}
+									echo '<a style="text-decoration: none;" href="index.php?locale=' . $k . '"><img src="' . $lang['flag'] . '" alt="' . $lang['name'] . '" width="24px" height="18px" /></a> '; 
 ?>
-            	<li>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}</strong></li>
-							<li>
+						</td>
+						<td>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}&nbsp;</strong></td>
+						<td>
 								<select id="usercountry" onclick="javascript:usercountry_change()">
 <?php
 									global $tpl_usercountries;
@@ -164,11 +157,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>';
 									}
 ?>
-								</select>
-							</li>
-            </ul>
-					</div>
-				</div>
+								</select>&nbsp;
+            </td>
+					</tr>
+				</table>
+			</div>
 		  <div class="page-container-1" style="position: relative;">
 				<div id="bg1">&nbsp;</div>
 				<div id="bg2">&nbsp;</div>

htdocs/lang/de/ocstyle/varset.inc.php

@@ -26,8 +26,8 @@
 	tpl_set_var('runtime', '');
 
 	//set up main template specific string
-	$sLoggedOut = '<b><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="formbutton_header" style="width: 65px;" onclick="javascript:submitbutton(\'LogMeIn\')"/></form></b>';
-	$sLoggedIn = "<b>" . t('Logged in as') . ':</b> <a href="myhome.php">{username}</a> - <a href="login.php?action=logout">' . t('Logout') . '</a>';
+	$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') . ' <a href="myhome.php">{username}</a></b> - <a href="login.php?action=logout">' . t('Logout') . '</a>';
 
 	// target in Loginbox setzen
 	$target = basename($_SERVER['PHP_SELF']).'?';

htdocs/lib/common.inc.php

@@ -432,7 +432,7 @@ function __autoload($class_name)
 	function tpl_BuildTemplate($dbdisconnect=true)
 	{
 		//template handling vars
-		global $stylepath, $tplname, $vars, $langpath, $locale, $opt, $oc_nodeid;
+		global $style, $stylepath, $tplname, $vars, $langpath, $locale, $opt, $oc_nodeid;
 		//language specific expression
 		global $error_pagenotexist;
 		//only for debbuging
@@ -440,6 +440,9 @@ function __autoload($class_name)
 		// country dropdown
 		global $tpl_usercountries;
 
+		tpl_set_var('screen_css_time',filemtime($opt['rootpath'] . "resource2/" . $style . "/css/style_screen.css"));
+		tpl_set_var('print_css_time',filemtime($opt['rootpath'] . "resource2/" . $style . "/css/style_print.css"));
+
 		if (isset($bScriptExecution))
 		{
 			$bScriptExecution->Stop();

htdocs/lib2/OcSmarty.class.php

@@ -237,6 +237,9 @@ class OcSmarty extends Smarty
 		$this->bench->stop();
 		$this->assign('sys_runtime', $this->bench->diff());
 
+		$this->assign('screen_css_time',filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_screen.css"));
+		$this->assign('print_css_time',filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_print.css"));
+
 		// check if the template is compiled
 		// if not, check if translation works correct
     $_smarty_compile_path = $this->_get_compile_path($this->name);

htdocs/resource2/ocstyle/css/style_print.css

@@ -17,7 +17,7 @@ div#map_canvas img { behavior: none; }
 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;}
-.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 */
@@ -31,7 +31,29 @@ body {font-size: 62.5%; margin: 0px auto; padding: 0px; background-color: #fffff
 /*-----------------------------------*/
 /* 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;}
 
 .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: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 */
 /*----------------------------*/
-.nav1-container { top: 35px; position: absolute; z-index: 3; background: transparent;}
-.nav1 {margin: 0px; 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;}	
-.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 {
+	height:29px;
+	}
+
+.nav1 td {
+	font-family: verdana, arial, sans serif;
+	font-size: 1.0em;
+	vertical-align: middle;
+	white-space:nowrap;
+	}
 
 /*----------------------------*/
 /* 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;}
 
 .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;}
 
@@ -460,6 +476,7 @@ input {	border:1px solid black;	background-color:white;	padding:1px; font-size:1
 *.input120 {width:120px;}	/* emailadress */
 *.input200 {width:200px;}
 *.input300 {width:300px;}
+*.input350 {width:350px;}	/* overwrite saved query */
 *.input400 {width:400px;}	/* short cachedescription */
 
 input.checkbox {width:12px; height:12px; font-size:12px; border:0;}

htdocs/resource2/ocstyle/css/style_screen.css

@@ -46,8 +46,8 @@ div#langstripe {
 	top: 0;
 	left: 0;
 	width: 100%;
-	padding-top: 3px;
-	height: 28px;
+	padding-top: 0;
+	height: 31px;
 	background: #707070 url(../images/bg-langstripe.png) 0 100% repeat-x;
 	color: black;
 	z-index: 5;
@@ -124,7 +124,6 @@ div#bg2 {display: none;}
 	border: 0px none;
 }
 
-
 .site-name {
 	width: 300px;
 	height: 60px;
@@ -160,28 +159,19 @@ div#bg2 {display: none;}
 .site-slogan a {color: rgb(234,239,247); text-decoration: underline;}
 .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 */
 /*----------------------------*/
-/* .nav1-container {width: 970px; top: 35px; position: absolute; z-index: 3; background: transparent;} */
-.nav1-container {left: 5px; background: transparent; position: absolute; float: left;} 
+.nav1 {
+	height:29px;
+	}
 
-.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;}	
-.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 */

htdocs/resource2/ocstyle/js/session.js

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

htdocs/templates2/ocstyle/sys_main.tpl

@@ -18,8 +18,8 @@
 		<meta http-equiv="gallerimg" content="no" />
 		<meta http-equiv="cache-control" content="no-cache" />
 		<link rel="SHORTCUT ICON" href="favicon.ico">
-		<link rel="stylesheet" type="text/css" media="screen,projection" href="resource2/{$opt.template.style}/css/style_screen.css">
-		<link rel="stylesheet" type="text/css" media="print" href="resource2/{$opt.template.style}/css/style_print.css">
+		<link rel="stylesheet" type="text/css" media="screen,projection" href="resource2/{$opt.template.style}/css/style_screen.css?ft={$screen_css_time}">
+		<link rel="stylesheet" type="text/css" media="print" href="resource2/{$opt.template.style}/css/style_print.css?ft={$print_css_time}">
 		{literal}
 			<script type="text/javascript">
 			<!--
@@ -94,32 +94,35 @@
 			<div id="langstripe">
 
 				{* <!-- Navigation Level 1 --> *}
-				<div class="nav1-container">
-					{if $opt.session.url==true}
-						<div id="sessionWarn">
-							Automatische Abmeldung in <div id="sessionTimout">0</div>&nbsp;Minuten - <a href="#" onclick="cancelSessionTimeout()">Abbrechen</a>
-						</div>
-					{/if}
-					<div class="nav1" style="text-align: right; margin-right: 20px;">
-						{nocache}
-							{if ($login.userid==0)}
-								<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="formbutton_header" style="width: 65px;" type="submit"></form></b>	
-							{else}
-								<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;
+				<table class="nav1" cellspacing=0>
+					<tr>
+						{if $opt.session.url==true}
+							<div id="sessionWarn">
+								{* message is not properly formated and displays always 0 
+							   don't enable this feature until this is fixed and tested *}												
+								Automatische Abmeldung in <div id="sessionTimout">0</div>&nbsp;Minuten - <a href="#" onclick="cancelSessionTimeout()">Abbrechen</a>
+							</div>
+						{/if}
+						<td width="100%">
+							{nocache}
+								&nbsp;
+								{if $login.userid==0}
+									<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>	
+								{else}
+									<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>
+								{/if}
+							{/nocache}
+						</td>
+						<td><strong>{t}Language:{/t}&nbsp;</strong></td>
+						<td>
+							{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}
-						{/nocache}  
-					</div>
-				</div>
-				<div class="navflag">
-					<ul>
-						<li><strong>{t}Language:{/t}</strong></li>
-						{foreach from=$opt.template.locales key=localeKey item=localeItem}
-							{if $localeItem.show}
-								<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>
-							{/if}
-						{/foreach}
-						<li>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}</strong></li>
-						<li>
+							{/foreach}
+						</td>
+						<td>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}&nbsp;</strong></td>
+						<td>
 							<select id="usercountry" onclick="javascript:usercountry_change()">
 								{foreach from=$opt.template.usercountrieslist item=countryItem name=userCountryList}
 									{if $countryItem.begin_group==1 || $smarty.foreach.userCountryList.first}
@@ -137,10 +140,10 @@
 									{/if}
 									<option value="{$countryItem.country|escape}"{if $opt.template.country==$countryItem.country} selected="selected"{/if}>{$countryItem.name|escape}</option>
 								{/foreach}
-							</select>
-						</li>
-					</ul>
-				</div>
+							</select>&nbsp;
+						</td>
+					</tr>
+				</table>
 			</div>
 			<div class="page-container-1" style="position: relative;">