Project

General

Profile

« Previous | Next » 

Revision 1742

Added by Dietmar about 12 years ago

! Now you can style account login with your frontend Template CSS
this change is in work for the whole account

View differences:

branches/2.8.x/CHANGELOG
13 13

  
14 14

  
15 15

  
16
07 Sep-2012 Build 1742 Dietmar Woellbrink (Luisehahne)
17
! Now you can style account login with your frontend Template CSS
18
  this change is in work for the whole account
19
07 Sep-2012 Build 1741 Dietmar Woellbrink (Luisehahne)
20
! Preparing Separation of code and HTML in Droplets
16 21
05 Sep-2012 Build 1740 Dietmar Woellbrink (Luisehahne)
17 22
! frontend.functions.php remove return $content in page_content(), 
18 23
  incompatible with search logic
branches/2.8.x/wb/admin/skel/themes/htt/login.htt
2 2
<!-- BEGIN message_block -->
3 3
{MESSAGE_VALUE}
4 4
<!-- END message_block -->
5

  
6
<hr />
5
<hr /><br />
6
<div class="login-box rounded" style="overflow: hidden;width:100%;">
7 7
<form class="login-box" action="{ACTION_URL}" method="post">
8 8
	<input type="hidden" name="action" value="login" />
9 9
	<input type="hidden" name="username_fieldname" value="{USER_FIELDNAME}" />
10 10
	<input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
11 11
	<input type="hidden" name="redirect" value="{REDIRECT_URL}" />
12 12

  
13
<table summary="" style="width: 60%; font-size: 1em;">
14
		<tr>
15
			<td height="10" colspan="2" style="text-align: center;"><h1>{TEXT_LOGIN}</h1></td>
16
		</tr>
17
		<tr>
18
			<td height="40" style="text-align: center;" colspan="2">
19
			<strong style="text-align: center;">{THISAPP_MESSAGE_VALUE}</strong>
20
			</td>
21
		</tr>
22
<tr>
23
	<td style="width:100px">{TEXT_USERNAME}:</td>
24
	<td class="value_input">
25
		<input type="text" name="{USER_FIELDNAME}" maxlength="30" style="width:220px;"/>
13
<table summary="">
14
<tbody>
15
<tr class="row1">
16
	<td colspan="3"><h1>{TEXT_LOGIN}</h1></td>
17
</tr>
18
<tr class="row2">
19
	<td colspan="3">
20
	<strong>{THISAPP_MESSAGE_VALUE}</strong>
21
	</td>
22
</tr>
23
<tr class="row3">
24
	<td class="bold">{TEXT_USERNAME}:</td>
25
	<td colspan="2">
26
		<input type="text" name="{USER_FIELDNAME}" maxlength="30"  style="width:98%;"/>
26 27
    	<script type="text/javascript">
27 28
    	// document.login.{USER_FIELDNAME}.focus();
28 29
    	var ref= document.getElementById("{USER_FIELDNAME}");
......
30 31
    	</script>
31 32
	</td>
32 33
</tr>
33
<tr>
34
	<td style="width:100px">{TEXT_PASSWORD}:</td>
35
	<td class="value_input">
36
		<input type="password" name="{PASSWORD_FIELDNAME}" maxlength="30" style="width:220px;"/>
34
<tr class="row4">
35
	<td class="bold">{TEXT_PASSWORD}:</td>
36
	<td colspan="2">
37
		<input type="password" name="{PASSWORD_FIELDNAME}" maxlength="30" style="width:98%;"/>
37 38
	</td>
38 39
</tr>
39 40
<!-- BEGIN show_smart_login_block -->
40 41
<tr>
41 42
	<td>&nbsp;</td>
42
	<td>
43
	<td colspan="2">
43 44
		<input type="checkbox" name="remember" id="remember" value="true"/>
44 45
		<label for="remember">{TEXT_REMEMBER_ME}</label>
45 46
	</td>
46 47
</tr>
47 48
<!-- END show_smart_login_block -->
48
<tr>
49
	<td colspan="2" style="text-align: center;">
50
		<input type="submit" name="submit" value="{TEXT_LOGIN}" style="padding: 3px;"  />
51
		<input type="reset" name="reset" value="{TEXT_RESET}" style="padding: 3px;"  />
52
	<button type="button" value="cancel" onclick="javascript:window.location = '{WB_URL}/';" style="padding: 3px;" >{TEXT_CANCEL}</button>
49
<tr class="submit">
50
	<td>
51
	<p><input type="submit" name="submit" value="{TEXT_LOGIN}"  /></p>
