Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1741)
+++ branches/2.8.x/CHANGELOG	(revision 1742)
@@ -13,6 +13,11 @@
 
 
 
+07 Sep-2012 Build 1742 Dietmar Woellbrink (Luisehahne)
+! Now you can style account login with your frontend Template CSS
+  this change is in work for the whole account
+07 Sep-2012 Build 1741 Dietmar Woellbrink (Luisehahne)
+! Preparing Separation of code and HTML in Droplets
 05 Sep-2012 Build 1740 Dietmar Woellbrink (Luisehahne)
 ! frontend.functions.php remove return $content in page_content(), 
   incompatible with search logic
Index: branches/2.8.x/wb/admin/skel/themes/htt/login.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/login.htt	(revision 1741)
+++ branches/2.8.x/wb/admin/skel/themes/htt/login.htt	(revision 1742)
@@ -2,8 +2,8 @@
 <!-- BEGIN message_block -->
 {MESSAGE_VALUE}
 <!-- END message_block -->
-
-<hr />
+<hr /><br />
+<div class="login-box rounded" style="overflow: hidden;width:100%;">
 <form class="login-box" action="{ACTION_URL}" method="post">
 	<input type="hidden" name="action" value="login" />
 	<input type="hidden" name="username_fieldname" value="{USER_FIELDNAME}" />
@@ -10,19 +10,20 @@
 	<input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
 	<input type="hidden" name="redirect" value="{REDIRECT_URL}" />
 
-<table summary="" style="width: 60%; font-size: 1em;">
-		<tr>
-			<td height="10" colspan="2" style="text-align: center;"><h1>{TEXT_LOGIN}</h1></td>
-		</tr>
-		<tr>
-			<td height="40" style="text-align: center;" colspan="2">
-			<strong style="text-align: center;">{THISAPP_MESSAGE_VALUE}</strong>
-			</td>
-		</tr>
-<tr>
-	<td style="width:100px">{TEXT_USERNAME}:</td>
-	<td class="value_input">
-		<input type="text" name="{USER_FIELDNAME}" maxlength="30" style="width:220px;"/>
+<table summary="">
+<tbody>
+<tr class="row1">
+	<td colspan="3"><h1>{TEXT_LOGIN}</h1></td>
+</tr>
+<tr class="row2">
+	<td colspan="3">
+	<strong>{THISAPP_MESSAGE_VALUE}</strong>
+	</td>
+</tr>
+<tr class="row3">
+	<td class="bold">{TEXT_USERNAME}:</td>
+	<td colspan="2">
+		<input type="text" name="{USER_FIELDNAME}" maxlength="30"  style="width:98%;"/>
     	<script type="text/javascript">
     	// document.login.{USER_FIELDNAME}.focus();
     	var ref= document.getElementById("{USER_FIELDNAME}");
@@ -30,33 +31,40 @@
     	</script>
 	</td>
 </tr>
-<tr>
-	<td style="width:100px">{TEXT_PASSWORD}:</td>
-	<td class="value_input">
-		<input type="password" name="{PASSWORD_FIELDNAME}" maxlength="30" style="width:220px;"/>
+<tr class="row4">
+	<td class="bold">{TEXT_PASSWORD}:</td>
+	<td colspan="2">
+		<input type="password" name="{PASSWORD_FIELDNAME}" maxlength="30" style="width:98%;"/>
 	</td>
 </tr>
 <!-- BEGIN show_smart_login_block -->
 <tr>
 	<td>&nbsp;</td>
-	<td>
+	<td colspan="2">
 		<input type="checkbox" name="remember" id="remember" value="true"/>
 		<label for="remember">{TEXT_REMEMBER_ME}</label>
 	</td>
 </tr>
 <!-- END show_smart_login_block -->
-<tr>
-	<td colspan="2" style="text-align: center;">
-		<input type="submit" name="submit" value="{TEXT_LOGIN}" style="padding: 3px;"  />
-		<input type="reset" name="reset" value="{TEXT_RESET}" style="padding: 3px;"  />
-	<button type="button" value="cancel" onclick="javascript:window.location = '{WB_URL}/';" style="padding: 3px;" >{TEXT_CANCEL}</button>
+<tr class="submit">
+	<td>
+	<p><input type="submit" name="submit" value="{TEXT_LOGIN}"  /></p>
 	</td>
+	<td>
+	<p><input type="reset" name="reset" value="{TEXT_RESET}" /></p>
+	</td>
+	<td>
+	<p><button type="button" value="cancel" onclick="javascript:window.location='{WB_URL}/';" >{TEXT_CANCEL}</button></p>
+	</td>
 </tr>
