Add the new logo
I bought this logo from the excellent logojoy.com site, and am including the source files here to be covered under the project license (GPL).
@@ -1,6 +1,11 @@
 | 
				
			|||||||
Changelog
 | 
					Changelog
 | 
				
			||||||
#########
 | 
					#########
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					2.6.1
 | 
				
			||||||
 | 
					=====
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					* We now have a logo, complete with a favicon :-)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2.6.0
 | 
					2.6.0
 | 
				
			||||||
=====
 | 
					=====
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										1086
									
								
								resources/logo/print/eps/Black logo - no background.eps
									
									
									
									
									
										Normal file
									
								
							
							
						
						
							
								
								
									
										1090
									
								
								resources/logo/print/eps/Color logo - no background.eps
									
									
									
									
									
										Normal file
									
								
							
							
						
						
							
								
								
									
										1099
									
								
								resources/logo/print/eps/Color logo with background.eps
									
									
									
									
									
										Normal file
									
								
							
							
						
						
							
								
								
									
										1090
									
								
								resources/logo/print/eps/White logo - no background.eps
									
									
									
									
									
										Normal file
									
								
							
							
						
						
							
								
								
									
										
											BIN
										
									
								
								resources/logo/print/pdf/Black logo - no background.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
							
								
								
									
										
											BIN
										
									
								
								resources/logo/print/pdf/Color logo - no background.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
							
								
								
									
										
											BIN
										
									
								
								resources/logo/print/pdf/Color logo with background.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
							
								
								
									
										
											BIN
										
									
								
								resources/logo/print/pdf/White logo - no background.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
							
								
								
									
										
											BIN
										
									
								
								resources/logo/web/png/Black logo - no background.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| 
		 After Width: | Height: | Size: 91 KiB  | 
							
								
								
									
										
											BIN
										
									
								
								resources/logo/web/png/Color logo - no background.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| 
		 After Width: | Height: | Size: 111 KiB  | 
							
								
								
									
										
											BIN
										
									
								
								resources/logo/web/png/Color logo with background.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| 
		 After Width: | Height: | Size: 116 KiB  | 
							
								
								
									
										
											BIN
										
									
								
								resources/logo/web/png/White logo - no background.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| 
		 After Width: | Height: | Size: 94 KiB  | 
							
								
								
									
										8
									
								
								resources/logo/web/svg/Black logo - no background.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						| 
		 After Width: | Height: | Size: 7.4 KiB  | 
							
								
								
									
										8
									
								
								resources/logo/web/svg/Color logo - no background.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						| 
		 After Width: | Height: | Size: 7.5 KiB  | 
							
								
								
									
										8
									
								
								resources/logo/web/svg/Color logo with background.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						| 
		 After Width: | Height: | Size: 7.5 KiB  | 
							
								
								
									
										8
									
								
								resources/logo/web/svg/White logo - no background.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						| 
		 After Width: | Height: | Size: 7.4 KiB  | 
							
								
								
									
										82
									
								
								resources/logo/web/svg/square.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,82 @@
 | 
				
			|||||||
 | 
					<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 | 
				
			||||||
 | 
					<svg
 | 
				
			||||||
 | 
					   xmlns:dc="http://purl.org/dc/elements/1.1/"
 | 
				
			||||||
 | 
					   xmlns:cc="http://creativecommons.org/ns#"
 | 
				
			||||||
 | 
					   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 | 
				
			||||||
 | 
					   xmlns:svg="http://www.w3.org/2000/svg"
 | 
				
			||||||
 | 
					   xmlns="http://www.w3.org/2000/svg"
 | 
				
			||||||
 | 
					   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
 | 
				
			||||||
 | 
					   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
 | 
				
			||||||
 | 
					   version="1.1"
 | 
				
			||||||
 | 
					   width="900"
 | 
				
			||||||
 | 
					   height="900"
 | 
				
			||||||
 | 
					   id="svg3923"
 | 
				
			||||||
 | 
					   sodipodi:docname="square.svg"
 | 
				
			||||||
 | 
					   inkscape:export-filename="/tmp/test.png"
 | 
				
			||||||
 | 
					   inkscape:export-xdpi="96"
 | 
				
			||||||
 | 
					   inkscape:export-ydpi="96"
 | 
				
			||||||
 | 
					   inkscape:version="0.92.2 2405546, 2018-03-11">
 | 
				
			||||||
 | 
					  <metadata
 | 
				
			||||||
 | 
					     id="metadata3929">
 | 
				
			||||||
 | 
					    <rdf:RDF>
 | 
				
			||||||
 | 
					      <cc:Work
 | 
				
			||||||
 | 
					         rdf:about="">
 | 
				
			||||||
 | 
					        <dc:format>image/svg+xml</dc:format>
 | 
				
			||||||
 | 
					        <dc:type
 | 
				
			||||||
 | 
					           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
 | 
				
			||||||
 | 
					        <dc:title></dc:title>
 | 
				
			||||||
 | 
					      </cc:Work>
 | 
				
			||||||
 | 
					    </rdf:RDF>
 | 
				
			||||||
 | 
					  </metadata>
 | 
				
			||||||
 | 
					  <defs
 | 
				
			||||||
 | 
					     id="defs3927" />
 | 
				
			||||||
 | 
					  <sodipodi:namedview
 | 
				
			||||||
 | 
					     pagecolor="#ffffff"
 | 
				
			||||||
 | 
					     bordercolor="#666666"
 | 
				
			||||||
 | 
					     borderopacity="1"
 | 
				
			||||||
 | 
					     objecttolerance="10"
 | 
				
			||||||
 | 
					     gridtolerance="10"
 | 
				
			||||||
 | 
					     guidetolerance="10"
 | 
				
			||||||
 | 
					     inkscape:pageopacity="0"
 | 
				
			||||||
 | 
					     inkscape:pageshadow="2"
 | 
				
			||||||
 | 
					     inkscape:window-width="3840"
 | 
				
			||||||
 | 
					     inkscape:window-height="2096"
 | 
				
			||||||
 | 
					     id="namedview3925"
 | 
				
			||||||
 | 
					     showgrid="false"
 | 
				
			||||||
 | 
					     inkscape:zoom="1.1360927"
 | 
				
			||||||
 | 
					     inkscape:cx="635.07139"
 | 
				
			||||||
 | 
					     inkscape:cy="606.383"
 | 
				
			||||||
 | 
					     inkscape:window-x="0"
 | 
				
			||||||
 | 
					     inkscape:window-y="27"
 | 
				
			||||||
 | 
					     inkscape:window-maximized="1"
 | 
				
			||||||
 | 
					     inkscape:current-layer="g3921" />
 | 
				
			||||||
 | 
					  <g
 | 
				
			||||||
 | 
					     transform="matrix(10.638298,0,0,10.638298,106.38298,-206.38301)"
 | 
				
			||||||
 | 
					     id="g3921">
 | 
				
			||||||
 | 
					    <defs
 | 
				
			||||||
 | 
					       id="SvgjsDefs1018" />
 | 
				
			||||||
 | 
					    <g
 | 
				
			||||||
 | 
					       id="SvgjsG1019"
 | 
				
			||||||
 | 
					       featureKey="root"
 | 
				
			||||||
 | 
					       style="fill:#ffffff" />
 | 
				
			||||||
 | 
					    <g
 | 
				
			||||||
 | 
					       id="SvgjsG1020"
 | 
				
			||||||
 | 
					       featureKey="symbol1"
 | 
				
			||||||
 | 
					       transform="matrix(0.10341565,0,0,0.10341565,-11.43874,18.048418)"
 | 
				
			||||||
 | 
					       inkscape:export-filename="/tmp/test.png"
 | 
				
			||||||
 | 
					       inkscape:export-xdpi="116.02285"
 | 
				
			||||||
 | 
					       inkscape:export-ydpi="116.02285"
 | 
				
			||||||
 | 
					       style="fill:#17541f">
 | 
				
			||||||
 | 
					      <defs
 | 
				
			||||||
 | 
					         id="defs3911" />
 | 
				
			||||||
 | 
					      <g
 | 
				
			||||||
 | 
					         id="g3915">
 | 
				
			||||||
 | 
					        <path
 | 
				
			||||||
 | 
					           d="M 231,798 C 227,779 219,741 218,741 49,640 69,465 125,365 c 12,126 235,213 105,367 -1,2 6,26 12,48 26,-44 65,-97 63,-102 C 145,288 645,258 749,16 c 47,234 -24,596 -426,688 -2,1 -73,126 -76,127 0,-2 -30,-1 -26,-11 2,-6 6,-14 10,-22 z M 330,625 C 267,476 452,312 544,271 356,439 324,564 330,625 Z m -104,79 c 51,-59 -9,-160 -45,-193 61,105 57,166 45,193 z"
 | 
				
			||||||
 | 
					           style="fill:#17541f"
 | 
				
			||||||
 | 
					           id="path3913"
 | 
				
			||||||
 | 
					           inkscape:connector-curvature="0" />
 | 
				
			||||||
 | 
					      </g>
 | 
				
			||||||
 | 
					    </g>
 | 
				
			||||||
 | 
					  </g>
 | 
				
			||||||
 | 
					</svg>
 | 
				
			||||||