53 52
	</td>
53
	<td>
54
	<p><input type="reset" name="reset" value="{TEXT_RESET}" /></p>
55
	</td>
56
	<td>
57
	<p><button type="button" value="cancel" onclick="javascript:window.location='{WB_URL}/';" >{TEXT_CANCEL}</button></p>
58
	</td>
54 59
</tr>
55
<tr>
56
	<td colspan="2" style="text-align: center;">
60
<tr class="row6">
61
	<td colspan="3">
57 62
	<p class="link"><a href="{FORGOT_URL}">{TEXT_FORGOTTEN_DETAILS}</a></p>
58 63
	</td>
59 64
</tr>
65
</tbody>
60 66
</table>
61 67
</form>
68
</div>
69

  
62 70
<!-- END main_block -->
branches/2.8.x/wb/admin/skel/themes/htt/forgot.htt
2 2
<!-- BEGIN message_block -->
3 3
{MESSAGE_VALUE}
4 4
<!-- END message_block -->
5

  
6
<hr />
7
<form class="forgot-box" action="{ACTION_URL}" method="post">
5
<hr /><br />
6
<div class="login-box rounded" style="overflow: hidden;width:100%;">
7
<form class="login-box" action="{ACTION_URL}" method="post">
8 8
	<input type="hidden" name="action" value="forgot" />
9 9
	<input type="hidden" name="url" value="{URL}" />
10 10

  
11
<table summary="" style="width: 60%; font-size: 1em;">
12
<tr>
13
	<td height="10" colspan="2" style="text-align: center;"><h1>{MENU_FORGOT}</h1></td>
11
<table summary="">
12
<tbody>
13
<tr class="row1">
14
	<td colspan="3"><h1>{MENU_FORGOT}</h1></td>
14 15
</tr>
15
<tr>
16
	<td height="40" style="text-align: center;" colspan="2">
17
	<strong style="text-align: center;">{THISAPP_MESSAGE_VALUE}</strong>
16
<tr class="row2">
17
	<td colspan="3">
18
	<strong>{THISAPP_MESSAGE_VALUE}</strong>
18 19
	</td>
19 20
</tr>
20
		<tr>
21
			<td height="10" colspan="2">&nbsp;</td>
22
		</tr>
23
<tr>
24
	<td style="width:100px">{TEXT_EMAIL}:</td>
25
	<td class="value_input">
26
		<input type="text" name="email" maxlength="255" style="width:220px;"/>
21
<tr class="row3">
22
	<td colspan="3">&nbsp;</td>
23
</tr>
24
<tr class="row4">
25
	<td class="bold">{TEXT_EMAIL}:</td>
26
	<td colspan="2">
27
		<input type="text" name="email" maxlength="255" style="width:98%;"/>
27 28
	</td>
28 29
</tr>
29
		<tr>
30
			<td height="10" colspan="2">&nbsp;</td>
31
		</tr>
32
<tr>
33
	<td colspan="2" style="text-align: center;">
34
		<input type="submit" name="submit" value="{TEXT_SEND_DETAILS}" style="padding: 3px;"  />
35
		<input type="reset" name="reset" value="{TEXT_RESET}" style="padding: 3px;"  />
36
	<button type="button" value="cancel" onclick="javascript:window.location = '{WB_URL}/';" style="padding: 3px;" >{TEXT_CANCEL}</button>
30
<tr class="row5" >
31
	<td colspan="3">&nbsp;</td>
32
</tr>
33
<tr class="submit">
34
	<td>
35
	<p><input type="submit" name="submit" value="{TEXT_SEND_DETAILS}"  /></p>
37 36
	</td>
37
	<td>
38
	<p><input type="reset" name="reset" value="{TEXT_RESET}" /></p>
39
	</td>
40
	<td>
41
	<p><button type="button" value="cancel" onclick="javascript:window.location='{WB_URL}/';" >{TEXT_CANCEL}</button></p>
42
	</td>
38 43
</tr>
39 44
<tr>
40
	<td colspan="2" style="text-align: center;">
45
	<td class="row6" colspan="3">
41 46
	<p class="link"><a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a></p>
42 47
	</td>
43 48
</tr>
49
</tbody>
44 50
</table>
45 51
</form>
52
</div>
46 53
<!-- END main_block -->
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.3');
54
if(!defined('REVISION')) define('REVISION', '1740');
54
if(!defined('REVISION')) define('REVISION', '1742');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/account/login_form.php
46 46
//print_r( $thisApp->redirect_url ); print '</pre>';
47 47

  
48 48
// set template file and assign module and template block
49
	$oTpl = new Template(dirname(__FILE__).'/htt','keep');
