Merge pull request #131 from open-zaak/feature/admin-ui

Minor tweaks as part of UI update
open-zaak · Oct 22, 2019 · 8ecaf65 · 8ecaf65
2 parents 33515b1 + 6b8a544
commit 8ecaf65
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 34 deletions.
diff --git a/src/openzaak/components/authorizations/api/urls.py b/src/openzaak/components/authorizations/api/urls.py
@@ -24,12 +24,14 @@ class SchemaView(_SchemaView):
                 # API documentation
                 url(
                     r"^schema/openapi(?P<format>\.json|\.yaml)$",
-                    SchemaView.without_ui(cache_timeout=None),
+                    SchemaView.without_ui(cache_timeout=settings.SPEC_CACHE_TIMEOUT),
                     name="schema-json-authorizations",
                 ),
                 url(
                     r"^schema/$",
-                    SchemaView.with_ui("redoc", cache_timeout=None),
+                    SchemaView.with_ui(
+                        "redoc", cache_timeout=settings.SPEC_CACHE_TIMEOUT
+                    ),
                     name="schema-redoc-authorizations",
                 ),
                 # actual API

diff --git a/src/openzaak/components/besluiten/api/urls.py b/src/openzaak/components/besluiten/api/urls.py
@@ -33,12 +33,14 @@ class SchemaView(_SchemaView):
                 # API documentation
                 url(
                     r"^schema/openapi(?P<format>\.json|\.yaml)$",
-                    SchemaView.without_ui(cache_timeout=None),
+                    SchemaView.without_ui(cache_timeout=settings.SPEC_CACHE_TIMEOUT),
                     name="schema-json-besluiten",
                 ),
                 url(
                     r"^schema/$",
-                    SchemaView.with_ui("redoc", cache_timeout=None),
+                    SchemaView.with_ui(
+                        "redoc", cache_timeout=settings.SPEC_CACHE_TIMEOUT
+                    ),
                     name="schema-redoc-besluiten",
                 ),
                 # actual API

diff --git a/src/openzaak/components/catalogi/api/urls.py b/src/openzaak/components/catalogi/api/urls.py
@@ -42,12 +42,14 @@ class SchemaView(_SchemaView):
                 # API documentation
                 url(
                     r"^schema/openapi(?P<format>\.json|\.yaml)$",
-                    SchemaView.without_ui(cache_timeout=None),
+                    SchemaView.without_ui(cache_timeout=settings.SPEC_CACHE_TIMEOUT),
                     name="schema-json-catalogi",
                 ),
                 url(
                     r"^schema/$",
-                    SchemaView.with_ui("redoc", cache_timeout=None),
+                    SchemaView.with_ui(
+                        "redoc", cache_timeout=settings.SPEC_CACHE_TIMEOUT
+                    ),
                     name="schema-redoc-catalogi",
                 ),
                 # actual API

diff --git a/src/openzaak/components/documenten/api/urls.py b/src/openzaak/components/documenten/api/urls.py
@@ -36,12 +36,14 @@ class SchemaView(_SchemaView):
                 # API documentation
                 url(
                     r"^schema/openapi(?P<format>\.json|\.yaml)$",
-                    SchemaView.without_ui(cache_timeout=None),
+                    SchemaView.without_ui(cache_timeout=settings.SPEC_CACHE_TIMEOUT),
                     name="schema-json-documenten",
                 ),
                 url(
                     r"^schema/$",
-                    SchemaView.with_ui("redoc", cache_timeout=None),
+                    SchemaView.with_ui(
+                        "redoc", cache_timeout=settings.SPEC_CACHE_TIMEOUT
+                    ),
                     name="schema-redoc-documenten",
                 ),
                 # actual API

diff --git a/src/openzaak/components/zaken/api/urls.py b/src/openzaak/components/zaken/api/urls.py
@@ -49,12 +49,14 @@ class SchemaView(_SchemaView):
                 # API documentation
                 url(
                     r"^schema/openapi(?P<format>\.json|\.yaml)$",
-                    SchemaView.without_ui(cache_timeout=None),
+                    SchemaView.without_ui(cache_timeout=settings.SPEC_CACHE_TIMEOUT),
                     name="schema-json-zaken",
                 ),
                 url(
                     r"^schema/$",
-                    SchemaView.with_ui("redoc", cache_timeout=None),
+                    SchemaView.with_ui(
+                        "redoc", cache_timeout=settings.SPEC_CACHE_TIMEOUT
+                    ),
                     name="schema-redoc-zaken",
                 ),
                 # actual API

