smile/cbmi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use e-mail field, add preferred email to main navigation menu #8

Browse source
This commit is contained in:
Uwe Kamper 2015-12-01 00:42:55 +01:00
parent eacbb841a7
commit a153ca8d1c
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
account/forms.py
View file

@ -147,9 +147,9 @@ class CLabPinForm(forms.Form):
class PreferredEmailForm(forms.Form): class PreferredEmailForm(forms.Form):
preferred_email = forms.CharField(max_length=255, required=False, preferred_email = forms.EmailField(max_length=255, required=False,
label = _('Preferred e-mail'), label = _('Preferred e-mail'),
help_text=_("Forward my mail to this address.")) help_text=_("Forward my mail to this address. Leave empty to use the c-base IMAP and SMTP servers."))
class AdminForm(forms.Form): class AdminForm(forms.Form):

4
account/templates/member_base.html
View file

@ -36,6 +36,10 @@
<li class="{% if request.path == sippin_url %}active{% endif %}"> <li class="{% if request.path == sippin_url %}active{% endif %}">
<a href="{{ sippin_url }}">{% trans "SIP-PIN" %}</a> <a href="{{ sippin_url }}">{% trans "SIP-PIN" %}</a>
</li> </li>
{% url 'preferred_email' as preferred_email_url %}
<li class="{% if request.path == preferred_email_url %}active{% endif %}">
<a href="{{ preferred_email_url }}">{% trans "Preferred e-mail" %}</a>
</li>
{% for group in request.user.groups.all %} {% for group in request.user.groups.all %}
{% if group.name == 'ldap_admins' %} {% if group.name == 'ldap_admins' %}
{% url 'admin' as admin_url %} {% url 'admin' as admin_url %}