49
	$oTpl = new Template(dirname(__FILE__).'/htt');
50 50
	$oTpl->set_file('page', 'login.htt');
51 51
	$oTpl->debug = false; // false, true
52 52
	$oTpl->set_block('page', 'main_block', 'main');
......
62 62
		'REDIRECT_URL' => $thisApp->redirect_url,
63 63
		'WB_URL' => WB_URL,
64 64
		'THEME_URL' => THEME_URL,
65
		'TEMPLATE_URL' => TEMPLATE_DIR,
65 66
		'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
66 67
		'MESSAGE_VALUE' => '',
67 68
		'ERROR_VALUE' => '',
......
85 86
			)
86 87
		);
87 88

  
88
		$oTpl->parse('smart_login', 'show_smart_login_block', true);
89
		$oTpl->parse('show_smart_login', 'show_smart_login_block', true);
89 90
	} else {
90 91
		$oTpl->set_block('show_smart_login', '');
91 92
	}
branches/2.8.x/wb/account/htt/login.htt
2 2
<!-- BEGIN message_block -->
3 3
{MESSAGE_VALUE}
4 4
<!-- END message_block -->
5

  
6
<hr />
5
<hr /><br />
6
<div class="login-box rounded" style="overflow: hidden;width:100%;">
7 7
<form class="login-box" action="{ACTION_URL}" method="post">
8 8
	<input type="hidden" name="action" value="login" />
9 9
	<input type="hidden" name="username_fieldname" value="{USER_FIELDNAME}" />
10 10
	<input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
11 11
	<input type="hidden" name="redirect" value="{REDIRECT_URL}" />
12 12

  
13
<table summary="" style="width: 60%; font-size: 1em;">
14
		<tr>
15
			<td height="10" colspan="2" style="text-align: center;"><h1>{TEXT_LOGIN}</h1></td>
16
		</tr>
17
		<tr>
18
			<td height="40" style="text-align: center;" colspan="2">
19
			<strong style="text-align: center;">{THISAPP_MESSAGE_VALUE}</strong>
20
			</td>
21
		</tr>
22
<tr>
23
	<td style="width:100px">{TEXT_USERNAME}:</td>
24
	<td class="value_input">
25
		<input type="text" name="{USER_FIELDNAME}" maxlength="30" style="width:220px;"/>
13
<table summary="">
14
<tbody>
15
<tr class="row1">
16
	<td colspan="3"><h1>{TEXT_LOGIN}</h1></td>
17
</tr>
18
<tr class="row2">
19
	<td colspan="3">
20
	<strong>{THISAPP_MESSAGE_VALUE}</strong>
21
	</td>
22
</tr>
23
<tr class="row3">
24
	<td class="bold">{TEXT_USERNAME}:</td>
25
	<td colspan="2">
26
		<input type="text" name="{USER_FIELDNAME}" maxlength="30"  style="width:98%;"/>
26 27
    	<script type="text/javascript">
27 28
    	// document.login.{USER_FIELDNAME}.focus();
28 29
    	var ref= document.getElementById("{USER_FIELDNAME}");
......
30 31
    	</script>
31 32
	</td>
32 33
</tr>
33
<tr>
34
	<td style="width:100px">{TEXT_PASSWORD}:</td>
35
	<td class="value_input">
36
		<input type="password" name="{PASSWORD_FIELDNAME}" maxlength="30" style="width:220px;"/>
34
<tr class="row4">
35
	<td class="bold">{TEXT_PASSWORD}:</td>
36
	<td colspan="2">
37
		<input type="password" name="{PASSWORD_FIELDNAME}" maxlength="30" style="width:98%;"/>
37 38
	</td>
38 39
</tr>
39 40
<!-- BEGIN show_smart_login_block -->
40 41
<tr>
41 42
	<td>&nbsp;</td>
42
	<td>
43
	<td colspan="2">
43 44
		<input type="checkbox" name="remember" id="remember" value="true"/>
44 45
		<label for="remember">{TEXT_REMEMBER_ME}</label>
45 46
	</td>
46 47
</tr>
47 48
<!-- END show_smart_login_block -->
48
<tr>
49
	<td colspan="2" style="text-align: center;">
50
		<input type="submit" name="submit" value="{TEXT_LOGIN}" style="padding: 3px;"  />
51
		<input type="reset" name="reset" value="{TEXT_RESET}" style="padding: 3px;"  />