-<tr>
-	<td colspan="2" style="text-align: center;">
+<tr class="row6">
+	<td colspan="3">
 	<p class="link"><a href="{FORGOT_URL}">{TEXT_FORGOTTEN_DETAILS}</a></p>
 	</td>
 </tr>
+</tbody>
 </table>
 </form>
+</div>
+
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/skel/themes/htt/forgot.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/forgot.htt	(revision 1741)
+++ branches/2.8.x/wb/admin/skel/themes/htt/forgot.htt	(revision 1742)
@@ -2,45 +2,52 @@
 <!-- BEGIN message_block -->
 {MESSAGE_VALUE}
 <!-- END message_block -->
-
-<hr />
-<form class="forgot-box" action="{ACTION_URL}" method="post">
+<hr /><br />
+<div class="login-box rounded" style="overflow: hidden;width:100%;">
+<form class="login-box" action="{ACTION_URL}" method="post">
 	<input type="hidden" name="action" value="forgot" />
 	<input type="hidden" name="url" value="{URL}" />
 
-<table summary="" style="width: 60%; font-size: 1em;">
-<tr>
-	<td height="10" colspan="2" style="text-align: center;"><h1>{MENU_FORGOT}</h1></td>
+<table summary="">
+<tbody>
+<tr class="row1">
+	<td colspan="3"><h1>{MENU_FORGOT}</h1></td>
 </tr>
-<tr>
-	<td height="40" style="text-align: center;" colspan="2">
-	<strong style="text-align: center;">{THISAPP_MESSAGE_VALUE}</strong>
+<tr class="row2">
+	<td colspan="3">
+	<strong>{THISAPP_MESSAGE_VALUE}</strong>
 	</td>
 </tr>
-		<tr>
-			<td height="10" colspan="2">&nbsp;</td>
-		</tr>
-<tr>
-	<td style="width:100px">{TEXT_EMAIL}:</td>
-	<td class="value_input">
-		<input type="text" name="email" maxlength="255" style="width:220px;"/>
+<tr class="row3">
+	<td colspan="3">&nbsp;</td>
+</tr>
+<tr class="row4">
+	<td class="bold">{TEXT_EMAIL}:</td>
+	<td colspan="2">
+		<input type="text" name="email" maxlength="255" style="width:98%;"/>
 	</td>
 </tr>
-		<tr>
-			<td height="10" colspan="2">&nbsp;</td>
-		</tr>
-<tr>
-	<td colspan="2" style="text-align: center;">
-		<input type="submit" name="submit" value="{TEXT_SEND_DETAILS}" style="padding: 3px;"  />
-		<input type="reset" name="reset" value="{TEXT_RESET}" style="padding: 3px;"  />
-	<button type="button" value="cancel" onclick="javascript:window.location = '{WB_URL}/';" style="padding: 3px;" >{TEXT_CANCEL}</button>
+<tr class="row5" >
+	<td colspan="3">&nbsp;</td>
+</tr>
+<tr class="submit">
+	<td>
+	<p><input type="submit" name="submit" value="{TEXT_SEND_DETAILS}"  /></p>
 	</td>
+	<td>
+	<p><input type="reset" name="reset" value="{TEXT_RESET}" /></p>
+	</td>
+	<td>
+	<p><button type="button" value="cancel" onclick="javascript:window.location='{WB_URL}/';" >{TEXT_CANCEL}</button></p>
+	</td>
 </tr>
 <tr>
-	<td colspan="2" style="text-align: center;">
+	<td class="row6" colspan="3">
 	<p class="link"><a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a></p>
 	</td>
 </tr>
+</tbody>
 </table>
 </form>
+</div>
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1741)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1742)
@@ -51,5 +51,5 @@
 
 // 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.3');
-if(!defined('REVISION')) define('REVISION', '1740');
+if(!defined('REVISION')) define('REVISION', '1742');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/account/login_form.php
===================================================================
--- branches/2.8.x/wb/account/login_form.php	(revision 1741)
+++ branches/2.8.x/wb/account/login_form.php	(revision 1742)
@@ -46,7 +46,7 @@
 //print_r( $thisApp->redirect_url ); print '</pre>';
 
 // set template file and assign module and template block
