Added navigation link from document page view and document page transformation back to document view

apps/documents/__init__.py

@@ -46,7 +46,9 @@ document_download = {'text':_('download'), 'view':'document_download', 'args':'o
 document_page_transformation_create = {'text':_('create new transformation'), 'view':'document_page_transformation_create', 'args':'object.id', 'famfam':'pencil_add', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_TRANSFORM]}}
 document_page_transformation_edit = {'text':_('edit'), 'view':'document_page_transformation_edit', 'args':'object.id', 'famfam':'pencil_go', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_TRANSFORM]}}
 document_page_transformation_delete = {'text':_('delete'), 'view':'document_page_transformation_delete', 'args':'object.id', 'famfam':'pencil_delete', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_TRANSFORM]}}
-#document_page_transformation_go_back = {'text':_('delete'), 'view':'document_page_transformation_delete', 'args':'object.id', 'famfam':'pencil_delete', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_TRANSFORM]}}
+document_page_transformation_go_back = {'text':_('return to document'), 'view':'document_view', 'args':'object.document_page.document.id', 'famfam':'page_go', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_VIEW]}}
+
+document_page_go_back = {'text':_('return to document'), 'view':'document_view', 'args':'object.document.id', 'famfam':'page_go', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_VIEW]}}
 
 staging_file_preview = {'text':_('preview'), 'class':'fancybox-noscaling', 'view':'staging_file_preview', 'args':'object.id', 'famfam':'drive_magnify'}
 staging_file_delete = {'text':_('delete'), 'view':'staging_file_delete', 'args':'object.id', 'famfam':'drive_delete'}
@@ -55,11 +57,12 @@ register_links(Document, [document_view, document_edit, document_edit_metadata,
 register_links(Document, [document_list, document_create, document_create_multiple, document_create_sibling], menu_name='sidebar')
 register_links(['document_list', 'document_create', 'document_create_multiple', 'upload_document_with_type', 'upload_multiple_documents_with_type'], [document_list, document_create, document_create_multiple], menu_name='sidebar')
 
+register_links(DocumentPage, [document_page_go_back], menu_name='sidebar')
+
 register_links(DocumentPageTransformation, [document_page_transformation_edit, document_page_transformation_delete])
+register_links(DocumentPageTransformation, [document_page_transformation_go_back], menu_name='sidebar')
 register_links(['document_page_view', 'document_page_transformation_edit', 'document_page_transformation_delete', 'document_page_transformation_create'], [document_page_transformation_create], menu_name='sidebar')
 
-
-
 register_links(StagingFile, [staging_file_preview, staging_file_delete])
 
 register_model_list_columns(Document, [

apps/documents/views.py

@@ -581,7 +581,7 @@ def document_page_view(request, document_page_id):
     form_list = [
         {
             'form':document_page_form,
-            'title':_(u'document page'),
+            'title':_(u'document page: %s') % document_page.page_number,
             'object':document_page,
             'grid':6,
         },

apps/ocr/conf/settings.py

@@ -1,4 +1,5 @@
 from django.conf import settings
 
 TESSERACT_PATH = getattr(settings, 'OCR_TESSERACT_PATH', u'/usr/bin/tesseract')
+TESSERACT_LANGUAGE = getattr(settings, 'OCR_TESSERACT_LANGUAGE', None)
 MAX_CONCURRENT_EXECUTION = getattr(settings, 'OCR_MAX_CONCURRENT_EXECUTION', 2)

settings.py

@@ -224,6 +224,8 @@ LOGIN_EXEMPT_URLS = (
 # OCR
 #OCR_TESSERACT_PATH = u'/usr/bin/tesseract'
 #OCR_MAX_CONCURRENT_EXECUTION = 2
+#OCR_TESSERACT_LANGUAGE = None
+
 
 # Permissions
 #ROLES_DEFAULT_ROLES = []