52
	<button type="button" value="cancel" onclick="javascript:window.location = '{WB_URL}/';" style="padding: 3px;" >{TEXT_CANCEL}</button>
49
<tr class="submit">
50
	<td>
51
	<p><input type="submit" name="submit" value="{TEXT_LOGIN}"  /></p>
53 52
	</td>
53
	<td>
54
	<p><input type="reset" name="reset" value="{TEXT_RESET}" /></p>
55
	</td>
56
	<td>
57
	<p><button type="button" value="cancel" onclick="javascript:window.location='{WB_URL}/';" >{TEXT_CANCEL}</button></p>
58
	</td>
54 59
</tr>
55
<tr>
56
	<td colspan="2" style="text-align: center;">
60
<tr class="row6">
61
	<td colspan="3">
57 62
	<p class="link"><a href="{FORGOT_URL}">{TEXT_FORGOTTEN_DETAILS}</a></p>
58 63
	</td>
59 64
</tr>
65
</tbody>
60 66
</table>
61 67
</form>
68
</div>
69

  
62 70
<!-- END main_block -->
branches/2.8.x/wb/account/htt/forgot.htt
2 2
<!-- BEGIN message_block -->
3 3
{MESSAGE_VALUE}
4 4
<!-- END message_block -->
5

  
6
<hr />
7
<form class="forgot-box" action="{ACTION_URL}" method="post">
5
<hr /><br />
6
<div class="login-box rounded" style="overflow: hidden;width:100%;">
7
<form class="login-box" action="{ACTION_URL}" method="post">
8 8
	<input type="hidden" name="action" value="forgot" />
9 9
	<input type="hidden" name="url" value="{URL}" />
10 10

  
11
<table summary="" style="width: 60%; font-size: 1em;">
12
<tr>
13
	<td height="10" colspan="2" style="text-align: center;"><h1>{MENU_FORGOT}</h1></td>
11
<table summary="">
12
<tbody>
13
<tr class="row1">
14
	<td colspan="3"><h1>{MENU_FORGOT}</h1></td>
14 15
</tr>
15
<tr>
16
	<td height="40" style="text-align: center;" colspan="2">
17
	<strong style="text-align: center;">{THISAPP_MESSAGE_VALUE}</strong>
16
<tr class="row2">
17
	<td colspan="3">
18
	<strong>{THISAPP_MESSAGE_VALUE}</strong>
18 19
	</td>
19 20
</tr>
20
		<tr>
21
			<td height="10" colspan="2">&nbsp;</td>
22
		</tr>
23
<tr>
24
	<td style="width:100px">{TEXT_EMAIL}:</td>
25
	<td class="value_input">
26
		<input type="text" name="email" maxlength="255" style="width:220px;"/>
21
<tr class="row3">
22
	<td colspan="3">&nbsp;</td>
23
</tr>
24
<tr class="row4">
25
	<td class="bold">{TEXT_EMAIL}:</td>
26
	<td colspan="2">
27
		<input type="text" name="email" maxlength="255" style="width:98%;"/>
27 28
	</td>
28 29
</tr>
29
		<tr>
30
			<td height="10" colspan="2">&nbsp;</td>
31
		</tr>
32
<tr>
33
	<td colspan="2" style="text-align: center;">
34
		<input type="submit" name="submit" value="{TEXT_SEND_DETAILS}" style="padding: 3px;"  />
35
		<input type="reset" name="reset" value="{TEXT_RESET}" style="padding: 3px;"  />
36
	<button type="button" value="cancel" onclick="javascript:window.location = '{WB_URL}/';" style="padding: 3px;" >{TEXT_CANCEL}</button>
30
<tr class="row5" >
31
	<td colspan="3">&nbsp;</td>
32
</tr>
33
<tr class="submit">
34
	<td>
35
	<p><input type="submit" name="submit" value="{TEXT_SEND_DETAILS}"  /></p>
37 36
	</td>
37
	<td>
38
	<p><input type="reset" name="reset" value="{TEXT_RESET}" /></p>
39
	</td>
40
	<td>
41
	<p><button type="button" value="cancel" onclick="javascript:window.location='{WB_URL}/';" >{TEXT_CANCEL}</button></p>
42
	</td>
38 43
</tr>
39 44
<tr>
40
	<td colspan="2" style="text-align: center;">
45
	<td class="row6" colspan="3">
41 46
	<p class="link"><a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a></p>
42 47
	</td>
