From f499ee9347f539c36f3846fdc41020f2320bae77 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Rekucki?= Date: Sat, 10 Apr 2010 21:10:07 +0200 Subject: [PATCH 1/1] * End of javascript refactoring: both editors, history and gallery work as expected. * Minor refactoring to wiki views. * Added views and vstorage support for taging history. * Other minor changes in vstorage. --- apps/wiki/forms.py | 12 +- apps/wiki/models.py | 27 +- .../wiki/templates/wiki/document_details.html | 29 +- apps/wiki/templates/wiki/history_view.html | 30 +- apps/wiki/templates/wiki/save_dialog.html | 42 ++- apps/wiki/urls.py | 2 +- apps/wiki/views.py | 131 ++++---- lib/test_vstorage.py | 87 ++++- lib/vstorage.py | 40 ++- platforma/settings.py | 16 +- platforma/static/css/dialogs.css | 5 + platforma/static/css/history.css | 174 +++++----- platforma/static/css/html.css | 315 ++++++++---------- platforma/static/css/master.css | 20 +- platforma/static/css/xmlcolors_15032010.css | 6 +- platforma/static/js/slugify.js | 4 +- platforma/static/js/wiki/base.js | 241 +++++++++++++- platforma/static/js/wiki/diff_view.js | 11 +- platforma/static/js/wiki/history_view.js | 199 ++++++----- platforma/static/js/wiki/main.js | 143 +++----- platforma/static/js/wiki/save_dialog.js | 26 +- platforma/static/js/wiki/scan_gallery.js | 283 +++++++--------- platforma/static/js/wiki/source_editor.js | 88 ++--- platforma/static/js/wiki/summary_view.js | 10 +- platforma/static/js/wiki/wikiapi.js | 65 ++-- platforma/static/js/wiki/wysiwyg_editor.js | 198 +++++------ platforma/templates/base.html | 3 +- 27 files changed, 1316 insertions(+), 891 deletions(-) diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py index ca219889..236c3f0e 100644 --- a/apps/wiki/forms.py +++ b/apps/wiki/forms.py @@ -35,6 +35,14 @@ class DocumentForm(forms.Form): parent =self.cleaned_data['revision'] ) return storage.get(self.cleaned_data['name']) + +class DocumentTagForm(forms.Form): + TAGS = ( + ("publish", "Do publikacji"), + ) + + tag = forms.ChoiceField(choices = TAGS) + version = forms.IntegerField(widget = forms.HiddenInput) class DocumentTextSaveForm(forms.Form): """ @@ -55,16 +63,16 @@ class DocumentTextSaveForm(forms.Form): id = forms.CharField(widget=forms.HiddenInput) parent_revision = forms.IntegerField(widget=forms.HiddenInput) + text = forms.CharField(widget=forms.HiddenInput) author = forms.CharField( required = False, label = _(u"Autor"), help_text = _(u"Twoje imie i nazwisko lub email.") - ) comment = forms.CharField( - required = False, + required = True, widget=forms.Textarea, label = _(u"Twój komentarz"), help_text = _(u"Opisz w miarę dokładnie swoje zmiany."), diff --git a/apps/wiki/models.py b/apps/wiki/models.py index 22a81196..a530916f 100644 --- a/apps/wiki/models.py +++ b/apps/wiki/models.py @@ -4,10 +4,16 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # import re +import os import vstorage from vstorage import DocumentNotFound from wiki import settings +from django.http import Http404 + +import logging +logger = logging.getLogger("fnp.wiki") + class DocumentStorage(object): def __init__(self, path): self.vstorage = vstorage.VersionedStorage(path) @@ -18,6 +24,12 @@ class DocumentStorage(object): else: text = self.vstorage.revision_text(name, revision) return Document(self, name = name, text = text) + + def get_or_404(self, *args, **kwargs): + try: + return self.get(*args, **kwargs) + except DocumentNotFound: + raise Http404 def put(self, document, author, comment, parent): self.vstorage.save_text( @@ -52,7 +64,12 @@ class Document(object): try: return self.storage._info(self.name)[0] except DocumentNotFound: - return - 1 + return -1 + + def add_tag(self, tag): + """ Add document specific tag """ + logger.debug("Adding tag %s to doc %s version %d", tag, self.name, self.revision) + self.storage.vstorage.add_page_tag(self.name, self.revision, tag) @property def plain_text(self): @@ -70,8 +87,12 @@ class Document(object): except ValueError: continue - if 'gallery' not in result: - result['gallery'] = (settings.GALLERY_URL + self.name).replace(' ', '_') + gallery = result.get('gallery', self.name.replace(' ', '_')) + + if gallery.startswith('/'): + gallery = os.path.basename(gallery) + + result['gallery'] = gallery if 'title' not in result: result['title'] = self.name.title() diff --git a/apps/wiki/templates/wiki/document_details.html b/apps/wiki/templates/wiki/document_details.html index d077e7db..cbed276c 100644 --- a/apps/wiki/templates/wiki/document_details.html +++ b/apps/wiki/templates/wiki/document_details.html @@ -23,7 +23,7 @@ - @@ -117,4 +119,5 @@ {% include "wiki/save_dialog.html" %} +{% include "wiki/tag_dialog.html" %} {% endblock %} \ No newline at end of file diff --git a/apps/wiki/templates/wiki/history_view.html b/apps/wiki/templates/wiki/history_view.html index c14cb4de..36be4873 100644 --- a/apps/wiki/templates/wiki/history_view.html +++ b/apps/wiki/templates/wiki/history_view.html @@ -1,19 +1,27 @@