| 
		 After Width: | Height: | Size: 2.6 KiB  | 
@@ -3,10 +3,63 @@
 | 
				
			|||||||
{# NOTE: This should probably be extending base.html.  See CSS comment below details. #}
 | 
					{# NOTE: This should probably be extending base.html.  See CSS comment below details. #}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					{% load static %}
 | 
				
			||||||
{% load custom_css from customisation %}
 | 
					{% load custom_css from customisation %}
 | 
				
			||||||
{% load custom_js from customisation %}
 | 
					{% load custom_js from customisation %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					{% block extrahead %}
 | 
				
			||||||
 | 
						<link rel="icon" type="image/x-icon" href="{% url 'favicon' %}" />
 | 
				
			||||||
 | 
						<style>
 | 
				
			||||||
 | 
							#header {
 | 
				
			||||||
 | 
								background-color: #90a9b7;
 | 
				
			||||||
 | 
								line-height: inherit;
 | 
				
			||||||
 | 
								height: auto;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							#branding h1 {
 | 
				
			||||||
 | 
								font-weight: inherit;
 | 
				
			||||||
 | 
								font-size: inherit;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							.button,
 | 
				
			||||||
 | 
							.button:active,
 | 
				
			||||||
 | 
							.button:focus,
 | 
				
			||||||
 | 
							.button:hover,
 | 
				
			||||||
 | 
							a.button,
 | 
				
			||||||
 | 
							.submit-row input,
 | 
				
			||||||
 | 
							input[type="submit"],
 | 
				
			||||||
 | 
							input[type="submit"]:active,
 | 
				
			||||||
 | 
							input[type="submit"]:focus,
 | 
				
			||||||
 | 
							input[type="submit"]:hover,
 | 
				
			||||||
 | 
							input[type="button"],
 | 
				
			||||||
 | 
							input[type="button"]:active,
 | 
				
			||||||
 | 
							input[type="button"]:focus,
 | 
				
			||||||
 | 
							input[type="button"]:hover {
 | 
				
			||||||
 | 
								background-color: #074f57;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							.module h2,
 | 
				
			||||||
 | 
							.module caption,
 | 
				
			||||||
 | 
							.inline-group h2 {
 | 
				
			||||||
 | 
								background-color: #90a9b7;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							div.breadcrumbs {
 | 
				
			||||||
 | 
								background-color: #077187;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							.module h2,
 | 
				
			||||||
 | 
							.module caption,
 | 
				
			||||||
 | 
							.inline-group h2 {
 | 
				
			||||||
 | 
								background-color: #077187;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						</style>
 | 
				
			||||||
 | 
					{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					{% block branding %}
 | 
				
			||||||
 | 
					<h1 id="site-name">
 | 
				
			||||||
 | 
						<a href="{% url 'admin:index' %}"><img src="{% static 'paperless/img/logo-light.png' %}" alt="Paperless" /></a>
 | 
				
			||||||
 | 
					</h1>
 | 
				
			||||||
 | 
					{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block blockbots %}
 | 
					{% block blockbots %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	{% comment %}
 | 
						{% comment %}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,7 +28,7 @@
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
  .result .header {
 | 
					  .result .header {
 | 
				
			||||||
    padding: 5px;
 | 
					    padding: 5px;
 | 
				
			||||||
    background-color: #79AEC8;
 | 
					    background-color: #90a9b7;
 | 
				
			||||||
    position: relative;
 | 
					    position: relative;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  .result .header .checkbox {
 | 
					  .result .header .checkbox {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -72,6 +72,7 @@ INSTALLED_APPS = [
 | 
				
			|||||||
    "corsheaders",
 | 
					    "corsheaders",
 | 
				
			||||||
    "django_extensions",
 | 
					    "django_extensions",
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    "paperless",
 | 
				
			||||||
    "documents.apps.DocumentsConfig",
 | 
					    "documents.apps.DocumentsConfig",
 | 
				
			||||||
    "reminders.apps.RemindersConfig",
 | 
					    "reminders.apps.RemindersConfig",
 | 
				
			||||||
    "paperless_tesseract.apps.PaperlessTesseractConfig",
 | 
					    "paperless_tesseract.apps.PaperlessTesseractConfig",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,6 +6,7 @@ from django.views.decorators.csrf import csrf_exempt
 | 
				
			|||||||
from django.views.generic import RedirectView
 | 
					from django.views.generic import RedirectView
 | 
				
			||||||
from rest_framework.routers import DefaultRouter
 | 
					from rest_framework.routers import DefaultRouter
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					from paperless.views import FaviconView
 | 
				
			||||||
from documents.views import (
 | 
					from documents.views import (
 | 
				
			||||||
    CorrespondentViewSet,
 | 
					    CorrespondentViewSet,
 | 
				
			||||||
    DocumentViewSet,
 | 
					    DocumentViewSet,
 | 
				
			||||||
@@ -44,6 +45,9 @@ urlpatterns = [
 | 
				
			|||||||
    # File uploads
 | 
					    # File uploads
 | 
				
			||||||
    url(r"^push$", csrf_exempt(PushView.as_view()), name="push"),
 | 
					    url(r"^push$", csrf_exempt(PushView.as_view()), name="push"),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Favicon
 | 
				
			||||||
 | 
					    url(r"^favicon.ico$", FaviconView.as_view(), name="favicon"),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # The Django admin
 | 
					    # The Django admin
 | 
				
			||||||
    url(r"admin/", admin.site.urls),
 | 
					    url(r"admin/", admin.site.urls),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,3 +1,7 @@
 | 
				
			|||||||
 | 
					import os
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					from django.http import HttpResponse
 | 
				
			||||||
 | 
					from django.views.generic import View
 | 
				
			||||||
from rest_framework.pagination import PageNumberPagination
 | 
					from rest_framework.pagination import PageNumberPagination
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -5,3 +9,17 @@ class StandardPagination(PageNumberPagination):
 | 
				
			|||||||
    page_size = 25
 | 
					    page_size = 25
 | 
				
			||||||
    page_size_query_param = "page-size"
 | 
					    page_size_query_param = "page-size"
 | 
				
			||||||
    max_page_size = 100000
 | 
					    max_page_size = 100000
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class FaviconView(View):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    def get(self, request, *args, **kwargs):
 | 
				
			||||||
 | 
					        favicon = os.path.join(
 | 
				
			||||||
 | 
					            os.path.dirname(__file__),
 | 
				
			||||||
 | 
					            "static",
 | 
				
			||||||
 | 
					            "paperless",
 | 
				
			||||||
 | 
					            "img",
 | 
				
			||||||
 | 
					            "favicon.ico"
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
 | 
					        with open(favicon, "rb") as f:
 | 
				
			||||||
 | 
					            return HttpResponse(f, content_type="image/x-icon")
 | 
				
			||||||
 
 | 
				
			|||||||