Merge branch 'master' of github.com:benjaoming/django-wiki

wiki/plugins/images/templates/wiki/plugins/images/index.html

 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n humanize thumbnail %}
+{% load wiki_tags i18n humanize wiki_thumbnails %}
 {% load url from future %}
 
 {% block wiki_pagetitle %}{% trans "Images" %}: {{ article.current_revision.title }}{% endblock %}

wiki/plugins/images/templates/wiki/plugins/images/purge.html

 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n humanize thumbnail %}
+{% load wiki_tags i18n humanize wiki_thumbnails %}
 {% load url from future %}
 
 {% block wiki_pagetitle %}{% trans "Purge deletion" %}: {{ image }}{% endblock %}

wiki/plugins/images/templates/wiki/plugins/images/render.html

-{% load thumbnail i18n %}{% comment %}
+{% load wiki_thumbnails i18n %}{% comment %}
   This template is used for the markdown extension that renders images and captions.
   
   NB! Watch out for line breaks, markdown might add <br />s and <p>s.

wiki/plugins/images/templates/wiki/plugins/images/revision_add.html

 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n humanize thumbnail %}
+{% load wiki_tags i18n humanize wiki_thumbnails %}
 {% load url from future %}
 
 {% block wiki_pagetitle %}{% trans "Replace image" %}: {{ image }}{% endblock %}

wiki/plugins/images/templates/wiki/plugins/images/sidebar.html

-{% load i18n wiki_tags wiki_images_tags humanize thumbnail sekizai_tags %}
+{% load i18n wiki_tags wiki_images_tags humanize wiki_thumbnails sekizai_tags %}
 {% load url from future %}
 
 {% addtoblock "js" %}

wiki/plugins/images/templatetags/wiki_thumbnails.py

+from sorl.thumbnail.templatetags.thumbnail import register

wiki/templates/wiki/create_root.html

@@ -4,7 +4,7 @@
 {% block wiki_pagetitle %}{% trans "Create root article" %}{% endblock %}
 
 {% block wiki_contents %}
-  
+
   {% addtoblock "js" %}
   {% for js in editor.Media.js %}
   <script type="text/javascript" src="{{ STATIC_URL }}{{ js }}"></script>
@@ -23,17 +23,17 @@
   <p class="lead">
     {% trans "You have django-wiki installed... but there are no articles. So it's time to create the first one, the root article. In the beginning, it will only be editable by administrators, but you can define permissions after." %}
   </p>
-  
+
   <h2 class="page-header">{% trans "Root article" %}</h2>
-  
+
   <form method="POST" class="form-horizontal">
-    {% wiki_form create_form %}
+    {% wiki_form form %}
     <div class="form-group form-actions">
       <div class="col-lg-2"></div>
       <div class="col-lg-10">
         <input type="submit" name="save_changes" value="{% trans "Create root" %} &raquo;" class="btn btn-primary btn-large" />
       </div>
-    </div>  
+    </div>
   </form>
 
 {% endblock %}

wiki/urls.py

@@ -6,10 +6,11 @@ from wiki.core.plugins import registry
 from wiki.views import article, accounts
 from wiki.core.utils import get_class_from_str
 
