diff --git a/apps/documents/conf/settings.py b/apps/documents/conf/settings.py index 1bb83b76f5..7aa854d90f 100644 --- a/apps/documents/conf/settings.py +++ b/apps/documents/conf/settings.py @@ -62,7 +62,6 @@ PREVIEW_SIZE = getattr(settings, 'DOCUMENTS_PREVIEW_SIZE', '640x480') MULTIPAGE_PREVIEW_SIZE = getattr(settings, 'DOCUMENTS_MULTIPAGE_PREVIEW_SIZE', '160x120') THUMBNAIL_SIZE = getattr(settings, 'DOCUMENTS_THUMBNAIL_SIZE', '50x50') DISPLAY_SIZE = getattr(settings, 'DOCUMENTS_DISPLAY_SIZE', '1200') -TRANFORMATION_PREVIEW_SIZE = getattr(settings, 'DOCUMENTS_TRANFORMATION_PREVIEW_SIZE', '640x480') RECENT_COUNT = getattr(settings, 'DOCUMENTS_RECENT_COUNT', 20) # Transformations @@ -72,8 +71,6 @@ DEFAULT_TRANSFORMATIONS = getattr(settings, 'DOCUMENTS_DEFAULT_TRANSFORMATIONS', #Groups GROUP_MAX_RESULTS = getattr(settings, 'DOCUMENTS_GROUP_MAX_RESULTS', 20) GROUP_SHOW_EMPTY = getattr(settings, 'DOCUMENTS_GROUP_SHOW_EMPTY', True) -GROUP_SHOW_THUMBNAIL = getattr(settings, 'DOCUMENTS_GROUP_SHOW_THUMBNAIL', True) setting_description = { - 'DOCUMENTS_GROUP_SHOW_THUMBNAIL': _(u'Show document thumbnail in metadata group list') } diff --git a/apps/documents/urls.py b/apps/documents/urls.py index 4dc8498424..9291ed97fb 100644 --- a/apps/documents/urls.py +++ b/apps/documents/urls.py @@ -6,7 +6,6 @@ from documents.conf.settings import PREVIEW_SIZE from documents.conf.settings import THUMBNAIL_SIZE from documents.conf.settings import DISPLAY_SIZE from documents.conf.settings import MULTIPAGE_PREVIEW_SIZE -from documents.conf.settings import TRANFORMATION_PREVIEW_SIZE from documents.conf.settings import ENABLE_SINGLE_DOCUMENT_UPLOAD from converter.api import QUALITY_HIGH @@ -29,7 +28,6 @@ urlpatterns = patterns('documents.views', url(r'^document/(?P\d+)/display/preview/$', 'get_document_image', {'size': PREVIEW_SIZE}, 'document_preview'), url(r'^document/(?P\d+)/display/preview/multipage/$', 'get_document_image', {'size': MULTIPAGE_PREVIEW_SIZE}, 'document_preview_multipage'), - url(r'^document/(?P\d+)/display/preview/transformation/$', 'get_document_image', {'size': TRANFORMATION_PREVIEW_SIZE}, 'document_preview_transformation'), url(r'^document/(?P\d+)/display/thumbnail/$', 'get_document_image', {'size': THUMBNAIL_SIZE}, 'document_thumbnail'), url(r'^document/(?P\d+)/display/$', 'get_document_image', {'size': DISPLAY_SIZE, 'quality': QUALITY_HIGH}, 'document_display'), diff --git a/apps/documents/views.py b/apps/documents/views.py index ba4dc02aab..35bc5aa7e4 100644 --- a/apps/documents/views.py +++ b/apps/documents/views.py @@ -32,7 +32,6 @@ from documents.conf.settings import PREVIEW_SIZE from documents.conf.settings import THUMBNAIL_SIZE from documents.conf.settings import GROUP_MAX_RESULTS from documents.conf.settings import GROUP_SHOW_EMPTY -from documents.conf.settings import GROUP_SHOW_THUMBNAIL from documents.conf.settings import DEFAULT_TRANSFORMATIONS from documents.conf.settings import UNCOMPRESS_COMPRESSED_LOCAL_FILES from documents.conf.settings import UNCOMPRESS_COMPRESSED_STAGING_FILES diff --git a/apps/main/views.py b/apps/main/views.py index a0bffc6d0c..73f56f9792 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -43,7 +43,6 @@ def check_settings(request): {'name': 'DOCUMENTS_PREVIEW_SIZE', 'value': documents_settings.PREVIEW_SIZE}, {'name': 'DOCUMENTS_THUMBNAIL_SIZE', 'value': documents_settings.THUMBNAIL_SIZE}, {'name': 'DOCUMENTS_DISPLAY_SIZE', 'value': documents_settings.DISPLAY_SIZE}, - {'name': 'DOCUMENTS_TRANFORMATION_PREVIEW_SIZE', 'value': documents_settings.TRANFORMATION_PREVIEW_SIZE}, {'name': 'DOCUMENTS_ENABLE_SINGLE_DOCUMENT_UPLOAD', 'value': documents_settings.ENABLE_SINGLE_DOCUMENT_UPLOAD}, {'name': 'DOCUMENTS_UNCOMPRESS_COMPRESSED_LOCAL_FILES', 'value': documents_settings.UNCOMPRESS_COMPRESSED_LOCAL_FILES}, {'name': 'DOCUMENTS_UNCOMPRESS_COMPRESSED_STAGING_FILES', 'value': documents_settings.UNCOMPRESS_COMPRESSED_STAGING_FILES}, @@ -51,9 +50,6 @@ def check_settings(request): #Groups {'name': 'DOCUMENTS_GROUP_MAX_RESULTS', 'value': documents_settings.GROUP_MAX_RESULTS}, {'name': 'DOCUMENTS_GROUP_SHOW_EMPTY', 'value': documents_settings.GROUP_SHOW_EMPTY}, - {'name': 'DOCUMENTS_GROUP_SHOW_THUMBNAIL', - 'value': documents_settings.GROUP_SHOW_THUMBNAIL, - 'description': documents_settings.setting_description}, {'name': 'DOCUMENTS_RECENT_COUNT', 'value': documents_settings.RECENT_COUNT}, #Filesystem_serving diff --git a/settings.py b/settings.py index dcae2e0082..3554cc6bfe 100644 --- a/settings.py +++ b/settings.py @@ -191,7 +191,6 @@ TEMPLATE_CONTEXT_PROCESSORS = ( #DOCUMENTS_THUMBNAIL_SIZE = '50x50' #DOCUMENTS_DISPLAY_SIZE = '1200' #DOCUMENTS_MULTIPAGE_PREVIEW_SIZE = '160x120' -#DOCUMENTS_TRANFORMATION_PREVIEW_SIZE = '640x480' #DOCUMENTS_AVAILABLE_TRANSFORMATIONS = {} #example: DOCUMENTS_DEFAULT_TRANSFORMATIONS = [{'name':'rotate', 'arguments':"{'degrees':270}"}] #DOCUMENTS_RECENT_COUNT = 20 @@ -199,7 +198,6 @@ TEMPLATE_CONTEXT_PROCESSORS = ( # Groups #DOCUMENTS_GROUP_MAX_RESULTS = 20 #DOCUMENTS_GROUP_SHOW_EMPTY = True -#DOCUMENTS_GROUP_SHOW_THUMBNAIL = True # Serving #FILESYSTEM_FILESERVING_ENABLE = True