radarsys Commit - r367:9e304f85f976 · Jicamarca Repository

Se logró solucionar el problema del ID replicado al momento de crear un campaña con template experiment

Renato-TUF -

r367:9e304f85f976

parent child

Context file:

r367:9e304f85f976

Expand all files

The requested changes are too big and content was truncated. Show full diff

apps/abs/migrations/0003_merge_0002_auto_20230117_0948_0002_initial.py created 644 +14 0

@@ -0,0 +1,14
	1	# Generated by Django 4.1.5 on 2023-01-31 16:15
	2
	3	from django.db import migrations
	4
	5
	6	class Migration(migrations.Migration):
	7
	8	dependencies = [
	9	('abs', '0002_auto_20230117_0948'),
	10	('abs', '0002_initial'),
	11	]
	12
	13	operations = [
	14	]

postgres/init.sql created 644 +3 0

@@ -0,0 +1,3
	1	CREATE USER docker WITH PASSWORD docker;
	2	CREATE DATABASE radarsys;
	3	GRANT ALL PRIVILEGES ON DATABASE radarsys TO docker; No newline at end of file

static/admin/css/dark_mode.css created 644 +33 0

@@ -0,0 +1,33
	1	@media (prefers-color-scheme: dark) {
	2	:root {
	3	--primary: #264b5d;
	4	--primary-fg: #f7f7f7;
	5
	6	--body-fg: #eeeeee;
	7	--body-bg: #121212;
	8	--body-quiet-color: #e0e0e0;
	9	--body-loud-color: #ffffff;
	10
	11	--breadcrumbs-link-fg: #e0e0e0;
	12	--breadcrumbs-bg: var(--primary);
	13
	14	--link-fg: #81d4fa;
	15	--link-hover-color: #4ac1f7;
	16	--link-selected-fg: #6f94c6;
	17
	18	--hairline-color: #272727;
	19	--border-color: #353535;
	20
	21	--error-fg: #e35f5f;
	22	--message-success-bg: #006b1b;
	23	--message-warning-bg: #583305;
	24	--message-error-bg: #570808;
	25
	26	--darkened-bg: #212121;
	27	--selected-bg: #1b1b1b;
	28	--selected-row: #00363a;
	29
	30	--close-button-bg: #333333;
	31	--close-button-hover-bg: #666666;
	32	}
	33	}

static/admin/css/nav_sidebar.css created 644 +139 0

@@ -0,0 +1,139
	1	.sticky {
	2	position: sticky;
	3	top: 0;
	4	max-height: 100vh;
	5	}
	6
	7	.toggle-nav-sidebar {
	8	z-index: 20;
	9	left: 0;
	10	display: flex;
	11	align-items: center;
	12	justify-content: center;
	13	flex: 0 0 23px;
	14	width: 23px;
	15	border: 0;
	16	border-right: 1px solid var(--hairline-color);
	17	background-color: var(--body-bg);
	18	cursor: pointer;
	19	font-size: 1.25rem;
	20	color: var(--link-fg);
	21	padding: 0;
	22	}
	23
	24	[dir="rtl"] .toggle-nav-sidebar {
	25	border-left: 1px solid var(--hairline-color);
	26	border-right: 0;
	27	}
	28
	29	.toggle-nav-sidebar:hover,
	30	.toggle-nav-sidebar:focus {
	31	background-color: var(--darkened-bg);
	32	}
	33
	34	#nav-sidebar {
	35	z-index: 15;
	36	flex: 0 0 275px;
	37	left: -276px;
	38	margin-left: -276px;
	39	border-top: 1px solid transparent;
	40	border-right: 1px solid var(--hairline-color);
	41	background-color: var(--body-bg);
	42	overflow: auto;
	43	}
	44
	45	[dir="rtl"] #nav-sidebar {
	46	border-left: 1px solid var(--hairline-color);
	47	border-right: 0;
	48	left: 0;
	49	margin-left: 0;
	50	right: -276px;
	51	margin-right: -276px;
	52	}
	53
	54	.toggle-nav-sidebar::before {
	55	content: '\00BB';
	56	}
	57
	58	.main.shifted .toggle-nav-sidebar::before {
	59	content: '\00AB';
	60	}
	61
	62	.main.shifted > #nav-sidebar {
	63	margin-left: 0;
	64	}
	65
	66	[dir="rtl"] .main.shifted > #nav-sidebar {
	67	margin-right: 0;
	68	}
	69
	70	#nav-sidebar .module th {
	71	width: 100%;
	72	overflow-wrap: anywhere;
	73	}
	74
	75	#nav-sidebar .module th,
	76	#nav-sidebar .module caption {
	77	padding-left: 16px;
	78	}
	79
	80	#nav-sidebar .module td {
	81	white-space: nowrap;
	82	}
	83
	84	[dir="rtl"] #nav-sidebar .module th,
	85	[dir="rtl"] #nav-sidebar .module caption {
	86	padding-left: 8px;
	87	padding-right: 16px;
	88	}
	89
	90	#nav-sidebar .current-app .section:link,
	91	#nav-sidebar .current-app .section:visited {
	92	color: var(--header-color);
	93	font-weight: bold;
	94	}
	95
	96	#nav-sidebar .current-model {
	97	background: var(--selected-row);
	98	}
	99
	100	.main > #nav-sidebar + .content {
	101	max-width: calc(100% - 23px);
	102	}
	103
	104	.main.shifted > #nav-sidebar + .content {
	105	max-width: calc(100% - 299px);
	106	}
	107
	108	@media (max-width: 767px) {
	109	#nav-sidebar, #toggle-nav-sidebar {
	110	display: none;
	111	}
	112
	113	.main > #nav-sidebar + .content,
	114	.main.shifted > #nav-sidebar + .content {
	115	max-width: 100%;
	116	}
	117	}
	118
	119	#nav-filter {
	120	width: 100%;
	121	box-sizing: border-box;
	122	padding: 2px 5px;
	123	margin: 5px 0;
	124	border: 1px solid var(--border-color);
	125	background-color: var(--darkened-bg);
	126	color: var(--body-fg);
	127	}
	128
	129	#nav-filter:focus {
	130	border-color: var(--body-quiet-color);
	131	}
	132
	133	#nav-filter.no-results {
	134	background: var(--message-error-bg);
	135	}
	136
	137	#nav-sidebar table {
	138	width: 100%;
	139	}

static/admin/js/filters.js created 644 +30 0

@@ -0,0 +1,30
	1	/**
	2	* Persist changelist filters state (collapsed/expanded).
	3	*/
	4	'use strict';
	5	{
	6	// Init filters.
	7	let filters = JSON.parse(sessionStorage.getItem('django.admin.filtersState'));
	8
	9	if (!filters) {
	10	filters = {};
	11	}
	12
	13	Object.entries(filters).forEach(([key, value]) => {
	14	const detailElement = document.querySelector(`[data-filter-title='${key}']`);
	15
	16	// Check if the filter is present, it could be from other view.
	17	if (detailElement) {
	18	value ? detailElement.setAttribute('open', '') : detailElement.removeAttribute('open');
	19	}
	20	});
	21
	22	// Save filter state when clicks.
	23	const details = document.querySelectorAll('details');
	24	details.forEach(detail => {
	25	detail.addEventListener('toggle', event => {
	26	filters[`${event.target.dataset.filterTitle}`] = detail.open;
	27	sessionStorage.setItem('django.admin.filtersState', JSON.stringify(filters));
	28	});
	29	});
	30	}

static/admin/js/nav_sidebar.js created 644 +102 0

@@ -0,0 +1,102
	1	'use strict';
	2	{
	3	const toggleNavSidebar = document.getElementById('toggle-nav-sidebar');
	4	if (toggleNavSidebar !== null) {
	5	const navLinks = document.querySelectorAll('#nav-sidebar a');
	6	function disableNavLinkTabbing() {
	7	for (const navLink of navLinks) {
	8	navLink.tabIndex = -1;
	9	}
	10	}
	11	function enableNavLinkTabbing() {
	12	for (const navLink of navLinks) {
	13	navLink.tabIndex = 0;
	14	}
	15	}
	16	function disableNavFilterTabbing() {
	17	document.getElementById('nav-filter').tabIndex = -1;
	18	}
	19	function enableNavFilterTabbing() {
	20	document.getElementById('nav-filter').tabIndex = 0;
	21	}
	22
	23	const main = document.getElementById('main');
	24	let navSidebarIsOpen = localStorage.getItem('django.admin.navSidebarIsOpen');
	25	if (navSidebarIsOpen === null) {
	26	navSidebarIsOpen = 'true';
	27	}
	28	if (navSidebarIsOpen === 'false') {
	29	disableNavLinkTabbing();
	30	disableNavFilterTabbing();
	31	}
	32	main.classList.toggle('shifted', navSidebarIsOpen === 'true');
	33
	34	toggleNavSidebar.addEventListener('click', function() {
	35	if (navSidebarIsOpen === 'true') {
	36	navSidebarIsOpen = 'false';
	37	disableNavLinkTabbing();
	38	disableNavFilterTabbing();
	39	} else {
	40	navSidebarIsOpen = 'true';
	41	enableNavLinkTabbing();
	42	enableNavFilterTabbing();
	43	}
	44	localStorage.setItem('django.admin.navSidebarIsOpen', navSidebarIsOpen);
	45	main.classList.toggle('shifted');
	46	});
	47	}
	48
	49	function initSidebarQuickFilter() {
	50	const options = [];
	51	const navSidebar = document.getElementById('nav-sidebar');
	52	if (!navSidebar) {
	53	return;
	54	}
	55	navSidebar.querySelectorAll('th[scope=row] a').forEach((container) => {
	56	options.push({title: container.innerHTML, node: container});
	57	});
	58
	59	function checkValue(event) {
	60	let filterValue = event.target.value;
	61	if (filterValue) {
	62	filterValue = filterValue.toLowerCase();
	63	}
	64	if (event.key === 'Escape') {
	65	filterValue = '';
	66	event.target.value = ''; // clear input
	67	}
	68	let matches = false;
	69	for (const o of options) {
	70	let displayValue = '';
	71	if (filterValue) {
	72	if (o.title.toLowerCase().indexOf(filterValue) === -1) {
	73	displayValue = 'none';
	74	} else {
	75	matches = true;
	76	}
	77	}
	78	// show/hide parent <TR>
	79	o.node.parentNode.parentNode.style.display = displayValue;
	80	}
	81	if (!filterValue \|\| matches) {
	82	event.target.classList.remove('no-results');
	83	} else {
	84	event.target.classList.add('no-results');
	85	}
	86	sessionStorage.setItem('django.admin.navSidebarFilterValue', filterValue);
	87	}
	88
	89	const nav = document.getElementById('nav-filter');
	90	nav.addEventListener('change', checkValue, false);
	91	nav.addEventListener('input', checkValue, false);
	92	nav.addEventListener('keyup', checkValue, false);
	93
	94	const storedValue = sessionStorage.getItem('django.admin.navSidebarFilterValue');
	95	if (storedValue) {
	96	nav.value = storedValue;
	97	checkValue({target: nav, key: ''});
	98	}
	99	}
	100	window.initSidebarQuickFilter = initSidebarQuickFilter;
	101	initSidebarQuickFilter();
	102	}

static/admin/js/vendor/select2/i18n/af.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/bn.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/bs.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/dsb.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/hsb.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/hy.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/ka.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/ne.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/ps.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/sl.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/sq.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/tk.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

.env +8 -3

             POSTGRES_PORT_5432_TCP_ADDR=radarsys-postgres
             #    POSTGRES_PORT_5432_TCP_PORT=5400
             POSTGRES_PORT_5432_TCP_PORT=5432
-            DB_NAME=radarsys
+            #POSTGRES_HOST?? DONDE IRIA
-            DB_USER=docker
+            POSTGRES_USER=docker
-            DB_PASSWORD=docker
+            POSTGRES_PASSWORD=docker
+            POSTGRES_DB=radarsys
+            # DB_NAME=radarsys
+            # DB_USER=docker
+            # DB_PASSWORD=docker
             PGDATA=/var/lib/postgresql/data
             LC_ALL=C.UTF-8
             TZ=America/Lima

apps/main/static/css/style.css +1 -1

             }
             #sidebar a {
-                color: gray;
+                color: white;
                 padding: 0.1rem;
             }

apps/main/views.py +2 -1

                     if form.is_valid():
                         campaign = form.save(commit=False)
                         campaign.author = request.user
+                        campaign.save()
                         for exp in experiments:
                             campaign.experiments.add(exp)
-                        campaign.save()
                         return redirect('url_campaign', id_camp=campaign.id)
                 kwargs['form']           = form

docker-compose.yml +40 -36

@@ -1,28 +1,28
1	version: '2'	1	version: '2'
2	services:	2	services:
3	# Django app	3	# Django app
4	web:	4	# web:
5	container_name: 'radarsys'	5	# container_name: 'radarsys'
6	build: .	6	# build: .
7	restart: always	7	# restart: always
8	image: radarsys	8	# image: radarsys
9	command: gunicorn radarsys.wsgi:application -w 2 -b :8000	9	# command: gunicorn radarsys.wsgi:application -w 2 -b :8000
10	#command: python manage.py runserver 0.0.0.0:8030	10	# #command: python manage.py runserver 0.0.0.0:8030
11	ports:	11	# ports:
12	- 8000:8000	12	# - 8000:8000
13	#ports:	13	# #ports:
14	# - 8030:8030	14	# # - 8030:8030
15	env_file: .env	15	# env_file: .env
16		16
17	links:	17	# links:
18	# - redis	18	# # - redis
19	- postgres	19	# - postgres
20	volumes:	20	# volumes:
21	- './:/radarsys'	21	# - './:/radarsys'
22	- '${DOCKER_DATA}/static:/radarsys/static'	22	# - '${DOCKER_DATA}/static:/radarsys/static'
23	depends_on:	23	# depends_on:
24	# - redis	24	# # - redis
25	- postgres	25	# - postgres
26		26
27	# redis:	27	# redis:
28	# container_name: 'radarsys-redis'	28	# container_name: 'radarsys-redis'
@@ -47,23 +47,27 services:
47	volumes:	47	volumes:
48	- ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d	48	- ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
49	- pgdata:/var/lib/postgresql/data	49	- pgdata:/var/lib/postgresql/data
50	# ports:	50	ports:
51	# - 5432:5432	51	- 5432:5432
		52	environment:
		53	- POSTGRES_PASSWORD=docker
		54	- POSTGRES_USER=docker
		55	- POSTGRES_DB=radarsys
52	env_file: .env	56	env_file: .env
53		57
54	#Web Server	58	# #Web Server
55	nginx:	59	# nginx:
56	container_name: 'radarsys-nginx'	60	# container_name: 'radarsys-nginx'
57	restart: always	61	# restart: always
58	build: ./nginx/	62	# build: ./nginx/
59	ports:	63	# ports:
60	- '8030:8030'	64	# - '8030:8030'
61	volumes_from:	65	# volumes_from:
62	- web	66	# - web
63	links:	67	# links:
64	- web:web	68	# - web:web
65	depends_on:	69	# depends_on:
66	- web	70	# - web
67		71
68	volumes:	72	volumes:
69	pgdata:	73	pgdata:

postgres/Dockerfile +3 -1

@@ -1,3 +1,5
1	FROM postgres:14.6-alpine	1	FROM postgres:14.6-alpine
		2	#FROM library/postgres
2		3
3	RUN mkdir -p "$PGDATA" && chmod 700 "$PGDATA" No newline at end of file	4	RUN mkdir -p "$PGDATA" && chmod 700 "$PGDATA"
		5	#COPY ./init.sql /docker-entrypoint-initdb.d/ No newline at end of file

postgres/docker-entrypoint-initdb.d/create_db.sh +4 -4

             set -e
             echo "Creating database & user"
-            psql -v --username "postgres" --dbname "postgres" <<-EOSQL
+            psql -v --username "docker" --dbname "radarsys" <<-EOSQL
-            	CREATE USER $DB_USER WITH PASSWORD '$DB_PASSWORD';
+            	CREATE USER docker WITH PASSWORD 'docker';
-            	CREATE DATABASE $DB_NAME;
+            	CREATE DATABASE radarsys;
-            	GRANT ALL PRIVILEGES ON DATABASE $DB_NAME TO $DB_USER;
+            	GRANT ALL PRIVILEGES ON DATABASE radarsys TO docker;
             EOSQL

static/admin/css/autocomplete.css +36 -21

             .select2-container--admin-autocomplete.select2-container--focus .select2-selection,
             .select2-container--admin-autocomplete.select2-container--open .select2-selection {
-                border-color: #999;
+                border-color: var(--body-quiet-color);
                 min-height: 30px;
             }
             }
             .select2-container--admin-autocomplete .select2-selection--single {
-                background-color: #fff;
+                background-color: var(--body-bg);
-                border: 1px solid #ccc;
+                border: 1px solid var(--border-color);
                 border-radius: 4px;
             }
             .select2-container--admin-autocomplete .select2-selection--single .select2-selection__rendered {
-                color: #444;
+                color: var(--body-fg);
                 line-height: 30px;
             }
             }
             .select2-container--admin-autocomplete .select2-selection--single .select2-selection__placeholder {
-                color: #999;
+                color: var(--body-quiet-color);
             }
             .select2-container--admin-autocomplete .select2-selection--single .select2-selection__arrow {
             }
             .select2-container--admin-autocomplete.select2-container--disabled .select2-selection--single {
-                background-color: #eee;
+                background-color: var(--darkened-bg);
                 cursor: default;
             }
             }
             .select2-container--admin-autocomplete .select2-selection--multiple {
-                background-color: white;
+                background-color: var(--body-bg);
-                border: 1px solid #ccc;
+                border: 1px solid var(--border-color);
                 border-radius: 4px;
                 cursor: text;
             }
                 box-sizing: border-box;
                 list-style: none;
                 margin: 0;
-                padding: 0 5px;
+                padding: 0 10px 5px 5px;
                 width: 100%;
+                display: flex;
+                flex-wrap: wrap;
             }
             .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__rendered li {
             }
             .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__placeholder {
-                color: #999;
+                color: var(--body-quiet-color);
                 margin-top: 5px;
                 float: left;
             }
                 float: right;
                 font-weight: bold;
                 margin: 5px;
+                position: absolute;
+                right: 0;
             }
             .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice {
-                background-color: #e4e4e4;
+                background-color: var(--darkened-bg);
-                border: 1px solid #ccc;
+                border: 1px solid var(--border-color);
                 border-radius: 4px;
                 cursor: default;
                 float: left;
             }
             .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice__remove {
-                color: #999;
+                color: var(--body-quiet-color);
                 cursor: pointer;
                 display: inline-block;
                 font-weight: bold;
             }
             .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice__remove:hover {
-                color: #333;
+                color: var(--body-fg);
             }
             .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-search--inline {
             }
             .select2-container--admin-autocomplete.select2-container--focus .select2-selection--multiple {
-                border: solid #999 1px;
+                border: solid var(--body-quiet-color) 1px;
                 outline: 0;
             }
             .select2-container--admin-autocomplete.select2-container--disabled .select2-selection--multiple {
-                background-color: #eee;
+                background-color: var(--darkened-bg);
                 cursor: default;
             }
                 border-bottom-right-radius: 0;
             }
