Widok do edycji dokumentów w aplikacji wiki.

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index 679d006..150b03d 100755 (executable)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -16,7 +16,7 @@ from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
 
 from explorer import forms
 from django.contrib.auth.decorators import login_required
 
 from explorer import forms

-from api.models import PullRequest
+# from api.models import PullRequest

 from bookthemes.models import Theme
 
 def ajax_login_required(view):
 from bookthemes.models import Theme
 
 def ajax_login_required(view):


@@ -47,18 +47,17 @@ def display_editor(request, path):
 # View all files
 #
 def file_list(request):   
 # View all files
 #
 def file_list(request):   

-    import api.forms
-    from api.resources import library_resource
-
-    bookform = api.forms.DocumentUploadForm()
+    from wiki.views import document_list

 
     # short-circut the api document list
 
     # short-circut the api document list

-    doctree = library_resource.handler.read(request)
+    # doctree = library_resource.handler.read(request)

     # print "DOCTREE:", doctree['documents']
         
     # print "DOCTREE:", doctree['documents']
         

-    return direct_to_template(request, 'explorer/file_list.html', extra_context={
-        'filetree': doctree['documents'], 'bookform': bookform,
-    })
+    return document_list(request, 'explorer/file_list.html')
+    
+    # return direct_to_template(request, 'explorer/file_list.html', extra_context={
+    #     'files': files, 'bookform': bookform,
+    # })

 
 @permission_required('api.document.can_add')
 def file_upload(request):
 
 @permission_required('api.document.can_add')
 def file_upload(request):

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
new file mode 100644 (file)
index 0000000..e247487
--- /dev/null
+++ b/apps/wiki/forms.py
@@ -0,0 +1,27 @@
+from django import forms
+from wiki.models import Document, storage
+
+
+class DocumentForm(forms.Form):
+    name = forms.CharField(widget=forms.HiddenInput)
+    text = forms.CharField(widget=forms.Textarea)
+    revision = forms.IntegerField(widget=forms.HiddenInput)
+    author = forms.CharField()
+    comment = forms.CharField()
+    
+    def __init__(self, *args, **kwargs):
+        document = kwargs.pop('instance', None)
+        super(DocumentForm, self).__init__(*args, **kwargs)
+        if document:
+            self.fields['name'].initial = document.name
+            self.fields['text'].initial = document.text
+            self.fields['revision'].initial = document.revision()
+    
+    def get_storage(self):
+        return storage
+    
+    def save(self):
+        document = Document(self.get_storage(), name=self.cleaned_data['name'], text=self.cleaned_data['text'])
+        storage.put(document, self.cleaned_data['author'], self.cleaned_data['comment'],
+            self.cleaned_data['revision'])
+

diff --git a/apps/wiki/models.py b/apps/wiki/models.py
index a128133..2809dbc 100644 (file)
--- a/apps/wiki/models.py
+++ b/apps/wiki/models.py
@@ -1,4 +1,5 @@
 import vstorage
 import vstorage

+from vstorage import DocumentNotFound

 from wiki import settings
 
 
 from wiki import settings
 
 


@@ -13,18 +14,30 @@ class DocumentStorage(object):
             text = self.vstorage.revision_text(name, revision)
         return Document(self, name=name, text=text)
     
             text = self.vstorage.revision_text(name, revision)
         return Document(self, name=name, text=text)
     

-    def put(self, name, document, author, comment, parent):
+    def put(self, document, author, comment, parent):

         self.vstorage.save_text(document.name, document.text, author, comment, parent)
 
         self.vstorage.save_text(document.name, document.text, author, comment, parent)
 

-    def delete(name, author, comment):
+    def delete(self, name, author, comment):

         self.vstorage.delete_page(name, author, comment)
 
         self.vstorage.delete_page(name, author, comment)
 

+    def all(self):
+        return list(self.vstorage.all_pages())
+
+    def _info(self, name):
+        return self.vstorage.page_meta(name)
+

 
 class Document(object):
     def __init__(self, storage, **kwargs):
         self.storage = storage
 
 class Document(object):
     def __init__(self, storage, **kwargs):
         self.storage = storage

-        for attr, value in kwargs:
+        for attr, value in kwargs.iteritems():

             setattr(self, attr, value)
             setattr(self, attr, value)

