Merge branch 'release-1.10.11'

README.md

@@ -9,6 +9,16 @@ A cool, modern and responsive django admin application based on bootstrap 4.5.0
 
 Documentation: [readthedocs](http://django-baton.readthedocs.io/)
 
+---
+**Live Demo**
+
+Now you can try django-baton using the new shining live demo!
+Login with user `demo` and password `demo`
+
+[https://django-baton-demo.herokuapp.com/](https://django-baton-demo.herokuapp.com/)
+
+---
+
 ![Screenshot](screenshots/index-analytics-lg.png)
 
 ## Table of contents
@@ -95,18 +105,6 @@ Replace django.contrib.admin in your project urls, and add baton urls:
 
     # from django.contrib import admin
     from baton.autodiscover import admin
-
-    urlpatterns = [
-        url(r'^admin/', include(admin.site.urls)),
-        # ...
-        url(r'^baton/', include('baton.urls')),
-    ]
-
-### Django 2
-
-The first two steps are the same, but in your project urls you should use _path_:
-
-    from baton.autodiscover import admin
     from django.urls import path, include
 
     urlpatterns = [

baton/static/baton/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "1.10.10",
+  "version": "1.10.11",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

baton/static/baton/app/src/core/ChangeList.js

@@ -62,7 +62,6 @@ let ChangeList = {
     `
     modal.html(modalContent)
     modal.find('.modal-content').prepend($('#changelist-filter-modal'))
-    console.log(modal.find('#changelist-filter-modal > h2'), 'DIO')
     let title = modal.find('#changelist-filter-modal > h2')
     modal.find('.modal-content').prepend(title.addClass('modal-header').css('margin-bottom', 0))
     return modal

baton/static/baton/app/src/styles/_calendarclock.scss

@@ -1,180 +1,195 @@
 // scss-lint:disable all
 /* CALENDARS & CLOCKS */
 
-.calendarbox, .clockbox {
-    margin: 5px auto;
-    font-size: 12px;
-    width: 19em;
-    text-align: center;
-    background: white;
-    border: 1px solid #ddd;
-    border-radius: 4px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15);
-    overflow: hidden;
-    position: relative;
+.calendarbox,
+.clockbox {
+  margin: 5px auto;
+  font-size: 12px;
+  width: 19em;
+  text-align: center;
+  background: white;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15);
+  overflow: hidden;
+  position: relative;
 }
 
 .clockbox {
-    width: auto;
+  width: auto;
 
-    h2 {
-      background: $clockbox-title-bg;
-      border-bottom: 1px solid $clockbox-title-border-color;
-      font-size: 1rem;
-      padding: .5rem 1rem;
-    }
+  h2 {
+    background: $clockbox-title-bg;
+    border-bottom: 1px solid $clockbox-title-border-color;
+    font-size: 1rem;
+    padding: 0.5rem 1rem;
+  }
 }
 
 .calendar {
-    margin: 0;
-    padding: 0;
+  margin: 0;
+  padding: 0;
 }
 
 .calendar table {
-    margin: 0;
-    padding: 0;
-    border-collapse: collapse;
-    background: white;
-    width: 100%;
+  margin: 0;
+  padding: 0;
+  border-collapse: collapse;
+  background: white;
+  width: 100%;
+
+  caption {
+    caption-side: top;
+  }
 }
 
-.calendar caption, .calendarbox h2 {
-    margin: 0;
-    text-align: center;
-    border-top: none;
-    background: #f5dd5d;
-    font-weight: 700;
-    font-size: 12px;
-    color: #333;
+.calendar caption,
+.calendarbox h2 {
+  margin: 0;
+  text-align: center;
+  border-top: none;
+  background: #f5dd5d;
+  font-weight: 700;
+  font-size: 12px;
+  color: #333;
 }
 
 .calendar th {
-    padding: 8px 5px;
-    background: #f8f8f8;
-    border-bottom: 1px solid #ddd;
-    font-weight: 400;
-    font-size: 12px;
-    text-align: center;
-    color: #666;
+  padding: 8px 5px;
+  background: #f8f8f8;
+  border-bottom: 1px solid #ddd;
+  font-weight: 400;
+  font-size: 12px;
+  text-align: center;
+  color: #666;
 }
 
 .calendar td {
-    font-weight: 400;
-    font-size: 12px;
-    text-align: center;
-    padding: 0;
-    border-top: 1px solid #eee;
-    border-bottom: none;
+  font-weight: 400;
+  font-size: 12px;
+  text-align: center;
+  padding: 0;
+  border-top: 1px solid #eee;
+  border-bottom: none;
 }
 
 .calendar td.selected a {
-    background: #79aec8;
-    color: #fff;
+  background: #79aec8;
+  color: #fff;
 }
 
 .calendar td.nonday {
-    background: #f8f8f8;
+  background: #f8f8f8;
 }
 
 .calendar td.today a {
-    font-weight: 700;
+  font-weight: 700;
 }
 
-.calendar td a, .timelist a {
-    display: block;
-    font-weight: 400;
-    padding: 6px;
-    text-decoration: none;
-    color: #444;
+.calendar td a,
+.timelist a {
+  display: block;
+  font-weight: 400;
+  padding: 6px;
+  text-decoration: none;
+  color: #444;
 }
 
-.calendar td a:focus, .timelist a:focus,
-.calendar td a:hover, .timelist a:hover {
-    background: #79aec8;
-    color: white;
+.calendar td a:focus,
+.timelist a:focus,
+.calendar td a:hover,
+.timelist a:hover {
+  background: #79aec8;
+  color: white;
 }
 
-.calendar td a:active, .timelist a:active {
-    background: #417690;
-    color: white;
+.calendar td a:active,
+.timelist a:active {
+  background: #417690;
+  color: white;
 }
 
 .calendarnav {
-    font-size: 10px;
-    text-align: center;
-    color: #ccc;
-    margin: 0;
-    padding: 1px 3px;
+  font-size: 10px;
+  text-align: center;
+  color: #ccc;
+  margin: 0;
+  padding: 1px 3px;
 }
 
-.calendarnav a:link, #calendarnav a:visited,
-#calendarnav a:focus, #calendarnav a:hover {
-    color: #999;
+.calendarnav a:link,
+#calendarnav a:visited,
+#calendarnav a:focus,
+#calendarnav a:hover {
+  color: #999;
 }
 
 .calendar-shortcuts {
-    background: white;
-    font-size: 11px;
-    line-height: 11px;
-    border-top: 1px solid #eee;
-    padding: 8px 0;
-    color: #ccc;
+  background: white;
+  border-top: 1px solid #eee;
+  font-size: 11px;
+  line-height: 11px;
+  padding: 8px 0;
+  color: #ccc;
 }
 
-.calendarbox .calendarnav-previous, .calendarbox .calendarnav-next {
-    display: block;
-    margin: 6px;
-    width: 15px;
-    height: 15px;
-    text-indent: -9999px;
-    padding: 0;
+.calendarbox .calendarnav-previous,
+.calendarbox .calendarnav-next {
+  display: block;
+  height: 15px;
+  padding: 0;
+  position: absolute;
+  text-indent: -9999px;
+  top: 14px;
+  width: 15px;
 }
 
 .calendarnav-previous {
-    background: url(../img/calendar-icons.svg) 0 0 no-repeat;
-    float: left;
+  background: url(../img/calendar-icons.svg) 0 0 no-repeat;
+  left: 10px;
 }
 
 .calendarbox .calendarnav-previous:focus,
 .calendarbox .calendarnav-previous:hover {
-    background-position: 0 -15px;
+  background-position: 0 -15px;
 }
 
 .calendarnav-next {
-    right: 10px;
-    background: url(../img/calendar-icons.svg) 0 -30px no-repeat;
-    float: right;
+  right: 10px;
+  background: url(../img/calendar-icons.svg) 0 -30px no-repeat;
 }
 
 .calendarbox .calendarnav-next:focus,
 .calendarbox .calendarnav-next:hover {
-    background-position: 0 -45px;
+  background-position: 0 -45px;
 }
 
 .calendar-cancel {
-    margin: 0;
-    padding: 4px 0;
-    font-size: 12px;
-    background: #eee;
-    border-top: 1px solid #ddd;
-    color: #333;
+  margin: 0;
+  padding: 4px 0;
+  font-size: 12px;
+  background: #eee;
+  border-top: 1px solid #ddd;
+  color: #333;
 }
 
-.calendar-cancel:focus, .calendar-cancel:hover {
-    background: #ddd;
+.calendar-cancel:focus,
+.calendar-cancel:hover {
+  background: #ddd;
 }
 
 .calendar-cancel a {
-    color: black;
-    display: block;
+  color: black;
+  display: block;
 }
 
-ul.timelist, .timelist li {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
+ul.timelist,
+.timelist li {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
 }
 
 .timelist a {
-    padding: 2px;
+  padding: 2px;
 }