+            .select2-container--admin-autocomplete .select2-search--dropdown {
+                background: var(--darkened-bg);
+            }
             .select2-container--admin-autocomplete .select2-search--dropdown .select2-search__field {
-                border: 1px solid #ccc;
+                background: var(--body-bg);
+                color: var(--body-fg);
+                border: 1px solid var(--border-color);
+                border-radius: 4px;
             }
             .select2-container--admin-autocomplete .select2-search--inline .select2-search__field {
                 background: transparent;
+                color: var(--body-fg);
                 border: none;
                 outline: 0;
                 box-shadow: none;
             .select2-container--admin-autocomplete .select2-results > .select2-results__options {
                 max-height: 200px;
                 overflow-y: auto;
+                color: var(--body-fg);
+                background: var(--body-bg);
             }
             .select2-container--admin-autocomplete .select2-results__option[role=group] {
             }
             .select2-container--admin-autocomplete .select2-results__option[aria-disabled=true] {
-                color: #999;
+                color: var(--body-quiet-color);
             }
             .select2-container--admin-autocomplete .select2-results__option[aria-selected=true] {
-                background-color: #ddd;
+                background-color: var(--selected-bg);
+                color: var(--body-fg);
             }
             .select2-container--admin-autocomplete .select2-results__option .select2-results__option {
             }
             .select2-container--admin-autocomplete .select2-results__option--highlighted[aria-selected] {
-                background-color: #79aec8;
+                background-color: var(--primary);
-                color: white;
+                color: var(--primary-fg);
             }
             .select2-container--admin-autocomplete .select2-results__group {

static/admin/css/base.css +285 -183

             @import url(fonts.css);
+            /* VARIABLE DEFINITIONS */
+            :root {
+              --primary: #79aec8;
+              --secondary: #417690;
+              --accent: #f5dd5d;
+              --primary-fg: #fff;
+              --body-fg: #333;
+              --body-bg: #fff;
+              --body-quiet-color: #666;
+              --body-loud-color: #000;
+              --header-color: #ffc;
+              --header-branding-color: var(--accent);
+              --header-bg: var(--secondary);
+              --header-link-color: var(--primary-fg);
+              --breadcrumbs-fg: #c4dce8;
+              --breadcrumbs-link-fg: var(--body-bg);
+              --breadcrumbs-bg: var(--primary);
+              --link-fg: #447e9b;
+              --link-hover-color: #036;
+              --link-selected-fg: #5b80b2;
+              --hairline-color: #e8e8e8;
+              --border-color: #ccc;
+              --error-fg: #ba2121;
+              --message-success-bg: #dfd;
+              --message-warning-bg: #ffc;
+              --message-error-bg: #ffefef;
+              --darkened-bg: #f8f8f8; /* A bit darker than --body-bg */
+              --selected-bg: #e4e4e4; /* E.g. selected table cells */
+              --selected-row: #ffc;
+              --button-fg: #fff;
+              --button-bg: var(--primary);
+              --button-hover-bg: #609ab6;
+              --default-button-bg: var(--secondary);
+              --default-button-hover-bg: #205067;
+              --close-button-bg: #888; /* Previously #bbb, contrast 1.92 */
+              --close-button-hover-bg: #747474;
+              --delete-button-bg: #ba2121;
+              --delete-button-hover-bg: #a41515;
+              --object-tools-fg: var(--button-fg);
+              --object-tools-bg: var(--close-button-bg);
+              --object-tools-hover-bg: var(--close-button-hover-bg);
+            }
+            html, body {
+                height: 100%;
+            }
             body {
                 margin: 0;
                 padding: 0;
-                font-size: 14px;
+                font-size: 0.875rem;
                 font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
-                color: #333;
+                color: var(--body-fg);
-                background: #fff;
+                background: var(--body-bg);
             }
             /* LINKS */
             a:link, a:visited {
-                color: #447e9b;
+                color: var(--link-fg);
                 text-decoration: none;
+                transition: color 0.15s, background 0.15s;
             }
             a:focus, a:hover {
-                color: #036;
+                color: var(--link-hover-color);
             }
             a:focus {
             }
             a.section:link, a.section:visited {
-                color: #fff;
+                color: var(--header-link-color);
                 text-decoration: none;
             }
             h1 {
                 margin: 0 0 20px;
                 font-weight: 300;
-                font-size: 20px;
+                font-size: 1.25rem;
-                color: #666;
+                color: var(--body-quiet-color);
             }
             h2 {
-                font-size: 16px;
+                font-size: 1rem;
                 margin: 1em 0 .5em 0;
             }
             }
             h3 {
-                font-size: 14px;
+                font-size: 0.875rem;
                 margin: .8em 0 .3em 0;
-                color: #666;
+                color: var(--body-quiet-color);
                 font-weight: bold;
             }
             h4 {
-                font-size: 12px;
+                font-size: 0.75rem;
                 margin: 1em 0 .8em 0;
                 padding-bottom: 3px;
             }
             h5 {
-                font-size: 10px;
+                font-size: 0.625rem;
                 margin: 1.5em 0 .5em 0;
-                color: #666;
+                color: var(--body-quiet-color);
                 text-transform: uppercase;
                 letter-spacing: 1px;
             }
-            ul li {
+            ul > li {
                 list-style-type: square;
                 padding: 1px 0;
             }
             }
             li, dt, dd {
-                font-size: 13px;
+                font-size: 0.8125rem;
                 line-height: 20px;
             }
             fieldset {
                 margin: 0;
+                min-width: 0;
                 padding: 0;
                 border: none;
-                border-top: 1px solid #eee;
+                border-top: 1px solid var(--hairline-color);
             }
             blockquote {
-                font-size: 11px;
+                font-size: 0.6875rem;
                 color: #777;
                 margin-left: 2px;
                 padding-left: 10px;
             code, pre {
                 font-family: "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace;
-                color: #666;
+                color: var(--body-quiet-color);
-                font-size: 12px;
+                font-size: 0.75rem;
+                overflow-x: auto;
             }
             pre.literal-block {
                 margin: 10px;
-                background: #eee;
+                background: var(--darkened-bg);
                 padding: 6px 8px;
             }
             hr {
                 clear: both;
-                color: #eee;
+                color: var(--hairline-color);
-                background-color: #eee;
+                background-color: var(--hairline-color);
                 height: 1px;
                 border: none;
                 margin: 0;
                 padding: 0;
-                font-size: 1px;
                 line-height: 1px;
             }
             /* TEXT STYLES & MODIFIERS */
             .small {
-                font-size: 11px;
+                font-size: 0.6875rem;
-            .tiny {
-                font-size: 10px;
-            p.tiny {
-                margin-top: -2px;
             }
             .mini {
-                font-size: 10px;
+                font-size: 0.625rem;
-            p.mini {
-                margin-top: -3px;
             }
             .help, p.help, form p.help, div.help, form div.help, div.help li {
-                font-size: 11px;
+                font-size: 0.6875rem;
-                color: #999;
+                color: var(--body-quiet-color);
             }
             div.help ul {
             }
             .quiet, a.quiet:link, a.quiet:visited {
-                color: #999;
+                color: var(--body-quiet-color);
                 font-weight: normal;
             }
-            .float-right {
-                float: right;
-            .float-left {
-                float: left;
             .clear {
                 clear: both;
             }
-            .align-left {
-                text-align: left;
-            .align-right {
-                text-align: right;
-            .example {
-                margin: 10px 0;
-                padding: 5px 10px;
-                background: #efefef;
             .nowrap {
                 white-space: nowrap;
             }
+            .hidden {
+                display: none !important;
+            }
             /* TABLES */
             table {
                 border-collapse: collapse;
-                border-color: #ccc;
+                border-color: var(--border-color);
             }
             td, th {
-                font-size: 13px;
+                font-size: 0.8125rem;
                 line-height: 16px;
-                border-bottom: 1px solid #eee;
+                border-bottom: 1px solid var(--hairline-color);
                 vertical-align: top;
                 padding: 8px;
-                font-family: "Roboto", "Lucida Grande", Verdana, Arial, sans-serif;
             }
             th {
             thead th,
             tfoot td {
-                color: #666;
+                color: var(--body-quiet-color);
                 padding: 5px 10px;
-                font-size: 11px;
+                font-size: 0.6875rem;
-                background: #fff;
+                background: var(--body-bg);
                 border: none;
-                border-top: 1px solid #eee;
+                border-top: 1px solid var(--hairline-color);
-                border-bottom: 1px solid #eee;
+                border-bottom: 1px solid var(--hairline-color);
             }
             tfoot td {
                 border-bottom: none;
-                border-top: 1px solid #eee;
+                border-top: 1px solid var(--hairline-color);
             }
             thead th.required {
-                color: #000;
+                color: var(--body-loud-color);
             }
             tr.alt {
-                background: #f6f6f6;
+                background: var(--darkened-bg);
             }
-            .row1 {
+            tr:nth-child(odd), .row-form-errors {
-                background: #fff;
+                background: var(--body-bg);
             }
-            .row2 {
+            tr:nth-child(even),
-                background: #f9f9f9;
+            tr:nth-child(even) .errorlist,
+            tr:nth-child(odd) + .row-form-errors,
+            tr:nth-child(odd) + .row-form-errors .errorlist {
+                background: var(--darkened-bg);
             }
             /* SORTABLE TABLES */
                 padding: 5px 10px;
                 line-height: normal;
                 text-transform: uppercase;
-                background: #f6f6f6;
+                background: var(--darkened-bg);
             }
             thead th a:link, thead th a:visited {
-                color: #666;
+                color: var(--body-quiet-color);
             }
             thead th.sorted {
-                background: #eee;
+                background: var(--selected-bg);
             }
             thead th.sorted .text {
             }
             table thead th .text a:focus, table thead th .text a:hover {
-                background: #eee;
+                background: var(--selected-bg);
             }
             thead th.sorted a.sortremove {
                 top: -6px;
                 left: 3px;
                 font-weight: 200;
-                font-size: 18px;
+                font-size: 1.125rem;
-                color: #999;
+                color: var(--body-quiet-color);
             }
             table thead th.sorted .sortoptions a.sortremove:focus:after,
             table thead th.sorted .sortoptions a.sortremove:hover:after {
-                color: #447e9b;
+                color: var(--link-fg);
             }
             table thead th.sorted .sortoptions a.sortremove:focus,
                 vertical-align: middle;
                 font-family: "Roboto", "Lucida Grande", Verdana, Arial, sans-serif;
                 font-weight: normal;
-                font-size: 13px;
+                font-size: 0.8125rem;
             }
             .form-row div.help {
                 padding: 2px 3px;
             input[type=text], input[type=password], input[type=email], input[type=url],
             input[type=number], input[type=tel], textarea, select, .vTextField {
-                border: 1px solid #ccc;
+                border: 1px solid var(--border-color);
                 border-radius: 4px;
                 padding: 5px 6px;
                 margin-top: 0;
+                color: var(--body-fg);
+                background-color: var(--body-bg);
             }
             input[type=text]:focus, input[type=password]:focus, input[type=email]:focus,
             input[type=url]:focus, input[type=number]:focus, input[type=tel]:focus,
             textarea:focus, select:focus, .vTextField:focus {
-                border-color: #999;
+                border-color: var(--body-quiet-color);
             }
             select {
             /* FORM BUTTONS */
             .button, input[type=submit], input[type=button], .submit-row input, a.button {
-                background: #79aec8;
+                background: var(--button-bg);
                 padding: 10px 15px;
                 border: none;
                 border-radius: 4px;
-                color: #fff;
+                color: var(--button-fg);
                 cursor: pointer;
+                transition: background 0.15s;
             }
             a.button {
             .button:active, input[type=submit]:active, input[type=button]:active,
             .button:focus, input[type=submit]:focus, input[type=button]:focus,
             .button:hover, input[type=submit]:hover, input[type=button]:hover {
-                background: #609ab6;
+                background: var(--button-hover-bg);
             }
             .button[disabled], input[type=submit][disabled], input[type=button][disabled] {
                 float: right;
                 border: none;
                 font-weight: 400;
-                background: #417690;
+                background: var(--default-button-bg);
             }
             .button.default:active, input[type=submit].default:active,
             .button.default:focus, input[type=submit].default:focus,
             .button.default:hover, input[type=submit].default:hover {
-                background: #205067;
+                background: var(--default-button-hover-bg);
             }
             .button[disabled].default,
             .module {
                 border: none;
                 margin-bottom: 30px;
-                background: #fff;
+                background: var(--body-bg);
             }
             .module p, .module ul, .module h3, .module h4, .module dl, .module pre {
                 margin: 0;
                 padding: 8px;
                 font-weight: 400;
-                font-size: 13px;
+                font-size: 0.8125rem;
                 text-align: left;
-                background: #79aec8;
+                background: var(--primary);
-                color: #fff;
+                color: var(--header-link-color);
             }
             .module caption,
             .inline-group h2 {
-                font-size: 12px;
+                font-size: 0.75rem;
                 letter-spacing: 0.5px;
                 text-transform: uppercase;
             }
             ul.messagelist li {
                 display: block;
                 font-weight: 400;
-                font-size: 13px;
+                font-size: 0.8125rem;
                 padding: 10px 10px 10px 65px;
                 margin: 0 0 10px 0;
-                background: #dfd url(../img/icon-yes.svg) 40px 12px no-repeat;
+                background: var(--message-success-bg) url(../img/icon-yes.svg) 40px 12px no-repeat;
                 background-size: 16px auto;
-                color: #333;
+                color: var(--body-fg);
+                word-break: break-word;
             }
             ul.messagelist li.warning {
-                background: #ffc url(../img/icon-alert.svg) 40px 14px no-repeat;
+                background: var(--message-warning-bg) url(../img/icon-alert.svg) 40px 14px no-repeat;
                 background-size: 14px auto;
             }
             ul.messagelist li.error {
-                background: #ffefef url(../img/icon-no.svg) 40px 12px no-repeat;
+                background: var(--message-error-bg) url(../img/icon-no.svg) 40px 12px no-repeat;
                 background-size: 16px auto;
             }
             .errornote {
-                font-size: 14px;
+                font-size: 0.875rem;
                 font-weight: 700;
                 display: block;
                 padding: 10px 12px;
                 margin: 0 0 10px 0;
-                color: #ba2121;
+                color: var(--error-fg);
-                border: 1px solid #ba2121;
+                border: 1px solid var(--error-fg);
                 border-radius: 4px;
-                background-color: #fff;
+                background-color: var(--body-bg);
                 background-position: 5px 12px;
+                overflow-wrap: break-word;
             }
             ul.errorlist {
                 margin: 0 0 4px;
                 padding: 0;
-                color: #ba2121;
+                color: var(--error-fg);
-                background: #fff;
+                background: var(--body-bg);
             }
             ul.errorlist li {
-                font-size: 13px;
+                font-size: 0.8125rem;
                 display: block;
                 margin-bottom: 4px;
+                overflow-wrap: break-word;
             }
             ul.errorlist li:first-child {
             .form-row.errors {
                 margin: 0;
                 border: none;
-                border-bottom: 1px solid #eee;
+                border-bottom: 1px solid var(--hairline-color);
                 background: none;
             }
                 padding-left: 0;
             }
-            .errors input, .errors select, .errors textarea {
+            .errors input, .errors select, .errors textarea,
-                border: 1px solid #ba2121;
+            td ul.errorlist + input, td ul.errorlist + select, td ul.errorlist + textarea {
+                border: 1px solid var(--error-fg);
-            div.system-message {
-                background: #ffc;
-                margin: 10px;
-                padding: 6px 8px;
-                font-size: .8em;
-            div.system-message p.system-message-title {
-                padding: 4px 5px 4px 25px;
-                margin: 0;
-                color: #c11;
-                background: #ffefef url(../img/icon-no.svg) 5px 5px no-repeat;
             }
             .description {
-                font-size: 12px;
+                font-size: 0.75rem;
                 padding: 5px 0 0 12px;
             }
             /* BREADCRUMBS */
             div.breadcrumbs {
-                background: #79aec8;
+                background: var(--breadcrumbs-bg);
                 padding: 10px 40px;
                 border: none;
-                font-size: 14px;
+                color: var(--breadcrumbs-fg);
-                color: #c4dce8;
                 text-align: left;
             }
             div.breadcrumbs a {
-                color: #fff;
+                color: var(--breadcrumbs-link-fg);
             }
             div.breadcrumbs a:focus, div.breadcrumbs a:hover {
-                color: #c4dce8;
+                color: var(--breadcrumbs-fg);
             }
             /* ACTION ICONS */
             }
             a.deletelink:link, a.deletelink:visited {
-                color: #CC3434;
+                color: #CC3434; /* XXX Probably unused? */
             }
             a.deletelink:focus, a.deletelink:hover {
-                color: #993333;
+                color: #993333; /* XXX Probably unused? */
                 text-decoration: none;
             }
             /* OBJECT TOOLS */
             .object-tools {
-                font-size: 10px;
+                font-size: 0.625rem;
                 font-weight: bold;
                 padding-left: 0;
                 float: right;
                 margin-top: -48px;
             }
-            .form-row .object-tools {
-                margin-top: 5px;
-                margin-bottom: 5px;
-                float: none;
-                height: 2em;
-                padding-left: 3.5em;
             .object-tools li {
                 display: block;
                 float: left;
                 display: block;
                 float: left;
                 padding: 3px 12px;
-                background: #999;
+                background: var(--object-tools-bg);
+                color: var(--object-tools-fg);
                 font-weight: 400;
-                font-size: 11px;
+                font-size: 0.6875rem;
                 text-transform: uppercase;
                 letter-spacing: 0.5px;
-                color: #fff;
             }
             .object-tools a:focus, .object-tools a:hover {
-                background-color: #417690;
+                background-color: var(--object-tools-hover-bg);
             }
             .object-tools a:focus{
                 text-decoration: none;
             }
-            .object-tools a.viewsitelink, .object-tools a.golink,.object-tools a.addlink {
+            .object-tools a.viewsitelink, .object-tools a.addlink {
                 background-repeat: no-repeat;
                 background-position: right 7px center;
                 padding-right: 26px;
             }
-            .object-tools a.viewsitelink, .object-tools a.golink {
+            .object-tools a.viewsitelink {
                 background-image: url(../img/tooltag-arrowright.svg);
             }
             /* OBJECT HISTORY */
-            table#change-history {
+            #change-history table {
                 width: 100%;
             }
-            table#change-history tbody th {
+            #change-history table tbody th {
                 width: 16em;
             }
+            #change-history .paginator {
+                color: var(--body-quiet-color);
+                border-bottom: 1px solid var(--hairline-color);
+                background: var(--body-bg);
+                overflow: hidden;
+            }
             /* PAGE STRUCTURE */
             #container {
                 width: 100%;
                 min-width: 980px;
                 padding: 0;
+                display: flex;
+                flex-direction: column;
+                height: 100%;
+            }
+            #container > div {
+                flex-shrink: 0;
+            }
+            #container > .main {
+                display: flex;
+                flex: 1 0 auto;
+            }
+            .main > .content {
+                flex:  1 0;
+                max-width: 100%;
             }
             #content {
                 justify-content: space-between;
                 align-items: center;
                 padding: 10px 40px;
-                background: #417690;
+                background: var(--header-bg);
-                color: #ffc;
+                color: var(--header-color);
                 overflow: hidden;
             }
-            #header a:link, #header a:visited {
+            #header a:link, #header a:visited, #logout-form button {
-                color: #fff;
+                color: var(--header-link-color);
             }
             #header a:focus , #header a:hover {
                 padding: 0;
                 margin: 0 20px 0 0;
                 font-weight: 300;
-                font-size: 24px;
+                font-size: 1.5rem;
-                color: #f5dd5d;
+                color: var(--header-branding-color);
             }
-            #branding h1, #branding h1 a:link, #branding h1 a:visited {
+            #branding h1 a:link, #branding h1 a:visited {
-                color: #f5dd5d;
+                color: var(--accent);
             }
             #branding h2 {
                 padding: 0 10px;
-                font-size: 14px;
+                font-size: 0.875rem;
                 margin: -8px 0 8px 0;
                 font-weight: normal;
-                color: #ffc;
+                color: var(--header-color);
             }
             #branding a:hover {
                 text-decoration: none;
             }
+            #logout-form {
+                display: inline;
+            }
+            #logout-form button {
+                background: none;
+                border: 0;
+                cursor: pointer;
+                font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
+            }
             #user-tools {
                 float: right;
-                padding: 0;
                 margin: 0 0 0 20px;
+                text-align: right;
+            }
+            #user-tools, #logout-form button{
+                padding: 0;
                 font-weight: 300;
-                font-size: 11px;
+                font-size: 0.6875rem;
                 letter-spacing: 0.5px;
                 text-transform: uppercase;
-                text-align: right;
             }
-            #user-tools a {
+            #user-tools a, #logout-form button {
                 border-bottom: 1px solid rgba(255, 255, 255, 0.25);
             }
-            #user-tools a:focus, #user-tools a:hover {
+            #user-tools a:focus, #user-tools a:hover,
+            #logout-form button:active, #logout-form button:hover {
                 text-decoration: none;
-                border-bottom-color: #79aec8;
+                border-bottom: 0;
-                color: #79aec8;
+            #logout-form button:active, #logout-form button:hover {
+                margin-bottom: 1px;
             }
             /* SIDEBAR */
             #content-related {
-                background: #f8f8f8;
+                background: var(--darkened-bg);
             }
             #content-related .module {
             }
             #content-related h3 {
-                font-size: 14px;
+                color: var(--body-quiet-color);
-                color: #666;
                 padding: 0 16px;
                 margin: 0 0 16px;
             }
             #content-related h4 {
-                font-size: 13px;
+                font-size: 0.8125rem;
             }
             #content-related p {
                 background: none;
                 padding: 16px;
                 margin-bottom: 16px;
-                border-bottom: 1px solid #eaeaea;
+                border-bottom: 1px solid var(--hairline-color);
-                font-size: 18px;
+                font-size: 1.125rem;
-                color: #333;
+                color: var(--body-fg);
             }
             .delete-confirmation form input[type="submit"] {
-                background: #ba2121;
+                background: var(--delete-button-bg);
                 border-radius: 4px;
                 padding: 10px 15px;
-                color: #fff;
+                color: var(--button-fg);
             }
             .delete-confirmation form input[type="submit"]:active,
             .delete-confirmation form input[type="submit"]:focus,
             .delete-confirmation form input[type="submit"]:hover {
-                background: #a41515;
+                background: var(--delete-button-hover-bg);
             }
             .delete-confirmation form .cancel-link {
                 vertical-align: middle;
                 height: 15px;
                 line-height: 15px;
-                background: #ddd;
                 border-radius: 4px;
                 padding: 10px 15px;
-                color: #333;
+                color: var(--button-fg);
+                background: var(--close-button-bg);
                 margin: 0 0 0 10px;
             }
             .delete-confirmation form .cancel-link:active,
             .delete-confirmation form .cancel-link:focus,
             .delete-confirmation form .cancel-link:hover {
-                background: #ccc;
+                background: var(--close-button-hover-bg);
             }
             /* POPUP */
             .popup #header {
                 padding: 10px 20px;
             }
+            /* PAGINATOR */
+            .paginator {
+                font-size: 0.8125rem;
+                padding-top: 10px;
+                padding-bottom: 10px;
+                line-height: 22px;
+                margin: 0;
+                border-top: 1px solid var(--hairline-color);
+                width: 100%;
+            }
+            .paginator a:link, .paginator a:visited {
+                padding: 2px 6px;
+                background: var(--button-bg);
+                text-decoration: none;
+                color: var(--button-fg);
+            }
+            .paginator a.showall {
+                border: none;
+                background: none;
+                color: var(--link-fg);
+            }
+            .paginator a.showall:focus, .paginator a.showall:hover {
+                background: none;
+                color: var(--link-hover-color);
+            }
+            .paginator .end {
+                margin-right: 6px;
+            }
+            .paginator .this-page {
+                padding: 2px 6px;
+                font-weight: bold;
+                font-size: 0.8125rem;
+                vertical-align: top;
+            }
+            .paginator a:focus, .paginator a:hover {
+                color: white;
+                background: var(--link-hover-color);
+            }

static/admin/css/changelists.css +101 -120

             /* CHANGELISTS */
             #changelist {
-                position: relative;
+                display: flex;
-                width: 100%;
+                align-items: flex-start;
+                justify-content: space-between;
+            }
+            #changelist .changelist-form-container {
+                flex: 1 1 auto;
+                min-width: 0;
             }
             #changelist table {
             .change-list .filtered .results, .change-list .filtered .paginator,
             .filtered #toolbar, .filtered div.xfull {
-                margin-right: 280px;
                 width: auto;
             }
             }
             #changelist-form .results {
-              overflow-x: auto;
+                overflow-x: auto;
+                width: 100%;
             }
             #changelist .toplinks {
-                border-bottom: 1px solid #ddd;
+                border-bottom: 1px solid var(--hairline-color);
             }
             #changelist .paginator {
-                color: #666;
+                color: var(--body-quiet-color);
-                border-bottom: 1px solid #eee;
+                border-bottom: 1px solid var(--hairline-color);
-                background: #fff;
+                background: var(--body-bg);
                 overflow: hidden;
             }
             }
             #changelist table tfoot {
-                color: #666;
+                color: var(--body-quiet-color);
             }
             /* TOOLBAR */
-            #changelist #toolbar {
+            #toolbar {
                 padding: 8px 10px;
                 margin-bottom: 15px;
-                border-top: 1px solid #eee;
+                border-top: 1px solid var(--hairline-color);
-                border-bottom: 1px solid #eee;
+                border-bottom: 1px solid var(--hairline-color);
-                background: #f8f8f8;
+                background: var(--darkened-bg);
-                color: #666;
+                color: var(--body-quiet-color);
             }
-            #changelist #toolbar form input {
+            #toolbar form input {
                 border-radius: 4px;
-                font-size: 14px;
+                font-size: 0.875rem;
                 padding: 5px;
-                color: #333;
+                color: var(--body-fg);
             }
-            #changelist #toolbar form #searchbar {
+            #toolbar #searchbar {
                 height: 19px;
-                border: 1px solid #ccc;
+                border: 1px solid var(--border-color);
                 padding: 2px 5px;
                 margin: 0;
                 vertical-align: top;
-                font-size: 13px;
+                font-size: 0.8125rem;
+                max-width: 100%;
             }
-            #changelist #toolbar form #searchbar:focus {
+            #toolbar #searchbar:focus {
-                border-color: #999;
+                border-color: var(--body-quiet-color);
             }
-            #changelist #toolbar form input[type="submit"] {
+            #toolbar form input[type="submit"] {
-                border: 1px solid #ccc;
+                border: 1px solid var(--border-color);
-                padding: 2px 10px;
+                font-size: 0.8125rem;
+                padding: 4px 8px;
                 margin: 0;
                 vertical-align: middle;
-                background: #fff;
+                background: var(--body-bg);
                 box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset;
                 cursor: pointer;
-                color: #333;
+                color: var(--body-fg);
             }
-            #changelist #toolbar form input[type="submit"]:focus,
+            #toolbar form input[type="submit"]:focus,
-            #changelist #toolbar form input[type="submit"]:hover {
+            #toolbar form input[type="submit"]:hover {
-                border-color: #999;
+                border-color: var(--body-quiet-color);
             }
-            #changelist #changelist-search img {
+            #changelist-search img {
                 vertical-align: middle;
                 margin-right: 4px;
             }
+            #changelist-search .help {
+                word-break: break-word;
+            }
             /* FILTER COLUMN */
             #changelist-filter {
-                position: absolute;
+                flex: 0 0 240px;
-                top: 0;
+                order: 1;
-                right: 0;
+                background: var(--darkened-bg);
-                z-index: 1000;
-                width: 240px;
-                background: #f8f8f8;
                 border-left: none;
-                margin: 0;
+                margin: 0 0 0 30px;
             }
             #changelist-filter h2 {
-                font-size: 14px;
+                font-size: 0.875rem;
                 text-transform: uppercase;
                 letter-spacing: 0.5px;
                 padding: 5px 15px;
                 border-bottom: none;
             }
-            #changelist-filter h3 {
+            #changelist-filter h3,
+            #changelist-filter details summary {
                 font-weight: 400;
-                font-size: 14px;
                 padding: 0 15px;
                 margin-bottom: 10px;
             }
+            #changelist-filter details summary > * {
+                display: inline;
+            }
+            #changelist-filter details > summary {
+                list-style-type: none;
+            }
+            #changelist-filter details > summary::-webkit-details-marker {
+                display: none;
+            }
+            #changelist-filter details > summary::before {
+                content: '→';
+                font-weight: bold;
+                color: var(--link-hover-color);
+            }
+            #changelist-filter details[open] > summary::before {
+                content: '↓';
+            }
             #changelist-filter ul {
                 margin: 5px 0;
                 padding: 0 15px 15px;
-                border-bottom: 1px solid #eaeaea;
+                border-bottom: 1px solid var(--hairline-color);
             }
             #changelist-filter ul:last-child {
                 border-bottom: none;
-                padding-bottom: none;
             }
             #changelist-filter li {
             #changelist-filter a {
                 display: block;
-                color: #999;
+                color: var(--body-quiet-color);
-                text-overflow: ellipsis;
+                word-break: break-word;
-                overflow-x: hidden;
             }
             #changelist-filter li.selected {
-                border-left: 5px solid #eaeaea;
+                border-left: 5px solid var(--hairline-color);
                 padding-left: 10px;
                 margin-left: -15px;
             }
             #changelist-filter li.selected a {
-                color: #5b80b2;
+                color: var(--link-selected-fg);
             }
             #changelist-filter a:focus, #changelist-filter a:hover,
             #changelist-filter li.selected a:focus,
             #changelist-filter li.selected a:hover {
-                color: #036;
+                color: var(--link-hover-color);
+            }
+            #changelist-filter #changelist-filter-clear a {
+                font-size: 0.8125rem;
+                padding-bottom: 10px;
+                border-bottom: 1px solid var(--hairline-color);
             }
             /* DATE DRILLDOWN */
             }
             .change-list ul.toplinks .date-back a {
-                color: #999;
+                color: var(--body-quiet-color);
             }
             .change-list ul.toplinks .date-back a:focus,
             .change-list ul.toplinks .date-back a:hover {
-                color: #036;
+                color: var(--link-hover-color);
-            /* PAGINATOR */
-            .paginator {
-                font-size: 13px;
-                padding-top: 10px;
-                padding-bottom: 10px;
-                line-height: 22px;
-                margin: 0;
-                border-top: 1px solid #ddd;
-            .paginator a:link, .paginator a:visited {
-                padding: 2px 6px;
-                background: #79aec8;
-                text-decoration: none;
-                color: #fff;
-            .paginator a.showall {
-                padding: 0;
-                border: none;
-                background: none;
-                color: #5b80b2;
-            .paginator a.showall:focus, .paginator a.showall:hover {
-                background: none;
-                color: #036;
-            .paginator .end {
-                margin-right: 6px;
-            .paginator .this-page {
-                padding: 2px 6px;
-                font-weight: bold;
-                font-size: 13px;
-                vertical-align: top;
-            .paginator a:focus, .paginator a:hover {
-                color: white;
-                background: #036;
             }
             /* ACTIONS */
             .filtered .actions {
-                margin-right: 280px;
                 border-right: none;
             }
             }
             #changelist table tbody tr.selected {
-                background-color: #FFFFCC;
+                background-color: var(--selected-row);
             }
             #changelist .actions {
                 padding: 10px;
-                background: #fff;
+                background: var(--body-bg);
                 border-top: none;
                 border-bottom: none;
                 line-height: 24px;
-                color: #999;
+                color: var(--body-quiet-color);
+                width: 100%;
-            #changelist .actions.selected {
-                background: #fffccf;
-                border-top: 1px solid #fffee8;
-                border-bottom: 1px solid #edecd6;
             }
             #changelist .actions span.all,
             #changelist .actions span.action-counter,
             #changelist .actions span.clear,
             #changelist .actions span.question {
-                font-size: 13px;
+                font-size: 0.8125rem;
                 margin: 0 0.5em;
-                display: none;
             }
             #changelist .actions:last-child {
             #changelist .actions select {
                 vertical-align: top;
                 height: 24px;
-                background: none;
+                color: var(--body-fg);
-                color: #000;
+                border: 1px solid var(--border-color);
-                border: 1px solid #ccc;
                 border-radius: 4px;
-                font-size: 14px;
+                font-size: 0.875rem;
                 padding: 0 0 0 4px;
                 margin: 0;
                 margin-left: 10px;
             }
             #changelist .actions select:focus {
-                border-color: #999;
+                border-color: var(--body-quiet-color);
             }
             #changelist .actions label {
                 display: inline-block;
                 vertical-align: middle;
-                font-size: 13px;
+                font-size: 0.8125rem;
             }
             #changelist .actions .button {
-                font-size: 13px;
+                font-size: 0.8125rem;
-                border: 1px solid #ccc;
+                border: 1px solid var(--border-color);
                 border-radius: 4px;
-                background: #fff;
+                background: var(--body-bg);
                 box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset;
                 cursor: pointer;
                 height: 24px;
                 line-height: 1;
                 padding: 4px 8px;
                 margin: 0;
-                color: #333;
+                color: var(--body-fg);
             }
             #changelist .actions .button:focus, #changelist .actions .button:hover {
-                border-color: #999;
+                border-color: var(--body-quiet-color);
             }

static/admin/css/dashboard.css 0 -1

                 list-style-type: none;
                 overflow: hidden;
                 text-overflow: ellipsis;
-                -o-text-overflow: ellipsis;
             }

static/admin/css/forms.css +55 -59

             .form-row {
                 overflow: hidden;
                 padding: 10px;
-                font-size: 13px;
+                font-size: 0.8125rem;
-                border-bottom: 1px solid #eee;
+                border-bottom: 1px solid var(--hairline-color);
             }
             .form-row img, .form-row input {
                 padding-left: 0;
             }
