librarian in submodule, HTML and TXT book previews, URL fixes

[redakcja.git] / apps / wiki / forms.py

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index e48c5ea..b057be0 100644 (file)
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -5,6 +5,7 @@
 #
 from django import forms
 from wiki.constants import DOCUMENT_TAGS, DOCUMENT_STAGES
+from wiki.models import Book
 from django.utils.translation import ugettext_lazy as _
 
 
@@ -18,16 +19,19 @@ class DocumentTagForm(forms.Form):
     revision = forms.IntegerField(widget=forms.HiddenInput)
 
 
-class DocumentCreateForm(forms.Form):
+class DocumentCreateForm(forms.ModelForm):
     """
         Form used for creating new documents.
     """
-    title = forms.CharField()
-    id = forms.RegexField(regex=ur"^[\wąćęłńóśźżĄĆĘŁŃÓŚŹŻ]+$")
     file = forms.FileField(required=False)
     text = forms.CharField(required=False, widget=forms.Textarea)
 
+    class Meta:
+        model = Book
+        exclude = ['gallery']
+
     def clean(self):
+        super(DocumentCreateForm, self).clean()
         file = self.cleaned_data['file']
 
         if file is not None:
@@ -66,14 +70,12 @@ class DocumentTextSaveForm(forms.Form):
     """
     Form for saving document's text:
 
-        * name - document's storage identifier.
         * parent_revision - revision which the modified text originated from.
         * comment - user's verbose comment; will be used in commit.
         * stage_completed - mark this change as end of given stage.
 
     """
 
-    id = forms.CharField(widget=forms.HiddenInput)
     parent_revision = forms.IntegerField(widget=forms.HiddenInput)
     text = forms.CharField(widget=forms.HiddenInput)
 
@@ -102,3 +104,34 @@ class DocumentTextSaveForm(forms.Form):
         label=_(u"Completed"),
         help_text=_(u"If you completed a life cycle stage, select it."),
     )
+
+
+class DocumentTextRevertForm(forms.Form):
+    """
+    Form for reverting document's text:
+
+        * revision - revision to revert to.
+        * comment - user's verbose comment; will be used in commit.
+
+    """
+
+    revision = forms.IntegerField(widget=forms.HiddenInput)
+
+    author_name = forms.CharField(
+        required=False,
+        label=_(u"Author"),
+        help_text=_(u"Your name"),
+    )
+
+    author_email = forms.EmailField(
+        required=False,
+        label=_(u"Author's email"),
+        help_text=_(u"Your email address, so we can show a gravatar :)"),
+    )
+
+    comment = forms.CharField(
+        required=True,
+        widget=forms.Textarea,
+        label=_(u"Your comments"),
+        help_text=_(u"Describe the reason for reverting."),
+    )