-	$oTpl = new Template(dirname(__FILE__).'/htt','keep');
+	$oTpl = new Template(dirname(__FILE__).'/htt');
 	$oTpl->set_file('page', 'login.htt');
 	$oTpl->debug = false; // false, true
 	$oTpl->set_block('page', 'main_block', 'main');
@@ -62,6 +62,7 @@
 		'REDIRECT_URL' => $thisApp->redirect_url,
 		'WB_URL' => WB_URL,
 		'THEME_URL' => THEME_URL,
+		'TEMPLATE_URL' => TEMPLATE_DIR,
 		'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
 		'MESSAGE_VALUE' => '',
 		'ERROR_VALUE' => '',
@@ -85,7 +86,7 @@
 			)
 		);
 
-		$oTpl->parse('smart_login', 'show_smart_login_block', true);
+		$oTpl->parse('show_smart_login', 'show_smart_login_block', true);
 	} else {
 		$oTpl->set_block('show_smart_login', '');
 	}
Index: branches/2.8.x/wb/account/htt/login.htt
===================================================================
--- branches/2.8.x/wb/account/htt/login.htt	(revision 1741)
+++ branches/2.8.x/wb/account/htt/login.htt	(revision 1742)
@@ -2,8 +2,8 @@
 <!-- BEGIN message_block -->
 {MESSAGE_VALUE}
 <!-- END message_block -->
-
-<hr />
+<hr /><br />
+<div class="login-box rounded" style="overflow: hidden;width:100%;">
 <form class="login-box" action="{ACTION_URL}" method="post">
 	<input type="hidden" name="action" value="login" />
 	<input type="hidden" name="username_fieldname" value="{USER_FIELDNAME}" />
@@ -10,19 +10,20 @@
 	<input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
 	<input type="hidden" name="redirect" value="{REDIRECT_URL}" />
 
-<table summary="" style="width: 60%; font-size: 1em;">
-		<tr>
-			<td height="10" colspan="2" style="text-align: center;"><h1>{TEXT_LOGIN}</h1></td>
-		</tr>
-		<tr>
-			<td height="40" style="text-align: center;" colspan="2">
-			<strong style="text-align: center;">{THISAPP_MESSAGE_VALUE}</strong>
-			</td>
-		</tr>
-<tr>
-	<td style="width:100px">{TEXT_USERNAME}:</td>
-	<td class="value_input">
-		<input type="text" name="{USER_FIELDNAME}" maxlength="30" style="width:220px;"/>
+<table summary="">
+<tbody>
+<tr class="row1">
+	<td colspan="3"><h1>{TEXT_LOGIN}</h1></td>
+</tr>
+<tr class="row2">
+	<td colspan="3">
+	<strong>{THISAPP_MESSAGE_VALUE}</strong>
+	</td>
+</tr>
+<tr class="row3">
+	<td class="bold">{TEXT_USERNAME}:</td>
+	<td colspan="2">
+		<input type="text" name="{USER_FIELDNAME}" maxlength="30"  style="width:98%;"/>
     	<script type="text/javascript">
     	// document.login.{USER_FIELDNAME}.focus();
     	var ref= document.getElementById("{USER_FIELDNAME}");
@@ -30,33 +31,40 @@
     	</script>
 	</td>
 </tr>
-<tr>
-	<td style="width:100px">{TEXT_PASSWORD}:</td>
-	<td class="value_input">
-		<input type="password" name="{PASSWORD_FIELDNAME}" maxlength="30" style="width:220px;"/>
+<tr class="row4">
+	<td class="bold">{TEXT_PASSWORD}:</td>
+	<td colspan="2">
+		<input type="password" name="{PASSWORD_FIELDNAME}" maxlength="30" style="width:98%;"/>
 	</td>
 </tr>
 <!-- BEGIN show_smart_login_block -->
 <tr>
 	<td>&nbsp;</td>
-	<td>
+	<td colspan="2">
 		<input type="checkbox" name="remember" id="remember" value="true"/>
 		<label for="remember">{TEXT_REMEMBER_ME}</label>
 	</td>
 </tr>
 <!-- END show_smart_login_block -->
-<tr>
-	<td colspan="2" style="text-align: center;">
-		<input type="submit" name="submit" value="{TEXT_LOGIN}" style="padding: 3px;"  />
-		<input type="reset" name="reset" value="{TEXT_RESET}" style="padding: 3px;"  />
-	<button type="button" value="cancel" onclick="javascript:window.location = '{WB_URL}/';" style="padding: 3px;" >{TEXT_CANCEL}</button>
+<tr class="submit">
+	<td>
+	<p><input type="submit" name="submit" value="{TEXT_LOGIN}"  /></p>
 	</td>