-            .hidden {
-                display: none;
             /* FORM LABELS */
             label {
                 font-weight: normal;
-                color: #666;
+                color: var(--body-quiet-color);
-                font-size: 13px;
+                font-size: 0.8125rem;
             }
             .required label, label.required {
                 font-weight: bold;
-                color: #333;
+                color: var(--body-fg);
             }
             /* RADIO BUTTONS */
-            form ul.radiolist li {
+            form div.radiolist div {
-                list-style-type: none;
+                padding-right: 7px;
             }
-            form ul.radiolist label {
+            form div.radiolist.inline div {
-                float: none;
+                display: inline-block;
-                display: inline;
+            form div.radiolist label {
+                width: auto;
             }
-            form ul.radiolist input[type="radio"] {
+            form div.radiolist input[type="radio"] {
                 margin: -2px 4px 0 0;
                 padding: 0;
             }
                 margin-top: 0;
                 margin-bottom: 0;
                 margin-left: 170px;
+                overflow-wrap: break-word;
             }
             .aligned ul label {
                 padding-left: 10px;
             }
-            form .aligned ul.radiolist {
+            form .aligned div.radiolist {
                 display: inline-block;
                 margin: 0;
                 padding: 0;
             }
             fieldset.collapsed {
-                border: 1px solid #eee;
+                border: 1px solid var(--hairline-color);
                 border-radius: 4px;
                 overflow: hidden;
             }
             fieldset.collapsed h2 {
-                background: #f8f8f8;
+                background: var(--darkened-bg);
-                color: #666;
+                color: var(--body-quiet-color);
             }
             fieldset .collapse-toggle {
-                color: #fff;
+                color: var(--header-link-color);
             }
             fieldset.collapsed .collapse-toggle {
                 background: transparent;
                 display: inline;
-                color: #447e9b;
+                color: var(--link-fg);
             }
             /* MONOSPACE TEXTAREAS */
             /* SUBMIT ROW */
             .submit-row {
-                padding: 12px 14px;
+                padding: 12px 14px 7px;
                 margin: 0 0 20px;
-                background: #f8f8f8;
+                background: var(--darkened-bg);
-                border: 1px solid #eee;
+                border: 1px solid var(--hairline-color);
                 border-radius: 4px;
                 text-align: right;
                 overflow: hidden;
             .submit-row input {
                 height: 35px;
                 line-height: 15px;
-                margin: 0 0 0 5px;
+                margin: 0 0 5px 5px;
             }
             .submit-row input.default {
-                margin: 0 0 0 8px;
+                margin: 0 0 5px 8px;
                 text-transform: uppercase;
             }
             .submit-row a.deletelink {
                 display: block;
-                background: #ba2121;
+                background: var(--delete-button-bg);
                 border-radius: 4px;
                 padding: 10px 15px;
                 height: 15px;
                 line-height: 15px;
-                color: #fff;
+                margin-bottom: 5px;
+                color: var(--button-fg);
             }
             .submit-row a.closelink {
                 display: inline-block;
-                background: #bbbbbb;
+                background: var(--close-button-bg);
                 border-radius: 4px;
                 padding: 10px 15px;
                 height: 15px;
                 line-height: 15px;
                 margin: 0 0 0 5px;
-                color: #fff;
+                color: var(--button-fg);
             }
             .submit-row a.deletelink:focus,
             .submit-row a.deletelink:hover,
             .submit-row a.deletelink:active {
-                background: #a41515;
+                background: var(--delete-button-hover-bg);
             }
             .submit-row a.closelink:focus,
             .submit-row a.closelink:hover,
             .submit-row a.closelink:active {
-                background: #aaaaaa;
+                background: var(--close-button-hover-bg);
             }
             /* CUSTOM FORM FIELDS */
                 width: 2.2em;
             }
-            .vTextField, .vUUIDField {
-                width: 20em;
             .vIntegerField {
                 width: 5em;
             }
                 width: 5em;
             }
+            .vTextField, .vUUIDField {
+                width: 20em;
+            }
             /* INLINES */
             .inline-group {
             .inline-related h3 {
                 margin: 0;
-                color: #666;
+                color: var(--body-quiet-color);
                 padding: 5px;
-                font-size: 13px;
+                font-size: 0.8125rem;
-                background: #f8f8f8;
+                background: var(--darkened-bg);
-                border-top: 1px solid #eee;
+                border-top: 1px solid var(--hairline-color);
-                border-bottom: 1px solid #eee;
+                border-bottom: 1px solid var(--hairline-color);
             }
             .inline-related h3 span.delete {
             .inline-related h3 span.delete label {
                 margin-left: 2px;
-                font-size: 11px;
+                font-size: 0.6875rem;
             }
             .inline-related fieldset {
                 margin: 0;
-                background: #fff;
+                background: var(--body-bg);
                 border: none;
                 width: 100%;
             }
             .inline-related fieldset.module h3 {
                 margin: 0;
                 padding: 2px 5px 3px 5px;
-                font-size: 11px;
+                font-size: 0.6875rem;
                 text-align: left;
                 font-weight: bold;
                 background: #bcd;
-                color: #fff;
+                color: var(--body-bg);
             }
             .inline-group .tabular fieldset.module {
             .inline-related.tabular fieldset.module table {
                 width: 100%;
+                overflow-x: scroll;
             }
             .last-related fieldset {
                 height: 1.1em;
                 padding: 2px 9px;
                 overflow: hidden;
-                font-size: 9px;
+                font-size: 0.5625rem;
                 font-weight: bold;
-                color: #666;
+                color: var(--body-quiet-color);
                 _width: 700px;
             }
             .inline-group div.add-row,
             .inline-group .tabular tr.add-row td {
-                color: #666;
+                color: var(--body-quiet-color);
-                background: #f8f8f8;
+                background: var(--darkened-bg);
                 padding: 8px 10px;
-                border-bottom: 1px solid #eee;
+                border-bottom: 1px solid var(--hairline-color);
             }
             .inline-group .tabular tr.add-row td {
                 padding: 8px 10px;
-                border-bottom: 1px solid #eee;
+                border-bottom: 1px solid var(--hairline-color);
             }
             .inline-group ul.tools a.add,
             .inline-group .tabular tr.add-row td a {
                 background: url(../img/icon-addlink.svg) 0 1px no-repeat;
                 padding-left: 16px;
-                font-size: 12px;
+                font-size: 0.75rem;
             }
             .empty-form {
             /* RELATED FIELD ADD ONE / LOOKUP */
-            .add-another, .related-lookup {
+            .related-lookup {
                 margin-left: 5px;
                 display: inline-block;
                 vertical-align: middle;
                 background-size: 14px;
             }
-            .add-another {
-                width: 16px;
-                height: 16px;
-                background-image: url(../img/icon-addlink.svg);
             .related-lookup {
                 width: 16px;
                 height: 16px;

static/admin/css/login.css +13 -31

             /* LOGIN FORM */
-            body.login {
+            .login {
-                background: #f8f8f8;
+                background: var(--darkened-bg);
+                height: auto;
             }
             .login #header {
             }
             .login #header h1 {
-                font-size: 18px;
+                font-size: 1.125rem;
+                margin: 0;
             }
             .login #header h1 a {
-                color: #fff;
+                color: var(--header-link-color);
             }
             .login #content {
             }
             .login #container {
-                background: #fff;
+                background: var(--body-bg);
-                border: 1px solid #eaeaea;
+                border: 1px solid var(--hairline-color);
                 border-radius: 4px;
                 overflow: hidden;
                 width: 28em;
                 min-width: 300px;
                 margin: 100px auto;
+                height: auto;
-            .login #content-main {
-                width: 100%;
             }
             .login .form-row {
                 padding: 4px 0;
-                float: left;
-                width: 100%;
-                border-bottom: none;
             }
             .login .form-row label {
-                padding-right: 0.5em;
+                display: block;
                 line-height: 2em;
-                font-size: 1em;
-                clear: both;
-                color: #333;
             }
             .login .form-row #id_username, .login .form-row #id_password {
-                clear: both;
                 padding: 8px;
                 width: 100%;
-                -webkit-box-sizing: border-box;
+                box-sizing: border-box;
-                   -moz-box-sizing: border-box;
-                        box-sizing: border-box;
-            .login span.help {
-                font-size: 10px;
-                display: block;
             }
             .login .submit-row {
-                clear: both;
+                padding: 1em 0 0 0;
-                padding: 1em 0 0 9.4em;
                 margin: 0;
-                border: none;
+                text-align: center;
-                background: none;
-                text-align: left;
             }
             .login .password-reset-link {

static/admin/css/responsive.css +94 -71

                 td, th {
                     padding: 10px;
-                    font-size: 14px;
+                    font-size: 0.875rem;
                 }
                 .small {
-                    font-size: 12px;
+                    font-size: 0.75rem;
                 }
                 /* Layout */
                 }
                 #content {
-                    padding: 20px 30px 30px;
+                    padding: 15px 20px 20px;
                 }
                 div.breadcrumbs {
                 #branding h1 {
                     margin: 0 0 8px;
-                    font-size: 20px;
                     line-height: 1.2;
                 }
                 }
                 td .changelink, td .addlink {
-                    font-size: 13px;
+                    font-size: 0.8125rem;
                 }
                 /* Changelist */
-                #changelist #toolbar {
+                #toolbar {
                     border: none;
                     padding: 15px;
                 }
                 #changelist-search > div {
-                    display: -webkit-flex;
                     display: flex;
-                    -webkit-flex-wrap: wrap;
+                    flex-wrap: nowrap;
-                    flex-wrap: wrap;
                     max-width: 480px;
                 }
                     line-height: 22px;
                 }
-                #changelist #toolbar form #searchbar {
+                #toolbar form #searchbar {
-                    -webkit-flex: 1 0 auto;
                     flex: 1 0 auto;
                     width: 0;
                     height: 22px;
                     margin: 0 10px 0 6px;
                 }
+                #toolbar form input[type=submit] {
+                    flex: 0 1 auto;
+                }
                 #changelist-search .quiet {
-                    width: 100%;
+                    width: 0;
+                    flex: 1 0 auto;
                     margin: 5px 0 0 25px;
                 }
                     padding: 15px 0;
                 }
-                #changelist .actions.selected {
-                    border: none;
                 #changelist .actions label {
                     display: flex;
                 }
                 #changelist .actions select {
-                    background: #fff;
+                    background: var(--body-bg);
                 }
                 #changelist .actions .button {
                 #changelist .actions span.clear,
                 #changelist .actions span.question,
                 #changelist .actions span.action-counter {
-                    font-size: 11px;
+                    font-size: 0.6875rem;
                     margin: 0 10px 0 0;
                 }
                 #changelist-filter {
-                    width: 200px;
+                    flex-basis: 200px;
                 }
                 .change-list .filtered .results,
                 .change-list .filtered .paginator,
                 .filtered #toolbar,
                 .filtered .actions,
-                .filtered div.xfull {
-                    margin-right: 230px;
                 #changelist .paginator {
-                    border-top-color: #eee;
+                    border-top-color: var(--hairline-color); /* XXX Is this used at all? */
                 }
                 #changelist .results + .paginator {
                 /* Forms */
                 label {
-                    font-size: 14px;
+                    font-size: 0.875rem;
                 }
                 .form-row input[type=text],
                     margin: 0;
                     padding: 6px 8px;
                     min-height: 36px;
-                    font-size: 14px;
+                    font-size: 0.875rem;
                 }
                 .form-row select {
                 fieldset .fieldBox + .fieldBox {
                     margin-top: 10px;
                     padding-top: 10px;
-                    border-top: 1px solid #eee;
+                    border-top: 1px solid var(--hairline-color);
                 }
                 textarea {
-                    max-width: 518px;
+                    max-width: 100%;
                     max-height: 120px;
                 }
                     padding-top: 6px;
                 }
-                .aligned .add-another,
                 .aligned .related-lookup,
                 .aligned .datetimeshortcuts,
                 .aligned .related-lookup + strong {
                     margin-left: 15px;
                 }
-                form .aligned ul.radiolist {
+                form .aligned div.radiolist {
                     margin-left: 2px;
                 }
+                .submit-row {
+                    padding: 8px 8px 3px 8px;
+                }
+                .submit-row a.deletelink {
+                    padding: 10px 7px;
+                }
+                .submit-row input.default {
+                    margin: 0 0 5px 5px;
+                }
+                .button, input[type=submit], input[type=button], .submit-row input, a.button {
+                    padding: 7px;
+                }
                 /* Related widget */
                 .related-widget-wrapper {
                 }
                 .stacked .active.selector-add {
+                    background-position: 0 -40px;
+                }
+                .active.selector-add:focus, .active.selector-add:hover {
+                    background-position: 0 -140px;
+                }
+                .stacked .active.selector-add:focus, .stacked .active.selector-add:hover {
                     background-position: 0 -60px;
                 }
                 }
                 .stacked .active.selector-remove {
+                    background-position: 0 0;
+                }
+                .active.selector-remove:focus, .active.selector-remove:hover {
+                    background-position: 0 -100px;
+                }
+                .stacked .active.selector-remove:focus, .stacked .active.selector-remove:hover {
                     background-position: 0 -20px;
                 }
                 }
                 .datetime span {
-                    font-size: 13px;
+                    font-size: 0.8125rem;
                 }
                 .datetime .timezonewarning {
                     display: block;
-                    font-size: 11px;
+                    font-size: 0.6875rem;
-                    color: #999;
+                    color: var(--body-quiet-color);
                 }
                 .datetimeshortcuts {
-                    color: #ccc;
+                    color: var(--border-color); /* XXX Redundant, .datetime span also sets #ccc */
+                }
+                .form-row .datetime input.vDateField, .form-row .datetime input.vTimeField {
+                    width: 75%;
                 }
                 .inline-group {
                 #content-related .module h2 {
                     padding: 10px 15px;
-                    font-size: 16px;
+                    font-size: 1rem;
                 }
                 /* Changelist */
                 #changelist {
-                    display: flex;
+                    align-items: stretch;
                     flex-direction: column;
                 }
-                #changelist #toolbar {
+                #toolbar {
-                    order: 1;
                     padding: 10px;
                 }
-                #changelist .xfull {
-                    order: 2;
-                #changelist-form {
-                    order: 3;
                 #changelist-filter {
-                    order: 4;
+                    margin-left: 0;
                 }
                 #changelist .actions label {
                     flex: 1 0 100%;
                 }
-                .change-list .filtered .results, .change-list .filtered .paginator,
-                .filtered #toolbar, .filtered .actions, .filtered div.xfull {
-                    margin-right: 0;
                 #changelist-filter {
                     position: static;
                     width: auto;
                 .aligned p.file-upload {
                     margin-left: 0;
-                    font-size: 13px;
+                    font-size: 0.8125rem;
                 }
                 span.clearable-file-input {
                 }
                 span.clearable-file-input label {
-                    font-size: 13px;
+                    font-size: 0.8125rem;
                     padding-bottom: 0;
                 }
                     padding-left: 0;
                 }
-                form .aligned ul.radiolist {
+                form .aligned div.radiolist {
+                    margin-top: 5px;
                     margin-right: 15px;
                     margin-bottom: -3px;
                 }
-                form .aligned ul.radiolist li + li {
+                form .aligned div.radiolist:not(.inline) div + div {
                     margin-top: 5px;
                 }
                     background-position: 0 0;
                 }
+                .active.selector-remove:focus, .active.selector-remove:hover {
+                    background-position: 0 -20px;
+                }
                 .selector-add  {
                     background-position: 0 -40px;
                 }
+                .active.selector-add:focus, .active.selector-add:hover {
+                    background-position: 0 -60px;
+                }
                 /* Inlines */
                 .inline-group[data-inline-type="stacked"] .inline-related {
-                    border: 2px solid #eee;
+                    border: 1px solid var(--hairline-color);
                     border-radius: 4px;
                     margin-top: 15px;
                     overflow: auto;
                     box-sizing: border-box;
                 }
-                .inline-group[data-inline-type="stacked"] .inline-related + .inline-related {
-                    margin-top: 30px;
                 .inline-group[data-inline-type="stacked"] .inline-related .module {
                     padding: 0 10px;
                 }
-                .inline-group[data-inline-type="stacked"] .inline-related .module .form-row:last-child {
+                .inline-group[data-inline-type="stacked"] .inline-related .module .form-row {
+                    border-top: 1px solid var(--hairline-color);
                     border-bottom: none;
                 }
+                .inline-group[data-inline-type="stacked"] .inline-related .module .form-row:first-child {
+                    border-top: none;
+                }
                 .inline-group[data-inline-type="stacked"] .inline-related h3 {
                     padding: 10px;
                     border-top-width: 0;
                 .inline-group[data-inline-type="stacked"] div.add-row {
                     margin-top: 15px;
-                    border: 1px solid #eee;
+                    border: 1px solid var(--hairline-color);
                     border-radius: 4px;
                 }
                 /* Submit row */
                 .submit-row {
-                    padding: 10px 10px 0;
+                    padding: 10px 10px 5px;
                     margin: 0 0 15px;
                     display: flex;
                     flex-direction: column;
                 }
                 .login .form-row label {
-                    display: block;
                     margin: 0 0 5px;
-                    padding: 0;
                     line-height: 1.2;
                 }
                     padding: 15px 0 0;
                 }
-                .login br, .login .submit-row label {
+                .login br {
                     display: none;
                 }
                 .errornote {
                     margin: 0 0 20px;
                     padding: 8px 12px;
-                    font-size: 13px;
+                    font-size: 0.8125rem;
                 }
                 /* Calendar and clock */
                 .calendar-shortcuts {
                     padding: 10px 0;
-                    font-size: 12px;
+                    font-size: 0.75rem;
                     line-height: 12px;
                 }
                 }
                 .timelist a {
-                    background: #fff;
+                    background: var(--body-bg);
                     padding: 4px;
                 }
                 /* History */
                 table#change-history tbody th, table#change-history tbody td {
-                    font-size: 13px;
+                    font-size: 0.8125rem;
                     word-break: break-word;
                 }
                 /* Docs */
                 table.model tbody th, table.model tbody td {
-                    font-size: 13px;
+                    font-size: 0.8125rem;
                     word-break: break-word;
                 }
             }

static/admin/css/responsive_rtl.css +8 -12

                 [dir="rtl"] .change-list .filtered .paginator,
                 [dir="rtl"] .filtered #toolbar,
                 [dir="rtl"] .filtered div.xfull,
-                [dir="rtl"] .filtered .actions {
+                [dir="rtl"] .filtered .actions,
-                    margin-right: 0;
+                [dir="rtl"] #changelist-filter {
-                    margin-left: 230px;
+                    margin-left: 0;
                 }
                 [dir="rtl"] .inline-group ul.tools a.add,
             /* MOBILE */
             @media (max-width: 767px) {
-                [dir="rtl"] .change-list .filtered .results,
-                [dir="rtl"] .change-list .filtered .paginator,
-                [dir="rtl"] .filtered #toolbar,
-                [dir="rtl"] .filtered div.xfull,
-                [dir="rtl"] .filtered .actions {
-                    margin-left: 0;
-                [dir="rtl"] .aligned .add-another,
                 [dir="rtl"] .aligned .related-lookup,
                 [dir="rtl"] .aligned .datetimeshortcuts {
                     margin-left: 0;
                 [dir="rtl"] .aligned ul {
                     margin-right: 0;
                 }
+                [dir="rtl"] #changelist-filter {
+                    margin-left: 0;
+                    margin-right: 0;
+                }
             }

static/admin/css/rtl.css +15 -45

@@ -1,25 +1,3
1	body {
2	direction: rtl;
3	}
4
5	/* LOGIN */
6
7	.login .form-row {
8	float: right;
9	}
10
11	.login .form-row label {
12	float: right;
13	padding-left: 0.5em;
14	padding-right: 0;
15	text-align: left;
16	}
17
18	.login .submit-row {
19	clear: both;
20	padding: 1em 9.4em 0 0;
21	}
22
23	/* GLOBAL */	1	/* GLOBAL */
24		2
25	th {	3	th {
@@ -109,31 +87,21 thead th.sorted .text {
109	}	87	}
110		88
111	#changelist-filter {	89	#changelist-filter {
112	right: auto;
113	left: 0;
114	border-left: none;	90	border-left: none;
115	border-right: none;	91	border-right: none;
116	}	92	margin-left: 0;
117		93	margin-right: 30px;
118	.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
119	margin-right: 0;
120	margin-left: 280px;
121	}	94	}
122		95
123	#changelist-filter li.selected {	96	#changelist-filter li.selected {
124	border-left: none;	97	border-left: none;
125	padding-left: 10px;	98	padding-left: 10px;
126	margin-left: 0;	99	margin-left: 0;
127	border-right: 5px solid ~~#eaeaea~~;	100	border-right: 5px solid var(--hairline-color);
128	padding-right: 10px;	101	padding-right: 10px;
129	margin-right: -15px;	102	margin-right: -15px;
130	}	103	}
131		104
132	.filtered .actions {
133	margin-left: 280px;
134	margin-right: 0;
135	}
136
137	#changelist table tbody td:first-child, #changelist table tbody th:first-child {	105	#changelist table tbody td:first-child, #changelist table tbody th:first-child {
138	border-right: none;	106	border-right: none;
139	border-left: none;	107	border-left: none;
@@ -207,12 +175,24 fieldset .fieldBox {
207	top: 0;	175	top: 0;
208	left: auto;	176	left: auto;
209	right: 10px;	177	right: 10px;
		178	background: url(../img/calendar-icons.svg) 0 -30px no-repeat;
		179	}
		180
		181	.calendarbox .calendarnav-previous:focus,
		182	.calendarbox .calendarnav-previous:hover {
		183	background-position: 0 -45px;
210	}	184	}
211		185
212	.calendarnav-next {	186	.calendarnav-next {
213	top: 0;	187	top: 0;
214	right: auto;	188	right: auto;
215	left: 10px;	189	left: 10px;
		190	background: url(../img/calendar-icons.svg) 0 0 no-repeat;
		191	}
		192
		193	.calendarbox .calendarnav-next:focus,
		194	.calendarbox .calendarnav-next:hover {
		195	background-position: 0 -15px;
216	}	196	}
217		197
218	.calendar caption, .calendarbox h2 {	198	.calendar caption, .calendarbox h2 {
@@ -257,13 +237,3 form .form-row p.datetime {
257	margin-left: inherit;	237	margin-left: inherit;
258	margin-right: 2px;	238	margin-right: 2px;
259	}	239	}
260
261	/* IE7 specific bug fixes */
262
263	div.colM {
264	position: relative;
265	}
266
267	.submit-row input {
268	float: left;
269	}

static/admin/css/vendor/select2/LICENSE-SELECT2.md +1 -1

             The MIT License (MIT)
-            Copyright (c) 2012-2015 Kevin Brown, Igor Vaynberg, and Select2 contributors
+            Copyright (c) 2012-2017 Kevin Brown, Igor Vaynberg, and Select2 contributors
             Permission is hereby granted, free of charge, to any person obtaining a copy
             of this software and associated documentation files (the "Software"), to deal

static/admin/css/vendor/select2/select2.css +8 -11

             .select2-hidden-accessible {
               border: 0 !important;
               clip: rect(0 0 0 0) !important;
+              -webkit-clip-path: inset(50%) !important;
+              clip-path: inset(50%) !important;
               height: 1px !important;
-              margin: -1px !important;
               overflow: hidden !important;
               padding: 0 !important;
               position: absolute !important;
-              width: 1px !important; }
+              width: 1px !important;
+              white-space: nowrap !important; }
             .select2-container--default .select2-selection--single {
               background-color: #fff;
                 width: 100%; }
                 .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
                   list-style: none; }
-              .select2-container--default .select2-selection--multiple .select2-selection__placeholder {
-                color: #999;
-                margin-top: 5px;
-                float: left; }
               .select2-container--default .select2-selection--multiple .select2-selection__clear {
                 cursor: pointer;
                 float: right;
                 font-weight: bold;
                 margin-top: 5px;
-                margin-right: 10px; }
+                margin-right: 10px;
+                padding: 1px; }
               .select2-container--default .select2-selection--multiple .select2-selection__choice {
                 background-color: #e4e4e4;
                 border: 1px solid #aaa;
                 .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {
                   color: #333; }
-            .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+            .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
               float: right; }
             .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
                   color: #555; }
             .select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
-              float: right; }
+              float: right;
-            .select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
               margin-left: 5px;
               margin-right: auto; }