+            
+    def revision(self):
+        try:
+            return self.storage._info(self.name)[0]
+        except DocumentNotFound:
+            return -1

 
 
 storage = DocumentStorage(settings.REPOSITORY_PATH)
 
 
 storage = DocumentStorage(settings.REPOSITORY_PATH)

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
new file mode 100644 (file)
index 0000000..339bde8
--- /dev/null
+++ b/apps/wiki/views.py
@@ -0,0 +1,31 @@
+from django.views.generic.simple import direct_to_template
+from django.http import HttpResponseRedirect
+
+from wiki.models import storage, Document, DocumentNotFound
+from wiki.forms import DocumentForm
+
+
+def document_list(request, template_name='wiki/document_list.html'):
+    return direct_to_template(request, template_name, extra_context={
+        'document_list': storage.all(),
+    })
+
+
+def document_detail(request, name, template_name='wiki/document_details.html'):
+    try:
+        document = storage.get(name)
+    except DocumentNotFound:
+        document = Document(storage, name=name, text='')
+        
+    if request.method == 'POST':
+        form = DocumentForm(request.POST, instance=document)
+        if form.is_valid():
+            form.save()
+            return HttpResponseRedirect('/')
+    else:
+        form = DocumentForm(instance=document)
+    
+    return direct_to_template(request, template_name, extra_context={
+        'document': document,
+        'form': form,
+    })

diff --git a/platforma/settings.py b/platforma/settings.py
index 58861bf..19c5321 100755 (executable)
--- a/platforma/settings.py
+++ b/platforma/settings.py
@@ -124,7 +124,7 @@ INSTALLED_APPS = (
     'explorer',
     'toolbar',
     'bookthemes',
     'explorer',
     'toolbar',
     'bookthemes',

-    'api',
+    # 'api',

 )
 
 
 )
 
 

