Merge branch 'master' into lqc-trunk

diff --cc apps/api/handlers/library_handlers.py
index 27ff47d,7e90e31..e2d986e
--- 1/apps/api/handlers/library_handlers.py
--- 2/apps/api/handlers/library_handlers.py
+++ b/apps/api/handlers/library_handlers.py
@@@ -19,10 -15,8 +15,8 @@@ from django.db import IntegrityErro
  import librarian
  import librarian.html
  import difflib
- from librarian import dcparser, parser
++import wlrepo 
  
- import wlrepo
- from api.models import PullRequest
 -from wlrepo import *
  from explorer.models import GalleryForDocument
  
  # internal imports
@@@ -184,27 -178,6 +178,7 @@@ class LibraryHandler(BaseHandler)
  #
  # Document Handlers
  #
- class BasicDocumentHandler(AnonymousBaseHandler):
-     allowed_methods = ('GET',)
- 
-     @hglibrary
-     def read(self, request, docid, lib):
-         try:    
-             doc = lib.document(docid)
-         except wlrepo.RevisionNotFound:
-             return rc.NOT_FOUND
- 
-         result = {
-             'name': doc.id,
-             'html_url': reverse('dochtml_view', args=[doc.id]),
-             'text_url': reverse('doctext_view', args=[doc.id]),
-             'dc_url': reverse('docdc_view', args=[doc.id]),
-             'public_revision': doc.revision,
-         }
- 
-         return result
- 
 +
  class DiffHandler(BaseHandler):
      allowed_methods = ('GET',)
      

diff --cc apps/explorer/views.py
index fd99f27,5ec452a..a67d27c
mode 100755,100644..100755
--- 1/apps/explorer/views.py
--- 2/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@@ -11,12 -11,12 +11,14 @@@ from django.core.urlresolvers import re
  from django.http import HttpResponse
  from django.utils import simplejson as json
  from django.views.generic.simple import direct_to_template
 +from django.shortcuts import render_to_response
 +from django.template import RequestContext
  from django.contrib.auth.decorators import login_required
  
+ from explorer import forms
  from api.models import PullRequest
  
+ 
  def ajax_login_required(view):
      """Similar ro @login_required, but instead of redirect, 
      just return some JSON stuff with error."""
@@@ -30,15 -30,14 +32,16 @@@
  @login_required
  def display_editor(request, path):
      user = request.GET.get('user', request.user.username)
-     log.info(user)
- 
+     gallery_form = forms.GalleryChoiceForm()
+     
 -    return direct_to_template(request, 'explorer/editor.html', extra_context={
 +    return render_to_response('explorer/editor.html',
-         mimetype="text/html",
++        # mimetype="text/html",
 +        dictionary = {
              'fileid': path,
-             'euser': user
+             'euser': user,
 -            'gallery_form': gallery_form,
 -    })
 -    
++            'gallery_from': gallery_form,
 +        }, context_instance=RequestContext(request))
-     
++
  #
  # View all files
  #
@@@ -120,11 -119,3 +123,11 @@@ def pull_requests(request)
  
      return direct_to_template(request, 'manager/pull_request.html', 
          extra_context = {'objects': objects} )
-         extra_context = {} )
 +
 +
 +#
 +# Testing
 +#
 +def renderer_test(request):
 +    return direct_to_template(request, 'renderer.html', mimetype="application/xhtml+xml",
++        extra_context = {} )

diff --cc platforma/static/js/models.js
Simple merge

diff --cc platforma/static/js/views/gallery.js
index 31b47ce,a403c9e..d6844c6
mode 100755,100644..100755
--- 1/platforma/static/js/views/gallery.js
--- 2/platforma/static/js/views/gallery.js
+++ b/platforma/static/js/views/gallery.js

diff --cc platforma/templates/explorer/editor.html
Simple merge

diff --cc platforma/urls.py
index 8a56210,498b5b2..1f7372a
mode 100755,100644..100755
--- 1/platforma/urls.py
--- 2/platforma/urls.py
+++ b/platforma/urls.py