+	<td>
+	<p><input type="reset" name="reset" value="{TEXT_RESET}" /></p>
+	</td>
+	<td>
+	<p><button type="button" value="cancel" onclick="javascript:window.location='{WB_URL}/';" >{TEXT_CANCEL}</button></p>
+	</td>
 </tr>
-<tr>
-	<td colspan="2" style="text-align: center;">
+<tr class="row6">
+	<td colspan="3">
 	<p class="link"><a href="{FORGOT_URL}">{TEXT_FORGOTTEN_DETAILS}</a></p>
 	</td>
 </tr>
+</tbody>
 </table>
 </form>
+</div>
+
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/account/htt/forgot.htt
===================================================================
--- branches/2.8.x/wb/account/htt/forgot.htt	(revision 1741)
+++ branches/2.8.x/wb/account/htt/forgot.htt	(revision 1742)
@@ -2,45 +2,52 @@
 <!-- BEGIN message_block -->
 {MESSAGE_VALUE}
 <!-- END message_block -->
-
-<hr />
-<form class="forgot-box" action="{ACTION_URL}" method="post">
+<hr /><br />
+<div class="login-box rounded" style="overflow: hidden;width:100%;">
+<form class="login-box" action="{ACTION_URL}" method="post">
 	<input type="hidden" name="action" value="forgot" />
 	<input type="hidden" name="url" value="{URL}" />
 
-<table summary="" style="width: 60%; font-size: 1em;">
-<tr>
-	<td height="10" colspan="2" style="text-align: center;"><h1>{MENU_FORGOT}</h1></td>
+<table summary="">
+<tbody>
+<tr class="row1">
+	<td colspan="3"><h1>{MENU_FORGOT}</h1></td>
 </tr>
-<tr>
-	<td height="40" style="text-align: center;" colspan="2">
-	<strong style="text-align: center;">{THISAPP_MESSAGE_VALUE}</strong>
+<tr class="row2">
+	<td colspan="3">
+	<strong>{THISAPP_MESSAGE_VALUE}</strong>
 	</td>
 </tr>
-		<tr>
-			<td height="10" colspan="2">&nbsp;</td>
-		</tr>
-<tr>
-	<td style="width:100px">{TEXT_EMAIL}:</td>
-	<td class="value_input">
-		<input type="text" name="email" maxlength="255" style="width:220px;"/>
+<tr class="row3">
+	<td colspan="3">&nbsp;</td>
+</tr>
+<tr class="row4">
+	<td class="bold">{TEXT_EMAIL}:</td>
+	<td colspan="2">
+		<input type="text" name="email" maxlength="255" style="width:98%;"/>
 	</td>
 </tr>
-		<tr>
-			<td height="10" colspan="2">&nbsp;</td>
-		</tr>
-<tr>
-	<td colspan="2" style="text-align: center;">
-		<input type="submit" name="submit" value="{TEXT_SEND_DETAILS}" style="padding: 3px;"  />
-		<input type="reset" name="reset" value="{TEXT_RESET}" style="padding: 3px;"  />
-	<button type="button" value="cancel" onclick="javascript:window.location = '{WB_URL}/';" style="padding: 3px;" >{TEXT_CANCEL}</button>
+<tr class="row5" >
+	<td colspan="3">&nbsp;</td>
+</tr>
+<tr class="submit">
+	<td>
+	<p><input type="submit" name="submit" value="{TEXT_SEND_DETAILS}"  /></p>
 	</td>
+	<td>
+	<p><input type="reset" name="reset" value="{TEXT_RESET}" /></p>
+	</td>
+	<td>
+	<p><button type="button" value="cancel" onclick="javascript:window.location='{WB_URL}/';" >{TEXT_CANCEL}</button></p>
+	</td>
 </tr>
 <tr>
-	<td colspan="2" style="text-align: center;">
+	<td class="row6" colspan="3">
 	<p class="link"><a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a></p>
 	</td>
 </tr>
+</tbody>
 </table>
 </form>
+</div>
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/account/languages/DE.php
===================================================================
--- branches/2.8.x/wb/account/languages/DE.php	(revision 1741)
+++ branches/2.8.x/wb/account/languages/DE.php	(revision 1742)
@@ -101,7 +101,7 @@
 $MESSAGE['CONFIRMED'] .= 'Vielen Dank!';
 $MESSAGE['CHANGE_PASSWORD'] = 'Aus Sicherheitsgründen sollten Sie dieses Kennwort sofort ändern. Besuchen Sie dazu folgende Website:';
 