diff --git a/platforma/static/js/slugify.js b/platforma/static/js/slugify.js
new file mode 100644 (file)
index 0000000..b000b64
--- /dev/null
+++ b/platforma/static/js/slugify.js
@@ -0,0 +1,124 @@
+(function() {
+    var ALL_DOWNCODE_MAPS = new Array()
+
+    ALL_DOWNCODE_MAPS[0] = {
+        // LATIN_MAP
+        'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Å': 'A', 'Æ': 'AE', 'Ç':
+        'C', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'Ì': 'I', 'Í': 'I', 'Î': 'I',
+        'Ï': 'I', 'Ð': 'D', 'Ñ': 'N', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O', 'Õ': 'O', 'Ö':
+        'O', 'Ő': 'O', 'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U', 'Ü': 'U', 'Ű': 'U',
+        'Ý': 'Y', 'Þ': 'TH', 'ß': 'ss', 'à':'a', 'á':'a', 'â': 'a', 'ã': 'a', 'ä':
+        'a', 'å': 'a', 'æ': 'ae', 'ç': 'c', 'è': 'e', 'é': 'e', 'ê': 'e', 'ë': 'e',
+        'ì': 'i', 'í': 'i', 'î': 'i', 'ï': 'i', 'ð': 'd', 'ñ': 'n', 'ò': 'o', 'ó':
+        'o', 'ô': 'o', 'õ': 'o', 'ö': 'o', 'ő': 'o', 'ø': 'o', 'ù': 'u', 'ú': 'u',
+        'û': 'u', 'ü': 'u', 'ű': 'u', 'ý': 'y', 'þ': 'th', 'ÿ': 'y'
+    }
+    ALL_DOWNCODE_MAPS[1] = {
+        // LATIN_SYMBOLS_MAP
+        '©':'(c)'
+    }
+    ALL_DOWNCODE_MAPS[2] = {
+        // GREEK_MAP
+        'α':'a', 'β':'b', 'γ':'g', 'δ':'d', 'ε':'e', 'ζ':'z', 'η':'h', 'θ':'8',
+        'ι':'i', 'κ':'k', 'λ':'l', 'μ':'m', 'ν':'n', 'ξ':'3', 'ο':'o', 'π':'p',
+        'ρ':'r', 'σ':'s', 'τ':'t', 'υ':'y', 'φ':'f', 'χ':'x', 'ψ':'ps', 'ω':'w',
+        'ά':'a', 'έ':'e', 'ί':'i', 'ό':'o', 'ύ':'y', 'ή':'h', 'ώ':'w', 'ς':'s',
+        'ϊ':'i', 'ΰ':'y', 'ϋ':'y', 'ΐ':'i',
+        'Α':'A', 'Β':'B', 'Γ':'G', 'Δ':'D', 'Ε':'E', 'Ζ':'Z', 'Η':'H', 'Θ':'8',
+        'Ι':'I', 'Κ':'K', 'Λ':'L', 'Μ':'M', 'Ν':'N', 'Ξ':'3', 'Ο':'O', 'Π':'P',
+        'Ρ':'R', 'Σ':'S', 'Τ':'T', 'Υ':'Y', 'Φ':'F', 'Χ':'X', 'Ψ':'PS', 'Ω':'W',
+        'Ά':'A', 'Έ':'E', 'Ί':'I', 'Ό':'O', 'Ύ':'Y', 'Ή':'H', 'Ώ':'W', 'Ϊ':'I',
+        'Ϋ':'Y'
+    }
+    ALL_DOWNCODE_MAPS[3] = {
+        // TURKISH_MAP
+        'ş':'s', 'Ş':'S', 'ı':'i', 'İ':'I', 'ç':'c', 'Ç':'C', 'ü':'u', 'Ü':'U',
+        'ö':'o', 'Ö':'O', 'ğ':'g', 'Ğ':'G'
+    }
+    ALL_DOWNCODE_MAPS[4] = {
+        // RUSSIAN_MAP
+        'а':'a', 'б':'b', 'в':'v', 'г':'g', 'д':'d', 'е':'e', 'ё':'yo', 'ж':'zh',
+        'з':'z', 'и':'i', 'й':'j', 'к':'k', 'л':'l', 'м':'m', 'н':'n', 'о':'o',
+        'п':'p', 'р':'r', 'с':'s', 'т':'t', 'у':'u', 'ф':'f', 'х':'h', 'ц':'c',
+        'ч':'ch', 'ш':'sh', 'щ':'sh', 'ъ':'', 'ы':'y', 'ь':'', 'э':'e', 'ю':'yu',
+        'я':'ya',
+        'А':'A', 'Б':'B', 'В':'V', 'Г':'G', 'Д':'D', 'Е':'E', 'Ё':'Yo', 'Ж':'Zh',
+        'З':'Z', 'И':'I', 'Й':'J', 'К':'K', 'Л':'L', 'М':'M', 'Н':'N', 'О':'O',
+        'П':'P', 'Р':'R', 'С':'S', 'Т':'T', 'У':'U', 'Ф':'F', 'Х':'H', 'Ц':'C',
+        'Ч':'Ch', 'Ш':'Sh', 'Щ':'Sh', 'Ъ':'', 'Ы':'Y', 'Ь':'', 'Э':'E', 'Ю':'Yu',
+        'Я':'Ya'
+    }
+    ALL_DOWNCODE_MAPS[5] = {
+        // UKRAINIAN_MAP
+        'Є':'Ye', 'І':'I', 'Ї':'Yi', 'Ґ':'G', 'є':'ye', 'і':'i', 'ї':'yi', 'ґ':'g'
+    }
+    ALL_DOWNCODE_MAPS[6] = {
+        // CZECH_MAP
+        'č':'c', 'ď':'d', 'ě':'e', 'ň': 'n', 'ř':'r', 'š':'s', 'ť':'t', 'ů':'u',
+        'ž':'z', 'Č':'C', 'Ď':'D', 'Ě':'E', 'Ň': 'N', 'Ř':'R', 'Š':'S', 'Ť':'T',
+        'Ů':'U', 'Ž':'Z'
+    }
+
+    ALL_DOWNCODE_MAPS[7] = {
+        // POLISH_MAP
+        'ą':'a', 'ć':'c', 'ę':'e', 'ł':'l', 'ń':'n', 'ó':'o', 'ś':'s', 'ź':'z',
+        'ż':'z', 'Ą':'A', 'Ć':'C', 'Ę':'e', 'Ł':'L', 'Ń':'N', 'Ó':'o', 'Ś':'S',
+        'Ź':'Z', 'Ż':'Z'
+    }
+
+    ALL_DOWNCODE_MAPS[8] = {
+        // LATVIAN_MAP
+        'ā':'a', 'č':'c', 'ē':'e', 'ģ':'g', 'ī':'i', 'ķ':'k', 'ļ':'l', 'ņ':'n',
+        'š':'s', 'ū':'u', 'ž':'z', 'Ā':'A', 'Č':'C', 'Ē':'E', 'Ģ':'G', 'Ī':'i',
+        'Ķ':'k', 'Ļ':'L', 'Ņ':'N', 'Š':'S', 'Ū':'u', 'Ž':'Z'
+    }
+
+    var Downcoder = new Object();
+
+    Downcoder.Initialize = function() {
+        if (Downcoder.map) // already made
+            return ;
+        Downcoder.map ={}
+        Downcoder.chars = '';
+        for(var i in ALL_DOWNCODE_MAPS) {
+            var lookup = ALL_DOWNCODE_MAPS[i]
+            for (var c in lookup) {
+                Downcoder.map[c] = lookup[c];
+                Downcoder.chars += c;
+            }
+         }
+        Downcoder.regex = new RegExp('[' + Downcoder.chars + ']|[^' + Downcoder.chars + ']+','g');
+    }
+
+    downcode = function(slug) {
+        Downcoder.Initialize();
+        var downcoded =""
+        var pieces = slug.match(Downcoder.regex);
+        if(pieces) {
+            for (var i = 0 ; i < pieces.length ; i++) {
+                if (pieces[i].length == 1) {
+                    var mapped = Downcoder.map[pieces[i]];
+                    if (mapped != null) {
+                        downcoded+=mapped;
+                        continue;
+                    }
+                }
+                downcoded+=pieces[i];
+            }
+        } else {
+            downcoded = slug;
+        }
+        return downcoded;
+    }
+    
+    slugify = function(s) {
+        s = downcode(s);
+        // if downcode doesn't hit, the char will be stripped here
+        s = s.replace(/[^-\w\s]/g, '');  // remove unneeded chars
+        s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
+        s = s.replace(/[-\s]+/g, '-');   // convert spaces to hyphens
+        s = s.toLowerCase();             // convert to lowercase
+        
+        return s;
+    }
+})()

