diff options
| author | Thomas ZILLIOX <thomas@zilliox.me> | 2013-07-02 20:08:38 +0400 |
|---|---|---|
| committer | Thomas ZILLIOX <thomas@zilliox.me> | 2013-07-02 20:08:38 +0400 |
| commit | 287dcbbe9eecd9d6e4c5cd89a5a2fa7fe14bb09a (patch) | |
| tree | 3ca1c8b4a1fd14cca3c5f492cf6ea8391f1a1060 /plugins/Login/templates/login.twig | |
| parent | 3b367dd3afffa6d44fdf0069f62b00c2bb487a5a (diff) | |
Merge with master
Diffstat (limited to 'plugins/Login/templates/login.twig')
| -rw-r--r-- | plugins/Login/templates/login.twig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig index 6d8ad31519..ebc38f185d 100644 --- a/plugins/Login/templates/login.twig +++ b/plugins/Login/templates/login.twig @@ -34,10 +34,9 @@ {% if 'General_LayoutDirection'|translate =='rtl' %} <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/rtl.css"/> {% endif %} - {% include "_iframeBusterHeader.twig" %} </head> <body class="login"> -{% include "_iframeBusterBody.twig" %} +{% include "_iframeBuster.twig" %} <div id="logo"> {% if isCustomLogo == false %}<a href="http://piwik.org" title="{{ linkTitle }}">{% endif %} {% if hasSVGLogo %} @@ -83,11 +82,11 @@ {% endif %} {% if AccessErrorString %} - <div id="login_error"><strong>{{ 'General_Error'|translate }}</strong>: {{ AccessErrorString }}<br/></div> + <div id="login_error"><strong>{{ 'General_Error'|translate }}</strong>: {{ AccessErrorString|raw }}<br/></div> {% endif %} {% if infoMessage %} - <p class="message">{{ infoMessage}}</p> + <p class="message">{{ infoMessage|raw }}</p> {% endif %} </div> <form {{ form_data.attributes|raw }}> |