widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #17147
Re: [Merge] lp:~widelands-dev/widelands-website/gaming_password into lp:widelands-website
Some string nits, rest LGTM :)
Diff comments:
>
> === modified file 'wlggz/forms.py'
> --- wlggz/forms.py 2019-03-05 08:47:47 +0000
> +++ wlggz/forms.py 2019-05-15 06:56:07 +0000
> @@ -10,13 +10,12 @@
> from models import GGZAuth
> from django.utils.translation import ugettext_lazy as _
>
> -import hashlib
> -import base64
> -
>
> class EditGGZForm(forms.ModelForm):
> password = forms.CharField(label=_(u'Online Gaming Password'),
> widget=forms.PasswordInput(render_value=False), required=True)
> + password2 = forms.CharField(label=_(u'Enter again'),
"Enter the password again" or "Confirm Password" would be easier to understand.
> + widget=forms.PasswordInput(render_value=False), required=True)
>
> class Meta:
> model = GGZAuth
>
> === modified file 'wlggz/templates/wlggz/edit_ggz.html'
> --- wlggz/templates/wlggz/edit_ggz.html 2019-01-24 18:03:54 +0000
> +++ wlggz/templates/wlggz/edit_ggz.html 2019-05-15 06:56:07 +0000
> @@ -6,17 +6,28 @@
> {% trans "Set Online Gaming Password" %} - {{ block.super }}
> {% endblock %}
>
> +{% block game_passwrd %}class="active"{% endblock %}
> +
> {% block content_header %}
> <h1>{% trans "Set Online Gaming Password" %}</h1>
> {% endblock %}
>
> {% block content_main %}
> -<div class="blogEntry">
> +<div class="blogEntry">
> + <p>The password set here can be used when playing widelands over internet.
over the internet
> + Although it is optional to use a password it is recommended to use one,
> + because your username will be reserved then. The password is stored encrypted.</p>
> + <p>To use the password on internetgames:</p>
on internetgames -> in internet games
> + <ul>
> + <li>Start the game and click on 'Multiplayer -> Internet Game'</li>
> + <li>Enter your website's username and the password you have set here</li>
website's -> Widelands website
your website's implies that the player owns a website ;)
> + <li>Click on 'Login'</li>
> + </ul>
> <form method="post" enctype="multipart/form-data">
> <table>
> {% for field in ggz_form %}
> <tr>
> - <td class="grey">{{ field.label_tag }}:</td>
> + <td class="grey">{{ field.label_tag }}</td>
> <td>{{ field }}</td>
> <td class="errormessage">{{ field.errors }}</td>
> </tr>
--
https://code.launchpad.net/~widelands-dev/widelands-website/gaming_password/+merge/367448
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/gaming_password into lp:widelands-website.
References