diff --git a/src/openzaak/conf/includes/api.py b/src/openzaak/conf/includes/api.py
@@ -66,3 +66,5 @@
 ZRC_API_SPEC = (
     f"https://raw.githubusercontent.com/{zrc_repo}/{zrc_commit}/src/openapi.yaml"
 )
+
+SPEC_CACHE_TIMEOUT = 60 * 60 * 24  # 24 hours
diff --git a/src/openzaak/conf/includes/base.py b/src/openzaak/conf/includes/base.py
@@ -332,7 +332,7 @@
 # Custom settings
 #
 PROJECT_NAME = "Open Zaak"
-SITE_TITLE = "Open Zaak"
+SITE_TITLE = "API dashboard"
 
 ENVIRONMENT = None
 ENVIRONMENT_SHOWN_IN_ADMIN = True
@@ -461,5 +461,5 @@
 #
 # DJANGO-ADMIN-INDEX
 #
-ADMIN_INDEX_SHOW_REMAINING_APPS_TO_SUPERUSERS = True
+ADMIN_INDEX_SHOW_REMAINING_APPS_TO_SUPERUSERS = False
 ADMIN_INDEX_AUTO_CREATE_APP_GROUP = False
diff --git a/src/openzaak/conf/includes/local_example.py b/src/openzaak/conf/includes/local_example.py
@@ -1,6 +1,6 @@
 import sys
 
-from .dev import DATABASES, INSTALLED_APPS
+from ..dev import DATABASES, INSTALLED_APPS
 
 INSTALLED_APPS += ["django_extensions"]
 

diff --git a/src/openzaak/sass/admin/admin_overrides.scss b/src/openzaak/sass/admin/admin_overrides.scss
@@ -1,13 +1,13 @@
 /* Colors */
-$color_primary: #2B579A;
+$color_primary: #2E8DD0;
 $color_primary_dark: #124078;
 $color_primary_light: #c4dce8;
 
 $color_secondary: #F3F3F3;
 $color_secondary_dark: #C6C6C6;
 $color_secondary_light: #fff;
 
-$color_link: #2B579A;
+$color_link: #005DD0;
 $color_link_hover: #124078;
 
 $color_darkest: #000;