+
 class WikiURLPatterns(object):
     '''
     configurator for wiki urls.
-    
+
     To customize, you can define your own subclass, either overriding
     the view providers, or overriding the functions that collect
     views.
@@ -27,10 +28,9 @@ class WikiURLPatterns(object):
     article_settings_view_class = article.Settings
     article_source_view_class = article.Source
     article_plugin_view_class = article.Plugin
-    revision_change_view = 'wiki.views.article.change_revision'
+    revision_change_view = article.ChangeRevisionView
     revision_merge_view = 'wiki.views.article.merge'
 
-    create_root = 'wiki.views.article.root_create'
     search_view_class = settings.SEARCH_VIEW
     article_diff_view = 'wiki.views.article.diff'
 
@@ -38,14 +38,14 @@ class WikiURLPatterns(object):
     signup_view_class = accounts.Signup
     login_view_class = accounts.Login
     logout_view_class = accounts.Logout
-    
+
     def get_urls(self):
         urlpatterns = self.get_root_urls()
         urlpatterns += self.get_accounts_urls()
         urlpatterns += self.get_revision_urls()
         urlpatterns += self.get_article_urls()
         urlpatterns += self.get_plugin_urls()
-        
+
         # This ALWAYS has to be the last of all the patterns since
         # the paths in theory could wrongly match other targets.
         urlpatterns += self.get_article_path_urls()
@@ -54,7 +54,7 @@ class WikiURLPatterns(object):
     def get_root_urls(self):
         urlpatterns = patterns('',
             url('^$', self.article_view_class.as_view(), name='root', kwargs={'path': ''}),
-            url('^create-root/$', self.create_root, name='root_create'),
+            url('^create-root/$', article.CreateRootView.as_view(), name='root_create'),
             url('^_search/$', get_class_from_str(self.search_view_class).as_view(), name='search'),
             url('^_revision/diff/(?P<revision_id>\d+)/$', self.article_diff_view, name='diff'),
        )
@@ -70,8 +70,8 @@ class WikiURLPatterns(object):
 
     def get_revision_urls(self):
         urlpatterns = patterns('',
-            # This one doesn't work because it don't know where to redirect after...   
-            url('^_revision/change/(?P<article_id>\d+)/(?P<revision_id>\d+)/$', self.revision_change_view, name='change_revision'),
+            # This one doesn't work because it don't know where to redirect after...
+            url('^_revision/change/(?P<article_id>\d+)/(?P<revision_id>\d+)/$', self.revision_change_view.as_view(), name='change_revision'),
             url('^_revision/preview/(?P<article_id>\d+)/$', self.article_preview_view_class.as_view(), name='preview_revision'),
             url('^_revision/merge/(?P<article_id>\d+)/(?P<revision_id>\d+)/preview/$', self.revision_merge_view, name='merge_revision_preview', kwargs={'preview': True}),
            )
@@ -88,7 +88,7 @@ class WikiURLPatterns(object):
             url('^(?P<article_id>\d+)/history/$', self.article_history_view_class.as_view(), name='history'),
             url('^(?P<article_id>\d+)/settings/$', self.article_settings_view_class.as_view(), name='settings'),
             url('^(?P<article_id>\d+)/source/$', self.article_source_view_class.as_view(), name='source'),
-            url('^(?P<article_id>\d+)/revision/change/(?P<revision_id>\d+)/$', self.revision_change_view, name='change_revision'),
+            url('^(?P<article_id>\d+)/revision/change/(?P<revision_id>\d+)/$', self.revision_change_view.as_view(), name='change_revision'),
             url('^(?P<article_id>\d+)/revision/merge/(?P<revision_id>\d+)/$', self.revision_merge_view, name='merge_revision'),
             url('^(?P<article_id>\d+)/plugin/(?P<slug>\w+)/$', self.article_plugin_view_class.as_view(), name='plugin'),
            )
@@ -106,7 +106,7 @@ class WikiURLPatterns(object):
             url('^(?P<path>.+/|)_dir/$', self.article_dir_view_class.as_view(), name='dir'),
             url('^(?P<path>.+/|)_settings/$', self.article_settings_view_class.as_view(), name='settings'),
             url('^(?P<path>.+/|)_source/$', self.article_source_view_class.as_view(), name='source'),
-            url('^(?P<path>.+/|)_revision/change/(?P<revision_id>\d+)/$', self.revision_change_view, name='change_revision'),
+            url('^(?P<path>.+/|)_revision/change/(?P<revision_id>\d+)/$', self.revision_change_view.as_view(), name='change_revision'),
             url('^(?P<path>.+/|)_revision/merge/(?P<revision_id>\d+)/$', self.revision_merge_view, name='merge_revision'),
             url('^(?P<path>.+/|)_plugin/(?P<slug>\w+)/$', self.article_plugin_view_class.as_view(), name='plugin'),
             # This should always go last!