From 6bf7429ef6c2505740a19010856fc137abe58194 Mon Sep 17 00:00:00 2001 From: David Martin Date: Thu, 25 May 2017 20:16:59 +1000 Subject: [PATCH 1/3] Refer to Paperless instead of Django in webserver pages. It looks better to have the page titles refer to Paperless rather than Django. The same with the login. Setting it in urls.py is based on this stackoverflow response [0]. The proper documentation for the admin page is under [1]. [0] https://stackoverflow.com/a/24983231 [1] https://docs.djangoproject.com/en/1.10/ref/contrib/admin/#adminsite-attributes --- src/paperless/urls.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/paperless/urls.py b/src/paperless/urls.py index b7bc13b10..9ae1efc91 100644 --- a/src/paperless/urls.py +++ b/src/paperless/urls.py @@ -60,3 +60,10 @@ urlpatterns = [ if settings.SHARED_SECRET: urlpatterns.insert(0, url(r"^push$", PushView.as_view(), name="push")) + +# Text in each page's

(and above login form). +admin.site.site_header = 'Paperless' +# Text at the end of each page's . +admin.site.site_title = 'Paperless' +# Text at the top of the admin index page. +admin.site.index_title = 'Paperless administration' From 482f02fbaa80968fc077a5c6008409f156df37fe Mon Sep 17 00:00:00 2001 From: David Martin <david_martin@fastmail.com> Date: Thu, 25 May 2017 20:22:05 +1000 Subject: [PATCH 2/3] Update link to Django documentation in urls.py. As per requirements.txt we are using Django version 1.10. It makes sense to link to the documentation for that version as well. Also, the documentation for the previous version has a notice on the top that informs about the version being unsafe which is a bit disconcerting when seeing it. --- src/paperless/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paperless/urls.py b/src/paperless/urls.py index 9ae1efc91..8348eef4f 100644 --- a/src/paperless/urls.py +++ b/src/paperless/urls.py @@ -1,7 +1,7 @@ """paperless URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/1.9/topics/http/urls/ + https://docs.djangoproject.com/en/1.10/topics/http/urls/ Examples: Function views 1. Add an import: from my_app import views From c3a55c91dca3ee48d4fe6c96c0e715e0ed76fe47 Mon Sep 17 00:00:00 2001 From: David Martin <david_martin@fastmail.com> Date: Sat, 27 May 2017 08:49:03 +1000 Subject: [PATCH 3/3] Update version of remaining weblinks to Django documentation. We are using Django 1.10 as per requirements.txt and should refer to its documentation as well. --- src/paperless/settings.py | 14 +++++++------- src/paperless/wsgi.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/paperless/settings.py b/src/paperless/settings.py index f95c69be5..f9a8de6b7 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -4,10 +4,10 @@ Django settings for paperless project. Generated by 'django-admin startproject' using Django 1.9. For more information on this file, see -https://docs.djangoproject.com/en/1.9/topics/settings/ +https://docs.djangoproject.com/en/1.10/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.9/ref/settings/ +https://docs.djangoproject.com/en/1.10/ref/settings/ """ import os @@ -25,7 +25,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/ +# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ # The secret key has a default that should be fine so long as you're hosting # Paperless on a closed network. However, if you're putting this anywhere @@ -108,7 +108,7 @@ WSGI_APPLICATION = 'paperless.wsgi.application' # Database -# https://docs.djangoproject.com/en/1.9/ref/settings/#databases +# https://docs.djangoproject.com/en/1.10/ref/settings/#databases DATABASES = { "default": { @@ -133,7 +133,7 @@ if os.getenv("PAPERLESS_DBUSER") and os.getenv("PAPERLESS_DBPASS"): # Password validation -# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators +# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators AUTH_PASSWORD_VALIDATORS = [ { @@ -152,7 +152,7 @@ AUTH_PASSWORD_VALIDATORS = [ # Internationalization -# https://docs.djangoproject.com/en/1.9/topics/i18n/ +# https://docs.djangoproject.com/en/1.10/topics/i18n/ LANGUAGE_CODE = 'en-us' @@ -166,7 +166,7 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.9/howto/static-files/ +# https://docs.djangoproject.com/en/1.10/howto/static-files/ STATIC_ROOT = os.getenv( "PAPERLESS_STATICDIR", os.path.join(BASE_DIR, "..", "static")) diff --git a/src/paperless/wsgi.py b/src/paperless/wsgi.py index 9bf10da62..6aab72299 100644 --- a/src/paperless/wsgi.py +++ b/src/paperless/wsgi.py @@ -4,7 +4,7 @@ WSGI config for paperless project. It exposes the WSGI callable as a module-level variable named ``application``. For more information on this file, see -https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/ +https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ """ import os