diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-06 22:11:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-06 22:11:33 +0200 |
| commit | a97d9d4b899c424530e53d813c71eee192262e40 (patch) | |
| tree | fa692d5bba3e49c60607b6a578aba5cd92649687 /phpBB/styles/prosilver | |
| parent | 01eded7cc2b206cce593a389f09259c25e5107ff (diff) | |
| parent | 841f1e492204b67443f9595e2ecdb571e74aabe9 (diff) | |
| download | forums-a97d9d4b899c424530e53d813c71eee192262e40.tar forums-a97d9d4b899c424530e53d813c71eee192262e40.tar.gz forums-a97d9d4b899c424530e53d813c71eee192262e40.tar.bz2 forums-a97d9d4b899c424530e53d813c71eee192262e40.tar.xz forums-a97d9d4b899c424530e53d813c71eee192262e40.zip | |
Merge branch 'develop-olympus' into develop
* 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
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/login_forum.html | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html index 63f0b2e0f7..c83a625b3f 100644 --- a/phpBB/styles/prosilver/template/login_forum.html +++ b/phpBB/styles/prosilver/template/login_forum.html @@ -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> - - <fieldset class="fields2"> - <!-- IF LOGIN_ERROR --> - <dl> - <dt> </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> </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> + <div class="content"> + <h2>{L_LOGIN}</h2> + + <p>{L_LOGIN_FORUM}</p> + + <fieldset class="fields1"> + <!-- IF LOGIN_ERROR --> + <dl> + <dt> </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> </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> |