Merge branch 'master' into dev

src/documents/serialisers.py

@@ -61,6 +61,7 @@ class DocumentSerializer(serializers.ModelSerializer):
             "checksum",
             "created",
             "modified",
+            "added",
             "file_name",
             "download_url",
             "thumbnail_url",

src/documents/templates/admin/base_site.html

@@ -3,10 +3,63 @@
 {# NOTE: This should probably be extending base.html.  See CSS comment below details. #}
 
 
+{% load static %}
 {% load custom_css 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 %}
 
 	{% comment %}

src/documents/templates/admin/documents/document/change_list_results.html

@@ -29,7 +29,7 @@
   }
   .result .header {
     padding: 5px;
-    background-color: #79AEC8;
+    background-color: #90a9b7;
     position: relative;
   }
   .result .header .checkbox {

src/documents/views.py

@@ -148,7 +148,7 @@ class DocumentViewSet(RetrieveModelMixin,
     filter_class = DocumentFilterSet
     search_fields = ("title", "correspondent__name", "content")
     ordering_fields = (
-        "id", "title", "correspondent__name", "created", "modified")
+        "id", "title", "correspondent__name", "created", "modified", "added")
 
 
 class LogViewSet(ReadOnlyModelViewSet):