Permalink
Browse files

Show message about new root password

  • Loading branch information...
1 parent db22963 commit 2e323069a528be3d22ccda29d1ba6760719e676d @william-gr william-gr committed Nov 7, 2013
Showing with 11 additions and 2 deletions.
  1. +3 −0 gui/account/views.py
  2. +8 −2 gui/templates/registration/login.html
@@ -166,6 +166,9 @@ def login_wrapper(
)
if not qs.exists():
authentication_form = forms.NewPasswordForm
+ extra_context.update({
+ 'reset_password': True,
+ })
response = login(
request,
template_name='registration/login.html',
@@ -43,9 +43,15 @@
{% if user.is_authenticated %}
<p>{% blocktrans with user.username as username %}Welcome, {{ username }}. Thanks for logging in.{% endblocktrans %}</p>
-{% else %}
-<div id="login" data-dojo-type="dijit.Dialog" data-dojo-props="title: '{% blocktrans with sw_login_version=sw_login_version sw_name=sw_name %}Welcome to {{ sw_name }}&trade; {{ sw_login_version }}{% endblocktrans %}'">
+{% else %}
+<div id="login" data-dojo-type="dijit.Dialog" data-dojo-props="title: '{% blocktrans with sw_login_version=sw_login_version sw_name=sw_name %}Welcome to {{ sw_name }}&trade; {{ sw_login_version }}{% endblocktrans %}'" style="max-width: 400px;">
<form action="." method="post">{% csrf_token %}
+{% if reset_password %}
+<p>{% trans "The web admin user has been removed in this release in order to unify the web and Unix authentication mechanisms." %}</p>
+<p>{% trans "Administrators should log in to the web UI as root, since the web UI already confers superuser privileges in many areas." %}</p>
+
+<p>{% trans "For security reasons, you must now set a new root password:" %}</p>
+{% endif %}
<table>
{{ form }}
</table>

0 comments on commit 2e32306

Please sign in to comment.