static/admin/css/vendor/select2/select2.min.css +1 -1

	@@ -1,1 +1,1
	1	.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;height:1px !important;~~margin~~:-1px !important;~~overflow~~:~~hidden~~ !important;p~~adding~~:0 !important;~~position~~:~~absolute~~ !important;w~~idth~~:1px !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__~~placeholder~~{~~color~~:~~#999~~;margin-top:5px;~~float~~:~~left~~}.~~select2-container--default~~ .~~select2-selection--multiple~~ .~~select2-selection__clear~~{~~cursor~~:~~pointer~~;~~float~~:~~right~~;~~font-weight~~:~~bold~~;~~margin-top~~:5px;margin-right:10px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-se~~lection__placeholder~~,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-se~~arch--inline~~{~~float~~:~~right~~}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--~~default~~.select2-container--~~focus~~ .select2-selection--multiple{border:solid ~~black~~ 1px;outline:0}.select2-container--~~default~~.~~select2-container--disabled~~ .select2-se~~lection--multiple~~{background-color:#~~eee~~;~~cursor~~:def~~ault~~}.~~select2-container--de~~f~~ault~~.~~select2-container--disabled~~ .~~select2-selection__choice__remove~~{~~display~~:~~none~~}.~~select2-container--de~~f~~ault~~.~~select2-container--open~~.~~select2-container--above~~ .~~select2-selection--single~~,.~~select2-container--default~~.~~select2-container--open~~.~~select2-container--above~~ .~~select2-selection--multiple~~{~~border-top-left-radius~~:0;~~border-top-right-radius~~:0}.~~select2-container--default~~.~~select2-container--open~~.~~select2-container--below~~ .~~select2-selection--single~~,.~~select2-container--default~~.~~select2-container--open~~.~~select2-container--below~~ .~~select2-selection--multiple~~{~~border-bottom-left-radius~~:0;~~border-bottom-right-radius~~:0}.~~select2-container--default~~ .~~select2-search--dropdown~~ .~~select2-search__field~~{border:1px solid ~~#aaa~~}.~~select2-container--default~~ .~~select2-search--inline~~ .~~select2-search__field~~{~~background~~:transparent;~~border~~:~~none~~;~~outline~~:0;~~box-shadow~~:~~none~~;~~-webkit-appearance~~:~~textfield~~}.select2-container--~~default~~ .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--~~default~~ .select2-results__option[role=group]{padding:0}.select2-container--~~default~~ .select2-results__option[aria-disabled=true]{color:~~#999~~}.~~select2-container--default~~ .~~select2-results__option~~[~~aria-selected~~=~~true~~]{~~background-color~~:~~#ddd~~}.~~select2-container--default~~ .~~select2-results__option~~ .~~select2-results__option~~{~~padding-left~~:1em}.~~select2-container--default~~ .~~select2-results__option~~ .~~select2-results__option~~ .~~select2-results__group~~{~~padding-left~~:0}.~~select2-container--default~~ .~~select2-results__option~~ .~~select2-results__option~~ .~~select2-results__option~~{~~margin-left~~:-1em;~~padding-left~~:2em}.~~select2-container--default~~ .~~select2-results__option~~ .~~select2-results__option~~ .~~select2-results__option~~ .~~select2-results__option~~{~~margin-left~~:-2em;~~padding-left~~:3em}.~~select2-container--default~~ .~~select2-results__option~~ .~~select2-results__option~~ .~~select2-results__option~~ .~~select2-results__option~~ .~~select2-results__option~~{~~margin-left~~:-3em;~~padding-left~~:4em}.select2-container--~~default~~ .~~sele~~c~~t2-resu~~l~~ts__option~~ .~~select2-results__option~~ .~~select2-results__option~~ .~~select2-results__option~~ .~~select2-results__option~~ .~~select2-results__option~~{ma~~rgin-left~~:-4em;~~padding-left~~:5em}.s~~elect2-container--default~~ .s~~elect2-results__opt~~ion .~~select2-results__option~~ .~~select2-results__option~~ .~~sele~~c~~t2-results__option~~ .~~select2-results__option~~ .~~select2-results__option~~ .~~select2-results__option~~{~~margin-left~~:-5em;~~padding-left~~:6em}.~~select2-container--default~~ .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;~~color~~:~~white~~}.~~select2-container--default~~ .~~select2-results__group~~{~~cursor~~:~~default~~;~~display~~:~~block~~;~~padding~~:6px}.~~select2-container--classic~~ .~~select2-selection--single~~{~~background-color~~:~~#f7f7f7~~;~~border~~:1px ~~solid~~ ~~#aaa~~;~~border-radius~~:4px;~~outline~~:0;~~background-image~~:~~-webkit-linear-gradient~~(~~top~~, ~~#fff~~ 50%, ~~#eee~~ ~~100~~%);~~background-image~~:~~-o-linear-gradient~~(~~top~~, ~~#fff~~ 50%, ~~#eee~~ ~~100~~%);~~background-image~~:~~linear-gradient~~(to ~~bottom~~, ~~#fff~~ 50%, ~~#eee~~ ~~100~~%);~~background-repeat~~:~~repeat-x~~;~~filter~~:~~progid~~:~~DXImageTransform~~.~~Microsoft~~.~~gradient~~(~~startColorstr~~=~~'#FFFFFFFF'~~, ~~endColorstr~~=~~'#FFEEEEEE'~~, ~~GradientType~~=0~~)}.select2-container--classic~~ .~~select2-selection--single~~:~~focus~~{~~border~~:1px ~~solid~~ ~~#5897fb~~}.~~select2-container--classic~~ .~~select2-selection--single~~ .~~select2-selection__rendered~~{~~color~~:~~#444~~;~~line-height~~:28px}.~~select2-container--classic~~ .~~select2-selection--single~~ .~~select2-selection__clear~~{~~cursor~~:~~pointer~~;~~float~~:~~right~~;~~font-weight~~:~~bold~~;~~margin-right~~:10px}.~~select2-container--classic~~ .~~select2-selection--single~~ .~~select2-selection__placeholder~~{~~color~~:~~#999~~}.~~select2-container--classic~~ .~~select2-selection--single~~ .~~select2-selection__arrow~~{~~background-color~~:~~#ddd~~;~~border~~:~~none~~;~~border-left~~:1px ~~solid~~ ~~#aaa~~;~~border-top-right-radius~~:4px;~~border-bottom-right-radius~~:4px;~~height~~:26px;~~position~~:~~absolute~~;~~top~~:1px;~~right~~:1px;~~width~~:20px;~~background-image~~:~~-webkit-linear-gradient~~(~~top~~, ~~#eee~~ 50%, ~~#ccc~~ ~~100~~%);~~background-image~~:~~-o-linear-gradient~~(~~top~~, ~~#eee~~ 50%, ~~#ccc~~ ~~100~~%);~~background-image~~:~~linear-gradient~~(to ~~bottom~~, ~~#eee~~ 50%, ~~#ccc~~ ~~100~~%);~~background-repeat~~:~~repeat-x~~;~~filter~~:~~progid~~:~~DXImageTransform~~.~~Microsoft~~.~~gradient~~(~~startColorstr~~=~~'#FFEEEEEE'~~, ~~endColorstr~~=~~'#FFCCCCCC'~~, ~~GradientType~~=0~~)}.select2-container--classic~~ .~~select2-selection--single~~ .~~select2-selection__arrow~~ b{~~border-color~~:~~#888~~ ~~transparent~~ ~~transparent~~ ~~transparent~~;~~border-style~~:~~solid~~;~~border-width~~:5px 4px 0 4px;~~height~~:0;~~left~~:50%;~~margin-left~~:-4px;~~margin-top~~:-2px;~~position~~:~~absolute~~;~~top~~:50%;~~width~~:0}.~~select2-container--classic~~[~~dir~~=~~"rtl"~~] .~~select2-selection--single~~ .~~select2-selection__clear~~{~~float~~:~~left~~}.~~select2-container--classic~~[~~dir~~=~~"rtl"~~] .~~select2-selection--single~~ .~~select2-selection__arrow~~{~~border~~:~~none~~;~~border-right~~:1px ~~solid~~ ~~#aaa~~;~~border-radius~~:0;~~border-top-left-radius~~:4px;~~border-bottom-left-radius~~:4px;~~left~~:1px;~~right~~:~~auto~~}.~~select2-container--classic~~.~~select2-container--open~~ .~~select2-selection--single~~{~~border~~:1px ~~solid~~ ~~#5897fb~~}.~~select2-container--classic~~.~~select2-container--open~~ .~~select2-selection--single~~ .~~select2-selection__arrow~~{~~background~~:~~transparent~~;~~border~~:~~none~~}.~~select2-container--classic~~.~~select2-container--open~~ .~~select2-selection--single~~ .~~select2-selection__arrow~~ b{~~border-color~~:~~transparent~~ ~~transparent~~ ~~#888~~ ~~transparent~~;~~border-width~~:0 4px 5px 4px}.~~select2-container--classic~~.~~select2-container--open~~.~~select2-container--above~~ .~~select2-selection--single~~{~~border-top~~:~~none~~;~~border-top-left-radius~~:0;~~border-top-right-radius~~:0;~~background-image~~:~~-webkit-linear-gradient~~(~~top~~, ~~#fff~~ 0%, ~~#eee~~ 50%);~~background-image~~:~~-o-linear-gradient~~(~~top~~, ~~#fff~~ 0%, ~~#eee~~ 50%);~~background-image~~:~~linear-gradient~~(to ~~bottom~~, ~~#fff~~ 0%, ~~#eee~~ 50%);~~background-repeat~~:~~repeat-x~~;~~filter~~:~~progid~~:~~DXImageTransform~~.~~Microsoft~~.~~gradient~~(~~startColorstr~~=~~'#FFFFFFFF'~~, ~~endColorstr~~=~~'#FFEEEEEE'~~, ~~GradientType~~=0~~)}.select2-container--classic~~.~~select2-container--open~~.~~select2-container--below~~ .~~select2-selection--single~~{~~border-bottom~~:~~none~~;~~border-bottom-left-radius~~:0;~~border-bottom-right-radius~~:0;~~background-image~~:~~-webkit-linear-gradient~~(~~top~~, ~~#eee~~ 50%, ~~#fff~~ ~~100~~%);~~background-image~~:~~-o-linear-gradient~~(~~top~~, ~~#eee~~ 50%, ~~#fff~~ ~~100~~%);~~background-image~~:~~linear-gradient~~(to ~~bottom~~, ~~#eee~~ 50%, ~~#fff~~ ~~100~~%);~~background-repeat~~:~~repeat-x~~;~~filter~~:~~progid~~:~~DXImageTransform~~.~~Microsoft~~.~~gradient~~(~~startColorstr~~=~~'#FFEEEEEE'~~, ~~endColorstr~~=~~'#FFFFFFFF'~~, ~~GradientType~~=0~~)}.select2-container--classic~~ .~~select2-selection--multiple~~{~~background-color~~:~~white~~;~~border~~:1px ~~solid~~ ~~#aaa~~;~~border-radius~~:4px;~~cursor~~:~~text~~;~~outline~~:0}.~~select2-container--classic~~ .~~select2-selection--multiple~~:~~focus~~{~~border~~:1px ~~solid~~ ~~#5897fb~~}.~~select2-container--classic~~ .~~select2-selection--multiple~~ .~~select2-selection__rendered~~{~~list-style~~:~~none~~;~~margin~~:0;~~padding~~:0 5px}.~~select2-container--classic~~ .~~select2-selection--multiple~~ .~~select2-selection__clear~~{~~display~~:~~none~~}.~~select2-container--classic~~ .~~select2-selection--multiple~~ .~~select2-selection__choice~~{~~background-color~~:~~#e4e4e4~~;~~border~~:1px ~~solid~~ ~~#aaa~~;~~border-radius~~:4px;~~cursor~~:~~default~~;~~float~~:~~left~~;~~margin-right~~:5px;~~margin-top~~:5px;~~padding~~:0 5px}.~~select2-container--classic~~ .~~select2-selection--multiple~~ .~~select2-selection__choice__remove~~{~~color~~:~~#888~~;~~cursor~~:~~pointer~~;~~display~~:~~inline-block~~;~~font-weight~~:~~bold~~;~~margin-right~~:2px}.~~select2-container--classic~~ .~~select2-selection--multiple~~ .~~select2-selection__choice__remove~~:~~hover~~{~~color~~:~~#555~~}.~~select2-container--classic~~[~~dir~~=~~"rtl"~~] .~~select2-selection--multiple~~ .~~select2-selection__choice~~{~~float~~:~~right~~}.~~select2-container--classic~~[~~dir~~=~~"rtl"~~] .~~select2-selection--multiple~~ .~~select2-selection__choice~~{~~margin-left~~:5px;~~margin-right~~:~~auto~~}.~~select2-container--classic~~[~~dir~~=~~"rtl"~~] .~~select2-selection--multiple~~ .~~select2-selection__choice__remove~~{~~margin-left~~:2px;~~margin-right~~:~~auto~~}.~~select2-container--classic~~.~~select2-container--open~~ .~~select2-selection--multiple~~{~~border~~:1px ~~solid~~ ~~#5897fb~~}.~~select2-container--classic~~.~~select2-container--open~~.~~select2-container--above~~ .~~select2-selection--multiple~~{~~border-top~~:~~none~~;~~border-top-left-radius~~:0;~~border-top-right-radius~~:0}.~~select2-container--classic~~.~~select2-container--open~~.~~select2-container--below~~ .~~select2-selection--multiple~~{~~border-bottom~~:~~none~~;~~border-bottom-left-radius~~:0;~~border-bottom-right-radius~~:0}.~~select2-container--classic~~ .~~select2-search--dropdown~~ .~~select2-search__field~~{~~border~~:1px ~~solid~~ ~~#aaa~~;~~outline~~:0}.~~select2-container--classic~~ .~~select2-search--inline~~ .~~select2-search__field~~{~~outline~~:0;~~box-shadow~~:~~none~~}.~~select2-container--classic~~ .~~select2-dropdown~~{~~background-color~~:~~#fff~~;~~border~~:1px ~~solid~~ ~~transparent~~}.~~select2-container--classic~~ .~~select2-dropdown--above~~{~~border-bottom~~:~~none~~}.~~select2-container--classic~~ .~~select2-dropdown--below~~{~~border-top~~:~~none~~}.~~select2-container--classic~~ .~~select2-results~~>.~~select2-results__options~~{~~max-height~~:~~200~~px;~~overflow-y~~:~~auto~~}.~~select2-container--classic~~ .~~select2-results__option~~[~~role~~=~~group~~]{~~padding~~:0}.~~select2-container--classic~~ .~~select2-results__option~~[~~aria-disabled~~=~~true~~]{~~color~~:~~grey~~}.~~select2-container--classic~~ .~~select2-results__option--highlighted~~[~~aria-selected~~]{~~background-color~~:~~#3875d7~~;~~color~~:~~#fff~~}.~~select2-container--classic~~ .~~select2-results__group~~{~~cursor~~:~~default~~;~~display~~:~~block~~;~~padding~~:6px}.~~select2-container--classic~~.~~select2-container--open~~ .~~select2-dropdown~~{~~border-color~~:~~#5897fb~~}		1	.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px;padding:1px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}

static/admin/css/widgets.css +71 -56

             .selector {
                 width: 800px;
                 float: left;
+                display: flex;
             }
             .selector select {
                 width: 380px;
                 height: 17.2em;
+                flex: 1 0 auto;
             }
             .selector-available, .selector-chosen {
-                float: left;
                 width: 380px;
                 text-align: center;
                 margin-bottom: 5px;
+                display: flex;
+                flex-direction: column;
             }
             .selector-chosen select {
             }
             .selector-available h2, .selector-chosen h2 {
-                border: 1px solid #ccc;
+                border: 1px solid var(--border-color);
                 border-radius: 4px 4px 0 0;
             }
             .selector-chosen h2 {
-                background: #79aec8;
+                background: var(--primary);
-                color: #fff;
+                color: var(--header-link-color);
             }
             .selector .selector-available h2 {
-                background: #f8f8f8;
+                background: var(--darkened-bg);
-                color: #666;
+                color: var(--body-quiet-color);
             }
             .selector .selector-filter {
-                background: white;
+                border: 1px solid var(--border-color);
-                border: 1px solid #ccc;
                 border-width: 0 1px;
                 padding: 8px;
-                color: #999;
+                color: var(--body-quiet-color);
-                font-size: 10px;
+                font-size: 0.625rem;
                 margin: 0;
                 text-align: left;
             }
             }
             .selector ul.selector-chooser {
-                float: left;
+                align-self: center;
                 width: 22px;
-                background-color: #eee;
+                background-color: var(--selected-bg);
                 border-radius: 10px;
-                margin: 10em 5px 0 5px;
+                margin: 0 5px;
                 padding: 0;
+                transform: translateY(-17px);
             }
             .selector-chooser li {
                 text-indent: -3000px;
                 overflow: hidden;
                 cursor: default;
-                opacity: 0.3;
+                opacity: 0.55;
             }
             .active.selector-add, .active.selector-remove {
                 overflow: hidden;
                 font-weight: bold;
                 line-height: 16px;
-                color: #666;
+                color: var(--body-quiet-color);
                 text-decoration: none;
-                opacity: 0.3;
+                opacity: 0.55;
             }
             a.active.selector-chooseall:focus, a.active.selector-clearall:focus,
             a.active.selector-chooseall:hover, a.active.selector-clearall:hover {
-                color: #447e9b;
+                color: var(--link-fg);
             }
             a.active.selector-chooseall, a.active.selector-clearall {
             .stacked {
                 float: left;
                 width: 490px;
+                display: block;
             }
             .stacked select {
                 margin: 0 0 10px 40%;
                 background-color: #eee;
                 border-radius: 10px;
+                transform: none;
             }
             .stacked .selector-chooser li {
             }
             .stacked .active.selector-add {
+                background-position: 0 -32px;
+                cursor: pointer;
+            }
+            .stacked .active.selector-add:focus, .stacked .active.selector-add:hover {
                 background-position: 0 -48px;
                 cursor: pointer;
             }
             }
             .stacked .active.selector-remove {
+                background-position: 0 0px;
+                cursor: pointer;
+            }
+            .stacked .active.selector-remove:focus, .stacked .active.selector-remove:hover {
                 background-position: 0 -16px;
                 cursor: pointer;
             }
                 line-height: 20px;
                 margin: 0;
                 padding: 0;
-                color: #666;
+                color: var(--body-quiet-color);
                 font-weight: bold;
             }
             .datetime span {
                 white-space: nowrap;
                 font-weight: normal;
-                font-size: 11px;
+                font-size: 0.6875rem;
-                color: #ccc;
+                color: var(--body-quiet-color);
             }
             .datetime input, .form-row .datetime input.vDateField, .form-row .datetime input.vTimeField {
-                min-width: 0;
                 margin-left: 5px;
                 margin-bottom: 4px;
             }
             table p.datetime {
-                font-size: 11px;
+                font-size: 0.6875rem;
                 margin-left: 0;
                 padding-left: 0;
             }
             }
             .timezonewarning {
-                font-size: 11px;
+                font-size: 0.6875rem;
-                color: #999;
+                color: var(--body-quiet-color);
             }
             /* URL */
                 line-height: 20px;
                 margin: 0;
                 padding: 0;
-                color: #666;
+                color: var(--body-quiet-color);
-                font-size: 11px;
+                font-size: 0.6875rem;
                 font-weight: bold;
             }
                 line-height: 20px;
                 margin: 0;
                 padding: 0;
-                color: #666;
+                color: var(--body-quiet-color);
-                font-size: 11px;
+                font-size: 0.6875rem;
                 font-weight: bold;
             }
             }
             span.clearable-file-input label {
-                color: #333;
+                color: var(--body-fg);
-                font-size: 11px;
+                font-size: 0.6875rem;
                 display: inline;
                 float: none;
             }
             .calendarbox, .clockbox {
                 margin: 5px auto;
-                font-size: 12px;
+                font-size: 0.75rem;
                 width: 19em;
                 text-align: center;
-                background: white;
+                background: var(--body-bg);
-                border: 1px solid #ddd;
+                color: var(--body-fg);
+                border: 1px solid var(--hairline-color);
                 border-radius: 4px;
                 box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15);
                 overflow: hidden;
                 margin: 0;
                 text-align: center;
                 border-top: none;
-                background: #f5dd5d;
                 font-weight: 700;
-                font-size: 12px;
+                font-size: 0.75rem;
                 color: #333;
