X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/9308d78c7f1e4d2a4faf3b98d1b24c262f3b6287..fa21c2cc4d92e1f723a3b38daa2f033dbb4889e5:/forum/forms/admin.py?ds=sidebyside diff --git a/forum/forms/admin.py b/forum/forms/admin.py index eabeb57..1ff2e85 100644 --- a/forum/forms/admin.py +++ b/forum/forms/admin.py @@ -1,8 +1,11 @@ import socket from django import forms from django.utils.translation import ugettext as _ +from django.contrib.admin.widgets import FilteredSelectMultiple, AdminDateWidget from qanda import TitleField, EditorField from forum import settings +from forum.models.node import NodeMetaClass +from forum.models import User class IPListField(forms.CharField): def clean(self, value): @@ -37,30 +40,29 @@ class MaintenanceModeForm(forms.Form): TEMPLATE_CHOICES = ( - ('default', _('Default')), - ('sidebar', _('Default with sidebar')), - ('none', _('None')), +('default', _('Default')), +('sidebar', _('Default with sidebar')), +('none', _('None')), ) RENDER_CHOICES = ( - ('markdown', _('Markdown')), - ('html', _('HTML')), - ('escape', _('Escaped')) +('markdown', _('Markdown')), +('html', _('HTML')), +('escape', _('Escaped')) ) class UrlFieldWidget(forms.TextInput): def render(self, name, value, attrs=None): if not value: value = '' - + return """ - - """ % {'name': name, 'value': value, 'app_url': settings.APP_URL, 'script_alias': settings.FORUM_SCRIPT_ALIAS} + + """ % {'name': name, 'value': value, 'app_url': settings.APP_URL} class PageForm(forms.Form): - def __init__(self, page, *args, **kwargs): if page: initial = page.extra @@ -70,17 +72,36 @@ class PageForm(forms.Form): super(PageForm, self).__init__(*args, **kwargs) - title = forms.CharField(label=_('Title'), max_length=255, widget=forms.TextInput(attrs={'class': 'longstring'}), initial='New page') + title = forms.CharField(label=_('Title'), max_length=255, widget=forms.TextInput(attrs={'class': 'longstring'}), + initial='New page') path = forms.CharField(label=_('Page URL'), widget=UrlFieldWidget, initial='pages/new/') content = forms.CharField(label=_('Page Content'), widget=forms.Textarea(attrs={'rows': 30})) - render = forms.ChoiceField(widget=forms.RadioSelect, choices=RENDER_CHOICES, initial='markdown', label=_('Render Mode')) + mimetype = forms.CharField(label=_('Mime Type'), initial='text/html') - template = forms.ChoiceField(widget=forms.RadioSelect, choices=TEMPLATE_CHOICES, initial='default', label=_('Template')) + render = forms.ChoiceField(widget=forms.RadioSelect, choices=RENDER_CHOICES, initial='markdown', + label=_('Render Mode')) + + template = forms.ChoiceField(widget=forms.RadioSelect, choices=TEMPLATE_CHOICES, initial='default', + label=_('Template')) sidebar = forms.CharField(label=_('Sidebar Content'), widget=forms.Textarea(attrs={'rows': 20}), required=False) - sidebar_wrap = forms.BooleanField(label=_("Wrap sidebar block"), initial=True, required=False) - sidebar_render = forms.ChoiceField(widget=forms.RadioSelect, choices=RENDER_CHOICES, initial='markdown', label=_('Sidebar Render Mode')) + sidebar_wrap = forms.BooleanField(label=_("Wrap sidebar block"), initial=True, required=False) + sidebar_render = forms.ChoiceField(widget=forms.RadioSelect, choices=RENDER_CHOICES, initial='markdown', + label=_('Sidebar Render Mode')) comments = forms.BooleanField(label=_("Allow comments"), initial=False, required=False) - \ No newline at end of file +from forum.forms.auth import SimpleRegistrationForm +from forum.forms.general import SetPasswordForm + + +class CreateUserForm(SimpleRegistrationForm, SetPasswordForm): + validate_email = forms.BooleanField(required=False, label=_('send validation email')) + + def __init__(self, *args, **kwargs): + super(CreateUserForm, self).__init__(*args, **kwargs) + self.fields.keyOrder = ['username', 'email', 'validate_email', 'password1', 'password2'] + self.fields['email'].label = _('email address') + + +