X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/85ae208c067a898b80675c12e133968062737d72..dec7209ba6551afa5b885e892bff4f9ff34ef58b:/apps/explorer/views.py?ds=sidebyside diff --git a/apps/explorer/views.py b/apps/explorer/views.py index 3ab7e670..ed581911 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -1,23 +1,18 @@ # -*- coding: utf-8 -*- -from librarian import html -import hg, urllib2, time - -from django.utils import simplejson as json - -from librarian import dcparser, parser -from librarian import ParseError, ValidationError - -from django.views.generic.simple import direct_to_template +import urllib2 +import hg +from librarian import html, parser, dcparser, ParseError, ValidationError from django.conf import settings -from django.http import HttpResponseRedirect, HttpResponse - -from django.core.urlresolvers import reverse -from django.core.paginator import Paginator, InvalidPage, EmptyPage - from django.contrib.auth.decorators import login_required, permission_required +from django.core.paginator import Paginator, InvalidPage, EmptyPage +from django.core.urlresolvers import reverse +from django.http import HttpResponseRedirect, HttpResponse +from django.utils import simplejson as json +from django.views.generic.simple import direct_to_template from explorer import forms, models +from toolbar import models as toolbar_models # # Some useful decorators @@ -169,7 +164,9 @@ def file_dc(request, path, repo): @login_required def display_editor(request, path): return direct_to_template(request, 'explorer/editor.html', extra_context={ - 'hash': path, 'panel_list': ['lewy', 'prawy'], + 'hash': path, + 'panel_list': ['lewy', 'prawy'], + 'scriptlets': toolbar_models.Scriptlet.objects.all() }) # =============== @@ -215,10 +212,8 @@ def dceditor_panel(request, path, repo): try: doc_text = repo.get_file(path, user_branch) - document = parser.WLDocument.from_string(doc_text) form = forms.DublinCoreForm(info=document.book_info) - return direct_to_template(request, 'explorer/panels/dceditor.html', extra_context={ 'fpath': path, 'form': form,