-$MESSAGE['LOGIN_BOTH_BLANK'] = 'Bitte geben Sie unten Ihren Loginnamen und Passwort ein';
+$MESSAGE['LOGIN_BOTH_BLANK'] = 'Bitte geben Sie Ihren Loginnamen und Passwort ein';
 $MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Bitte geben Sie Ihr Passwort ein';
 $MESSAGE['LOGIN_PASSWORD_TOO_LONG'] = 'Das angegebene Passwort ist zu lang';
 $MESSAGE['LOGIN_PASSWORD_TOO_SHORT'] = 'Das angegebene Passwort ist zu kurz';
@@ -144,3 +144,4 @@
 $TEXT['NEW_PASSWORD'] = 'Neues Passwort';
 $TEXT['PASSWORD'] = 'Kennwort';
 $TEXT['ACTIVATION'] = 'Freischalten';
+$TEXT['SEND'] = 'Anfordern';
Index: branches/2.8.x/wb/account/forgot_form.php
===================================================================
--- branches/2.8.x/wb/account/forgot_form.php	(revision 1741)
+++ branches/2.8.x/wb/account/forgot_form.php	(revision 1742)
@@ -28,6 +28,7 @@
 $errMsg ='';
 
 $redirect_url = (isset($redirect_url) && ($redirect_url!='')  ? $redirect_url : $_SESSION['HTTP_REFERER'] );
+$redirect = (isset($redirect_url) && ($redirect_url!='')  ? '?redirect='.$redirect_url : '' );
 
 //print '<pre style="text-align: left;"><strong>function '.__FUNCTION__.'( '.''.' );</strong>  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> <br />';
 //print_r( $redirect_url ); print '</pre>';
@@ -126,11 +127,12 @@
 	$oTpl->set_var(array(
 		'FTAN' => $wb->getFTAN(),
 		'ACTION_URL' => WB_URL.'/account/forgot.php',
-		'LOGIN_URL' => WB_URL.'/account/login.php',
+		'LOGIN_URL' => WB_URL.'/account/login.php'.$redirect,
 		'REDIRECT_URL' => $redirect_url,
 		'URL' => $redirect_url,
 		'WB_URL' => WB_URL,
 		'THEME_URL' => THEME_URL,
+		'TEMPLATE_URL' => TEMPLATE_DIR,
 		'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
 		'MESSAGE_VALUE' => '',
 		'ERROR_VALUE' => '',
@@ -138,7 +140,7 @@
 		'TEXT_USERNAME' => $TEXT['USERNAME'],
 		'TEXT_EMAIL' => $TEXT['EMAIL'],
 //		'USER_FIELDNAME' => $username_fieldname,
-		'TEXT_SEND_DETAILS' => $TEXT['SEND_DETAILS'],
+		'TEXT_SEND_DETAILS' => $TEXT['NEW_PASSWORD'],
 		'TEXT_NEED_TO_LOGIN' => $TEXT['NEED_TO_LOGIN'],
 		'MENU_FORGOT' => $MENU['FORGOT'],
 		'TEXT_RESET' => $TEXT['RESET'],
Index: branches/2.8.x/wb/languages/DE.php
===================================================================
--- branches/2.8.x/wb/languages/DE.php	(revision 1741)
+++ branches/2.8.x/wb/languages/DE.php	(revision 1742)
@@ -521,7 +521,7 @@
 $MESSAGE['GROUPS_NO_GROUPS_FOUND'] = 'Keine Gruppen gefunden';
 $MESSAGE['GROUPS_SAVED'] = 'Die Gruppe wurde erfolgreich gespeichert';
 $MESSAGE['LOGIN_AUTHENTICATION_FAILED'] = 'Der Loginname oder das Passwort ist nicht korrekt';
-$MESSAGE['LOGIN_BOTH_BLANK'] = 'Bitte geben Sie unten Ihren Loginnamen und Passwort ein';
+$MESSAGE['LOGIN_BOTH_BLANK'] = 'Bitte geben Sie Ihren Loginnamen und Passwort ein';
 $MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Bitte geben Sie Ihr Passwort ein';
 $MESSAGE['LOGIN_PASSWORD_TOO_LONG'] = 'Das angegebene Passwort ist zu lang';
 $MESSAGE['LOGIN_PASSWORD_TOO_SHORT'] = 'Das angegebene Passwort ist zu kurz';