Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1527)
+++ branches/2.8.x/CHANGELOG	(revision 1528)
@@ -13,7 +13,9 @@
 =========================== add small Features 2.8.2 ==========================
 
 ----------------------------------- Fixes 2.8.2 --------------------------------
-20 Nov-2011 Build 1527 Dietmar Woellbrink (Luisehahne)
+23 Nov-2011 Build 1528 Dietmar Woellbrink (Luisehahne)
+! rework login and show_menu in templates allcss and round 
+22 Nov-2011 Build 1527 Dietmar Woellbrink (Luisehahne)
 # fix redirect login
 20 Nov-2011 Build 1526 Dietmar Woellbrink (Luisehahne)
 # typofix in BG and RU
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1527)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1528)
@@ -52,4 +52,4 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.2');
-if(!defined('REVISION')) define('REVISION', '1526');
+if(!defined('REVISION')) define('REVISION', '1528');
Index: branches/2.8.x/wb/templates/allcss/index.php
===================================================================
--- branches/2.8.x/wb/templates/allcss/index.php	(revision 1527)
+++ branches/2.8.x/wb/templates/allcss/index.php	(revision 1528)
@@ -79,19 +79,17 @@
 
 	<!-- main navigation menu -->
 	<div class="menu">
-		<?php show_menu(1, 0, -1, true, 
-			'<li><span [class]>[a][menu_title][/a]</span>', '</li>', 
-			'<ul>', '</ul>', 'class="menu_default"', 'class="menu_current"', 0
-			); 
-		?>
-		
-		<?php
+<?php show_menu2(SM2_ALLMENU, SM2_ROOT, SM2_ROOT+PAGE_LEVEL_LIMIT, SM2_ALL|SM2_NUMCLASS );	?>
+<?php
 		// CODE FOR WEBSITE BAKER FRONTEND LOGIN
-		if (FRONTEND_LOGIN == 'enabled' && VISIBILITY != 'private' 
-			&& $wb->get_session('USER_ID') == '') { ?>
+		if (FRONTEND_LOGIN == 'enabled' && VISIBILITY != 'private' && $wb->get_session('USER_ID') == '') {
+				$redirect_url = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : WB_URL );
+				$redirect_url = (isset($thisApp->redirect_url) ? $thisApp->redirect_url : $redirect_url );
+?>
 			<!-- login form -->
 			<br />
 			<form name="login" id="login" action="<?php echo LOGIN_URL; ?>" method="post">
+				<input type="hidden" name="redirect" value="<?php echo $redirect_url;?>" /></p>
 				<fieldset>
 					<legend><?php echo $TEXT['LOGIN']; ?></legend>
 					<label for="username" accesskey="1"><?php echo $TEXT['USERNAME']; ?>:</label>
Index: branches/2.8.x/wb/templates/round/index.php
===================================================================
--- branches/2.8.x/wb/templates/round/index.php	(revision 1527)
+++ branches/2.8.x/wb/templates/round/index.php	(revision 1528)
@@ -78,7 +78,7 @@
 		</tr>
 		<tr>
 			<td width="170">
-				<?php show_menu(); ?>
+<?php show_menu2(SM2_ALLMENU,SM2_ROOT, SM2_ROOT+PAGE_LEVEL_LIMIT, SM2_ALL|SM2_NUMCLASS );	?>
 			</td>
 		</tr>
 		<tr>
@@ -119,11 +119,13 @@
 		</form>
 		<?php } ?>
 		
-		<?php
-		if(FRONTEND_LOGIN AND !$wb->is_authenticated()) {
-		?>
+<?php
+		if(FRONTEND_LOGIN AND !$wb->is_authenticated() AND VISIBILITY != 'private' ) {
+			$redirect_url = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : WB_URL );
+			$redirect_url = (isset($thisApp->redirect_url) ? $thisApp->redirect_url : $redirect_url );
+?>
 		<form name="login" action="<?php echo LOGIN_URL; ?>" method="post">
-			
+			<input type="hidden" name="redirect" value="<?php echo $redirect_url;?>" /></p>
 			<table cellpadding="0" cellspacing="0" border="0" width="150" align="center" style="margin-top: 10px;">
 			<tr>
 				<td class="border">