43 48
</tr>
49
</tbody>
44 50
</table>
45 51
</form>
52
</div>
46 53
<!-- END main_block -->
branches/2.8.x/wb/account/languages/DE.php
101 101
$MESSAGE['CONFIRMED'] .= 'Vielen Dank!';
102 102
$MESSAGE['CHANGE_PASSWORD'] = 'Aus Sicherheitsgr?nden sollten Sie dieses Kennwort sofort ?ndern. Besuchen Sie dazu folgende Website:';
103 103

  
104
$MESSAGE['LOGIN_BOTH_BLANK'] = 'Bitte geben Sie unten Ihren Loginnamen und Passwort ein';
104
$MESSAGE['LOGIN_BOTH_BLANK'] = 'Bitte geben Sie Ihren Loginnamen und Passwort ein';
105 105
$MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Bitte geben Sie Ihr Passwort ein';
106 106
$MESSAGE['LOGIN_PASSWORD_TOO_LONG'] = 'Das angegebene Passwort ist zu lang';
107 107
$MESSAGE['LOGIN_PASSWORD_TOO_SHORT'] = 'Das angegebene Passwort ist zu kurz';
......
144 144
$TEXT['NEW_PASSWORD'] = 'Neues Passwort';
145 145
$TEXT['PASSWORD'] = 'Kennwort';
146 146
$TEXT['ACTIVATION'] = 'Freischalten';
147
$TEXT['SEND'] = 'Anfordern';
branches/2.8.x/wb/account/forgot_form.php
28 28
$errMsg ='';
29 29

  
30 30
$redirect_url = (isset($redirect_url) && ($redirect_url!='')  ? $redirect_url : $_SESSION['HTTP_REFERER'] );
31
$redirect = (isset($redirect_url) && ($redirect_url!='')  ? '?redirect='.$redirect_url : '' );
31 32

  
32 33
//print '<pre style="text-align: left;"><strong>function '.__FUNCTION__.'( '.''.' );</strong>  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> <br />';
33 34
//print_r( $redirect_url ); print '</pre>';
......
126 127
	$oTpl->set_var(array(
127 128
		'FTAN' => $wb->getFTAN(),
128 129
		'ACTION_URL' => WB_URL.'/account/forgot.php',
129
		'LOGIN_URL' => WB_URL.'/account/login.php',
130
		'LOGIN_URL' => WB_URL.'/account/login.php'.$redirect,
130 131
		'REDIRECT_URL' => $redirect_url,
131 132
		'URL' => $redirect_url,
132 133
		'WB_URL' => WB_URL,
133 134
		'THEME_URL' => THEME_URL,
135
		'TEMPLATE_URL' => TEMPLATE_DIR,
134 136
		'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
135 137
		'MESSAGE_VALUE' => '',
136 138
		'ERROR_VALUE' => '',
......
138 140
		'TEXT_USERNAME' => $TEXT['USERNAME'],
139 141
		'TEXT_EMAIL' => $TEXT['EMAIL'],
140 142
//		'USER_FIELDNAME' => $username_fieldname,
141
		'TEXT_SEND_DETAILS' => $TEXT['SEND_DETAILS'],
143
		'TEXT_SEND_DETAILS' => $TEXT['NEW_PASSWORD'],
142 144
		'TEXT_NEED_TO_LOGIN' => $TEXT['NEED_TO_LOGIN'],
143 145
		'MENU_FORGOT' => $MENU['FORGOT'],
144 146
		'TEXT_RESET' => $TEXT['RESET'],
branches/2.8.x/wb/languages/DE.php
521 521
$MESSAGE['GROUPS_NO_GROUPS_FOUND'] = 'Keine Gruppen gefunden';
522 522
$MESSAGE['GROUPS_SAVED'] = 'Die Gruppe wurde erfolgreich gespeichert';
523 523
$MESSAGE['LOGIN_AUTHENTICATION_FAILED'] = 'Der Loginname oder das Passwort ist nicht korrekt';
524
$MESSAGE['LOGIN_BOTH_BLANK'] = 'Bitte geben Sie unten Ihren Loginnamen und Passwort ein';
524
$MESSAGE['LOGIN_BOTH_BLANK'] = 'Bitte geben Sie Ihren Loginnamen und Passwort ein';
525 525
$MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Bitte geben Sie Ihr Passwort ein';
526 526
$MESSAGE['LOGIN_PASSWORD_TOO_LONG'] = 'Das angegebene Passwort ist zu lang';
527 527
$MESSAGE['LOGIN_PASSWORD_TOO_SHORT'] = 'Das angegebene Passwort ist zu kurz';

Also available in: Unified diff