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

Merge branch 'stable'

Browse Source
This commit is contained in:
following
2013-05-13 23:17:49 +02:00
parent 2e95c6226e 3b8deab9e6
commit 12ad667db6
8 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/lang/de/ocstyle/login.tpl.php
+3 -2
View File
@@ -29,6 +29,7 @@
<form action="login.php" method="post" enctype="application/x-www-form-urlencoded" name="login_form" dir="ltr" style="display: inline;">
<input type="hidden" name="target" value="{target}" />
<input type="hidden" name="action" value="login" />
<input type="hidden" name="source" value="loginpage" />
<table class="table">
<tr><td class="spacer" colspan="2"></td></tr>
{message_start}<tr><td colspan="2" class="message">{message}</td></tr><tr><td class="spacer" colspan="2"></td></tr>{message_end}
@@ -44,8 +45,8 @@
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{t}Reset{/t}" class="formbuttons" />&nbsp;&nbsp;
<input type="submit" name="LogMeIn" value="{t}Login{/t}" class="formbuttons" />
<input type="reset" name="reset" value="{t}Reset{/t}" class="formbutton" />&nbsp;&nbsp;
<input type="submit" name="LogMeIn" value="{t}Login{/t}" class="formbutton" />
</td>
</tr>
htdocs/lang/de/ocstyle/varset.inc.php
+1 -1
View File
@@ -26,7 +26,7 @@
tpl_set_var('runtime', '');
//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;"><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>';
$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}" /><input type="hidden" name="source" value="titlebar" />&nbsp;<input type="submit" name="LogMeIn" value="' . t('Login') . '" class="formbutton" 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