mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/11144] Add missing {FORUM_NAME} variable
  [ticket/11144] Add missing {FORUM_NAME} variable

Conflicts:
	phpBB/download/file.php
	phpBB/styles/prosilver/template/login_forum.html
This commit is contained in:
Andreas Fischer
2013-05-06 22:11:33 +02:00
parent 01eded7cc2 841f1e4922
commit a97d9d4b89
7 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
phpBB/styles/prosilver/template/login_forum.html
View File

@@ -1,31 +1,36 @@
<!-- INCLUDE overall_header.html -->
<h2 class="solo">{L_LOGIN} {FORUM_NAME}</h2>
<!-- IF FORUM_NAME --><h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2><!-- ENDIF -->
<form id="login_forum" method="post" action="{S_LOGIN_ACTION}">
{S_FORM_TOKEN}
<div class="panel">
<div class="inner">
<p>{L_LOGIN_FORUM}</p>
<div class="content">
<h2>{L_LOGIN}</h2>
<fieldset class="fields2">
<!-- IF LOGIN_ERROR -->
<dl>
<dt>&nbsp;</dt>
<dd class="error">{LOGIN_ERROR}</dd>
</dl>
<!-- ENDIF -->
<dl>
<dt><label for="password">{L_PASSWORD}{L_COLON}</label></dt>
<dd><input class="inputbox narrow" type="password" name="password" id="password" size="25" tabindex="1" /></dd>
</dl>
<dl class="fields2">
<dt>&nbsp;</dt>
<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1" value="{L_LOGIN}" tabindex="2" /></dd>
</dl>
{S_LOGIN_REDIRECT}
</fieldset>
<p>{L_LOGIN_FORUM}</p>
<fieldset class="fields1">
<!-- IF LOGIN_ERROR -->
<dl>
<dt>&nbsp;</dt>
<dd class="error">{LOGIN_ERROR}</dd>
</dl>
<!-- ENDIF -->
<dl>
<dt><label for="password">{L_PASSWORD}{L_COLON}</label></dt>
<dd><input type="password" tabindex="1" id="password" name="password" size="25" class="inputbox narrow" /></dd>
</dl>
{S_LOGIN_REDIRECT}
<dl>
<dt>&nbsp;</dt>
<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1" value="{L_LOGIN}" tabindex="2" /></dd>
</dl>
</fieldset>
</div>
</div>
</div>

8
phpBB/styles/subsilver2/template/login_forum.html
View File

@@ -1,5 +1,13 @@
<!-- INCLUDE overall_header.html -->
<!-- IF FORUM_NAME -->
<div id="pageheader">
<h2><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
</div>
<br clear="all" /><br />
<!-- ENDIF -->
<div id="pagecontent">
<form name="login_forum" method="post" action="{S_LOGIN_ACTION}">