Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma

[redakcja.git] / apps / explorer / views.py

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index 3b3fdb1..eeac7b6 100644 (file)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -3,8 +3,10 @@ import hg, urllib2
 from django.utils import simplejson as json
 
 from django.views.generic.simple import direct_to_template
 from django.utils import simplejson as json
 
 from django.views.generic.simple import direct_to_template

+

 from django.conf import settings
 from django.http import HttpResponseRedirect
 from django.conf import settings
 from django.http import HttpResponseRedirect

+from django.contrib.auth.decorators import login_required

 
 from explorer import forms, models
 
 
 from explorer import forms, models
 


@@ -57,11 +59,9 @@ def gallery_panel(request, path):
     })
 
 
     })
 
 

-def file_html(request, path):
-    return direct_to_template(request, 'explorer/file_html.html', extra_context={
-        'object': html.transform(repo.get_file(path).data(), is_file=False),
-        'hash': path,
-        'image_folders_form': forms.ImageFoldersForm(),
+def htmleditor_panel(request, path):
+    return direct_to_template(request, 'explorer/panels/htmleditor.html', extra_context={
+        'html': html.transform(repo.get_file(path).data(), is_file=False),

     })
  
 
     })