+                background: var(--accent);
             }
             .calendar th {
                 padding: 8px 5px;
-                background: #f8f8f8;
+                background: var(--darkened-bg);
-                border-bottom: 1px solid #ddd;
+                border-bottom: 1px solid var(--border-color);
                 font-weight: 400;
-                font-size: 12px;
+                font-size: 0.75rem;
                 text-align: center;
-                color: #666;
+                color: var(--body-quiet-color);
             }
             .calendar td {
                 font-weight: 400;
-                font-size: 12px;
+                font-size: 0.75rem;
                 text-align: center;
                 padding: 0;
-                border-top: 1px solid #eee;
+                border-top: 1px solid var(--hairline-color);
                 border-bottom: none;
             }
             .calendar td.selected a {
-                background: #79aec8;
+                background: var(--primary);
-                color: #fff;
+                color: var(--button-fg);
             }
             .calendar td.nonday {
-                background: #f8f8f8;
+                background: var(--darkened-bg);
             }
             .calendar td.today a {
                 font-weight: 400;
                 padding: 6px;
                 text-decoration: none;
-                color: #444;
+                color: var(--body-quiet-color);
             }
             .calendar td a:focus, .timelist a:focus,
             .calendar td a:hover, .timelist a:hover {
-                background: #79aec8;
+                background: var(--primary);
                 color: white;
             }
             .calendar td a:active, .timelist a:active {
-                background: #417690;
+                background: var(--header-bg);
                 color: white;
             }
             .calendarnav {
-                font-size: 10px;
+                font-size: 0.625rem;
                 text-align: center;
                 color: #ccc;
                 margin: 0;
             .calendarnav a:link, #calendarnav a:visited,
             #calendarnav a:focus, #calendarnav a:hover {
-                color: #999;
+                color: var(--body-quiet-color);
             }
             .calendar-shortcuts {
-                background: white;
+                background: var(--body-bg);
-                font-size: 11px;
+                color: var(--body-quiet-color);
+                font-size: 0.6875rem;
                 line-height: 11px;
-                border-top: 1px solid #eee;
+                border-top: 1px solid var(--hairline-color);
                 padding: 8px 0;
-                color: #ccc;
             }
             .calendarbox .calendarnav-previous, .calendarbox .calendarnav-next {
             .calendar-cancel {
                 margin: 0;
                 padding: 4px 0;
-                font-size: 12px;
+                font-size: 0.75rem;
                 background: #eee;
-                border-top: 1px solid #ddd;
+                border-top: 1px solid var(--border-color);
-                color: #333;
+                color: var(--body-fg);
             }
             .calendar-cancel:focus, .calendar-cancel:hover {

static/admin/js/SelectBox.js +38 -70

-            (function($) {
+            'use strict';
-                'use strict';
-                var SelectBox = {
+                const SelectBox = {
                     cache: {},
                     init: function(id) {
-                        var box = document.getElementById(id);
+                        const box = document.getElementById(id);
-                        var node;
                         SelectBox.cache[id] = [];
-                        var cache = SelectBox.cache[id];
+                        const cache = SelectBox.cache[id];
-                        var boxOptions = box.options;
+                        for (const node of box.options) {
-                        var boxOptionsLength = boxOptions.length;
-                        for (var i = 0, j = boxOptionsLength; i < j; i++) {
-                            node = boxOptions[i];
                             cache.push({value: node.value, text: node.text, displayed: 1});
                         }
                     },
                     redisplay: function(id) {
                         // Repopulate HTML select box from cache
-                        var box = document.getElementById(id);
+                        const box = document.getElementById(id);
-                        var node;
+                        const scroll_value_from_top = box.scrollTop;
-                        $(box).empty(); // clear all options
+                        box.innerHTML = '';
-                        var new_options = box.outerHTML.slice(0, -9);  // grab just the opening tag
+                        for (const node of SelectBox.cache[id]) {
-                        var cache = SelectBox.cache[id];
-                        for (var i = 0, j = cache.length; i < j; i++) {
-                            node = cache[i];
                             if (node.displayed) {
-                                var new_option = new Option(node.text, node.value, false, false);
+                                const new_option = new Option(node.text, node.value, false, false);
                                 // Shows a tooltip when hovering over the option
-                                new_option.setAttribute("title", node.text);
+                                new_option.title = node.text;
-                                new_options += new_option.outerHTML;
+                                box.appendChild(new_option);
                             }
                         }
-                        new_options += '</select>';
+                        box.scrollTop = scroll_value_from_top;
-                        box.outerHTML = new_options;
                     },
                     filter: function(id, text) {
                         // Redisplay the HTML select box, displaying only the choices containing ALL
                         // the words in text. (It's an AND search.)
-                        var tokens = text.toLowerCase().split(/\s+/);
+                        const tokens = text.toLowerCase().split(/\s+/);
-                        var node, token;
+                        for (const node of SelectBox.cache[id]) {
-                        var cache = SelectBox.cache[id];
-                        for (var i = 0, j = cache.length; i < j; i++) {
-                            node = cache[i];
                             node.displayed = 1;
-                            var node_text = node.text.toLowerCase();
+                            const node_text = node.text.toLowerCase();
-                            var numTokens = tokens.length;
+                            for (const token of tokens) {
-                            for (var k = 0; k < numTokens; k++) {
+                                if (!node_text.includes(token)) {
-                                token = tokens[k];
-                                if (node_text.indexOf(token) === -1) {
                                     node.displayed = 0;
-                                    break;  // Once the first token isn't found we're done
+                                    break; // Once the first token isn't found we're done
                                 }
                             }
                         }
                         SelectBox.redisplay(id);
                     },
                     delete_from_cache: function(id, value) {
-                        var node, delete_index = null;
+                        let delete_index = null;
-                        var cache = SelectBox.cache[id];
+                        const cache = SelectBox.cache[id];
-                        for (var i = 0, j = cache.length; i < j; i++) {
+                        for (const [i, node] of cache.entries()) {
-                            node = cache[i];
                             if (node.value === value) {
                                 delete_index = i;
                                 break;
                     },
                     cache_contains: function(id, value) {
                         // Check if an item is contained in the cache
-                        var node;
+                        for (const node of SelectBox.cache[id]) {
-                        var cache = SelectBox.cache[id];
-                        for (var i = 0, j = cache.length; i < j; i++) {
-                            node = cache[i];
                             if (node.value === value) {
                                 return true;
                             }
                         return false;
                     },
                     move: function(from, to) {
-                        var from_box = document.getElementById(from);
+                        const from_box = document.getElementById(from);
-                        var option;
+                        for (const option of from_box.options) {
-                        var boxOptions = from_box.options;
+                            const option_value = option.value;
-                        var boxOptionsLength = boxOptions.length;
-                        for (var i = 0, j = boxOptionsLength; i < j; i++) {
-                            option = boxOptions[i];
-                            var option_value = option.value;
                             if (option.selected && SelectBox.cache_contains(from, option_value)) {
                                 SelectBox.add_to_cache(to, {value: option_value, text: option.text, displayed: 1});
                                 SelectBox.delete_from_cache(from, option_value);
                         SelectBox.redisplay(to);
                     },
                     move_all: function(from, to) {
-                        var from_box = document.getElementById(from);
+                        const from_box = document.getElementById(from);
-                        var option;
+                        for (const option of from_box.options) {
-                        var boxOptions = from_box.options;
+                            const option_value = option.value;
-                        var boxOptionsLength = boxOptions.length;
-                        for (var i = 0, j = boxOptionsLength; i < j; i++) {
-                            option = boxOptions[i];
-                            var option_value = option.value;
                             if (SelectBox.cache_contains(from, option_value)) {
                                 SelectBox.add_to_cache(to, {value: option_value, text: option.text, displayed: 1});
                                 SelectBox.delete_from_cache(from, option_value);
                         SelectBox.cache[id].sort(function(a, b) {
                             a = a.text.toLowerCase();
                             b = b.text.toLowerCase();
-                            try {
+                            if (a > b) {
-                                if (a > b) {
+                                return 1;
-                                    return 1;
-                                if (a < b) {
-                                    return -1;
                             }
-                            catch (e) {
+                            if (a < b) {
-                                // silently fail on IE 'unknown' exception
+                                return -1;
                             }
                             return 0;
                         } );
                     },
                     select_all: function(id) {
-                        var box = document.getElementById(id);
+                        const box = document.getElementById(id);
-                        var boxOptions = box.options;
+                        for (const option of box.options) {
-                        var boxOptionsLength = boxOptions.length;
+                            option.selected = true;
-                        for (var i = 0; i < boxOptionsLength; i++) {
-                            boxOptions[i].selected = 'selected';
                         }
                     }
                 };
                 window.SelectBox = SelectBox;
-            })(django.jQuery);

static/admin/js/SelectFilter2.js +47 -75

             /*
             SelectFilter2 - Turns a multiple-select box into a filter interface.
-            Requires jQuery, core.js, and SelectBox.js.
+            Requires core.js and SelectBox.js.
             */
-            (function($) {
+            'use strict';
-                'use strict';
-                function findForm(node) {
-                    // returns the node of the form containing the given node
-                    if (node.tagName.toLowerCase() !== 'form') {
-                        return findForm(node.parentNode);
-                    return node;
                 window.SelectFilter = {
                     init: function(field_id, field_name, is_stacked) {
                         if (field_id.match(/__prefix__/)) {
                             // Don't initialize on empty forms.
                             return;
                         }
-                        var from_box = document.getElementById(field_id);
+                        const from_box = document.getElementById(field_id);
                         from_box.id += '_from'; // change its ID
                         from_box.className = 'filtered';
-                        var ps = from_box.parentNode.getElementsByTagName('p');
+                        for (const p of from_box.parentNode.getElementsByTagName('p')) {
-                        for (var i = 0; i < ps.length; i++) {
+                            if (p.classList.contains("info")) {
-                            if (ps[i].className.indexOf("info") !== -1) {
                                 // Remove <p class="info">, because it just gets in the way.
-                                from_box.parentNode.removeChild(ps[i]);
+                                from_box.parentNode.removeChild(p);
-                            } else if (ps[i].className.indexOf("help") !== -1) {
+                            } else if (p.classList.contains("help")) {
                                 // Move help text up to the top so it isn't below the select
                                 // boxes or wrapped off on the side to the right of the add
                                 // button:
-                                from_box.parentNode.insertBefore(ps[i], from_box.parentNode.firstChild);
+                                from_box.parentNode.insertBefore(p, from_box.parentNode.firstChild);
                             }
                         }
                         // <div class="selector"> or <div class="selector stacked">
-                        var selector_div = quickElement('div', from_box.parentNode);
+                        const selector_div = quickElement('div', from_box.parentNode);
                         selector_div.className = is_stacked ? 'selector stacked' : 'selector';
                         // <div class="selector-available">
-                        var selector_available = quickElement('div', selector_div);
+                        const selector_available = quickElement('div', selector_div);
                         selector_available.className = 'selector-available';
-                        var title_available = quickElement('h2', selector_available, interpolate(gettext('Available %s') + ' ', [field_name]));
+                        const title_available = quickElement('h2', selector_available, interpolate(gettext('Available %s') + ' ', [field_name]));
                         quickElement(
                             'span', title_available, '',
                             'class', 'help help-tooltip help-icon',
                             )
                         );
-                        var filter_p = quickElement('p', selector_available, '', 'id', field_id + '_filter');
+                        const filter_p = quickElement('p', selector_available, '', 'id', field_id + '_filter');
                         filter_p.className = 'selector-filter';
-                        var search_filter_label = quickElement('label', filter_p, '', 'for', field_id + '_input');
+                        const search_filter_label = quickElement('label', filter_p, '', 'for', field_id + '_input');
                         quickElement(
                             'span', search_filter_label, '',
                         filter_p.appendChild(document.createTextNode(' '));
-                        var filter_input = quickElement('input', filter_p, '', 'type', 'text', 'placeholder', gettext("Filter"));
+                        const filter_input = quickElement('input', filter_p, '', 'type', 'text', 'placeholder', gettext("Filter"));
                         filter_input.id = field_id + '_input';
                         selector_available.appendChild(from_box);
-                        var choose_all = quickElement('a', selector_available, gettext('Choose all'), 'title', interpolate(gettext('Click to choose all %s at once.'), [field_name]), 'href', '#', 'id', field_id + '_add_all_link');
+                        const choose_all = quickElement('a', selector_available, gettext('Choose all'), 'title', interpolate(gettext('Click to choose all %s at once.'), [field_name]), 'href', '#', 'id', field_id + '_add_all_link');
                         choose_all.className = 'selector-chooseall';
                         // <ul class="selector-chooser">
-                        var selector_chooser = quickElement('ul', selector_div);
+                        const selector_chooser = quickElement('ul', selector_div);
                         selector_chooser.className = 'selector-chooser';
-                        var add_link = quickElement('a', quickElement('li', selector_chooser), gettext('Choose'), 'title', gettext('Choose'), 'href', '#', 'id', field_id + '_add_link');
+                        const add_link = quickElement('a', quickElement('li', selector_chooser), gettext('Choose'), 'title', gettext('Choose'), 'href', '#', 'id', field_id + '_add_link');
                         add_link.className = 'selector-add';
-                        var remove_link = quickElement('a', quickElement('li', selector_chooser), gettext('Remove'), 'title', gettext('Remove'), 'href', '#', 'id', field_id + '_remove_link');
+                        const remove_link = quickElement('a', quickElement('li', selector_chooser), gettext('Remove'), 'title', gettext('Remove'), 'href', '#', 'id', field_id + '_remove_link');
                         remove_link.className = 'selector-remove';
                         // <div class="selector-chosen">
-                        var selector_chosen = quickElement('div', selector_div);
+                        const selector_chosen = quickElement('div', selector_div);
                         selector_chosen.className = 'selector-chosen';
-                        var title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s') + ' ', [field_name]));
+                        const title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s') + ' ', [field_name]));
                         quickElement(
                             'span', title_chosen, '',
                             'class', 'help help-tooltip help-icon',
                             )
                         );
-                        var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name'));
+                        const to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', '', 'size', from_box.size, 'name', from_box.name);
                         to_box.className = 'filtered';
-                        var clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', '#', 'id', field_id + '_remove_all_link');
+                        const clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', '#', 'id', field_id + '_remove_all_link');
                         clear_all.className = 'selector-clearall';
-                        from_box.setAttribute('name', from_box.getAttribute('name') + '_old');
+                        from_box.name = from_box.name + '_old';
                         // Set up the JavaScript event handlers for the select box filter interface
-                        var move_selection = function(e, elem, move_func, from, to) {
+                        const move_selection = function(e, elem, move_func, from, to) {
-                            if (elem.className.indexOf('active') !== -1) {
+                            if (elem.classList.contains('active')) {
                                 move_func(from, to);
                                 SelectFilter.refresh_icons(field_id);
                             }
                                 SelectFilter.refresh_icons(field_id);
                             }
                         });
-                        findForm(from_box).addEventListener('submit', function() {
+                        from_box.closest('form').addEventListener('submit', function() {
                             SelectBox.select_all(field_id + '_to');
                         });
                         SelectBox.init(field_id + '_from');
                         // Move selected from_box options to to_box
                         SelectBox.move(field_id + '_from', field_id + '_to');
-                        if (!is_stacked) {
-                            // In horizontal mode, give the same height to the two boxes.
-                            var j_from_box = $('#' + field_id + '_from');
-                            var j_to_box = $('#' + field_id + '_to');
-                            j_to_box.height($(filter_p).outerHeight() + j_from_box.outerHeight());
                         // Initial icon refresh
                         SelectFilter.refresh_icons(field_id);
                     },
                     any_selected: function(field) {
-                        var any_selected = false;
+                        // Temporarily add the required attribute and check validity.
-                        try {
+                        field.required = true;
-                            // Temporarily add the required attribute and check validity.
+                        const any_selected = field.checkValidity();
-                            // This is much faster in WebKit browsers than the fallback.
+                        field.required = false;
-                            field.attr('required', 'required');
-                            any_selected = field.is(':valid');
-                            field.removeAttr('required');
-                        } catch (e) {
-                            // Browsers that don't support :valid (IE < 10)
-                            any_selected = field.find('option:selected').length > 0;
                         return any_selected;
                     },
                     refresh_icons: function(field_id) {
-                        var from = $('#' + field_id + '_from');
+                        const from = document.getElementById(field_id + '_from');
-                        var to = $('#' + field_id + '_to');
+                        const to = document.getElementById(field_id + '_to');
                         // Active if at least one item is selected
-                        $('#' + field_id + '_add_link').toggleClass('active', SelectFilter.any_selected(from));
+                        document.getElementById(field_id + '_add_link').classList.toggle('active', SelectFilter.any_selected(from));
-                        $('#' + field_id + '_remove_link').toggleClass('active', SelectFilter.any_selected(to));
+                        document.getElementById(field_id + '_remove_link').classList.toggle('active', SelectFilter.any_selected(to));
                         // Active if the corresponding box isn't empty
-                        $('#' + field_id + '_add_all_link').toggleClass('active', from.find('option').length > 0);
+                        document.getElementById(field_id + '_add_all_link').classList.toggle('active', from.querySelector('option'));
-                        $('#' + field_id + '_remove_all_link').toggleClass('active', to.find('option').length > 0);
+                        document.getElementById(field_id + '_remove_all_link').classList.toggle('active', to.querySelector('option'));
                     },
                     filter_key_press: function(event, field_id) {
-                        var from = document.getElementById(field_id + '_from');
+                        const from = document.getElementById(field_id + '_from');
                         // don't submit form if user pressed Enter
                         if ((event.which && event.which === 13) || (event.keyCode && event.keyCode === 13)) {
                             from.selectedIndex = 0;
                             SelectBox.move(field_id + '_from', field_id + '_to');
                             from.selectedIndex = 0;
                             event.preventDefault();
-                            return false;
                         }
                     },
                     filter_key_up: function(event, field_id) {
-                        var from = document.getElementById(field_id + '_from');
+                        const from = document.getElementById(field_id + '_from');
-                        var temp = from.selectedIndex;
+                        const temp = from.selectedIndex;
                         SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value);
                         from.selectedIndex = temp;
-                        return true;
                     },
                     filter_key_down: function(event, field_id) {
-                        var from = document.getElementById(field_id + '_from');
+                        const from = document.getElementById(field_id + '_from');
                         // right arrow -- move across
                         if ((event.which && event.which === 39) || (event.keyCode && event.keyCode === 39)) {
-                            var old_index = from.selectedIndex;
+                            const old_index = from.selectedIndex;
                             SelectBox.move(field_id + '_from', field_id + '_to');
                             from.selectedIndex = (old_index === from.length) ? from.length - 1 : old_index;
-                            return false;
+                            return;
                         }
                         // down arrow -- wrap around
                         if ((event.which && event.which === 40) || (event.keyCode && event.keyCode === 40)) {
                         if ((event.which && event.which === 38) || (event.keyCode && event.keyCode === 38)) {
                             from.selectedIndex = (from.selectedIndex === 0) ? from.length - 1 : from.selectedIndex - 1;
                         }
-                        return true;
                     }
                 };
                 window.addEventListener('load', function(e) {
-                    $('select.selectfilter, select.selectfilterstacked').each(function() {
+                    document.querySelectorAll('select.selectfilter, select.selectfilterstacked').forEach(function(el) {
-                        var $el = $(this),
+                        const data = el.dataset;
-                            data = $el.data();
+                        SelectFilter.init(el.id, data.fieldName, parseInt(data.isStacked, 10));
-                        SelectFilter.init($el.attr('id'), data.fieldName, parseInt(data.isStacked, 10));
                     });
                 });
+            }
-            })(django.jQuery);

static/admin/js/actions.js +182 -134

@@ -1,153 +1,201
1	/global gettext, interpolate, ngettext/	1	/global gettext, interpolate, ngettext/
2	(function($) {	2	'use strict';
3	'use strict';	3	{
4	var lastChecked;	4	function show(selector) {
5		5	document.querySelectorAll(selector).forEach(function(el) {
6	$.fn.actions = function(opts) {	6	el.classList.remove('hidden');
7	var options = $.extend({}, $.fn.actions.defaults, opts);	7	});
8	var actionCheckboxes = $(this);	8	}
9	var list_editable_changed = false;	9
10	var showQuestion = function() {	10	function hide(selector) {
11	$(options.acrossClears).hide();	11	document.querySelectorAll(selector).forEach(function(el) {
12	$(options.acrossQuestions).show();	12	el.classList.add('hidden');
13	$(options.allContainer).hide();	13	});
14	},	14	}
15	showClear = function() {	15
16	$(options.acrossClears).show();	16	function showQuestion(options) {
17	$(options.across~~Questions~~).~~hide~~();	17	hide(options.acrossClears);
18	$(options.actionContainer).toggleClass(options.selectedClass);	18	show(options.acrossQuestions);
19	$(options.allContainer).~~show~~();	19	hide(options.allContainer);
20	$(options.counterContainer).hide();	20	}
21	},	21
22	reset = function() {	22	function showClear(options) {
23	$(options.acrossClears).~~hide~~();	23	show(options.acrossClears);
24	$(options.acrossQuestions).~~hide~~();	24	hide(options.acrossQuestions);
25	$(options.allContainer).hide();	25	document.querySelector(options.actionContainer).classList.remove(options.selectedClass);
26	$(options.~~counter~~Container).~~show~~();	26	show(options.allContainer);
27	},	27	hide(options.counterContainer);
28	clearAcross = function() {	28	}
29	reset();	29
30	$(options.acrossInput).val(0);	30	function reset(options) {
31	$(options.actionContainer).removeClass(options.selectedClass);	31	hide(options.acrossClears);
32	},	32	hide(options.acrossQuestions);
33	checker = function(checked) {	33	hide(options.allContainer);
34	if (checked) {	34	show(options.counterContainer);
35	showQuestion();	35	}
36	} else {	36
37	reset();	37	function clearAcross(options) {
38	}	38	reset(options);
39	$(actionCheckboxes).prop("checked", checked)	39	const acrossInputs = document.querySelectorAll(options.acrossInput);
40	.parent().parent().toggleClass(options.selectedClass, checked);	40	acrossInputs.forEach(function(acrossInput) {
41	},	41	acrossInput.value = 0;
42	updateCounter = function() {	42	});
43	var sel = $(actionCheckboxes).filter(":checked").length;	43	document.querySelector(options.actionContainer).classList.remove(options.selectedClass);
44	// data-actions-icnt is defined in the generated HTML	44	}
45	// and contains the total amount of objects in the queryset	45
46	var actions_icnt = $('.action-counter').data('actionsIcnt');	46	function checker(actionCheckboxes, options, checked) {
47	$(options.counterContainer).html(interpolate(	47	if (checked) {
		48	showQuestion(options);
		49	} else {
		50	reset(options);
		51	}
		52	actionCheckboxes.forEach(function(el) {
		53	el.checked = checked;
		54	el.closest('tr').classList.toggle(options.selectedClass, checked);
		55	});
		56	}
		57
		58	function updateCounter(actionCheckboxes, options) {
		59	const sel = Array.from(actionCheckboxes).filter(function(el) {
		60	return el.checked;
		61	}).length;
		62	const counter = document.querySelector(options.counterContainer);
		63	// data-actions-icnt is defined in the generated HTML
		64	// and contains the total amount of objects in the queryset
		65	const actions_icnt = Number(counter.dataset.actionsIcnt);
		66	counter.textContent = interpolate(
48	ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), {	67	ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), {
49	sel: sel,	68	sel: sel,
50	cnt: actions_icnt	69	cnt: actions_icnt
51	}, true));	70	}, true);
52	$(options.allToggle).prop("checked", function() {	71	const allToggle = document.getElementById(options.allToggleId);
53	var value;	72	allToggle.checked = sel === actionCheckboxes.length;
54	if (sel === actionCheckboxes.length) {	73	if (allToggle.checked) {
55	value = true;	74	showQuestion(options);
56	showQuestion();	75	} else {
57	} else {	76	clearAcross(options);
58	value = false;	77	}
59	clearAcross();	78	}
60	}	79
61	return value;	80	const defaults = {
62	});	81	actionContainer: "div.actions",
63	};	82	counterContainer: "span.action-counter",
64	// Show counter by default	83	allContainer: "div.actions span.all",
65	$(options.counterContainer).show();	84	acrossInput: "div.actions input.select-across",
66	// Check state of checkboxes and reinit state if needed	85	acrossQuestions: "div.actions span.question",
67	$(this).filter(":checked").each(function(i) {	86	acrossClears: "div.actions span.clear",
68	$(this).parent().parent().toggleClass(options.selectedClass);	87	allToggleId: "action-toggle",
69	updateCounter();	88	selectedClass: "selected"
70	if ($(options.acrossInput).val() === 1) {	89	};
71	showClear();	90
72	}	91	window.Actions = function(actionCheckboxes, options) {
73	});	92	options = Object.assign({}, defaults, options);
74	$(options.allToggle).show().on('click', function() {	93	let list_editable_changed = false;
75	checker($(this).prop("checked"));	94	let lastChecked = null;
76	updateCounter();	95	let shiftPressed = false;
		96
		97	document.addEventListener('keydown', (event) => {
		98	shiftPressed = event.shiftKey;
77	});	99	});
78	$("a", options.acrossQuestions).on('click', function(event) {	100
79	event.preventDefault();	101	document.addEventListener('keyup', (event) => {
80	$(options.acrossInput).val(1);	102	shiftPressed = event.shiftKey;
81	showClear();
82	});	103	});
83	$("a", options.acrossClears).on('click', function(event) {	104
84	event.preventDefault();	105	document.getElementById(options.allToggleId).addEventListener('click', function(event) {
85	$(options.allToggle).prop("checked", false);	106	checker(actionCheckboxes, options, this.checked);
86	clearAcross();	107	updateCounter(actionCheckboxes, options);
87	checker(0);
88	updateCounter();
89	});	108	});
90	lastChecked = null;	109
91	$(actionCheckboxes).on('click', function(event) {	110	document.querySelectorAll(options.acrossQuestions + " a").forEach(function(el) {
92	if (!event) { event = window.event; }	111	el.addEventListener('click', function(event) {
93	var target = event.target ? event.target : event.srcElement;	112	event.preventDefault();
94	if (lastChecked && $.data(lastChecked) !== $.data(target) && event.shiftKey === true) {	113	const acrossInputs = document.querySelectorAll(options.acrossInput);
95	var inrange = false;	114	acrossInputs.forEach(function(acrossInput) {
96	$(lastChecked).prop("checked", target.checked)	115	acrossInput.value = 1;
97	.parent().parent().toggleClass(options.selectedClass, target.checked);
98	$(actionCheckboxes).each(function() {
99	if ($.data(this) === $.data(lastChecked) \|\| $.data(this) === $.data(target)) {
100	inrange = (inrange) ? false : true;
101	}
102	if (inrange) {
103	$(this).prop("checked", target.checked)
104	.parent().parent().toggleClass(options.selectedClass, target.checked);
105	}
106	});	116	});
107	}	117	showClear(options);
108	$(target).parent().parent().toggleClass(options.selectedClass, target.checked);	118	});
109	lastChecked = target;
110	updateCounter();
111	});	119	});
112	$('form#changelist-form table#result_list tr').on('change', 'td:gt(0) :input', function() {	120
113	list_editable_changed = true;	121	document.querySelectorAll(options.acrossClears + " a").forEach(function(el) {
		122	el.addEventListener('click', function(event) {
		123	event.preventDefault();
		124	document.getElementById(options.allToggleId).checked = false;
		125	clearAcross(options);
		126	checker(actionCheckboxes, options, false);
		127	updateCounter(actionCheckboxes, options);
		128	});
114	});	129	});
115	$('form#changelist-form button[name="index"]').on('click', function(event) {	130
116	if (list_editable_changed) {	131	function affectedCheckboxes(target, withModifier) {
117	return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."));	132	const multiSelect = (lastChecked && withModifier && lastChecked !== target);
		133	if (!multiSelect) {
		134	return [target];
118	}	135	}
119	});	136	const checkboxes = Array.from(actionCheckboxes);
120	$('form#changelist-form input[name="_save"]').on('click', function(event) {	137	const targetIndex = checkboxes.findIndex(el => el === target);
121	var action_changed = false;	138	const lastCheckedIndex = checkboxes.findIndex(el => el === lastChecked);
122	$('select option:selected', options.actionContainer).each(function() {	139	const startIndex = Math.min(targetIndex, lastCheckedIndex);
123	if ($(this).val()) {	140	const endIndex = Math.max(targetIndex, lastCheckedIndex);
124	action_changed = true;	141	const filtered = checkboxes.filter((el, index) => (startIndex <= index) && (index <= endIndex));
		142	return filtered;
		143	};
		144
		145	Array.from(document.getElementById('result_list').tBodies).forEach(function(el) {
		146	el.addEventListener('change', function(event) {
		147	const target = event.target;
		148	if (target.classList.contains('action-select')) {
		149	const checkboxes = affectedCheckboxes(target, shiftPressed);
		150	checker(checkboxes, options, target.checked);
		151	updateCounter(actionCheckboxes, options);
		152	lastChecked = target;
		153	} else {
		154	list_editable_changed = true;
125	}	155	}
126	});	156	});
127	if (action_changed) {	157	});
128	if (list_editable_changed) {	158
129	return confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action."));	159	document.querySelector('#changelist-form button[name=index]').addEventListener('click', function(event) {
130	} else {	160	if (list_editable_changed) {
131	return confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."));	161	const confirmed = confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."));
		162	if (!confirmed) {
		163	event.preventDefault();
132	}	164	}
133	}	165	}
134	});	166	});
		167
		168	const el = document.querySelector('#changelist-form input[name=_save]');
		169	// The button does not exist if no fields are editable.
		170	if (el) {
		171	el.addEventListener('click', function(event) {
		172	if (document.querySelector('[name=action]').value) {
		173	const text = list_editable_changed
		174	? gettext("You have selected an action, but you haven’t saved your changes to individual fields yet. Please click OK to save. You’ll need to re-run the action.")
		175	: gettext("You have selected an action, and you haven’t made any changes on individual fields. You’re probably looking for the Go button rather than the Save button.");
		176	if (!confirm(text)) {
		177	event.preventDefault();
		178	}
		179	}
		180	});
		181	}
135	};	182	};
136	/* Setup plugin defaults */	183
137	$.fn.actions.defaults = {	184	// Call function fn when the DOM is loaded and ready. If it is already
138	actionContainer: "div.actions",	185	// loaded, call the function now.
139	counterContainer: "span.action-counter",	186	// http://youmightnotneedjquery.com/#ready
140	allContainer: "div.actions span.all",	187	function ready(fn) {
141	acrossInput: "div.actions input.select-across",	188	if (document.readyState !== 'loading') {
142	acrossQuestions: "div.actions span.question",	189	fn();
143	acrossClears: "div.actions span.clear",	190	} else {
144	allToggle: "#action-toggle",	191	document.addEventListener('DOMContentLoaded', fn);
145	selectedClass: "selected"	192	}
146	};	193	}
147	$(document).ready(function() {	194
148	var $actionsEls = $('tr input.action-select');	195	ready(function() {
149	if ($actionsEls.length > 0) {	196	const actionsEls = document.querySelectorAll('tr input.action-select');
150	$actionsEls.~~actions~~();	197	if (actionsEls.length > 0) {
		198	Actions(actionsEls);
151	}	199	}
152	});	200	});
153	})(django.jQuery);	201	}

static/admin/js/admin/DateTimeShortcuts.js +65 -79

-            /*global Calendar, findPosX, findPosY, getStyle, get_format, gettext, gettext_noop, interpolate, ngettext, quickElement*/
+            /*global Calendar, findPosX, findPosY, get_format, gettext, gettext_noop, interpolate, ngettext, quickElement*/
             // Inserts shortcut buttons after all of the following:
             //     <input type="text" class="vDateField">
             //     <input type="text" class="vTimeField">
-            (function() {
+            'use strict';
-                'use strict';
-                var DateTimeShortcuts = {
+                const DateTimeShortcuts = {
                     calendars: [],
                     calendarInputs: [],
                     clockInputs: [],
                     dismissClockFunc: [],
                     dismissCalendarFunc: [],
                     calendarDivName1: 'calendarbox', // name of calendar <div> that gets toggled
-                    calendarDivName2: 'calendarin',  // name of <div> that contains calendar
+                    calendarDivName2: 'calendarin', // name of <div> that contains calendar
-                    calendarLinkName: 'calendarlink',// name of the link that is used to toggle
+                    calendarLinkName: 'calendarlink', // name of the link that is used to toggle
-                    clockDivName: 'clockbox',        // name of clock <div> that gets toggled
+                    clockDivName: 'clockbox', // name of clock <div> that gets toggled
-                    clockLinkName: 'clocklink',      // name of the link that is used to toggle
+                    clockLinkName: 'clocklink', // name of the link that is used to toggle
                     shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts
                     timezoneWarningClass: 'timezonewarning', // class of the warning for timezone mismatch
                     timezoneOffset: 0,
                     init: function() {
-                        var body = document.getElementsByTagName('body')[0];
+                        const serverOffset = document.body.dataset.adminUtcOffset;
-                        var serverOffset = body.getAttribute('data-admin-utc-offset');
                         if (serverOffset) {
-                            var localOffset = new Date().getTimezoneOffset() * -60;
+                            const localOffset = new Date().getTimezoneOffset() * -60;
                             DateTimeShortcuts.timezoneOffset = localOffset - serverOffset;
                         }
-                        var inputs = document.getElementsByTagName('input');
+                        for (const inp of document.getElementsByTagName('input')) {
-                        for (var i = 0; i < inputs.length; i++) {
+                            if (inp.type === 'text' && inp.classList.contains('vTimeField')) {
-                            var inp = inputs[i];
-                            if (inp.getAttribute('type') === 'text' && inp.className.match(/vTimeField/)) {
                                 DateTimeShortcuts.addClock(inp);
                                 DateTimeShortcuts.addTimezoneWarning(inp);
                             }
-                            else if (inp.getAttribute('type') === 'text' && inp.className.match(/vDateField/)) {
+                            else if (inp.type === 'text' && inp.classList.contains('vDateField')) {
                                 DateTimeShortcuts.addCalendar(inp);
                                 DateTimeShortcuts.addTimezoneWarning(inp);
                             }
                     },
                     // Return the current time while accounting for the server timezone.
                     now: function() {
-                        var body = document.getElementsByTagName('body')[0];
+                        const serverOffset = document.body.dataset.adminUtcOffset;
-                        var serverOffset = body.getAttribute('data-admin-utc-offset');
                         if (serverOffset) {
-                            var localNow = new Date();
+                            const localNow = new Date();
-                            var localOffset = localNow.getTimezoneOffset() * -60;
+                            const localOffset = localNow.getTimezoneOffset() * -60;
                             localNow.setTime(localNow.getTime() + 1000 * (serverOffset - localOffset));
                             return localNow;
                         } else {
                     },
                     // Add a warning when the time zone in the browser and backend do not match.
                     addTimezoneWarning: function(inp) {
-                        var warningClass = DateTimeShortcuts.timezoneWarningClass;
+                        const warningClass = DateTimeShortcuts.timezoneWarningClass;
-                        var timezoneOffset = DateTimeShortcuts.timezoneOffset / 3600;
+                        let timezoneOffset = DateTimeShortcuts.timezoneOffset / 3600;
                         // Only warn if there is a time zone mismatch.
                         if (!timezoneOffset) {
                             return;
                         }
-                        var message;
+                        let message;
                         if (timezoneOffset > 0) {
                             message = ngettext(
                                 'Note: You are %s hour ahead of server time.',
                         }
                         message = interpolate(message, [timezoneOffset]);
-                        var warning = document.createElement('span');
+                        const warning = document.createElement('span');
                         warning.className = warningClass;
                         warning.textContent = message;
                         inp.parentNode.appendChild(document.createElement('br'));
                     },
                     // Add clock widget to a given field
                     addClock: function(inp) {
-                        var num = DateTimeShortcuts.clockInputs.length;
+                        const num = DateTimeShortcuts.clockInputs.length;
                         DateTimeShortcuts.clockInputs[num] = inp;
                         DateTimeShortcuts.dismissClockFunc[num] = function() { DateTimeShortcuts.dismissClock(num); return true; };
                         // Shortcut links (clock icon and "Now" link)
-                        var shortcuts_span = document.createElement('span');
+                        const shortcuts_span = document.createElement('span');
                         shortcuts_span.className = DateTimeShortcuts.shortCutsClass;
                         inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling);
-                        var now_link = document.createElement('a');
+                        const now_link = document.createElement('a');
-                        now_link.setAttribute('href', "#");
+                        now_link.href = "#";
                         now_link.textContent = gettext('Now');
                         now_link.addEventListener('click', function(e) {
                             e.preventDefault();
                             DateTimeShortcuts.handleClockQuicklink(num, -1);
                         });
-                        var clock_link = document.createElement('a');
+                        const clock_link = document.createElement('a');
-                        clock_link.setAttribute('href', '#');
+                        clock_link.href = '#';
                         clock_link.id = DateTimeShortcuts.clockLinkName + num;
                         clock_link.addEventListener('click', function(e) {
                             e.preventDefault();
                         //     <p class="calendar-cancel"><a href="#">Cancel</a></p>
                         // </div>
-                        var clock_box = document.createElement('div');
+                        const clock_box = document.createElement('div');
                         clock_box.style.display = 'none';
                         clock_box.style.position = 'absolute';
                         clock_box.className = 'clockbox module';
-                        clock_box.setAttribute('id', DateTimeShortcuts.clockDivName + num);
+                        clock_box.id = DateTimeShortcuts.clockDivName + num;
                         document.body.appendChild(clock_box);
                         clock_box.addEventListener('click', function(e) { e.stopPropagation(); });
                         quickElement('h2', clock_box, gettext('Choose a time'));
-                        var time_list = quickElement('ul', clock_box);
+                        const time_list = quickElement('ul', clock_box);
                         time_list.className = 'timelist';
                         // The list of choices can be overridden in JavaScript like this:
                         // DateTimeShortcuts.clockHours.name = [['3 a.m.', 3]];
                         // where name is the name attribute of the <input>.
-                        var name = typeof DateTimeShortcuts.clockHours[inp.name] === 'undefined' ? 'default_' : inp.name;
+                        const name = typeof DateTimeShortcuts.clockHours[inp.name] === 'undefined' ? 'default_' : inp.name;
                         DateTimeShortcuts.clockHours[name].forEach(function(element) {
-                            var time_link = quickElement('a', quickElement('li', time_list), gettext(element[0]), 'href', '#');
+                            const time_link = quickElement('a', quickElement('li', time_list), gettext(element[0]), 'href', '#');
                             time_link.addEventListener('click', function(e) {
                                 e.preventDefault();
                                 DateTimeShortcuts.handleClockQuicklink(num, element[1]);
                             });
                         });
-                        var cancel_p = quickElement('p', clock_box);
+                        const cancel_p = quickElement('p', clock_box);
                         cancel_p.className = 'calendar-cancel';
-                        var cancel_link = quickElement('a', cancel_p, gettext('Cancel'), 'href', '#');
+                        const cancel_link = quickElement('a', cancel_p, gettext('Cancel'), 'href', '#');
                         cancel_link.addEventListener('click', function(e) {
                             e.preventDefault();
                             DateTimeShortcuts.dismissClock(num);
                         });
                     },
                     openClock: function(num) {
-                        var clock_box = document.getElementById(DateTimeShortcuts.clockDivName + num);
+                        const clock_box = document.getElementById(DateTimeShortcuts.clockDivName + num);
-                        var clock_link = document.getElementById(DateTimeShortcuts.clockLinkName + num);
+                        const clock_link = document.getElementById(DateTimeShortcuts.clockLinkName + num);
                         // Recalculate the clockbox position
                         // is it left-to-right or right-to-left layout ?
-                        if (getStyle(document.body, 'direction') !== 'rtl') {
+                        if (window.getComputedStyle(document.body).direction !== 'rtl') {
                             clock_box.style.left = findPosX(clock_link) + 17 + 'px';
                         }
                         else {
                             // since style's width is in em, it'd be tough to calculate
                             // px value of it. let's use an estimated px for now
-                            // TODO: IE returns wrong value for findPosX when in rtl mode
-                            //       (it returns as it was left aligned), needs to be fixed.
                             clock_box.style.left = findPosX(clock_link) - 110 + 'px';
                         }
                         clock_box.style.top = Math.max(0, findPosY(clock_link) - 30) + 'px';
                         document.removeEventListener('click', DateTimeShortcuts.dismissClockFunc[num]);
                     },
                     handleClockQuicklink: function(num, val) {
-                        var d;
+                        let d;
                         if (val === -1) {
                             d = DateTimeShortcuts.now();
                         }
                     },
                     // Add calendar widget to a given field.
                     addCalendar: function(inp) {
-                        var num = DateTimeShortcuts.calendars.length;
+                        const num = DateTimeShortcuts.calendars.length;
                         DateTimeShortcuts.calendarInputs[num] = inp;
                         DateTimeShortcuts.dismissCalendarFunc[num] = function() { DateTimeShortcuts.dismissCalendar(num); return true; };
                         // Shortcut links (calendar icon and "Today" link)
-                        var shortcuts_span = document.createElement('span');
+                        const shortcuts_span = document.createElement('span');
                         shortcuts_span.className = DateTimeShortcuts.shortCutsClass;
                         inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling);
-                        var today_link = document.createElement('a');
+                        const today_link = document.createElement('a');
-                        today_link.setAttribute('href', '#');
+                        today_link.href = '#';
                         today_link.appendChild(document.createTextNode(gettext('Today')));
                         today_link.addEventListener('click', function(e) {
                             e.preventDefault();
                             DateTimeShortcuts.handleCalendarQuickLink(num, 0);
                         });
-                        var cal_link = document.createElement('a');
+                        const cal_link = document.createElement('a');
-                        cal_link.setAttribute('href', '#');
+                        cal_link.href = '#';
                         cal_link.id = DateTimeShortcuts.calendarLinkName + num;
                         cal_link.addEventListener('click', function(e) {
                             e.preventDefault();
                         //     </div>
                         //     <p class="calendar-cancel"><a href="#">Cancel</a></p>
                         // </div>
-                        var cal_box = document.createElement('div');
+                        const cal_box = document.createElement('div');
                         cal_box.style.display = 'none';
                         cal_box.style.position = 'absolute';
                         cal_box.className = 'calendarbox module';
-                        cal_box.setAttribute('id', DateTimeShortcuts.calendarDivName1 + num);
+                        cal_box.id = DateTimeShortcuts.calendarDivName1 + num;
                         document.body.appendChild(cal_box);
                         cal_box.addEventListener('click', function(e) { e.stopPropagation(); });
                         // next-prev links
-                        var cal_nav = quickElement('div', cal_box);
+                        const cal_nav = quickElement('div', cal_box);
-                        var cal_nav_prev = quickElement('a', cal_nav, '<', 'href', '#');
+                        const cal_nav_prev = quickElement('a', cal_nav, '<', 'href', '#');
                         cal_nav_prev.className = 'calendarnav-previous';
                         cal_nav_prev.addEventListener('click', function(e) {
                             e.preventDefault();
                             DateTimeShortcuts.drawPrev(num);
                         });
-                        var cal_nav_next = quickElement('a', cal_nav, '>', 'href', '#');
+                        const cal_nav_next = quickElement('a', cal_nav, '>', 'href', '#');
                         cal_nav_next.className = 'calendarnav-next';
                         cal_nav_next.addEventListener('click', function(e) {
                             e.preventDefault();
                         });
                         // main box
-                        var cal_main = quickElement('div', cal_box, '', 'id', DateTimeShortcuts.calendarDivName2 + num);
+                        const cal_main = quickElement('div', cal_box, '', 'id', DateTimeShortcuts.calendarDivName2 + num);
                         cal_main.className = 'calendar';
                         DateTimeShortcuts.calendars[num] = new Calendar(DateTimeShortcuts.calendarDivName2 + num, DateTimeShortcuts.handleCalendarCallback(num));
                         DateTimeShortcuts.calendars[num].drawCurrent();
                         // calendar shortcuts
-                        var shortcuts = quickElement('div', cal_box);
+                        const shortcuts = quickElement('div', cal_box);
                         shortcuts.className = 'calendar-shortcuts';
-                        var day_link = quickElement('a', shortcuts, gettext('Yesterday'), 'href', '#');
+                        let day_link = quickElement('a', shortcuts, gettext('Yesterday'), 'href', '#');
                         day_link.addEventListener('click', function(e) {
                             e.preventDefault();
                             DateTimeShortcuts.handleCalendarQuickLink(num, -1);
                         });
                         // cancel bar
-                        var cancel_p = quickElement('p', cal_box);
+                        const cancel_p = quickElement('p', cal_box);
                         cancel_p.className = 'calendar-cancel';
-                        var cancel_link = quickElement('a', cancel_p, gettext('Cancel'), 'href', '#');
+                        const cancel_link = quickElement('a', cancel_p, gettext('Cancel'), 'href', '#');
                         cancel_link.addEventListener('click', function(e) {
                             e.preventDefault();
                             DateTimeShortcuts.dismissCalendar(num);
                         });
                     },
                     openCalendar: function(num) {
-                        var cal_box = document.getElementById(DateTimeShortcuts.calendarDivName1 + num);
+                        const cal_box = document.getElementById(DateTimeShortcuts.calendarDivName1 + num);
-                        var cal_link = document.getElementById(DateTimeShortcuts.calendarLinkName + num);
+                        const cal_link = document.getElementById(DateTimeShortcuts.calendarLinkName + num);
-                        var inp = DateTimeShortcuts.calendarInputs[num];
+                        const inp = DateTimeShortcuts.calendarInputs[num];
                         // Determine if the current value in the input has a valid date.
                         // If so, draw the calendar with that date's year and month.
                         if (inp.value) {
-                            var format = get_format('DATE_INPUT_FORMATS')[0];
+                            const format = get_format('DATE_INPUT_FORMATS')[0];
-                            var selected = inp.value.strptime(format);
+                            const selected = inp.value.strptime(format);
-                            var year = selected.getUTCFullYear();
+                            const year = selected.getUTCFullYear();
-                            var month = selected.getUTCMonth() + 1;
+                            const month = selected.getUTCMonth() + 1;
-                            var re = /\d{4}/;
+                            const re = /\d{4}/;
                             if (re.test(year.toString()) && month >= 1 && month <= 12) {
                                 DateTimeShortcuts.calendars[num].drawDate(month, year, selected);
                             }
                         // Recalculate the clockbox position
                         // is it left-to-right or right-to-left layout ?
-                        if (getStyle(document.body, 'direction') !== 'rtl') {
+                        if (window.getComputedStyle(document.body).direction !== 'rtl') {
                             cal_box.style.left = findPosX(cal_link) + 17 + 'px';
                         }
                         else {
                             // since style's width is in em, it'd be tough to calculate
                             // px value of it. let's use an estimated px for now
-                            // TODO: IE returns wrong value for findPosX when in rtl mode
-                            //       (it returns as it was left aligned), needs to be fixed.
                             cal_box.style.left = findPosX(cal_link) - 180 + 'px';
                         }
                         cal_box.style.top = Math.max(0, findPosY(cal_link) - 75) + 'px';
                         DateTimeShortcuts.calendars[num].drawNextMonth();
                     },
                     handleCalendarCallback: function(num) {
-                        var format = get_format('DATE_INPUT_FORMATS')[0];
+                        const format = get_format('DATE_INPUT_FORMATS')[0];
-                        // the format needs to be escaped a little
-                        format = format.replace('\\', '\\\\')
-                                       .replace('\r', '\\r')
-                                       .replace('\n', '\\n')
-                                       .replace('\t', '\\t')
-                                       .replace("'", "\\'");
                         return function(y, m, d) {
                             DateTimeShortcuts.calendarInputs[num].value = new Date(y, m - 1, d).strftime(format);
                             DateTimeShortcuts.calendarInputs[num].focus();
                         };
                     },
                     handleCalendarQuickLink: function(num, offset) {
-                        var d = DateTimeShortcuts.now();
+                        const d = DateTimeShortcuts.now();
                         d.setDate(d.getDate() + offset);
                         DateTimeShortcuts.calendarInputs[num].value = d.strftime(get_format('DATE_INPUT_FORMATS')[0]);
                         DateTimeShortcuts.calendarInputs[num].focus();
                 window.addEventListener('load', DateTimeShortcuts.init);
                 window.DateTimeShortcuts = DateTimeShortcuts;
-            })();

static/admin/js/admin/RelatedObjectLookups.js +113 -54

             /*global SelectBox, interpolate*/
             // Handles related-objects functionality: lookup link for raw_id_fields
             // and Add Another links.
+            'use strict';
+            {
+                const $ = django.jQuery;
+                let popupIndex = 0;
+                const relatedWindows = [];
+                function dismissChildPopups() {
+                    relatedWindows.forEach(function(win) {
+                        if(!win.closed) {
+                            win.dismissChildPopups();
+                            win.close();
+                        }
+                    });
+                }
+                function setPopupIndex() {
+                    if(document.getElementsByName("_popup").length > 0) {
+                        const index = window.name.lastIndexOf("__") + 2;
+                        popupIndex = parseInt(window.name.substring(index));
+                    } else {
+                        popupIndex = 0;
+                    }
+                }
-            (function($) {
+                function addPopupIndex(name) {
-                'use strict';
+                    name = name + "__" + (popupIndex + 1);
+                    return name;
-                // IE doesn't accept periods or dashes in the window name, but the element IDs
-                // we use to generate popup window names may contain them, therefore we map them
-                // to allowed characters in a reversible way so that we can locate the correct
-                // element when the popup window is dismissed.
-                function id_to_windowname(text) {
-                    text = text.replace(/\./g, '__dot__');
-                    text = text.replace(/\-/g, '__dash__');
-                    return text;
                 }
-                function windowname_to_id(text) {
+                function removePopupIndex(name) {
-                    text = text.replace(/__dot__/g, '.');
+                    name = name.replace(new RegExp("__" + (popupIndex + 1) + "$"), '');
-                    text = text.replace(/__dash__/g, '-');
+                    return name;
-                    return text;
                 }
                 function showAdminPopup(triggeringLink, name_regexp, add_popup) {
-                    var name = triggeringLink.id.replace(name_regexp, '');
+                    const name = addPopupIndex(triggeringLink.id.replace(name_regexp, ''));
-                    name = id_to_windowname(name);
+                    const href = new URL(triggeringLink.href);
-                    var href = triggeringLink.href;
                     if (add_popup) {
-                        if (href.indexOf('?') === -1) {
+                        href.searchParams.set('_popup', 1);
-                            href += '?_popup=1';
-                        } else {
-                            href += '&_popup=1';
                     }
-                    var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
+                    const win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
+                    relatedWindows.push(win);
                     win.focus();
                     return false;
                 }
                 }
                 function dismissRelatedLookupPopup(win, chosenId) {
-                    var name = windowname_to_id(win.name);
+                    const name = removePopupIndex(win.name);
-                    var elem = document.getElementById(name);
+                    const elem = document.getElementById(name);
-                    if (elem.className.indexOf('vManyToManyRawIdAdminField') !== -1 && elem.value) {
+                    if (elem.classList.contains('vManyToManyRawIdAdminField') && elem.value) {
                         elem.value += ',' + chosenId;
                     } else {
                         document.getElementById(name).value = chosenId;
                     }
+                    const index = relatedWindows.indexOf(win);
+                    if (index > -1) {
+                        relatedWindows.splice(index, 1);
+                    }
                     win.close();
                 }
                 }
                 function updateRelatedObjectLinks(triggeringLink) {
-                    var $this = $(triggeringLink);
+                    const $this = $(triggeringLink);
-                    var siblings = $this.nextAll('.view-related, .change-related, .delete-related');
+                    const siblings = $this.nextAll('.view-related, .change-related, .delete-related');
                     if (!siblings.length) {
                         return;
                     }
-                    var value = $this.val();
+                    const value = $this.val();
                     if (value) {
                         siblings.each(function() {
-                            var elm = $(this);
+                            const elm = $(this);
                             elm.attr('href', elm.attr('data-href-template').replace('__fk__', value));
                         });
                     } else {
                     }
                 }
+                function updateRelatedSelectsOptions(currentSelect, win, objId, newRepr, newId) {
+                    // After create/edit a model from the options next to the current
+                    // select (+ or :pencil:) update ForeignKey PK of the rest of selects
+                    // in the page.
+                    const path = win.location.pathname;
+                    // Extract the model from the popup url '.../<model>/add/' or
+                    // '.../<model>/<id>/change/' depending the action (add or change).
+                    const modelName = path.split('/')[path.split('/').length - (objId ? 4 : 3)];
+                    // Exclude autocomplete selects.
+                    const selectsRelated = document.querySelectorAll(`[data-model-ref="${modelName}"] select:not(.admin-autocomplete)`);
+                    selectsRelated.forEach(function(select) {
+                        if (currentSelect === select) {
+                            return;
+                        }
+                        let option = select.querySelector(`option[value="${objId}"]`);
+                        if (!option) {
+                            option = new Option(newRepr, newId);
+                            select.options.add(option);
+                            return;
+                        }
+                        option.textContent = newRepr;
+                        option.value = newId;
+                    });
+                }
                 function dismissAddRelatedObjectPopup(win, newId, newRepr) {
-                    var name = windowname_to_id(win.name);
+                    const name = removePopupIndex(win.name);
-                    var elem = document.getElementById(name);
+                    const elem = document.getElementById(name);
                     if (elem) {
-                        var elemName = elem.nodeName.toUpperCase();
+                        const elemName = elem.nodeName.toUpperCase();
                         if (elemName === 'SELECT') {
                             elem.options[elem.options.length] = new Option(newRepr, newId, true, true);
+                            updateRelatedSelectsOptions(elem, win, null, newRepr, newId);
                         } else if (elemName === 'INPUT') {
-                            if (elem.className.indexOf('vManyToManyRawIdAdminField') !== -1 && elem.value) {
+                            if (elem.classList.contains('vManyToManyRawIdAdminField') && elem.value) {
                                 elem.value += ',' + newId;
                             } else {
                                 elem.value = newId;
                         // Trigger a change event to update related links if required.
                         $(elem).trigger('change');
                     } else {
-                        var toId = name + "_to";
+                        const toId = name + "_to";
-                        var o = new Option(newRepr, newId);
+                        const o = new Option(newRepr, newId);
                         SelectBox.add_to_cache(toId, o);
                         SelectBox.redisplay(toId);
                     }
+                    const index = relatedWindows.indexOf(win);
+                    if (index > -1) {
+                        relatedWindows.splice(index, 1);
+                    }
                     win.close();
                 }
                 function dismissChangeRelatedObjectPopup(win, objId, newRepr, newId) {
-                    var id = windowname_to_id(win.name).replace(/^edit_/, '');
+                    const id = removePopupIndex(win.name.replace(/^edit_/, ''));
-                    var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
+                    const selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
-                    var selects = $(selectsSelector);
+                    const selects = $(selectsSelector);
                     selects.find('option').each(function() {
                         if (this.value === objId) {
                             this.textContent = newRepr;
                             this.value = newId;
                         }
-                    });
+                    }).trigger('change');
+                    updateRelatedSelectsOptions(selects[0], win, objId, newRepr, newId);
                     selects.next().find('.select2-selection__rendered').each(function() {
                         // The element can have a clear button as a child.
                         // Use the lastChild to modify only the displayed value.
                         this.lastChild.textContent = newRepr;
                         this.title = newRepr;
                     });
+                    const index = relatedWindows.indexOf(win);
+                    if (index > -1) {
+                        relatedWindows.splice(index, 1);
+                    }
                     win.close();
                 }
                 function dismissDeleteRelatedObjectPopup(win, objId) {
-                    var id = windowname_to_id(win.name).replace(/^delete_/, '');
+                    const id = removePopupIndex(win.name.replace(/^delete_/, ''));
-                    var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
+                    const selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
-                    var selects = $(selectsSelector);
+                    const selects = $(selectsSelector);
                     selects.find('option').each(function() {
                         if (this.value === objId) {
                             $(this).remove();
                         }
                     }).trigger('change');
+                    const index = relatedWindows.indexOf(win);
+                    if (index > -1) {
+                        relatedWindows.splice(index, 1);
+                    }
                     win.close();
                 }
-                // Global for testing purposes
-                window.id_to_windowname = id_to_windowname;
-                window.windowname_to_id = windowname_to_id;
                 window.showRelatedObjectLookupPopup = showRelatedObjectLookupPopup;
                 window.dismissRelatedLookupPopup = dismissRelatedLookupPopup;
                 window.showRelatedObjectPopup = showRelatedObjectPopup;
                 window.dismissAddRelatedObjectPopup = dismissAddRelatedObjectPopup;
                 window.dismissChangeRelatedObjectPopup = dismissChangeRelatedObjectPopup;
                 window.dismissDeleteRelatedObjectPopup = dismissDeleteRelatedObjectPopup;
+                window.dismissChildPopups = dismissChildPopups;
                 // Kept for backward compatibility
                 window.showAddAnotherPopup = showRelatedObjectPopup;
                 window.dismissAddAnotherPopup = dismissAddRelatedObjectPopup;
+                window.addEventListener('unload', function(evt) {
+                    window.dismissChildPopups();
+                });
                 $(document).ready(function() {
+                    setPopupIndex();
                     $("a[data-popup-opener]").on('click', function(event) {
                         event.preventDefault();
                         opener.dismissRelatedLookupPopup(window, $(this).data("popup-opener"));
                     });
-                    $('body').on('click', '.related-widget-wrapper-link', function(e) {
+                    $('body').on('click', '.related-widget-wrapper-link[data-popup="yes"]', function(e) {
                         e.preventDefault();
                         if (this.href) {
-                            var event = $.Event('django:show-related', {href: this.href});
+                            const event = $.Event('django:show-related', {href: this.href});
                             $(this).trigger(event);
                             if (!event.isDefaultPrevented()) {
                                 showRelatedObjectPopup(this);
                         }
                     });
                     $('body').on('change', '.related-widget-wrapper select', function(e) {
-                        var event = $.Event('django:update-related');
+                        const event = $.Event('django:update-related');
                         $(this).trigger(event);
                         if (!event.isDefaultPrevented()) {
                             updateRelatedObjectLinks(this);
                     $('.related-widget-wrapper select').trigger('change');
                     $('body').on('click', '.related-lookup', function(e) {
                         e.preventDefault();
-                        var event = $.Event('django:lookup-related');
+                        const event = $.Event('django:lookup-related');
                         $(this).trigger(event);
                         if (!event.isDefaultPrevented()) {
                             showRelatedObjectLookupPopup(this);
                         }
                     });
                 });
+            }
-            })(django.jQuery);

static/admin/js/autocomplete.js +21 -25

@@ -1,24 +1,22
1	(function($) {	1	'use strict';
2	'use strict';	2	{
3	var init = function($element, options) {	3	const $ = django.jQuery;
4	var settings = $.extend({
5	ajax: {
6	data: function(params) {
7	return {
8	term: params.term,
9	page: params.page
10	};
11	}
12	}
13	}, options);
14	$element.select2(settings);
15	};
16		4
17	$.fn.djangoAdminSelect2 = function(~~options~~) {	5	$.fn.djangoAdminSelect2 = function() {
18	var settings = $.extend({}, options);
19	$.each(this, function(i, element) {	6	$.each(this, function(i, element) {
20	~~var~~ ~~$element~~ = $(element);	7	$(element).select2({
21	init($element, settings);	8	ajax: {
		9	data: (params) => {
		10	return {
		11	term: params.term,
		12	page: params.page,
		13	app_label: element.dataset.appLabel,
		14	model_name: element.dataset.modelName,
		15	field_name: element.dataset.fieldName
		16	};
		17	}
		18	}
		19	});
22	});	20	});
23	return this;	21	return this;
24	};	22	};
@@ -29,9 +27,7
29	$('.admin-autocomplete').not('[name*=__prefix__]').djangoAdminSelect2();	27	$('.admin-autocomplete').not('[name*=__prefix__]').djangoAdminSelect2();
30	});	28	});
31		29
32	$(document).on('formset:added', (~~function~~() {	30	document.addEventListener('formset:added', (event) => {
33	return function(event, $newFormset) {	31	$(event.target).find('.admin-autocomplete').djangoAdminSelect2();
34	return $newFormset.find('.admin-autocomplete').djangoAdminSelect2();	32	});
35	};	33	}
36	})(this));
37	}(django.jQuery));

static/admin/js/calendar.js +38 -25

             calendar.js - Calendar functions by Adrian Holovaty
             depends on core.js for utility functions like removeChildren or quickElement
             */
+            'use strict';
-            (function() {
-                'use strict';
                 // CalendarNamespace -- Provides a collection of HTML calendar-related helper functions
-                var CalendarNamespace = {
+                const CalendarNamespace = {
                     monthsOfYear: [
                         gettext('January'),
                         gettext('February'),
                         gettext('November'),
                         gettext('December')
                     ],
+                    monthsOfYearAbbrev: [
+                        pgettext('abbrev. month January', 'Jan'),
+                        pgettext('abbrev. month February', 'Feb'),
+                        pgettext('abbrev. month March', 'Mar'),
+                        pgettext('abbrev. month April', 'Apr'),
+                        pgettext('abbrev. month May', 'May'),
+                        pgettext('abbrev. month June', 'Jun'),
+                        pgettext('abbrev. month July', 'Jul'),
+                        pgettext('abbrev. month August', 'Aug'),
+                        pgettext('abbrev. month September', 'Sep'),
+                        pgettext('abbrev. month October', 'Oct'),
+                        pgettext('abbrev. month November', 'Nov'),
+                        pgettext('abbrev. month December', 'Dec')
+                    ],
                     daysOfWeek: [
                         pgettext('one letter Sunday', 'S'),
                         pgettext('one letter Monday', 'M'),
                         return (((year % 4) === 0) && ((year % 100) !== 0 ) || ((year % 400) === 0));
                     },
                     getDaysInMonth: function(month, year) {
-                        var days;
+                        let days;
                         if (month === 1 || month === 3 || month === 5 || month === 7 || month === 8 || month === 10 || month === 12) {
                             days = 31;
                         }
                         return days;
                     },
                     draw: function(month, year, div_id, callback, selected) { // month = 1-12, year = 1-9999
-                        var today = new Date();
+                        const today = new Date();
-                        var todayDay = today.getDate();
+                        const todayDay = today.getDate();
-                        var todayMonth = today.getMonth() + 1;
+                        const todayMonth = today.getMonth() + 1;
-                        var todayYear = today.getFullYear();
+                        const todayYear = today.getFullYear();
-                        var todayClass = '';
+                        let todayClass = '';
                         // Use UTC functions here because the date field does not contain time
                         // and using the UTC function variants prevent the local time offset
                         //
                         // The day variable above will be 1 instead of 2 in, say, US Pacific time
                         // zone.
-                        var isSelectedMonth = false;
+                        let isSelectedMonth = false;
                         if (typeof selected !== 'undefined') {
                             isSelectedMonth = (selected.getUTCFullYear() === year && (selected.getUTCMonth() + 1) === month);
                         }
                         month = parseInt(month);
                         year = parseInt(year);
-                        var calDiv = document.getElementById(div_id);
+                        const calDiv = document.getElementById(div_id);
                         removeChildren(calDiv);
-                        var calTable = document.createElement('table');
+                        const calTable = document.createElement('table');
                         quickElement('caption', calTable, CalendarNamespace.monthsOfYear[month - 1] + ' ' + year);
-                        var tableBody = quickElement('tbody', calTable);
+                        const tableBody = quickElement('tbody', calTable);
                         // Draw days-of-week header
-                        var tableRow = quickElement('tr', tableBody);
+                        let tableRow = quickElement('tr', tableBody);
-                        for (var i = 0; i < 7; i++) {
+                        for (let i = 0; i < 7; i++) {
                             quickElement('th', tableRow, CalendarNamespace.daysOfWeek[(i + CalendarNamespace.firstDayOfWeek) % 7]);
                         }
-                        var startingPos = new Date(year, month - 1, 1 - CalendarNamespace.firstDayOfWeek).getDay();
+                        const startingPos = new Date(year, month - 1, 1 - CalendarNamespace.firstDayOfWeek).getDay();
-                        var days = CalendarNamespace.getDaysInMonth(month, year);
+                        const days = CalendarNamespace.getDaysInMonth(month, year);
-                        var nonDayCell;
+                        let nonDayCell;
                         // Draw blanks before first of month
                         tableRow = quickElement('tr', tableBody);
-                        for (i = 0; i < startingPos; i++) {
+                        for (let i = 0; i < startingPos; i++) {
                             nonDayCell = quickElement('td', tableRow, ' ');
                             nonDayCell.className = "nonday";
                         }
                         }
                         // Draw days of month
-                        var currentDay = 1;
+                        let currentDay = 1;
-                        for (i = startingPos; currentDay <= days; i++) {
+                        for (let i = startingPos; currentDay <= days; i++) {
                             if (i % 7 === 0 && currentDay !== 1) {
                                 tableRow = quickElement('tr', tableBody);
                             }
                                 todayClass += "selected";
                             }
-                            var cell = quickElement('td', tableRow, '', 'class', todayClass);
+                            const cell = quickElement('td', tableRow, '', 'class', todayClass);
-                            var link = quickElement('a', cell, currentDay, 'href', '#');
+                            const link = quickElement('a', cell, currentDay, 'href', '#');
                             link.addEventListener('click', calendarMonth(year, month));
                             currentDay++;
                         }
                 };
                 window.Calendar = Calendar;
                 window.CalendarNamespace = CalendarNamespace;
-            })();

static/admin/js/cancel.js +25 -9

@@ -1,13 +1,29
1	(function($) {	1	'use strict';
2	'use strict';	2	{
3	$(function() {	3	// Call function fn when the DOM is loaded and ready. If it is already
4	$('.cancel-link').on('click', function(e) {	4	// loaded, call the function now.
5	e.preventDefault();	5	// http://youmightnotneedjquery.com/#ready
6	if (window.location.search.indexOf('&_popup=1') === -1) {	6	function ready(fn) {
7	window.history.back(); // Go back if not a popup.	7	if (document.readyState !== 'loading') {
		8	fn();
		9	} else {
		10	document.addEventListener('DOMContentLoaded', fn);
		11	}
		12	}
		13
		14	ready(function() {
		15	function handleClick(event) {
		16	event.preventDefault();
		17	const params = new URLSearchParams(window.location.search);
		18	if (params.has('_popup')) {
		19	window.close(); // Close the popup.
8	} else {	20	} else {
9	window.~~close~~(); // Otherwise, ~~close the popup~~.	21	window.history.back(); // Otherwise, go back.
10	}	22	}
		23	}
		24
		25	document.querySelectorAll('.cancel-link').forEach(function(el) {
		26	el.addEventListener('click', handleClick);
11	});	27	});
12	});	28	});
13	})(django.jQuery);	29	}

static/admin/js/change_form.js +14 -18

@@ -1,20 +1,16
1	/global showAddAnotherPopup, showRelatedObjectLookupPopup showRelatedObjectPopup updateRelatedObjectLinks/	1	'use strict';
2		2	{
3	(function($) {	3	const inputTags = ['BUTTON', 'INPUT', 'SELECT', 'TEXTAREA'];
4	'use strict';	4	const modelName = document.getElementById('django-admin-form-add-constants').dataset.modelName;
5	$(document).ready(function() {	5	if (modelName) {
6	var modelName = $('#django-admin-form-add-constants').data('modelName');	6	const form = document.getElementById(modelName + '_form');
7	$('body').on('click', '.add-another', function(e) {	7	for (const element of form.elements) {
8	e.preventDefault();	8	// HTMLElement.offsetParent returns null when the element is not
9	var event = $.Event('django:add-another-related');	9	// rendered.
10	$(this).trigger(event);	10	if (inputTags.includes(element.tagName) && !element.disabled && element.offsetParent) {
11	if (!event.isDefaultPrevented()) {	11	element.focus();
12	showAddAnotherPopup(this);	12	break;
13	}	13	}
14	});
15
16	if (modelName) {
17	$('form#' + modelName + '_form :input:visible:enabled:first').focus();
18	}	14	}
19	});	15	}
20	})(django.jQuery);	16	}

static/admin/js/collapse.js +29 -38

@@ -1,52 +1,43
1	/global gettext/	1	/global gettext/
2	(function() {	2	'use strict';
3	'use strict';	3	{
4	var closestElem = function(elem, tagName) {
5	if (elem.nodeName === tagName.toUpperCase()) {
6	return elem;
7	}
8	if (elem.parentNode.nodeName === 'BODY') {
9	return null;
10	}
11	return elem.parentNode && closestElem(elem.parentNode, tagName);
12	};
13
14	window.addEventListener('load', function() {	4	window.addEventListener('load', function() {
15	// Add anchor tag for Show/Hide link	5	// Add anchor tag for Show/Hide link
16	~~var~~ fieldsets = document.querySelectorAll('fieldset.collapse');	6	const fieldsets = document.querySelectorAll('fieldset.collapse');
17	for (~~var~~ i = 0; i < fieldsets.~~length~~; i++) {	7	for (const [i, elem] of fieldsets.entries()) {
18	var elem = fieldsets[i];
19	// Don't hide if fields in this fieldset have errors	8	// Don't hide if fields in this fieldset have errors
20	if (elem.querySelectorAll('div.errors').length === 0) {	9	if (elem.querySelectorAll('div.errors, ul.errorlist').length === 0) {
21	elem.classList.add('collapsed');	10	elem.classList.add('collapsed');
22	~~var~~ h2 = elem.querySelector('h2');	11	const h2 = elem.querySelector('h2');
23	~~var~~ link = document.createElement('a');	12	const link = document.createElement('a');
24	link.~~setAttribute~~(~~'id'~~, 'fieldsetcollapser' + i);	13	link.id = 'fieldsetcollapser' + i;
25	link.~~setAttribute~~(~~'class'~~, 'collapse-toggle');	14	link.className = 'collapse-toggle';
26	link.~~setAttribute~~(~~'href'~~, '#');	15	link.href = '#';
27	link.textContent = gettext('Show');	16	link.textContent = gettext('Show');
28	h2.appendChild(document.createTextNode(' ('));	17	h2.appendChild(document.createTextNode(' ('));
29	h2.appendChild(link);	18	h2.appendChild(link);
30	h2.appendChild(document.createTextNode(')'));	19	h2.appendChild(document.createTextNode(')'));
31	}	20	}
32	}	21	}
33	// Add toggle to anchor tag	22	// Add toggle to hide/show anchor tag
34	var toggles = document.querySelectorAll('fieldset.collapse a.collapse-toggle');	23	const toggleFunc = function(ev) {
35	var toggleFunc = function(ev) {	24	if (ev.target.matches('.collapse-toggle')) {
36	ev.preventDefault();	25	ev.preventDefault();
37	var fieldset = closestElem(this, 'fieldset');	26	ev.stopPropagation();
38	if (fieldset.classList.contains('collapsed')) {	27	const fieldset = ev.target.closest('fieldset');
39	// Show	28	if (fieldset.classList.contains('collapsed')) {
40	this.textContent = gettext('Hide');	29	// Show
41	fieldset.classList.remove('collapsed');	30	ev.target.textContent = gettext('Hide');
42	} else {	31	fieldset.classList.remove('collapsed');
43	~~// Hide~~	32	} else {
44	this.textContent = gettext('Show');	33	// Hide
45	fieldset.classList.add('collapsed');	34	ev.target.textContent = gettext('Show');
		35	fieldset.classList.add('collapsed');
		36	}
46	}	37	}
47	};	38	};
48	for (i = 0; i < toggles.length; i++) {	39	document.querySelectorAll('fieldset.module').forEach(function(el) {
49	~~toggles~~[i].addEventListener('click', toggleFunc);	40	el.addEventListener('click', toggleFunc);
50	}	41	});
51	});	42	});
52	})();	43	}

static/admin/js/core.js +44 -86

-            // Core javascript helper functions
+            // Core JavaScript helper functions
+            'use strict';
-            // basic browser identification & version
-            var isOpera = (navigator.userAgent.indexOf("Opera") >= 0) && parseFloat(navigator.appVersion);
-            var isIE = ((document.all) && (!isOpera)) && parseFloat(navigator.appVersion.split("MSIE ")[1].split(";")[0]);
             // quickElement(tagType, parentReference [, textInChildNode, attribute, attributeValue ...]);
             function quickElement() {
-                'use strict';
+                const obj = document.createElement(arguments[0]);
-                var obj = document.createElement(arguments[0]);
                 if (arguments[2]) {
-                    var textNode = document.createTextNode(arguments[2]);
+                    const textNode = document.createTextNode(arguments[2]);
                     obj.appendChild(textNode);
                 }
-                var len = arguments.length;
+                const len = arguments.length;
-                for (var i = 3; i < len; i += 2) {
+                for (let i = 3; i < len; i += 2) {
                     obj.setAttribute(arguments[i], arguments[i + 1]);
                 }
                 arguments[1].appendChild(obj);
             // "a" is reference to an object
             function removeChildren(a) {
-                'use strict';
                 while (a.hasChildNodes()) {
                     a.removeChild(a.lastChild);
                 }
             // See https://www.quirksmode.org/js/findpos.html
             // ----------------------------------------------------------------------------
             function findPosX(obj) {
-                'use strict';
+                let curleft = 0;
-                var curleft = 0;
                 if (obj.offsetParent) {
                     while (obj.offsetParent) {
-                        curleft += obj.offsetLeft - ((isOpera) ? 0 : obj.scrollLeft);
-                        obj = obj.offsetParent;
-                    // IE offsetParent does not include the top-level
-                    if (isIE && obj.parentElement) {
                         curleft += obj.offsetLeft - obj.scrollLeft;
+                        obj = obj.offsetParent;
                     }
                 } else if (obj.x) {
                     curleft += obj.x;
             }
             function findPosY(obj) {
-                'use strict';
+                let curtop = 0;
-                var curtop = 0;
                 if (obj.offsetParent) {
                     while (obj.offsetParent) {
-                        curtop += obj.offsetTop - ((isOpera) ? 0 : obj.scrollTop);
-                        obj = obj.offsetParent;
-                    // IE offsetParent does not include the top-level
-                    if (isIE && obj.parentElement) {
                         curtop += obj.offsetTop - obj.scrollTop;
+                        obj = obj.offsetParent;
                     }
                 } else if (obj.y) {
                     curtop += obj.y;
             //-----------------------------------------------------------------------------
             // Date object extensions
             // ----------------------------------------------------------------------------
-            (function() {
-                'use strict';
                 Date.prototype.getTwelveHours = function() {
-                    var hours = this.getHours();
+                    return this.getHours() % 12 || 12;
-                    if (hours === 0) {
-                        return 12;
-                    else {
-                        return hours <= 12 ? hours : hours - 12;
                 };
                 Date.prototype.getTwoDigitMonth = function() {
                     return (this.getSeconds() < 10) ? '0' + this.getSeconds() : this.getSeconds();
                 };
-                Date.prototype.getHourMinute = function() {
+                Date.prototype.getAbbrevMonthName = function() {
-                    return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute();
+                    return typeof window.CalendarNamespace === "undefined"
-                };
+                        ? this.getTwoDigitMonth()
+                        : window.CalendarNamespace.monthsOfYearAbbrev[this.getMonth()];
-                Date.prototype.getHourMinuteSecond = function() {
-                    return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute() + ':' + this.getTwoDigitSecond();
                 };
                 Date.prototype.getFullMonthName = function() {
                 };
                 Date.prototype.strftime = function(format) {
-                    var fields = {
+                    const fields = {
+                        b: this.getAbbrevMonthName(),
                         B: this.getFullMonthName(),
                         c: this.toString(),
                         d: this.getTwoDigitDate(),
                         Y: '' + this.getFullYear(),
                         '%': '%'
                     };
-                    var result = '', i = 0;
+                    let result = '', i = 0;
                     while (i < format.length) {
                         if (format.charAt(i) === '%') {
                             result = result + fields[format.charAt(i + 1)];
                     return result;
                 };
-            // ----------------------------------------------------------------------------
+                // ----------------------------------------------------------------------------
-            // String object extensions
+                // String object extensions
-            // ----------------------------------------------------------------------------
+                // ----------------------------------------------------------------------------
-                String.prototype.pad_left = function(pad_length, pad_string) {
-                    var new_string = this;
-                    for (var i = 0; new_string.length < pad_length; i++) {
-                        new_string = pad_string + new_string;
-                    return new_string;
-                };
                 String.prototype.strptime = function(format) {
-                    var split_format = format.split(/[.\-/]/);
+                    const split_format = format.split(/[.\-/]/);
-                    var date = this.split(/[.\-/]/);
+                    const date = this.split(/[.\-/]/);
-                    var i = 0;
+                    let i = 0;
-                    var day, month, year;
+                    let day, month, year;
                     while (i < split_format.length) {
                         switch (split_format[i]) {
-                            case "%d":
+                        case "%d":
-                                day = date[i];
+                            day = date[i];
-                                break;
+                            break;
-                            case "%m":
+                        case "%m":
-                                month = date[i] - 1;
+                            month = date[i] - 1;
-                                break;
+                            break;
-                            case "%Y":
+                        case "%Y":
+                            year = date[i];
+                            break;
+                        case "%y":
+                            // A %y value in the range of [00, 68] is in the current
+                            // century, while [69, 99] is in the previous century,
+                            // according to the Open Group Specification.
+                            if (parseInt(date[i], 10) >= 69) {
                                 year = date[i];
-                                break;
+                            } else {
-                            case "%y":
+                                year = (new Date(Date.UTC(date[i], 0))).getUTCFullYear() + 100;
-                                year = date[i];
-                                break;
+                            break;
                         }
                         ++i;
                     }
                     // date extraction.
                     return new Date(Date.UTC(year, month, day));
                 };
-            })();
-            // ----------------------------------------------------------------------------
-            // Get the computed style for and element
-            // ----------------------------------------------------------------------------
-            function getStyle(oElm, strCssRule) {
-                'use strict';
-                var strValue = "";
-                if(document.defaultView && document.defaultView.getComputedStyle) {
-                    strValue = document.defaultView.getComputedStyle(oElm, "").getPropertyValue(strCssRule);
-                else if(oElm.currentStyle) {
-                    strCssRule = strCssRule.replace(/\-(\w)/g, function(strMatch, p1) {
-                        return p1.toUpperCase();
-                    });
-                    strValue = oElm.currentStyle[strCssRule];
-                return strValue;
             }

static/admin/js/inlines.js +187 -126

@@ -15,15 +15,16
15	* Licensed under the New BSD License	15	* Licensed under the New BSD License
16	* See: https://opensource.org/licenses/bsd-license.php	16	* See: https://opensource.org/licenses/bsd-license.php
17	*/	17	*/
18	(function($) {	18	'use strict';
19	'use strict';	19	{
		20	const $ = django.jQuery;
20	$.fn.formset = function(opts) {	21	$.fn.formset = function(opts) {
21	~~var~~ options = $.extend({}, $.fn.formset.defaults, opts);	22	const options = $.extend({}, $.fn.formset.defaults, opts);
22	~~var~~ $this = $(this);	23	const $this = $(this);
23	~~var~~ $parent = $this.parent();	24	const $parent = $this.parent();
24	~~var~~ updateElementIndex = function(el, prefix, ndx) {	25	const updateElementIndex = function(el, prefix, ndx) {
25	~~var~~ id_regex = new RegExp("(" + prefix + "-(\\d+\|__prefix__))");	26	const id_regex = new RegExp("(" + prefix + "-(\\d+\|__prefix__))");
26	~~var~~ replacement = prefix + "-" + ndx;	27	const replacement = prefix + "-" + ndx;
27	if ($(el).prop("for")) {	28	if ($(el).prop("for")) {
28	$(el).prop("for", $(el).prop("for").replace(id_regex, replacement));	29	$(el).prop("for", $(el).prop("for").replace(id_regex, replacement));
29	}	30	}
@@ -34,22 +35,21
34	el.name = el.name.replace(id_regex, replacement);	35	el.name = el.name.replace(id_regex, replacement);
35	}	36	}
36	};	37	};
37	~~var~~ totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").prop("autocomplete", "off");	38	const totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").prop("autocomplete", "off");
38	~~var~~ nextIndex = parseInt(totalForms.val(), 10);	39	let nextIndex = parseInt(totalForms.val(), 10);
39	~~var~~ maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").prop("autocomplete", "off");	40	const maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").prop("autocomplete", "off");
40	// only show the add button if we are allowed to add more items,	41	const minForms = $("#id_" + options.prefix + "-MIN_NUM_FORMS").prop("autocomplete", "off");
41	// note that max_num = None translates to a blank string.	42	let addButton;
42	var showAddButton = maxForms.val() === '' \|\| (maxForms.val() - totalForms.val()) > 0;	43
43	$this.each(function(i) {	44	/**
44	$(this).not("." + options.emptyCssClass).addClass(options.formCssClass);	45	* The "Add another MyModel" button below the inline forms.
45	~~});~~	46	*/
46	if ($this.length && showAddButton) {	47	const addInlineAddButton = function() {
47	var addButton = options.addButton;
48	if (addButton === null) {	48	if (addButton === null) {
49	if ($this.prop("tagName") === "TR") {	49	if ($this.prop("tagName") === "TR") {
50	// If forms are laid out as table rows, insert the	50	// If forms are laid out as table rows, insert the
51	// "add" button in a new table row:	51	// "add" button in a new table row:
52	~~var~~ numCols = this.eq(-1).children().length;	52	const numCols = $this.eq(-1).children().length;
53	$parent.append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a href="#">' + options.addText + "</a></tr>");	53	$parent.append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a href="#">' + options.addText + "</a></tr>");
54	addButton = $parent.find("tr:last a");	54	addButton = $parent.find("tr:last a");
55	} else {	55	} else {
@@ -58,102 +58,163
58	addButton = $this.filter(":last").next().find("a");	58	addButton = $this.filter(":last").next().find("a");
59	}	59	}
60	}	60	}
61	addButton.on('click', ~~function~~(e) {	61	addButton.on('click', addInlineClickHandler);
62	e.preventDefault();	62	};
63	var template = $("#" + options.prefix + "-empty");	63
64	var row = template.clone(true);	64	const addInlineClickHandler = function(e) {
65	row.removeClass(options.emptyCssClass)	65	e.preventDefault();
		66	const template = $("#" + options.prefix + "-empty");
		67	const row = template.clone(true);
		68	row.removeClass(options.emptyCssClass)
66	.addClass(options.formCssClass)	69	.addClass(options.formCssClass)
67	.attr("id", options.prefix + "-" + nextIndex);	70	.attr("id", options.prefix + "-" + nextIndex);
68	if (row.is("tr")) {	71	addInlineDeleteButton(row);
69	// If the forms are laid out in table rows, insert	72	row.find("*").each(function() {
70	// the remove button into the last table cell:	73	updateElementIndex(this, options.prefix, totalForms.val());
71	row.children(":last").append('<div><a class="' + options.deleteCssClass + '" href="#">' + options.deleteText + "</a></div>");	74	});
72	} else if (row.is("ul") \|\| row.is("ol")) {	75	// Insert the new form when it has been fully edited.
73	// If they're laid out as an ordered/unordered list,	76	row.insertBefore($(template));
74	// insert an <li> after the last list item:	77	// Update number of total forms.
75	row.append('<li><a class="' + options.deleteCssClass + '" href="#">' + options.deleteText + "</a></li>");	78	$(totalForms).val(parseInt(totalForms.val(), 10) + 1);
76	} else {	79	nextIndex += 1;
77	// Otherwise, just insert the remove button as the	80	// Hide the add button if there's a limit and it's been reached.
78	// last child element of the form's container:	81	if ((maxForms.val() !== '') && (maxForms.val() - totalForms.val()) <= 0) {
79	row.children(":first").append('<span><a class="' + options.deleteCssClass + '" href="#">' + options.deleteText + "</a></span>");	82	addButton.parent().hide();
80	}	83	}
81	row.find("*").each(function() {	84	// Show the remove buttons if there are more than min_num.
82	updateElementIndex(this, options.prefix, totalForms.val());	85	toggleDeleteButtonVisibility(row.closest('.inline-group'));
83	});	86
84	// Insert the new form when it has been fully edited	87	// Pass the new form to the post-add callback, if provided.
85	row.insertBefore($(template));	88	if (options.added) {
86	// Update number of total forms	89	options.added(row);
87	$(totalForms).val(parseInt(totalForms.val(), 10) + 1);	90	}
88	nextIndex += 1;	91	row.get(0).dispatchEvent(new CustomEvent("formset:added", {
89	// Hide add button in case we've hit the max, except we want to add infinitely	92	bubbles: true,
90	if ((maxForms.val() !== '') && (maxForms.val() - totalForms.val()) <= 0) {	93	detail: {
91	~~addButton~~.p~~arent().hide();~~	94	formsetName: options.prefix
92	}	95	}
93	// The delete button of each row triggers a bunch of other things	96	}));
94	row.find("a." + options.deleteCssClass).on('click', function(e1) {	97	};
95	e1.preventDefault();	98
96	// Remove the parent form containing this button:	99	/**
97	row.remove();	100	* The "X" button that is part of every unsaved inline.
98	nextIndex -= 1;	101	* (When saved, it is replaced with a "Delete" checkbox.)
99	// If a post-delete callback was provided, call it with the deleted form:	102	*/
100	if (options.removed) {	103	const addInlineDeleteButton = function(row) {
101	options.removed(row);	104	if (row.is("tr")) {
102	}	105	// If the forms are laid out in table rows, insert
103	$(document).trigger('formset:removed', [row, options.prefix]);	106	// the remove button into the last table cell:
104	// Update the TOTAL_FORMS form count.	107	row.children(":last").append('<div><a class="' + options.deleteCssClass + '" href="#">' + options.deleteText + "</a></div>");
105	var forms = $("." + options.formCssClass);	108	} else if (row.is("ul") \|\| row.is("ol")) {
106	$("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length);	109	// If they're laid out as an ordered/unordered list,
107	// Show add button again once we drop below max	110	// insert an <li> after the last list item:
108	if ((maxForms.val() === '') \|\| (maxForms.val() - forms.length) > 0) {	111	row.append('<li><a class="' + options.deleteCssClass + '" href="#">' + options.deleteText + "</a></li>");
109	addButton.parent().show();	112	} else {
110	}	113	// Otherwise, just insert the remove button as the
111	// Also, update names and ids for all remaining form controls	114	// last child element of the form's container:
112	// so they remain in sequence:	115	row.children(":first").append('<span><a class="' + options.deleteCssClass + '" href="#">' + options.deleteText + "</a></span>");
113	var i, formCount;	116	}
114	var updateElementCallback = function() {	117	// Add delete handler for each row.
115	updateElementIndex(this, options.prefix, i);	118	row.find("a." + options.deleteCssClass).on('click', inlineDeleteHandler.bind(this));
116	};	119	};
117	for (i = 0, formCount = forms.length; i < formCount; i++) {	120
118	updateElementIndex($(forms).get(i), options.prefix, i);	121	const inlineDeleteHandler = function(e1) {
119	$(forms.get(i)).find("*").each(updateElementCallback);	122	e1.preventDefault();
120	}	123	const deleteButton = $(e1.target);
121	});	124	const row = deleteButton.closest('.' + options.formCssClass);
122	// If a post-add callback was supplied, call it with the added form:	125	const inlineGroup = row.closest('.inline-group');
123	if (options.added) {	126	// Remove the parent form containing this button,
124	options.added(row);	127	// and also remove the relevant row with non-field errors:
		128	const prevRow = row.prev();
		129	if (prevRow.length && prevRow.hasClass('row-form-errors')) {
		130	prevRow.remove();
		131	}
		132	row.remove();
		133	nextIndex -= 1;
		134	// Pass the deleted form to the post-delete callback, if provided.
		135	if (options.removed) {
		136	options.removed(row);
		137	}
		138	document.dispatchEvent(new CustomEvent("formset:removed", {
		139	detail: {
		140	formsetName: options.prefix
125	}	141	}
126	$(document).trigger('formset:added', [row, options.prefix]);	142	}));
127	});	143	// Update the TOTAL_FORMS form count.
		144	const forms = $("." + options.formCssClass);
		145	$("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length);
		146	// Show add button again once below maximum number.
		147	if ((maxForms.val() === '') \|\| (maxForms.val() - forms.length) > 0) {
		148	addButton.parent().show();
		149	}
		150	// Hide the remove buttons if at min_num.
		151	toggleDeleteButtonVisibility(inlineGroup);
		152	// Also, update names and ids for all remaining form controls so
		153	// they remain in sequence:
		154	let i, formCount;
		155	const updateElementCallback = function() {
		156	updateElementIndex(this, options.prefix, i);
		157	};
		158	for (i = 0, formCount = forms.length; i < formCount; i++) {
		159	updateElementIndex($(forms).get(i), options.prefix, i);
		160	$(forms.get(i)).find("*").each(updateElementCallback);
		161	}
		162	};
		163
		164	const toggleDeleteButtonVisibility = function(inlineGroup) {
		165	if ((minForms.val() !== '') && (minForms.val() - totalForms.val()) >= 0) {
		166	inlineGroup.find('.inline-deletelink').hide();
		167	} else {
		168	inlineGroup.find('.inline-deletelink').show();
		169	}
		170	};
		171
		172	$this.each(function(i) {
		173	$(this).not("." + options.emptyCssClass).addClass(options.formCssClass);
		174	});
		175
		176	// Create the delete buttons for all unsaved inlines:
		177	$this.filter('.' + options.formCssClass + ':not(.has_original):not(.' + options.emptyCssClass + ')').each(function() {
		178	addInlineDeleteButton($(this));
		179	});
		180	toggleDeleteButtonVisibility($this);
		181
		182	// Create the add button, initially hidden.
		183	addButton = options.addButton;
		184	addInlineAddButton();
		185
		186	// Show the add button if allowed to add more items.
		187	// Note that max_num = None translates to a blank string.
		188	const showAddButton = maxForms.val() === '' \|\| (maxForms.val() - totalForms.val()) > 0;
		189	if ($this.length && showAddButton) {
		190	addButton.parent().show();
		191	} else {
		192	addButton.parent().hide();
128	}	193	}
		194
129	return this;	195	return this;
130	};	196	};
131		197
132	/* Setup plugin defaults */	198	/* Setup plugin defaults */
133	$.fn.formset.defaults = {	199	$.fn.formset.defaults = {
134	prefix: "form", // The form prefix for your django formset	200	prefix: "form", // The form prefix for your django formset
135	addText: "add another", // Text for the add link	201	addText: "add another", // Text for the add link
136	deleteText: "remove", // Text for the delete link	202	deleteText: "remove", // Text for the delete link
137	addCssClass: "add-row", // CSS class applied to the add link	203	addCssClass: "add-row", // CSS class applied to the add link
138	deleteCssClass: "delete-row", // CSS class applied to the delete link	204	deleteCssClass: "delete-row", // CSS class applied to the delete link
139	emptyCssClass: "empty-row", // CSS class applied to the empty row	205	emptyCssClass: "empty-row", // CSS class applied to the empty row
140	formCssClass: "dynamic-form", // CSS class applied to each form in a formset	206	formCssClass: "dynamic-form", // CSS class applied to each form in a formset
141	added: null, // Function called each time a new form is added	207	added: null, // Function called each time a new form is added
142	removed: null, // Function called each time a form is deleted	208	removed: null, // Function called each time a form is deleted
143	addButton: null // Existing add button to use	209	addButton: null // Existing add button to use
144	};	210	};
145		211
146		212
147	// Tabular inlines ---------------------------------------------------------	213	// Tabular inlines ---------------------------------------------------------
148	$.fn.tabularFormset = function(selector, options) {	214	$.fn.tabularFormset = function(selector, options) {
149	~~var~~ $rows = $(this);	215	const $rows = $(this);
150	var alternatingRows = function(row) {
151	$(selector).not(".add-row").removeClass("row1 row2")
152	.filter(":even").addClass("row1").end()
153	.filter(":odd").addClass("row2");
154	};
155		216
156	~~var~~ reinitDateTimeShortCuts = function() {	217	const reinitDateTimeShortCuts = function() {
157	// Reinitialize the calendar and clock widgets by force	218	// Reinitialize the calendar and clock widgets by force
158	if (typeof DateTimeShortcuts !== "undefined") {	219	if (typeof DateTimeShortcuts !== "undefined") {
159	$(".datetimeshortcuts").remove();	220	$(".datetimeshortcuts").remove();
@@ -161,24 +222,22
161	}	222	}
162	};	223	};
163		224
164	~~var~~ updateSelectFilter = function() {	225	const updateSelectFilter = function() {
165	// If any SelectFilter widgets are a part of the new form,	226	// If any SelectFilter widgets are a part of the new form,
166	// instantiate a new SelectFilter instance for it.	227	// instantiate a new SelectFilter instance for it.
167	if (typeof SelectFilter !== 'undefined') {	228	if (typeof SelectFilter !== 'undefined') {
168	$('.selectfilter').each(function(index, value) {	229	$('.selectfilter').each(function(index, value) {
169	var namearr = value.name.split('-');	230	SelectFilter.init(value.id, this.dataset.fieldName, false);
170	SelectFilter.init(value.id, namearr[namearr.length - 1], false);
171	});	231	});
172	$('.selectfilterstacked').each(function(index, value) {	232	$('.selectfilterstacked').each(function(index, value) {
173	var namearr = value.name.split('-');	233	SelectFilter.init(value.id, this.dataset.fieldName, true);
174	SelectFilter.init(value.id, namearr[namearr.length - 1], true);
175	});	234	});
176	}	235	}
177	};	236	};
178		237
179	~~var~~ initPrepopulatedFields = function(row) {	238	const initPrepopulatedFields = function(row) {
180	row.find('.prepopulated_field').each(function() {	239	row.find('.prepopulated_field').each(function() {
181	~~var~~ field = $(this),	240	const field = $(this),
182	input = field.find('input, select, textarea'),	241	input = field.find('input, select, textarea'),
183	dependency_list = input.data('dependency_list') \|\| [],	242	dependency_list = input.data('dependency_list') \|\| [],
184	dependencies = [];	243	dependencies = [];
@@ -198,12 +257,10
198	deleteCssClass: "inline-deletelink",	257	deleteCssClass: "inline-deletelink",
199	deleteText: options.deleteText,	258	deleteText: options.deleteText,
200	emptyCssClass: "empty-form",	259	emptyCssClass: "empty-form",
201	removed: alternatingRows,
202	added: function(row) {	260	added: function(row) {
203	initPrepopulatedFields(row);	261	initPrepopulatedFields(row);
204	reinitDateTimeShortCuts();	262	reinitDateTimeShortCuts();
205	updateSelectFilter();	263	updateSelectFilter();
206	alternatingRows(row);
207	},	264	},
208	addButton: options.addButton	265	addButton: options.addButton
209	});	266	});
@@ -213,15 +270,15
213		270
214	// Stacked inlines ---------------------------------------------------------	271	// Stacked inlines ---------------------------------------------------------
215	$.fn.stackedFormset = function(selector, options) {	272	$.fn.stackedFormset = function(selector, options) {
216	~~var~~ $rows = $(this);	273	const $rows = $(this);
217	~~var~~ updateInlineLabel = function(row) {	274	const updateInlineLabel = function(row) {
218	$(selector).find(".inline_label").each(function(i) {	275	$(selector).find(".inline_label").each(function(i) {
219	~~var~~ count = i + 1;	276	const count = i + 1;
220	$(this).html($(this).html().replace(/(#\d+)/g, "#" + count));	277	$(this).html($(this).html().replace(/(#\d+)/g, "#" + count));
221	});	278	});
222	};	279	};
223		280
224	~~var~~ reinitDateTimeShortCuts = function() {	281	const reinitDateTimeShortCuts = function() {
225	// Reinitialize the calendar and clock widgets by force, yuck.	282	// Reinitialize the calendar and clock widgets by force, yuck.
226	if (typeof DateTimeShortcuts !== "undefined") {	283	if (typeof DateTimeShortcuts !== "undefined") {
227	$(".datetimeshortcuts").remove();	284	$(".datetimeshortcuts").remove();
@@ -229,28 +286,32
229	}	286	}
230	};	287	};
231		288
232	~~var~~ updateSelectFilter = function() {	289	const updateSelectFilter = function() {
233	// If any SelectFilter widgets were added, instantiate a new instance.	290	// If any SelectFilter widgets were added, instantiate a new instance.
234	if (typeof SelectFilter !== "undefined") {	291	if (typeof SelectFilter !== "undefined") {
235	$(".selectfilter").each(function(index, value) {	292	$(".selectfilter").each(function(index, value) {
236	var namearr = value.name.split('-');	293	SelectFilter.init(value.id, this.dataset.fieldName, false);
237	SelectFilter.init(value.id, namearr[namearr.length - 1], false);
238	});	294	});
239	$(".selectfilterstacked").each(function(index, value) {	295	$(".selectfilterstacked").each(function(index, value) {
240	var namearr = value.name.split('-');	296	SelectFilter.init(value.id, this.dataset.fieldName, true);
241	SelectFilter.init(value.id, namearr[namearr.length - 1], true);
242	});	297	});
243	}	298	}
244	};	299	};
245		300
246	~~var~~ initPrepopulatedFields = function(row) {	301	const initPrepopulatedFields = function(row) {
247	row.find('.prepopulated_field').each(function() {	302	row.find('.prepopulated_field').each(function() {
248	~~var~~ field = $(this),	303	const field = $(this),
249	input = field.find('input, select, textarea'),	304	input = field.find('input, select, textarea'),
250	dependency_list = input.data('dependency_list') \|\| [],	305	dependency_list = input.data('dependency_list') \|\| [],
251	dependencies = [];	306	dependencies = [];
252	$.each(dependency_list, function(i, field_name) {	307	$.each(dependency_list, function(i, field_name) {
253	dependencies.push('#' + row.find('.form-row .field-' + field_name).find('input, select, textarea').attr('id'));	308	// Dependency in a fieldset.
		309	let field_element = row.find('.form-row .field-' + field_name);
		310	// Dependency without a fieldset.
		311	if (!field_element.length) {
		312	field_element = row.find('.form-row.field-' + field_name);
		313	}
		314	dependencies.push('#' + field_element.find('input, select, textarea').attr('id'));
254	});	315	});
255	if (dependencies.length) {	316	if (dependencies.length) {
256	input.prepopulate(dependencies, input.attr('maxlength'));	317	input.prepopulate(dependencies, input.attr('maxlength'));
@@ -280,19 +341,19
280		341
281	$(document).ready(function() {	342	$(document).ready(function() {
282	$(".js-inline-admin-formset").each(function() {	343	$(".js-inline-admin-formset").each(function() {
283	~~var~~ data = $(this).data(),	344	const data = $(this).data(),
284	inlineOptions = data.inlineFormset,	345	inlineOptions = data.inlineFormset;
285	selector;	346	let selector;
286	switch(data.inlineType) {	347	switch(data.inlineType) {
287	case "stacked":	348	case "stacked":
288	selector = inlineOptions.name + "-group .inline-related";	349	selector = inlineOptions.name + "-group .inline-related";
289	$(selector).stackedFormset(selector, inlineOptions.options);	350	$(selector).stackedFormset(selector, inlineOptions.options);
290	break;	351	break;
291	case "tabular":	352	case "tabular":
292	selector = inlineOptions.name + "-group .tabular.inline-related tbody:first > tr";	353	selector = inlineOptions.name + "-group .tabular.inline-related tbody:first > tr.form-row";
293	$(selector).tabularFormset(selector, inlineOptions.options);	354	$(selector).tabularFormset(selector, inlineOptions.options);
294	break;	355	break;
295	}	356	}
296	});	357	});
297	});	358	});
298	})(django.jQuery);	359	}

static/admin/js/jquery.init.js +3 -3

-            /*global django:true, jQuery:false*/
+            /*global jQuery:false*/
+            'use strict';
             /* Puts the included jQuery into our own namespace using noConflict and passing
              * it 'true'. This ensures that the included jQuery doesn't pollute the global
              * namespace (i.e. this preserves pre-existing values for both window.$ and
              * window.jQuery).
              */
-            var django = django || {};
+            window.django = {jQuery: jQuery.noConflict(true)};
-            django.jQuery = jQuery.noConflict(true);

static/admin/js/popup_response.js +4 -4

             /*global opener */
-            (function() {
+            'use strict';
-                'use strict';
-                var initData = JSON.parse(document.getElementById('django-admin-popup-response-constants').dataset.popupResponse);
+                const initData = JSON.parse(document.getElementById('django-admin-popup-response-constants').dataset.popupResponse);
                 switch(initData.action) {
                 case 'change':
                     opener.dismissChangeRelatedObjectPopup(window, initData.value, initData.obj, initData.new_value);
                     opener.dismissAddRelatedObjectPopup(window, initData.value, initData.obj);
                     break;
                 }
-            })();

static/admin/js/prepopulate.js +7 -6

             /*global URLify*/
-            (function($) {
+            'use strict';
-                'use strict';
+                const $ = django.jQuery;
                 $.fn.prepopulate = function(dependencies, maxLength, allowUnicode) {
                     /*
                         Depends on urlify.js
                         allowUnicode - Unicode support of the URLify'd string
                     */
                     return this.each(function() {
-                        var prepopulatedField = $(this);
+                        const prepopulatedField = $(this);
-                        var populate = function() {
+                        const populate = function() {
                             // Bail if the field's value has been changed by the user
                             if (prepopulatedField.data('_changed')) {
                                 return;
                             }
-                            var values = [];
+                            const values = [];
                             $.each(dependencies, function(i, field) {
                                 field = $(field);
                                 if (field.val().length > 0) {
                         }
                     });
                 };
-            })(django.jQuery);

static/admin/js/prepopulate_init.js +10 -5

@@ -1,10 +1,15
1	(function($) {	1	'use strict';
2	'use strict';	2	{
3	var fields = $('#django-admin-prepopulated-fields-constants').data('prepopulatedFields');	3	const $ = django.jQuery;
		4	const fields = $('#django-admin-prepopulated-fields-constants').data('prepopulatedFields');
4	$.each(fields, function(index, field) {	5	$.each(fields, function(index, field) {
5	$('.empty-form .form-row .field-' + field.name + ', .empty-form.form-row .field-' + field.name).addClass('prepopulated_field');	6	$(
		7	'.empty-form .form-row .field-' + field.name +
		8	', .empty-form.form-row .field-' + field.name +
		9	', .empty-form .form-row.field-' + field.name
		10	).addClass('prepopulated_field');
6	$(field.id).data('dependency_list', field.dependency_list).prepopulate(	11	$(field.id).data('dependency_list', field.dependency_list).prepopulate(
7	field.dependency_ids, field.maxLength, field.allowUnicode	12	field.dependency_ids, field.maxLength, field.allowUnicode
8	);	13	);
9	});	14	});
10	})(django.jQuery);	15	}

static/admin/js/urlify.js +32 -57

             /*global XRegExp*/
-            (function() {
+            'use strict';
-                'use strict';
+                const LATIN_MAP = {
-                var LATIN_MAP = {
                     'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Å': 'A', 'Æ': 'AE',
                     'Ç': 'C', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'Ì': 'I', 'Í': 'I',
                     'Î': 'I', 'Ï': 'I', 'Ð': 'D', 'Ñ': 'N', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O',
                     'ö': 'o', 'ő': 'o', 'ø': 'o', 'ù': 'u', 'ú': 'u', 'û': 'u', 'ü': 'u',
                     'ű': 'u', 'ý': 'y', 'þ': 'th', 'ÿ': 'y'
                 };
-                var LATIN_SYMBOLS_MAP = {
+                const LATIN_SYMBOLS_MAP = {
                     '©': '(c)'
                 };
-                var GREEK_MAP = {
+                const GREEK_MAP = {
                     'α': 'a', 'β': 'b', 'γ': 'g', 'δ': 'd', 'ε': 'e', 'ζ': 'z', 'η': 'h',
                     'θ': '8', 'ι': 'i', 'κ': 'k', 'λ': 'l', 'μ': 'm', 'ν': 'n', 'ξ': '3',
                     'ο': 'o', 'π': 'p', 'ρ': 'r', 'σ': 's', 'τ': 't', 'υ': 'y', 'φ': 'f',
                     'Φ': 'F', 'Χ': 'X', 'Ψ': 'PS', 'Ω': 'W', 'Ά': 'A', 'Έ': 'E', 'Ί': 'I',
                     'Ό': 'O', 'Ύ': 'Y', 'Ή': 'H', 'Ώ': 'W', 'Ϊ': 'I', 'Ϋ': 'Y'
                 };
-                var TURKISH_MAP = {
+                const TURKISH_MAP = {
                     'ş': 's', 'Ş': 'S', 'ı': 'i', 'İ': 'I', 'ç': 'c', 'Ç': 'C', 'ü': 'u',
                     'Ü': 'U', 'ö': 'o', 'Ö': 'O', 'ğ': 'g', 'Ğ': 'G'
                 };
-                var ROMANIAN_MAP = {
+                const ROMANIAN_MAP = {
                     'ă': 'a', 'î': 'i', 'ș': 's', 'ț': 't', 'â': 'a',
                     'Ă': 'A', 'Î': 'I', 'Ș': 'S', 'Ț': 'T', 'Â': 'A'
                 };
-                var RUSSIAN_MAP = {
+                const RUSSIAN_MAP = {
                     'а': 'a', 'б': 'b', 'в': 'v', 'г': 'g', 'д': 'd', 'е': 'e', 'ё': 'yo',
                     'ж': 'zh', 'з': 'z', 'и': 'i', 'й': 'j', 'к': 'k', 'л': 'l', 'м': 'm',
                     'н': 'n', 'о': 'o', 'п': 'p', 'р': 'r', 'с': 's', 'т': 't', 'у': 'u',
                     'Ф': 'F', 'Х': 'H', 'Ц': 'C', 'Ч': 'Ch', 'Ш': 'Sh', 'Щ': 'Sh', 'Ъ': '',
                     'Ы': 'Y', 'Ь': '', 'Э': 'E', 'Ю': 'Yu', 'Я': 'Ya'
                 };
-                var UKRAINIAN_MAP = {
+                const UKRAINIAN_MAP = {
                     'Є': 'Ye', 'І': 'I', 'Ї': 'Yi', 'Ґ': 'G', 'є': 'ye', 'і': 'i',
                     'ї': 'yi', 'ґ': 'g'
                 };
-                var CZECH_MAP = {
+                const CZECH_MAP = {
                     'č': 'c', 'ď': 'd', 'ě': 'e', 'ň': 'n', 'ř': 'r', 'š': 's', 'ť': 't',
                     'ů': 'u', 'ž': 'z', 'Č': 'C', 'Ď': 'D', 'Ě': 'E', 'Ň': 'N', 'Ř': 'R',
                     'Š': 'S', 'Ť': 'T', 'Ů': 'U', 'Ž': 'Z'
                 };
-                var SLOVAK_MAP = {
+                const SLOVAK_MAP = {
                     'á': 'a', 'ä': 'a', 'č': 'c', 'ď': 'd', 'é': 'e', 'í': 'i', 'ľ': 'l',
                     'ĺ': 'l', 'ň': 'n', 'ó': 'o', 'ô': 'o', 'ŕ': 'r', 'š': 's', 'ť': 't',
                     'ú': 'u', 'ý': 'y', 'ž': 'z',
                     'Ĺ': 'L', 'Ň': 'N', 'Ó': 'O', 'Ô': 'O', 'Ŕ': 'R', 'Š': 'S', 'Ť': 'T',
                     'Ú': 'U', 'Ý': 'Y', 'Ž': 'Z'
                 };
-                var POLISH_MAP = {
+                const POLISH_MAP = {
                     'ą': 'a', 'ć': 'c', 'ę': 'e', 'ł': 'l', 'ń': 'n', 'ó': 'o', 'ś': 's',
                     'ź': 'z', 'ż': 'z',
                     'Ą': 'A', 'Ć': 'C', 'Ę': 'E', 'Ł': 'L', 'Ń': 'N', 'Ó': 'O', 'Ś': 'S',
                     'Ź': 'Z', 'Ż': 'Z'
                 };
-                var LATVIAN_MAP = {
+                const LATVIAN_MAP = {
                     'ā': 'a', 'č': 'c', 'ē': 'e', 'ģ': 'g', 'ī': 'i', 'ķ': 'k', 'ļ': 'l',
                     'ņ': 'n', 'š': 's', 'ū': 'u', 'ž': 'z',
                     'Ā': 'A', 'Č': 'C', 'Ē': 'E', 'Ģ': 'G', 'Ī': 'I', 'Ķ': 'K', 'Ļ': 'L',
                     'Ņ': 'N', 'Š': 'S', 'Ū': 'U', 'Ž': 'Z'
                 };
-                var ARABIC_MAP = {
+                const ARABIC_MAP = {
                     'أ': 'a', 'ب': 'b', 'ت': 't', 'ث': 'th', 'ج': 'g', 'ح': 'h', 'خ': 'kh', 'د': 'd',
                     'ذ': 'th', 'ر': 'r', 'ز': 'z', 'س': 's', 'ش': 'sh', 'ص': 's', 'ض': 'd', 'ط': 't',
                     'ظ': 'th', 'ع': 'aa', 'غ': 'gh', 'ف': 'f', 'ق': 'k', 'ك': 'k', 'ل': 'l', 'م': 'm',
                     'ن': 'n', 'ه': 'h', 'و': 'o', 'ي': 'y'
                 };
-                var LITHUANIAN_MAP = {
+                const LITHUANIAN_MAP = {
                     'ą': 'a', 'č': 'c', 'ę': 'e', 'ė': 'e', 'į': 'i', 'š': 's', 'ų': 'u',
                     'ū': 'u', 'ž': 'z',
                     'Ą': 'A', 'Č': 'C', 'Ę': 'E', 'Ė': 'E', 'Į': 'I', 'Š': 'S', 'Ų': 'U',
                     'Ū': 'U', 'Ž': 'Z'
                 };
-                var SERBIAN_MAP = {
+                const SERBIAN_MAP = {
                     'ђ': 'dj', 'ј': 'j', 'љ': 'lj', 'њ': 'nj', 'ћ': 'c', 'џ': 'dz',
                     'đ': 'dj', 'Ђ': 'Dj', 'Ј': 'j', 'Љ': 'Lj', 'Њ': 'Nj', 'Ћ': 'C',
                     'Џ': 'Dz', 'Đ': 'Dj'
                 };
-                var AZERBAIJANI_MAP = {
+                const AZERBAIJANI_MAP = {
                     'ç': 'c', 'ə': 'e', 'ğ': 'g', 'ı': 'i', 'ö': 'o', 'ş': 's', 'ü': 'u',
                     'Ç': 'C', 'Ə': 'E', 'Ğ': 'G', 'İ': 'I', 'Ö': 'O', 'Ş': 'S', 'Ü': 'U'
                 };
-                var GEORGIAN_MAP = {
+                const GEORGIAN_MAP = {
                     'ა': 'a', 'ბ': 'b', 'გ': 'g', 'დ': 'd', 'ე': 'e', 'ვ': 'v', 'ზ': 'z',
                     'თ': 't', 'ი': 'i', 'კ': 'k', 'ლ': 'l', 'მ': 'm', 'ნ': 'n', 'ო': 'o',
                     'პ': 'p', 'ჟ': 'j', 'რ': 'r', 'ს': 's', 'ტ': 't', 'უ': 'u', 'ფ': 'f',
                     'წ': 'w', 'ჭ': 'ch', 'ხ': 'x', 'ჯ': 'j', 'ჰ': 'h'
                 };
-                var ALL_DOWNCODE_MAPS = [
+                const ALL_DOWNCODE_MAPS = [
                     LATIN_MAP,
                     LATIN_SYMBOLS_MAP,
                     GREEK_MAP,
                     GEORGIAN_MAP
                 ];
-                var Downcoder = {
+                const Downcoder = {
                     'Initialize': function() {
-                        if (Downcoder.map) {  // already made
+                        if (Downcoder.map) { // already made
                             return;
                         }
                         Downcoder.map = {};
-                        Downcoder.chars = [];
+                        for (const lookup of ALL_DOWNCODE_MAPS) {
-                        for (var i = 0; i < ALL_DOWNCODE_MAPS.length; i++) {
+                            Object.assign(Downcoder.map, lookup);
-                            var lookup = ALL_DOWNCODE_MAPS[i];
-                            for (var c in lookup) {
-                                if (lookup.hasOwnProperty(c)) {
-                                    Downcoder.map[c] = lookup[c];
-                        for (var k in Downcoder.map) {
-                            if (Downcoder.map.hasOwnProperty(k)) {
-                                Downcoder.chars.push(k);
                         }
-                        Downcoder.regex = new RegExp(Downcoder.chars.join('|'), 'g');
+                        Downcoder.regex = new RegExp(Object.keys(Downcoder.map).join('|'), 'g');
                     }
                 };
                 function URLify(s, num_chars, allowUnicode) {
                     // changes, e.g., "Petty theft" to "petty-theft"
-                    // remove all these words from the string before urlifying
                     if (!allowUnicode) {
                         s = downcode(s);
                     }
-                    var hasUnicodeChars = /[^\u0000-\u007f]/.test(s);
+                    s = s.toLowerCase(); // convert to lowercase
-                    // Remove English words only if the string contains ASCII (English)
-                    // characters.
-                    if (!hasUnicodeChars) {
-                        var removeList = [
-                            "a", "an", "as", "at", "before", "but", "by", "for", "from",
-                            "is", "in", "into", "like", "of", "off", "on", "onto", "per",
-                            "since", "than", "the", "this", "that", "to", "up", "via",
-                            "with"
-                        ];
-                        var r = new RegExp('\\b(' + removeList.join('|') + ')\\b', 'gi');
-                        s = s.replace(r, '');
                     // if downcode doesn't hit, the char will be stripped here
                     if (allowUnicode) {
                         // Keep Unicode letters including both lowercase and uppercase
                         // characters, whitespace, and dash; remove other characters.
                         s = XRegExp.replace(s, XRegExp('[^-_\\p{L}\\p{N}\\s]', 'g'), '');
                     } else {
-                        s = s.replace(/[^-\w\s]/g, '');  // remove unneeded chars
+                        s = s.replace(/[^-\w\s]/g, ''); // remove unneeded chars
                     }
-                    s = s.replace(/^\s+|\s+$/g, '');   // trim leading/trailing spaces
+                    s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
-                    s = s.replace(/[-\s]+/g, '-');     // convert spaces to hyphens
+                    s = s.replace(/[-\s]+/g, '-'); // convert spaces to hyphens
-                    s = s.substring(0, num_chars);     // trim to first num_chars chars
+                    s = s.substring(0, num_chars); // trim to first num_chars chars
-                    s = s.replace(/-+$/g, '');         // trim any trailing hyphens
+                    s = s.replace(/-+$/g, ''); // trim any trailing hyphens
-                    return s.toLowerCase();            // convert to lowercase
+                    return s;
                 }
                 window.URLify = URLify;
-            })();

static/admin/js/vendor/jquery/LICENSE.txt +1 -7

@@ -1,10 +1,4
1	Copyright ~~jQuery~~ Foundation and other contributors, https://~~jquery~~.org/	1	Copyright OpenJS Foundation and other contributors, https://openjsf.org/
2
3	This software consists of voluntary contributions made by many
4	individuals. For exact contribution history, see the revision history
5	available at https://github.com/jquery/jquery
6
7	====
8		2
9	Permission is hereby granted, free of charge, to any person obtaining	3	Permission is hereby granted, free of charge, to any person obtaining
10	a copy of this software and associated documentation files (the	4	a copy of this software and associated documentation files (the

static/admin/js/vendor/jquery/jquery.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/jquery/jquery.min.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/LICENSE.md 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/ar.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/az.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/bg.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/ca.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/cs.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/da.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/de.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/el.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/en.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/es.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/et.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/eu.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/fa.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/fi.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/fr.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/gl.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/he.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/hi.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/hr.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/hu.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/id.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/is.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/it.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/ja.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/km.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/ko.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/lt.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/lv.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/mk.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/ms.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/nb.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/nl.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/pl.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/pt-BR.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/pt.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/ro.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/ru.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/sk.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/sr-Cyrl.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/sr.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/sv.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/th.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/tr.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/uk.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/vi.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/zh-CN.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/i18n/zh-TW.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/select2.full.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/select2/select2.full.min.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/xregexp/LICENSE.txt 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/xregexp/xregexp.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

static/admin/js/vendor/xregexp/xregexp.min.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

whole.json removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages