personalized fork for Open-Knesset

use at your own risk

Author: daonb

annotatetext/forms.py

@@ -12,7 +12,7 @@ class NewAnnotationForm(forms.Form):
     flags = forms.ChoiceField(choices=enumerate(ANNOTATION_FLAGS),widget=forms.Select(attrs={"class":"annotationflagselect"}), required=True)
     content_type = forms.IntegerField(widget=forms.HiddenInput, required=True)
     object_id = forms.IntegerField(widget=forms.HiddenInput, required=True)
-    comment = forms.CharField(widget=forms.Textarea(attrs={'cols': 50, 'rows': 3}), required=False)
+    comment = forms.CharField(widget=forms.Textarea(attrs={'rows': 5 }), required=False)
     color = forms.CharField(initial="#3f0b5c", widget=forms.TextInput(attrs={"size":6}), required=False)
     lengthcheck = forms.IntegerField(widget=forms.HiddenInput, required=True)
 
@@ -49,9 +49,10 @@ def clean(self):
         # so not every model can be annotated, don't know if this is cool in practice
         if not getattr(obj, "annotatable", False):
             raise forms.ValidationError(_("Invalid object"))
-        if not hasattr(obj,Annotation.field_name):
+        #TODO: generalize
+        if not hasattr(obj,'body'):
             raise forms.ValidationError(_("Bogus object"))
-        text = getattr(obj, Annotation.field_name)
+        text = getattr(obj, 'body')
         if len(text) != cleaned_data["lengthcheck"]:
             raise forms.ValidationError(_("Text changed"))
         if not "selection_start" in cleaned_data or not "selection_end" in cleaned_data:

annotatetext/models.py

@@ -9,7 +9,13 @@
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 
-ANNOTATION_FLAGS = getattr(settings, "ANNOTATETEXT_FLAGS", (_("Annotation"), ))
+# entries from settings.py are not translated automaticly 
+# http://docs.djangoproject.com/en/dev/ref/settings/#languages
+flags = getattr(settings, "ANNOTATETEXT_FLAGS", None)
+if flags is None:
+    ANNOTATION_FLAGS = (_("Annotation"), )
+else:
+    ANNOTATION_FLAGS = map(_, flags)
 
 
 class Annotation(models.Model):
@@ -39,7 +45,7 @@ class Annotation(models.Model):
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
     content_object = generic.GenericForeignKey('content_type', 'object_id')
-    field_name = models.CharField(blank=True, null=True, max_length=100)
+    field_name = models.CharField(default='body', null=True, max_length=100)
     selection_start = models.IntegerField()
     selection_end = models.IntegerField(blank=True, null=True)
     comment = models.TextField(blank=True)
@@ -119,7 +125,7 @@ def clean_text(self, text):
         return text
 
     @classmethod
-    def get_textfield_from_object(cls, obj, field_name="text"):
+    def get_textfield_from_object(cls, obj, field_name="body"):
         if field_name is None:
             return unicode(getattr(obj, "text", ""))
         else:

otherapp/__init__.py renamed to annotatetext/otherapp/__init__.py

@@ -1,6 +1,7 @@
-<div id="a_{{ annotation.id }}" class="semannotation annotationfor-{{ key }}" style="border:1px solid;border-color:{% if annotation.color %}{{ annotation.color }}{% else %}#ff0000{% endif %};">
+{% load i18n %}
+<div id="a_{{ annotation.id }}" class="semannotation annotationfor-{{ speech_part.id }}" style="border:1px solid;border-color:{% if annotation.color %}{{ annotation.color }}{% else %}#ff0000{% endif %};">
     <form class="admin really_delete" style="float:right" action="{% url annotatetext-delete_annotation %}" method="post"><input type="hidden" name="next" value="{{ next }}"/><input type="hidden" name="annotation_id" value="{{ annotation.id }}"/><input type="submit" value="X"/></form>
     <q class="start_{{ annotation.selection_range.0 }} end_{{ annotation.selection_range.1 }}">{{ annotation.selection }}</q>
-    <p class="annotation_meta" id="annotation-{{ annotation.id }}">{{ annotation.flag_value }} - {% if annotation.user %}{{ annotation.user }}{% else %}anonymous{% endif %} @ {{ annotation.timestamp|date:"d.m.Y H:i"}} - <a href="#annotation-{{ annotation.id }}">Permalink</a></p>
+    <p class="annotation_meta" id="annotation-{{ annotation.id }}">{{ annotation.flag_value }} {% trans "by" %} {% if annotation.user %}{{ annotation.user }}{% else %}anonymous{% endif %} - <a href="#annotation-{{ annotation.id }}">{% trans "Permalink"%}</a></p>
     <div class="content">{{ annotation.comment|urlizetrunc:25 }}</div>
 </div>

otherapp/models.py renamed to annotatetext/otherapp/models.py

@@ -20,7 +20,8 @@ def post_annotation(request):
                     color=form.cleaned_data["color"])
         new_annotation.save()
         fragment = "#annotation-%d" % new_annotation.id
-        return HttpResponseRedirect(request.POST.get("next","/") + fragment)
+        # return HttpResponseRedirect(request.POST.get("next","/") + fragment)
+        return HttpResponseRedirect(new_annotation.content_object.get_absolute_url())
     else:
         return HttpResponseBadRequest()
 
@@ -37,4 +38,4 @@ def delete_annotation(request):
         return HttpResponseBadRequest()
     annotation = get_object_or_404(Annotation, id=annoid)
     annotation.delete()
-    return HttpResponseRedirect(request.POST.get("next","/"))
+    return HttpResponseRedirect(request.POST.get("next","/"))