diff --git a/platforma/templates/base.html b/platforma/templates/base.html
index 597a432..5abf44b 100755 (executable)
--- a/platforma/templates/base.html
+++ b/platforma/templates/base.html
@@ -24,6 +24,5 @@
         <div id="content">{% block maincontent %} {% endblock %}</div>
         </div>
     {% block extrabody %}{% endblock %}
         <div id="content">{% block maincontent %} {% endblock %}</div>
         </div>
     {% block extrabody %}{% endblock %}

-    http://192.168.56.2:8000/editor/mickiewicz__pan_tadeusz__ksi%C4%99ga_1/

     </body>
 </html>
     </body>
 </html>

diff --git a/platforma/templates/explorer/file_list.html b/platforma/templates/explorer/file_list.html
index f44a105..abd9612 100644 (file)
--- a/platforma/templates/explorer/file_list.html
+++ b/platforma/templates/explorer/file_list.html
@@ -2,54 +2,22 @@
 
 {% block extrahead %}
 <link rel="stylesheet" href="{{ STATIC_URL }}css/filelist.css" type="text/css" />
 
 {% block extrahead %}
 <link rel="stylesheet" href="{{ STATIC_URL }}css/filelist.css" type="text/css" />

-    <script src="{{STATIC_URL}}js/jquery.json.js" type="text/javascript" charset="utf-8"></script>
-    <script src="{{STATIC_URL}}js/jquery.cookie.js" type="text/javascript" charset="utf-8"></script>
+<script src="{{ STATIC_URL }}js/slugify.js" type="text/javascript" charset="utf-8"></script>

 <script type="text/javascript" charset="utf-8">
 $(function() {
        function search(event) {
 <script type="text/javascript" charset="utf-8">
 $(function() {
        function search(event) {

-        var expr = new RegExp($('#file-list-filter').val(), 'i');
+        event.preventDefault();
+        
+        var expr = new RegExp(slugify($('#file-list-filter').val()), 'i');

        
         $('#file-list p').hide().filter(function(index) {
        
         $('#file-list p').hide().filter(function(index) {

-            return expr.test($(this).attr('title'));
+            console.log(expr.test($(this).attr('title')))
+            return expr.test(slugify($('a', this).html()));

         }).show();
         }).show();

-    
-        event.preventDefault();

     }
        
     }
        

-    $('#file-list-find-button').click(search);
+    $('#file-list-find-button').click(search).hide();

        $('#file-list-filter').bind('keyup change DOMAttrModified', search);
        $('#file-list-filter').bind('keyup change DOMAttrModified', search);

-               
-    var defaultOptions = {
-        panels: [
-        {
-            name: 'htmleditor',
-            ratio: 0.5
-        },
-
-        {
-            name: 'gallery',
-            ratio: 0.5
-        }
-        ],
-        recentFiles: [],
-        lastUpdate: 0
-    };
-    
-       var options = null;
-    try {
-        var cookie = $.cookie('options');
-        options = $.secureEvalJSON(cookie);
-        if (!options) {
-            options = defaultOptions;
-        }
-    } catch (e) {    
-        options = defaultOptions;
-    };
-       
-       $.each(options.recentFiles, function(index) {
-               var fileId = options.recentFiles[index].fileId;
-               $('#recent-file-list ul').append('<li><a href="{% url editor_base %}'+fileId+'">' + fileId + '</a></li>');
-       });

 });
 </script>
 {% endblock extrahead %}
 });
 </script>
 {% endblock extrahead %}


