diff --git a/base/context_processors.py b/base/context_processors.py index dc9ae46e35..4546ad231d 100644 --- a/base/context_processors.py +++ b/base/context_processors.py @@ -7,7 +7,7 @@ These are referenced from the setting TEMPLATE_CONTEXT_PROCESSORS and used by RequestContext. """ from settings import SEAFILE_VERSION, SITE_TITLE, SITE_NAME, SITE_BASE, \ - ENABLE_SIGNUP, MAX_FILE_NAME, USE_PDFJS + ENABLE_SIGNUP, MAX_FILE_NAME try: from settings import BUSINESS_MODE except ImportError: @@ -37,6 +37,5 @@ def base(request): 'site_name': SITE_NAME, 'enable_signup': ENABLE_SIGNUP, 'max_file_name': MAX_FILE_NAME, - 'use_pdfjs': USE_PDFJS, } diff --git a/media/css/seahub.css b/media/css/seahub.css index edaeeceb9f..13215533bb 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -1590,6 +1590,9 @@ textarea:-moz-placeholder {/* for FF */ border-radius:3px; -moz-border-radius:3px; } +#pdf-view { + max-width:950px; +} #op-after-edit { margin-top:.9em; } diff --git a/views.py b/views.py index 555cf2ec41..128b4225fe 100644 --- a/views.py +++ b/views.py @@ -1390,6 +1390,7 @@ def repo_view_file(request, repo_id): 'file_encoding_list':file_encoding_list, 'swf_exists': swf_exists, 'DOCUMENT_CONVERTOR_ROOT': DOCUMENT_CONVERTOR_ROOT, + 'use_pdfjs':USE_PDFJS, 'page_from': page_from, 'basedir': basedir, 'days': days, @@ -1474,6 +1475,7 @@ def repo_view_file(request, repo_id): 'comment_open':comment_open, 'swf_exists': swf_exists, 'DOCUMENT_CONVERTOR_ROOT': DOCUMENT_CONVERTOR_ROOT, + 'use_pdfjs':USE_PDFJS, 'contributors': contributors, 'latest_contributor': latest_contributor, 'last_modified': last_modified, @@ -2682,6 +2684,7 @@ def view_shared_file(request, token): 'file_encoding_list':file_encoding_list, 'swf_exists': swf_exists, 'DOCUMENT_CONVERTOR_ROOT': DOCUMENT_CONVERTOR_ROOT, + 'use_pdfjs':USE_PDFJS, }, context_instance=RequestContext(request)) def view_shared_dir(request, token): @@ -2789,6 +2792,7 @@ def view_file_via_shared_dir(request, token): 'file_encoding_list':file_encoding_list, 'swf_exists': swf_exists, 'DOCUMENT_CONVERTOR_ROOT': DOCUMENT_CONVERTOR_ROOT, + 'use_pdfjs':USE_PDFJS, 'zipped': zipped, 'token': token, }, context_instance=RequestContext(request))