diff --git a/apps/documents/conf/settings.py b/apps/documents/conf/settings.py index 7aa854d90f..973fef1c56 100644 --- a/apps/documents/conf/settings.py +++ b/apps/documents/conf/settings.py @@ -63,6 +63,9 @@ MULTIPAGE_PREVIEW_SIZE = getattr(settings, 'DOCUMENTS_MULTIPAGE_PREVIEW_SIZE', ' THUMBNAIL_SIZE = getattr(settings, 'DOCUMENTS_THUMBNAIL_SIZE', '50x50') DISPLAY_SIZE = getattr(settings, 'DOCUMENTS_DISPLAY_SIZE', '1200') RECENT_COUNT = getattr(settings, 'DOCUMENTS_RECENT_COUNT', 20) +ZOOM_PERCENT_STEP = getattr(settings, 'DOCUMENTS_ZOOM_PERCENT_STEP', 50) +ZOOM_MAX_LEVEL = getattr(settings, 'DOCUMENTS_ZOOM_MAX_LEVEL', 200) +ZOOM_MIN_LEVEL = getattr(settings, 'DOCUMENTS_ZOOM_MIN_LEVEL', 50) # Transformations AVAILABLE_TRANSFORMATIONS = getattr(settings, 'DOCUMENTS_AVAILABLE_TRANSFORMATIONS', available_transformations) diff --git a/apps/documents/views.py b/apps/documents/views.py index ba2beca0bc..91fcae87bd 100644 --- a/apps/documents/views.py +++ b/apps/documents/views.py @@ -36,6 +36,9 @@ 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 from documents.conf.settings import STORAGE_BACKEND +from documents.conf.settings import ZOOM_PERCENT_STEP +from documents.conf.settings import ZOOM_MAX_LEVEL +from documents.conf.settings import ZOOM_MIN_LEVEL from documents import PERMISSION_DOCUMENT_CREATE, \ PERMISSION_DOCUMENT_CREATE, PERMISSION_DOCUMENT_PROPERTIES_EDIT, \ @@ -1031,9 +1034,10 @@ def document_page_zoom_in(request, document_page_id): # Parse the query string and get the zoom value # parse_qs return a dictionary whose values are lists zoom = int(urlparse.parse_qs(query).get('zoom', ['100'])[0]) - zoom += 50 - if zoom > 200: - zoom = 200 + + zoom += ZOOM_PERCENT_STEP + if zoom > ZOOM_MAX_LEVEL: + zoom = ZOOM_MAX_LEVEL return HttpResponseRedirect(reverse(view, args=[document_page.pk]) + u'?zoom=%s' % zoom) @@ -1048,8 +1052,9 @@ def document_page_zoom_out(request, document_page_id): # Parse the query string and get the zoom value # parse_qs return a dictionary whose values are lists zoom = int(urlparse.parse_qs(query).get('zoom', ['100'])[0]) - zoom -= 50 - if zoom < 50: - zoom = 50 + print 'zoom', zoom + zoom -= ZOOM_PERCENT_STEP + if zoom < ZOOM_MIN_LEVEL: + zoom = ZOOM_MIN_LEVEL return HttpResponseRedirect(reverse(view, args=[document_page.pk]) + u'?zoom=%s' % zoom) diff --git a/apps/main/views.py b/apps/main/views.py index 73f56f9792..b9c7b399bf 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -46,6 +46,9 @@ def check_settings(request): {'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}, + {'name': 'DOCUMENTS_ZOOM_PERCENT_STEP', 'value': documents_settings.ZOOM_PERCENT_STEP}, + {'name': 'DOCUMENTS_ZOOM_MAX_LEVEL', 'value': documents_settings.ZOOM_MAX_LEVEL}, + {'name': 'DOCUMENTS_ZOOM_MIN_LEVEL', 'value': documents_settings.ZOOM_MIN_LEVEL}, #Groups {'name': 'DOCUMENTS_GROUP_MAX_RESULTS', 'value': documents_settings.GROUP_MAX_RESULTS}, diff --git a/settings.py b/settings.py index 3554cc6bfe..dd64379da8 100644 --- a/settings.py +++ b/settings.py @@ -194,6 +194,9 @@ TEMPLATE_CONTEXT_PROCESSORS = ( #DOCUMENTS_AVAILABLE_TRANSFORMATIONS = {} #example: DOCUMENTS_DEFAULT_TRANSFORMATIONS = [{'name':'rotate', 'arguments':"{'degrees':270}"}] #DOCUMENTS_RECENT_COUNT = 20 +#DOCUMENTS_ZOOM_PERCENT_STEP = 50 +#DOCUMENTS_ZOOM_MAX_LEVEL = 200 +#DOCUMENTS_ZOOM_MIN_LEVEL = 50 # Groups #DOCUMENTS_GROUP_MAX_RESULTS = 20