diff options
| author | mattpiwik <matthieu.aubry@gmail.com> | 2012-10-24 14:59:47 +0400 |
|---|---|---|
| committer | mattpiwik <matthieu.aubry@gmail.com> | 2012-10-24 14:59:47 +0400 |
| commit | 492da7b55ef16e3b0adc01b4b9f639d2e0ee2270 (patch) | |
| tree | bda725bc5245043f387edc4ff3d40f7dd075405a /plugins/Login | |
| parent | ac310375420a1996fbaed810b6d6137616d0c450 (diff) | |
Refs #3080
* Make sure a Port change results in warning message
* Disabling trusted host chek should disable the Nonce check (otherwise login will still fail)
* Displayed message in header.tpl rather than index,tpl since other "top menus" don't display 'index.tpl'
* Login will never work when trusted host warning is displayed (because of Nonce check) so let's be clear and suggest a clear fix for this issue
git-svn-id: http://dev.piwik.org/svn/trunk@7301 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/Login')
| -rw-r--r-- | plugins/Login/templates/login.tpl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/Login/templates/login.tpl b/plugins/Login/templates/login.tpl index 1b177de3d5..7df5d52d68 100644 --- a/plugins/Login/templates/login.tpl +++ b/plugins/Login/templates/login.tpl @@ -4,11 +4,15 @@ {* untrusted host warning *} {if isset($isValidHost) && isset($invalidHostMessage) && !$isValidHost} -<div id="login_error"> +<div id="login_error" style='width:400px'> <strong>{'General_Warning'|translate}: </strong>{$invalidHostMessage} -</div> -{/if} + <br><br>{$invalidHostMessageHowToFix} + <br/><br/><a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank">{'General_Help'|translate} <img style='vertical-align: bottom' src="themes/default/images/help_grey.png" /></a><br/> + + +</div> +{else} <div id="message_container"> {if $form_data.errors} <div id="login_error"> @@ -47,7 +51,6 @@ </p> </form> -{if isset($isValidHost) && $isValidHost} <form id="reset_form" style="display:none;"> <p> <label>{'Login_LoginOrEmail'|translate}:<br /> @@ -73,13 +76,10 @@ <input type="hidden" name="module" value="Login"/> <input type="hidden" name="action" value="resetPassword"/> </form> -{/if} <p id="nav"> -{if isset($isValidHost) && $isValidHost} <a id="login_form_nav" href="#" title="{'Login_LostYourPassword'|translate}">{'Login_LostYourPassword'|translate}</a> <a id="alternate_reset_nav" href="#" style="display:none;" title="{'Login_LogIn'|translate}">{'Login_LogIn'|translate}</a> -{/if} <a id="reset_form_nav" href="#" style="display:none;" title="{'Mobile_NavigationBack'|translate}">{'General_Cancel'|translate}</a> </p> {if isset($smarty.capture.poweredByPiwik)} @@ -91,7 +91,7 @@ <div id="lost_password_instructions" style="display:none;"> <p class="message">{'Login_ResetPasswordInstructions'|translate}</p> </div> - +{/if} </div> </body> </html> |