@@ -218,13 +218,13 @@ div.breadcrumbs {
 
 .dropdown-menu {
   /* Override for Environment banner */
-  top: 49px;
+  top: 48px;
   /* Added to attach body */
   border-bottom: 8px solid $color_secondary;
 }
 
 .breadcrumbs {
-  top: 49px !important;
+  top: 48px !important;
 }
 
 /* Integration into color scheme */

diff --git a/src/openzaak/static/css/admin/admin_overrides.css b/src/openzaak/static/css/admin/admin_overrides.css
@@ -5,7 +5,7 @@ body {
 }
 
 a:link, a:visited {
-  color: #2B579A;
+  color: #005DD0;
 }
 
 a:focus, a:hover {
@@ -14,7 +14,7 @@ a:focus, a:hover {
 
 #header {
   color: #fff;
-  background: #2B579A;
+  background: #2E8DD0;
   /* border-bottom: 8px solid $color_secondary; */
   position: -webkit-sticky;
   position: sticky;
@@ -36,7 +36,7 @@ a:focus, a:hover {
 }
 
 .module h2, .module caption, .inline-group h2 {
-  background: #2B579A;
+  background: #2E8DD0;
 }
 
 #branding h1 {
@@ -49,7 +49,7 @@ a:focus, a:hover {
 
 div.breadcrumbs {
   background: #F3F3F3;
-  color: #2B579A;
+  color: #2E8DD0;
   position: -webkit-sticky;
   position: sticky;
   top: 60px;
@@ -66,23 +66,23 @@ div.breadcrumbs a:focus, div.breadcrumbs a:hover {
 
 /* Important is used because Django templates include their own style, after ours */
 #changelist-filter a:focus, #changelist-filter a:hover {
-  color: #2B579A !important;
+  color: #005DD0 !important;
 }
 
 #changelist-filter li.selected a {
-  color: #2B579A !important;
+  color: #005DD0 !important;
 }
 
 #changelist-filter li.selected a:focus, #changelist-filter li.selected a:hover {
-  color: #2B579A !important;
+  color: #2E8DD0 !important;
 }
 
 .object-tools a:focus, .object-tools a:hover {
   background-color: #333;
 }
 
 .button, input[type=submit], input[type=button], .submit-row input, a.button {
-  background: #2B579A;
+  background: #2E8DD0;
   color: #fff;
   /* border: 2px solid $color_dark; */
 }
@@ -110,7 +110,7 @@ div.breadcrumbs a:focus, div.breadcrumbs a:hover {
 
 /* Many to many selector */
 .selector-chosen h2 {
-  background: #2B579A !important;
+  background: #2E8DD0 !important;
 }
 
 /* Calendar widget */
@@ -120,15 +120,15 @@ div.breadcrumbs a:focus, div.breadcrumbs a:hover {
 }
 
 .calendar td a:active {
-  background: #2B579A !important;
+  background: #2E8DD0 !important;
 }
 
 .calendar td a:focus, .calendar td a:hover {
   background: #124078 !important;
 }
 
 .calendar td.selected a {
-  background: #2B579A !important;
+  background: #2E8DD0 !important;
 }
 
 .calendarbox h2 {
@@ -138,7 +138,7 @@ div.breadcrumbs a:focus, div.breadcrumbs a:hover {
 
 /* Time widget */
 .timelist a:active {
-  background: #2B579A !important;
+  background: #2E8DD0 !important;
 }
 
 .timelist a:focus, .timelist a:hover {
@@ -199,18 +199,18 @@ div.breadcrumbs a:focus, div.breadcrumbs a:hover {
  */
 .dropdown-menu {
   /* Override for Environment banner */
-  top: 49px;
+  top: 48px;
   /* Added to attach body */
   border-bottom: 8px solid #F3F3F3;
 }
 
 .breadcrumbs {
-  top: 49px !important;
+  top: 48px !important;
 }
 
 /* Integration into color scheme */
 .dropdown-menu {
-  background-color: #2B579A;
+  background-color: #2E8DD0;
 }
 
 .dropdown-menu .dropdown-menu__item,
@@ -224,7 +224,7 @@ div.breadcrumbs a:focus, div.breadcrumbs a:hover {
 .dropdown-menu .dropdown-menu__item:visited.dropdown-menu__item--active {
   background-color: #F3F3F3;
   text-decoration: none;
-  color: #2B579A;
+  color: #2E8DD0;
 }
 
 .dropdown-menu .dropdown-menu__item.dropdown-menu__item--active:hover,
@@ -240,7 +240,7 @@ div.breadcrumbs a:focus, div.breadcrumbs a:hover {
 }
 
 .dropdown-menu .dropdown-menu__drop {
-  background-color: #2B579A;
+  background-color: #2E8DD0;
   box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2);
 }
 

diff --git a/src/openzaak/templates/admin/base_site.html b/src/openzaak/templates/admin/base_site.html
@@ -14,6 +14,21 @@
     <h1 id="site-name"><a href="{% url 'admin:index' %}">{{ settings.PROJECT_NAME }} beheer</a></h1>
 {% endblock %}
 
+{% block welcome-msg %}
+    {% trans 'Ingelogd als' %}
+    <strong>{% firstof user.get_short_name user.get_username %}</strong>.
+{% endblock %}
+
+{% block userlinks %}
+    {% if site_url %}
+        <a href="{{ site_url }}">{{ settings.SITE_TITLE }}</a> /
+    {% endif %}
+    {% if user.has_usable_password %}
+    <a href="{% url 'admin:password_change' %}">{% trans 'Change password' %}</a> /
+    {% endif %}
+    <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>
+{% endblock %}
+
 {% block nav-global %}{% endblock %}
 
 {% block messages %}

diff --git a/src/openzaak/templates/admin/index.html b/src/openzaak/templates/admin/index.html
@@ -0,0 +1,3 @@
+{% extends "admin/index.html" %}
+
+{% block content_title %}<h1>Welkom, {{ user.get_full_name|default:user.get_username }}</h1>{% endblock %}