@@ -59,17 +27,16 @@ $(function() {
 
 <div class="file-list-widget">
     <form action="#" method="GET">
 
 <div class="file-list-widget">
     <form action="#" method="GET">

-    <p><input name="filter" id="file-list-filter" type="text" size="60" />
+    <p><input autocomplete="off" name="filter" id="file-list-filter" type="text" size="60" />

         <input type="submit" value="Znajdź" id="file-list-find-button"/>
         <input type="reset" value="Wyczyść" id="file-list-reset-button"/>
     </p>
         <input type="submit" value="Znajdź" id="file-list-find-button"/>
         <input type="reset" value="Wyczyść" id="file-list-reset-button"/>
     </p>

-    </form>
-    {% load explorer_tags %}
-    <ul class="file-tree-part file-tree-top">
-    {% for file in filetree %}    
-        {% tree_part file %}            
+    </form> 
+    <div id="file-list">
+    {% for file in document_list %}
+        <p><a href="/{{ file|urlencode }}">{{ file }}</a></p>

     {% endfor %}
     {% endfor %}

-    </ul>
+    </div>

 </div>
 
 <div id="recent-file-list">
 </div>
 
 <div id="recent-file-list">

diff --git a/platforma/templates/wiki/document_details.html b/platforma/templates/wiki/document_details.html
new file mode 100644 (file)
index 0000000..7a2aa4b
--- /dev/null
+++ b/platforma/templates/wiki/document_details.html
@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+
+{% block extrahead %}
+    <script src="{{STATIC_URL}}js/lib/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript" charset="utf-8">
+        $(function() {
+            var editor = CodeMirror.fromTextArea('id_text', {
+                parserfile: 'parsexml.js',
+                path: "{{ STATIC_URL }}js/lib/codemirror/",
+                stylesheet: "{{ STATIC_URL }}css/xmlcolors.css",
+                parserConfig: {
+                    useHTMLKludges: false
+                },
+                textWrapping: true,
+                tabMode: 'spaces',
+                indentUnit: 0,
+            });
+        });
+    </script>
+{% endblock %}
+
+{% block maincontent %}
+    <form action="{% url wiki.views.document_detail document.name|urlencode %}" method="post" accept-charset="utf-8">
+        {{ form.as_p }}
+        <p><input type="submit" value="Continue &rarr;"></p>
+    </form>
+{% endblock %}
\ No newline at end of file

diff --git a/platforma/urls.py b/platforma/urls.py
index ccb9fcf..495c735 100755 (executable)
--- a/platforma/urls.py
+++ b/platforma/urls.py
@@ -30,7 +30,15 @@ urlpatterns = patterns('',
     url(r'themes/', include('bookthemes.urls')),
 
     # Our über-restful api
     url(r'themes/', include('bookthemes.urls')),
 
     # Our über-restful api

-    url(r'^api/', include('api.urls')),
+    # url(r'^api/', include('api.urls')),
+    
+    # Static files (should be served by Apache)
+    url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
+        {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
+    url(r'^%s(?P<path>.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve',
+        {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
+        
+    url(r'^(?P<name>(.*))$', 'wiki.views.document_detail'),

     
 )
 
     
 )
 


@@ -46,17 +54,3 @@ else:
         url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'redirect_field_name': 'next'}, name='login'),
         url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}, name='logout'),    
     )
         url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'redirect_field_name': 'next'}, name='login'),
         url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}, name='logout'),    
     )

-
-# Static files
-if settings.DEBUG:
-    urlpatterns += patterns('',
-        url(r'^renderer$', 'explorer.views.renderer_test'),
-    )
-
-    if not hasattr(settings, 'DONT_SERVE_STATIC'):
-        urlpatterns += patterns('',
-            url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
-                {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
-            url(r'^%s(?P<path>.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve',
-                {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
-        )
\ No newline at end of file