Merge fcce7b7bf4 into 835012f2ed

netbox/project-static/bundle.js

@@ -113,6 +113,7 @@ async function bundleStyles() {
       'netbox': 'styles/netbox.scss',
       rack_elevation: 'styles/svg/rack_elevation.scss',
       cable_trace: 'styles/svg/cable_trace.scss',
+      'rest-api': 'styles/rest_api.scss',
     };
     const pluginOptions = { outputStyle: 'compressed' };
     // Allow cache disabling.

netbox/project-static/styles/rest_api.scss

@@ -0,0 +1,31 @@
+.breadcrumb {
+  background-color: #fff;
+}
+.btn-primary {
+  background-color: #17a2b8;
+  border: none;
+}
+.navbar-default {
+  background-color: #1f2e41;
+  margin-bottom: 10px;
+}
+.navbar-default .navbar-text {
+  color: #fff;
+}
+.navbar>.container .navbar-brand, .navbar>.container-fluid .navbar-brand {
+  padding: 12px 0 12px 0;
+  margin-bottom: 5px;
+  margin-left: 1px;
+}
+.prettyprint {
+  background-color: #f6f8fb;
+}
+
+.breadcrumb {
+  margin-bottom: 10px;
+  padding-left: 0;
+}
+
+.page-header {
+  margin-top: 10px;
+}

netbox/templates/rest_framework/api.html

@@ -2,6 +2,13 @@
 {% load static %}
 {% load i18n %}
 
+{% block bootstrap_theme %}
+  <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/>
+  <link rel="stylesheet" type="text/css" href="{% static "rest-api.css" %}"/>
+{% endblock %}
+
+{% block bootstrap_navbar_variant %}navbar-default{% endblock %}
+
 {% block head %}
   {{ block.super }}
   <link rel="icon" type="image/png" href="{% static 'rest-api.ico' %}" />
@@ -10,5 +17,7 @@
 {% block title %}{% if name %}{{ name }} | {% endif %}NetBox {% trans "REST API" %}{% endblock %}
 
 {% block branding %}
-  <a class="navbar-brand" href="{% url 'home' %}">NetBox</a>
+  <a class="navbar-brand" href="{% url 'home' %}">
+    <img src="{% static 'netbox_logo.svg' %}" height="32" alt="{% trans "NetBox Logo" %}" class="navbar-brand-image">
+  </a>
 {% endblock branding %}

netbox/utilities/templatetags/builtins/filters.py

@@ -5,7 +5,7 @@ import re
 import yaml
 from django import template
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.humanize.templatetags.humanize import naturaltime
+from django.contrib.humanize.templatetags.humanize import naturalday, naturaltime
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from markdown import markdown
@@ -216,11 +216,12 @@ def render_yaml(value):
 def isodate(value):
     if type(value) is datetime.date:
         text = value.isoformat()
+        return mark_safe(f'<span title="{naturalday(value)}">{text}</span>')
     elif type(value) is datetime.datetime:
         text = value.date().isoformat()
+        return mark_safe(f'<span title="{naturaltime(value)}">{text}</span>')
     else:
         return ''
-    return mark_safe(f'<span title="{naturaltime(value)}">{text}</span>')
 
 
 @register.filter()