init crazy experiment

.env.example

@@ -0,0 +1,6 @@
+DEBUG=FALSE
+HOST_NAME=uat1.2020.fet.at
+SECRET_KEY=235t3groing43qo4ntgigon43qgi3q4gong
+MYSQL_USER=user
+MYSQL_PASSWORD=hgu
+MYSQL_PORT=3306

.gitignore

@@ -1,22 +1,14 @@
-.env/*
+.env/*
-*.pyc
+*.pyc
-*_design1
+*_design1
-fet2020/.env/*
+fet2020/files/*
-*.sqlite3
+fet2020/.env/*
-.theia/*
+*.sqlite3
-.flake8
+.theia/*
-migrate
+.flake8
-run
+migrate
-*.pid
+run
-*~
+*.pid
-APIKEY.txt
+*~
-tmp
+APIKEY.txt
-.ruff_cache
+tmp
-.venv
-etherpad
-files
-flowbite
-gallery/*
-tailwind
-whoosh_index
-databases/django

.theia-workspace

@@ -0,0 +1,17 @@
+{
+   "folders": [
+
+      {
+         "path": "fet2020"
+      }
+   ],
+"settings": {
+    "launch": {},
+    "python.linting.flake8Enabled": true,
+    "python.linting.banditEnabled": true,
+    "python.testing.pytestEnabled": true,
+    "python.linting.flake8Args": [
+        "--max-line-length=100"
+    ]
+}
+}

Dockerfile

@@ -5,43 +5,13 @@ RUN python -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 
 RUN apk add --no-cache --virtual .build-deps ca-certificates gcc linux-headers \
-        musl-dev \
+    	    musl-dev jpeg-dev zlib-dev libffi-dev mysql mariadb-dev freetype-dev\ 
-        jpeg-dev \
+	    && pip install --upgrade pip 
-        zlib-dev \
-        libffi-dev \
-        mysql \
-        mariadb-dev \
-        freetype-dev \
-# install for pymupdf
-#    && apk add --no-cache \
-#        libffi-dev \
-#        zlib-dev \
-#        freetype-dev \
-#        make \
-#        build-base \
-#        gcc \
-#        jbig2dec \
-#        jpeg-dev \
-#        harfbuzz-dev \
-#        libc-dev \
-#        mupdf-dev \
-#        musl-dev \
-#        openjpeg-dev \
-#        swig \
-#    && ln -s /usr/lib/libjbig2dec.so.0 /usr/lib/libjbig2dec.so \
-#    && pip install pymupdf==1.23.18 \
-# upgrade pip
-    && pip install --upgrade pip
-
-# setting for pymupdf
-# ENV PYMUPDF_SETUP_MUPDF_TESSERACT="0"
 
 COPY ./fet2020/requirements.txt /app/requirements.txt
 
 RUN pip install -r requirements.txt
 
-# Remove virtual environment dependencies
-# RUN apk del .builddeps
 
 FROM tiangolo/uwsgi-nginx:python3.8-alpine
 

Readme.md

@@ -1,158 +1,61 @@
-# Fet 2020 Django Project
+##Fet 2020 Django Project
-
+
-Diese Webseite ist im Jahr 2020 entwickelt worden. Wir haben dazu einige Designentscheidungen getroffen:
+Diese Webseite ist im Jahr 2020 entwickelt worden. Wir haben dazu einige Designentscheidungen getroffen:
-
+1. Zunächst auf die externen Kernfunktionen fokusieren
-1. Zunächst auf die externen Kernfunktionen fokussieren
+2. Python+Django nutzen weil:
-2. Python + Django nutzen weil:
+    * Wir Python mögen
-    * wir Python mögen
+    * Das Framework uns freiheit gibt zB die Mitglieder Daten entsprechend abzubilden
-    * das Framework uns die Freiheit gibt, zB die Mitglieder Daten entsprechend abzubilden
+    * Das Design unabhängig von der Funktion bleibt
-    * das Design unabhängig von der Funktion bleibt
+    * und einiges mehr
-    * und einiges mehr
+3. Als Kernfunktionen festgelegt wurden anfangs:
-3. Als Kernfunktionen festgelegt wurden anfangs:
+    * Neuigkeiten posten
-    * Neuigkeiten posten
+    * FET Sitzungen ankündigen 
-    * FET Sitzungen ankündigen
+    * Etherpad für Agenda und Protokoll
-    * Etherpad für Agenda und Protokoll
+    * Informationen zu Mitgliedern anzeigen
-    * Informationen zu Mitgliedern anzeigen
+4. Unter dem Eindruck eines Jahres des Lockdown wurde zusätzlich hinzugefügt
-4. Unter dem Eindruck eines Jahres des Lockdown wurde zusätzlich hinzugefügt
+    * Ein virtuelles Schwarzesbrett
-    * Ein virtuelles Schwarzesbrett
+    * Eine virtuelle Aufgabenliste
-
+
-## Development
+### Ablage und Entwicklung
-
+Der Master liegt auf dem virtuellen git Server und kann wie folgt geholt werden:
-The main branch is hosted on the FET git server. Clone the repository using the following command:
+```bash
-
+git clone https://git.fet.at/bofh/fet2020
-```bash
+```
-git clone https://git.fet.at/bofh/fet2020
+### Deployment
-```
+
-
+{{docker-compose.yml}}
-## Debug
+<code>
-
+docker-compose up
-If you are developing on Windows, install Visual Studio Code and Docker Desktop.
+</code>
-
+
-Add a local user/member for login because the project is not connected to FET LDAP in dev mode:
+### Command Befehle
-
+
-```bash
+Erstellt die fehlenden Thumbs für die Alben in der Galerie:
-python manage.py createsuperuser
+<code>
-```
+python3 fet2020/manage.py create_thumbs
-
+</code>
-### Python version
+
-
+Erstellt alle Searchindexes neu:
-View all python versions:
+<code>
-
+python3 fet2020/manage.py rebuild_index
-```bash
+</code>
-uv python list
+
-```
+Aktualisiert alle Searchindexes:
-
+<code>
-Installing Python executables:
+python3 fet2020/manage.py update_index
-
+</code>
-```bash
+
-uv python install $(.python-version) --default
+Fügt alle Cronjobs in diesem Projekt hinzu:
-```
+<code>
-
+python3 fet2020/manage.py crontab add
-Update the following files if the python version is increased:
+</code>
-
+
-* .python-version
+Fügt alle Staticfiles in die Assets hinzu: 
-* pyproject.toml
+<code>
-* run-pre-commit.sh
+python3 fet2020/manage.py collectstatic
-
+</code>
-## Deployment
+
-
+Überprüft, ob die Software bereit für die Produktion ist.
-### Docker image for django
+<code>
-
+python3 fet2020/manage.py check --deploy
-Makemigrations:
+</code>
-
-```bash
-python fet2020/manage.py makemigrations blackboard core finance gallery members posts rental
-```
-
-```bash
-python fet2020/manage.py makemigrations intern
-```
-
-Add all static files to the assets:
-
-```bash
-python fet2020/manage.py collectstatic
-```
-
-Check if the project is for deployment:
-
-```bash
-python fet2020/manage.py check --deploy
-```
-
-Build the docker image of django project:
-
-```bash
-docker build -t django-image -f fet2020/Dockerfile ./fet2020
-```
-
-### Docker image for nginx
-
-Build the docker image of nginx:
-
-```bash
-docker build -t django-nginx-image -f nginx/Dockerfile ./nginx
-```
-
-### Start docker container
-
-Add email password for 'Verleih' account to EMAIL_HOST_PASSWORD in the docker compose file!
-
-Build the docker containers:
-
-```bash
-docker compose -f docker-compose.yml up -d
-```
-
-Remove all unused docker images older than 24 hours:
-
-```bash
-docker image prune -a --filter "until=24h"
-```
-
-## Other Useful Commands
-
-Please use the command carefully! Remove all unused docker volumes:
-
-```bash
-docker volume prune -a
-```
-
-Rebuilds all search indexes:
-
-```bash
-python3 fet2020/manage.py rebuild_index
-```
-
-Updates all search indexes:
-
-```bash
-python3 fet2020/manage.py update_index
-```
-
-## TODO
-
-ckeditor -> django-prose-editor
-
-## Version History
-
-2.2.1
-
-* Fix rental (view, pdf file, sending mail)
-
-2.2.0
-
-* Add rental
-
-2.1.0
-
-* Add finance system
-
-2.0.0
-
-* Update the homepage design
-* Add intern
-
-1.0.0
-
-* First release of the new homepage

assets/Gallery-3.3.0/css/blueimp-gallery.min.css.map

@@ -1 +1 @@
-{"version":3,"sources":["blueimp-gallery.css","blueimp-gallery-indicator.css","blueimp-gallery-video.css"],"names":[],"mappings":"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"}
+{"version":3,"sources":["blueimp-gallery.css","blueimp-gallery-indicator.css","blueimp-gallery-video.css"],"names":[],"mappings":"iBAYA,iBACA,+CACA,mDACE,SAAU,SACV,IAAK,EACL,MAAO,EACP,OAAQ,EACR,KAAM,EACN,mBAAoB,QAAQ,IAAK,OACjC,gBAAiB,QAAQ,IAAK,OAC9B,eAAgB,QAAQ,IAAK,OAC7B,cAAe,QAAQ,IAAK,OAC5B,WAAY,QAAQ,IAAK,OAEzB,oBAAqB,OACrB,yBAA0B,OAE5B,+CACA,mDACE,OAAQ,KACR,MAAO,KACP,OAAQ,KACR,UAAW,KACX,WAAY,KACZ,QAAS,EAEX,iBACE,SAAU,MACV,QAAS,OACT,SAAU,OACV,WAAY,KACZ,QAAS,EACT,QAAS,KACT,UAAW,IACX,iBAAkB,WAClB,aAAc,WAEhB,0BACE,SAAU,SACV,QAAS,KACT,OAAQ,IAAI,KAEZ,eAAgB,OAChB,WAAY,EAAE,EAAE,IAAI,eACpB,iBAAkB,MAAM,WACxB,aAAc,MAAM,WACpB,QAAS,MAEX,yBACE,QAAS,MACT,QAAS,EAEX,yBACE,SAAU,SACV,OAAQ,KACR,SAAU,OAEZ,kCACE,SAAU,SAEZ,gCACE,WAAY,OACZ,SAAU,SACV,MAAO,KACP,OAAQ,KACR,WAAY,OACZ,mCAAoC,+BACpC,gCAAiC,+BACjC,+BAAgC,+BAChC,8BAA+B,+BAC/B,2BAA4B,+BAG9B,uCACA,qCAFA,qCAGE,WAAY,QAEd,wCACE,WAAY,wBAAwB,OAAO,UAC3C,gBAAiB,KAAK,KAExB,6CACE,iBAAkB,wBAEpB,uDACE,QAAS,EAEX,sCACE,WAAY,sBAAsB,OAAO,UAE3C,+CACE,iBAAkB,sBAEpB,qDACE,QAAS,KAGX,+BADA,+BAEE,SAAU,SACV,IAAK,IACL,KAAM,KACN,MAAO,IACP,OAAQ,KACR,QAAS,KAAK,KAAK,KAAK,KACxB,WAAY,MACZ,mBAAoB,YACpB,gBAAiB,YACjB,WAAY,YACZ,WAAY,KAAK,qBAAqB,OAAO,UAC7C,iBAAkB,eAClB,OAAQ,IAAI,MAAM,KAClB,sBAAuB,KACvB,mBAAoB,KACpB,cAAe,KACf,QAAS,GACT,OAAQ,QACR,QAAS,KAEX,+BACE,MAAO,KACP,KAAM,KACN,iBAAkB,qBAEpB,gCACE,iBAAkB,qBAEpB,gCACE,iBAAkB,qBAEpB,gCACE,SAAU,SACV,IAAK,KACL,MAAO,KACP,MAAO,KACP,OAAQ,KACR,WAAY,sBAAsB,OAAO,UACzC,QAAS,GACT,OAAQ,QACR,QAAS,KAEX,iCACE,iBAAkB,sBAEpB,wBACE,SAAU,SACV,IAAK,KACL,KAAM,KACN,OAAQ,EAAE,KAAK,EAAE,EACjB,UAAW,KACX,YAAa,KACb,MAAO,KACP,YAAa,EAAE,EAAE,IAAI,KACrB,QAAS,GACT,QAAS,KAEX,qCACE,SAAU,SACV,MAAO,KACP,OAAQ,KACR,MAAO,KACP,OAAQ,KACR,WAAY,2BAA2B,EAAE,EAAE,UAC3C,OAAQ,QACR,QAAS,GACT,QAAS,KAEX,sCACE,iBAAkB,2BAEpB,qCACE,oBAAqB,MAAM,EAI7B,iCADA,gCAGA,sCAJA,gCAGA,iCAEE,QAAS,MAET,kBAAmB,cACnB,eAAgB,cAChB,cAAe,cACf,aAAc,cACd,UAAW,cAGb,4BAEA,6BADA,8BAEA,oCAJA,8BAKE,QAAS,KAKX,wBADA,uBAEA,6BAHA,uBADA,+CAKE,oBAAqB,KACrB,mBAAoB,KACpB,iBAAkB,KAClB,gBAAiB,KACjB,YAAa,KAIf,8BADA,6BAGA,mCAJA,6BAGA,8BAEE,MAAO,KACP,QAAS,EAIX,uCACE,WAAY,MAEd,sDACE,SAAU,SAEZ,0DACE,SAAU,SAGZ,+BACE,uDACA,2DACE,MAAO,KACP,OAAQ,KACR,WAAY,SAIhB,oCACE,0BACE,WAAY,MC1OhB,4BACE,SAAU,SACV,IAAK,KACL,MAAO,KACP,OAAQ,KACR,KAAM,KACN,OAAQ,EAAE,KACV,QAAS,EACT,WAAY,KACZ,WAAY,OACZ,YAAa,KACb,QAAS,KACT,oBAAqB,KACrB,mBAAoB,KACpB,iBAAkB,KAClB,gBAAiB,KACjB,YAAa,KAEf,+BACE,QAAS,aACT,SAAU,SACV,MAAO,IACP,OAAQ,IACR,OAAQ,IAAI,IAAI,EAAE,IAClB,mBAAoB,YACpB,gBAAiB,YACjB,WAAY,YACZ,OAAQ,IAAI,MAAM,YAClB,WAAY,KACZ,WAAY,sBAA0B,OAAO,UAC7C,cAAe,IACf,WAAY,EAAE,EAAE,IAAI,KACpB,QAAS,GACT,OAAQ,QAIV,sCACE,QAAS,OAIX,oCADA,qCAEE,iBAAkB,KAClB,aAAc,KACd,QAAS,EAGX,qCACE,QAAS,EACT,QAAS,MACT,SAAU,SACV,QAAS,GACT,IAAK,KACL,KAAM,IACN,MAAO,KACP,OAAQ,KACR,WAAY,UAAU,IAAM,QAAQ,CAAE,QAAQ,IAAM,SACpD,UAAW,iBAAiB,cAAc,cAC1C,eAAgB,KAGlB,2CACE,QAAS,EACT,cAAe,IACf,WAAY,QACZ,UAAW,iBAAiB,iBAAiB,cAG/C,0CACE,QAAS,KAGX,qCACE,QAAS,MAET,kBAAmB,cACnB,eAAgB,cAChB,cAAe,cACf,aAAc,cACd,UAAW,cAEb,mCACE,QAAS,KCjFX,4DADA,sDADA,qDAGE,SAAU,SACV,IAAK,EACL,KAAM,EACN,MAAO,KACP,OAAQ,KACR,OAAQ,KAEV,4DACE,WAAY,OAAO,UACnB,gBAAiB,QAEnB,2DACE,iBAAkB,KAClB,iBAAkB,eAEpB,2DACE,SAAU,SACV,IAAK,IACL,MAAO,EACP,KAAM,EACN,OAAQ,MAAM,KAAK,EACnB,MAAO,MACP,OAAQ,MACR,WAAY,2BAA2B,OAAO,UAC9C,QAAS,GACT,OAAQ,QAEV,oEACE,iBAAkB,2BAGpB,4DADA,2DAEE,QAAS,KAEX,2DACE,WAAY,wBAAwB,OAAO,UAC3C,gBAAiB,KAAK,KAExB,gEACE,iBAAkB,wBAIpB,sDACE,OAAQ,KAEV,kEACE,KAAM,IACN,YAAa,MAGf,iEACE,QAAS"}

assets/Gallery-3.3.0/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blueimp-gallery",
-  "version": "3.4.0",
+  "version": "3.3.0",
   "title": "blueimp Gallery",
   "description": "blueimp Gallery is a touch-enabled, responsive and customizable image and video gallery, carousel and lightbox, optimized for both mobile and desktop web browsers. It features swipe, mouse and keyboard navigation, transition effects, slideshow functionality, fullscreen support and on-demand content loading and can be extended to display additional content types.",
   "keywords": [
@@ -33,17 +33,16 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "clean-css-cli": "5",
+    "clean-css-cli": "4",
     "eslint": "7",
     "eslint-config-blueimp": "2",
-    "eslint-config-prettier": "8",
+    "eslint-config-prettier": "6",
-    "eslint-plugin-jsdoc": "36",
+    "eslint-plugin-jsdoc": "30",
-    "eslint-plugin-prettier": "4",
+    "eslint-plugin-prettier": "3",
-    "jquery": "1",
     "prettier": "2",
     "stylelint": "13",
     "stylelint-config-prettier": "8",
-    "stylelint-config-recommended": "5",
+    "stylelint-config-recommended": "3",
     "uglify-js": "3"
   },
   "stylelint": {
@@ -78,7 +77,6 @@
   },
   "scripts": {
     "test": "stylelint '**/*.css' && eslint .",
-    "prebuild": "bin/sync-vendor-libs.sh",
     "build:js": "cd js && uglifyjs blueimp-helper.js blueimp-gallery.js blueimp-gallery-fullscreen.js blueimp-gallery-indicator.js blueimp-gallery-video.js blueimp-gallery-vimeo.js blueimp-gallery-youtube.js --ie8 -c -m -o blueimp-gallery.min.js --source-map url=blueimp-gallery.min.js.map",
     "build:jquery": "cd js && uglifyjs blueimp-gallery.js blueimp-gallery-fullscreen.js blueimp-gallery-indicator.js blueimp-gallery-video.js blueimp-gallery-vimeo.js blueimp-gallery-youtube.js jquery.blueimp-gallery.js --ie8 -c -m -o jquery.blueimp-gallery.min.js --source-map url=jquery.blueimp-gallery.min.js.map",
     "build:css": "cd css && cleancss -c ie7 --source-map -o blueimp-gallery.min.css blueimp-gallery.css blueimp-gallery-indicator.css blueimp-gallery-video.css",

assets/Gallery-3.4.0/bin/sync-vendor-libs.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-cd "$(dirname "$0")/.."
-cp node_modules/jquery/dist/jquery.js js/vendor/

assets/admin/css/autocomplete.css

@@ -273,7 +273,3 @@ select.admin-autocomplete {
     display: block;
     padding: 6px;
 }
-
-.errors .select2-selection {
-    border: 1px solid var(--error-fg);
-}

assets/admin/css/base.css

@@ -2,91 +2,93 @@
     DJANGO Admin styles
 */
 
+@import url(fonts.css);
+
 /* VARIABLE DEFINITIONS */
-html[data-theme="light"],
 :root {
-    --primary: #79aec8;
+  --primary: #79aec8;
-    --secondary: #417690;
+  --secondary: #417690;
-    --accent: #f5dd5d;
+  --accent: #f5dd5d;
-    --primary-fg: #fff;
+  --primary-fg: #fff;
 
-    --body-fg: #333;
+  --body-fg: #333;
-    --body-bg: #fff;
+  --body-bg: #fff;
-    --body-quiet-color: #666;
+  --body-quiet-color: #666;
-    --body-medium-color: #444;
+  --body-loud-color: #000;
-    --body-loud-color: #000;
 
-    --header-color: #ffc;
+  --header-color: #ffc;
-    --header-branding-color: var(--accent);
+  --header-branding-color: var(--accent);
-    --header-bg: var(--secondary);
+  --header-bg: var(--secondary);
-    --header-link-color: var(--primary-fg);
+  --header-link-color: var(--primary-fg);
 
-    --breadcrumbs-fg: #c4dce8;
+  --breadcrumbs-fg: #c4dce8;
-    --breadcrumbs-link-fg: var(--body-bg);
+  --breadcrumbs-link-fg: var(--body-bg);
-    --breadcrumbs-bg: #264b5d;
+  --breadcrumbs-bg: var(--primary);
 
-    --link-fg: #417893;
+  --link-fg: #447e9b;
-    --link-hover-color: #036;
+  --link-hover-color: #036;
-    --link-selected-fg: var(--secondary);
+  --link-selected-fg: #5b80b2;
 
-    --hairline-color: #e8e8e8;
+  --hairline-color: #e8e8e8;
-    --border-color: #ccc;
+  --border-color: #ccc;
 
-    --error-fg: #ba2121;
+  --error-fg: #ba2121;
 
-    --message-success-bg: #dfd;
+  --message-success-bg: #dfd;
-    --message-warning-bg: #ffc;
+  --message-warning-bg: #ffc;
-    --message-error-bg: #ffefef;
+  --message-error-bg: #ffefef;
 
-    --darkened-bg: #f8f8f8; /* A bit darker than --body-bg */
+  --darkened-bg: #f8f8f8; /* A bit darker than --body-bg */
-    --selected-bg: #e4e4e4; /* E.g. selected table cells */
+  --selected-bg: #e4e4e4; /* E.g. selected table cells */
-    --selected-row: #ffc;
+  --selected-row: #ffc;
 
-    --button-fg: #fff;
+  --button-fg: #fff;
-    --button-bg: var(--secondary);
+  --button-bg: var(--primary);
-    --button-hover-bg: #205067;
+  --button-hover-bg: #609ab6;
-    --default-button-bg: #205067;
+  --default-button-bg: var(--secondary);
-    --default-button-hover-bg: var(--secondary);
+  --default-button-hover-bg: #205067;
-    --close-button-bg: #747474;
+  --close-button-bg: #888; /* Previously #bbb, contrast 1.92 */
-    --close-button-hover-bg: #333;
+  --close-button-hover-bg: #747474;
-    --delete-button-bg: #ba2121;
+  --delete-button-bg: #ba2121;
-    --delete-button-hover-bg: #a41515;
+  --delete-button-hover-bg: #a41515;
 
-    --object-tools-fg: var(--button-fg);
+  --object-tools-fg: var(--button-fg);
-    --object-tools-bg: var(--close-button-bg);
+  --object-tools-bg: var(--close-button-bg);
-    --object-tools-hover-bg: var(--close-button-hover-bg);
+  --object-tools-hover-bg: var(--close-button-hover-bg);
+}
 
-    --font-family-primary:
+@media (prefers-color-scheme: dark) {
-        "Segoe UI",
+  :root {
-        system-ui,
+    --primary: #264b5d;
-        Roboto,
+    --primary-fg: #eee;
-        "Helvetica Neue",
-        Arial,
-        sans-serif,
-        "Apple Color Emoji",
-        "Segoe UI Emoji",
-        "Segoe UI Symbol",
-        "Noto Color Emoji";
-    --font-family-monospace:
-        ui-monospace,
-        Menlo,
-        Monaco,
-        "Cascadia Mono",
-        "Segoe UI Mono",
-        "Roboto Mono",
-        "Oxygen Mono",
-        "Ubuntu Monospace",
-        "Source Code Pro",
-        "Fira Mono",
-        "Droid Sans Mono",
-        "Courier New",
-        monospace,
-        "Apple Color Emoji",
-        "Segoe UI Emoji",
-        "Segoe UI Symbol",
-        "Noto Color Emoji";
 
-    color-scheme: light;
+    --body-fg: #eeeeee;
+    --body-bg: #121212;
+    --body-quiet-color: #e0e0e0;
+    --body-loud-color: #ffffff;
+
+    --breadcrumbs-link-fg: #e0e0e0;
+    --breadcrumbs-bg: var(--primary);
+
+    --link-fg: #81d4fa;
+    --link-hover-color: #4ac1f7;
+    --link-selected-fg: #6f94c6;
+
+    --hairline-color: #272727;
+    --border-color: #353535;
+
+    --error-fg: #e35f5f;
+    --message-success-bg: #006b1b;
+    --message-warning-bg: #583305;
+    --message-error-bg: #570808;
+
+    --darkened-bg: #212121;
+    --selected-bg: #1b1b1b;
+    --selected-row: #00363a;
+
+    --close-button-bg: #333333;
+    --close-button-hover-bg: #666666;
+  }
 }
 
 html, body {
@@ -96,8 +98,8 @@ html, body {
 body {
     margin: 0;
     padding: 0;
-    font-size: 0.875rem;
+    font-size: 14px;
-    font-family: var(--font-family-primary);
+    font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
     color: var(--body-fg);
     background: var(--body-bg);
 }
@@ -149,11 +151,12 @@ h1,h2,h3,h4,h5 {
 h1 {
     margin: 0 0 20px;
     font-weight: 300;
-    font-size: 1.25rem;
+    font-size: 20px;
+    color: var(--body-quiet-color);
 }
 
 h2 {
-    font-size: 1rem;
+    font-size: 16px;
     margin: 1em 0 .5em 0;
 }
 
@@ -163,21 +166,20 @@ h2.subhead {
 }
 
 h3 {
-    font-size: 0.875rem;
+    font-size: 14px;
     margin: .8em 0 .3em 0;
-    color: var(--body-medium-color);
+    color: var(--body-quiet-color);
     font-weight: bold;
 }
 
 h4 {
-    font-size: 0.75rem;
+    font-size: 12px;
     margin: 1em 0 .8em 0;
     padding-bottom: 3px;
-    color: var(--body-medium-color);
 }
 
 h5 {
-    font-size: 0.625rem;
+    font-size: 10px;
     margin: 1.5em 0 .5em 0;
     color: var(--body-quiet-color);
     text-transform: uppercase;
@@ -194,8 +196,8 @@ li ul {
 }
 
 li, dt, dd {
-    font-size: 0.8125rem;
+    font-size: 13px;
-    line-height: 1.25rem;
+    line-height: 20px;
 }
 
 dt {
@@ -220,12 +222,8 @@ fieldset {
     border-top: 1px solid var(--hairline-color);
 }
 
-details summary {
-    cursor: pointer;
-}
-
 blockquote {
-    font-size: 0.6875rem;
+    font-size: 11px;
     color: #777;
     margin-left: 2px;
     padding-left: 10px;
@@ -233,9 +231,9 @@ blockquote {
 }
 
 code, pre {
-    font-family: var(--font-family-monospace);
+    font-family: "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace;
     color: var(--body-quiet-color);
-    font-size: 0.75rem;
+    font-size: 12px;
     overflow-x: auto;
 }
 
@@ -257,21 +255,22 @@ hr {
     border: none;
     margin: 0;
     padding: 0;
+    font-size: 1px;
     line-height: 1px;
 }
 
 /* TEXT STYLES & MODIFIERS */
 
 .small {
-    font-size: 0.6875rem;
+    font-size: 11px;
 }
 
 .mini {
-    font-size: 0.625rem;
+    font-size: 10px;
 }
 
 .help, p.help, form p.help, div.help, form div.help, div.help li {
-    font-size: 0.6875rem;
+    font-size: 11px;
     color: var(--body-quiet-color);
 }
 
@@ -301,7 +300,7 @@ p img, h1 img, h2 img, h3 img, h4 img, td img {
 }
 
 .hidden {
-    display: none !important;
+    display: none;
 }
 
 /* TABLES */
@@ -312,15 +311,15 @@ table {
 }
 
 td, th {
-    font-size: 0.8125rem;
+    font-size: 13px;
-    line-height: 1rem;
+    line-height: 16px;
     border-bottom: 1px solid var(--hairline-color);
     vertical-align: top;
     padding: 8px;
 }
 
 th {
-    font-weight: 500;
+    font-weight: 600;
     text-align: left;
 }
 
@@ -328,7 +327,7 @@ thead th,
 tfoot td {
     color: var(--body-quiet-color);
     padding: 5px 10px;
-    font-size: 0.6875rem;
+    font-size: 11px;
     background: var(--body-bg);
     border: none;
     border-top: 1px solid var(--hairline-color);
@@ -341,7 +340,7 @@ tfoot td {
 }
 
 thead th.required {
-    font-weight: bold;
+    color: var(--body-loud-color);
 }
 
 tr.alt {
@@ -438,7 +437,7 @@ table thead th.sorted .sortoptions a.sortremove:after {
     top: -6px;
     left: 3px;
     font-weight: 200;
-    font-size: 1.125rem;
+    font-size: 18px;
     color: var(--body-quiet-color);
 }
 
@@ -477,9 +476,9 @@ input, textarea, select, .form-row p, form .button {
     margin: 2px 0;
     padding: 2px 3px;
     vertical-align: middle;
-    font-family: var(--font-family-primary);
+    font-family: "Roboto", "Lucida Grande", Verdana, Arial, sans-serif;
     font-weight: normal;
-    font-size: 0.8125rem;
+    font-size: 13px;
 }
 .form-row div.help {
     padding: 2px 3px;
@@ -489,13 +488,8 @@ textarea {
     vertical-align: top;
 }
 
-/*
+input[type=text], input[type=password], input[type=email], input[type=url],
-Minifiers remove the default (text) "type" attribute from "input" HTML tags.
+input[type=number], input[type=tel], textarea, select, .vTextField {
-Add input:not([type]) to make the CSS stylesheet work the same.
-*/
-input:not([type]), input[type=text], input[type=password], input[type=email],
-input[type=url], input[type=number], input[type=tel], textarea, select,
-.vTextField {
     border: 1px solid var(--border-color);
     border-radius: 4px;
     padding: 5px 6px;
@@ -504,18 +498,14 @@ input[type=url], input[type=number], input[type=tel], textarea, select,
     background-color: var(--body-bg);
 }
 
-/*
+input[type=text]:focus, input[type=password]:focus, input[type=email]:focus,
-Minifiers remove the default (text) "type" attribute from "input" HTML tags.
+input[type=url]:focus, input[type=number]:focus, input[type=tel]:focus,
-Add input:not([type]) to make the CSS stylesheet work the same.
+textarea:focus, select:focus, .vTextField:focus {
-*/
-input:not([type]):focus, 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: var(--body-quiet-color);
 }
 
 select {
-    height: 1.875rem;
+    height: 30px;
 }
 
 select[multiple] {
@@ -551,6 +541,7 @@ a.button {
 }
 
 .button.default, input[type=submit].default, .submit-row input.default {
+    float: right;
     border: none;
     font-weight: 400;
     background: var(--default-button-bg);
@@ -598,15 +589,15 @@ input[type=button][disabled].default {
     margin: 0;
     padding: 8px;
     font-weight: 400;
-    font-size: 0.8125rem;
+    font-size: 13px;
     text-align: left;
-    background: var(--header-bg);
+    background: var(--primary);
     color: var(--header-link-color);
 }
 
 .module caption,
 .inline-group h2 {
-    font-size: 0.75rem;
+    font-size: 12px;
     letter-spacing: 0.5px;
     text-transform: uppercase;
 }
@@ -625,13 +616,12 @@ ul.messagelist {
 ul.messagelist li {
     display: block;
     font-weight: 400;
-    font-size: 0.8125rem;
+    font-size: 13px;
     padding: 10px 10px 10px 65px;
     margin: 0 0 10px 0;
     background: var(--message-success-bg) url(../img/icon-yes.svg) 40px 12px no-repeat;
     background-size: 16px auto;
     color: var(--body-fg);
-    word-break: break-word;
 }
 
 ul.messagelist li.warning {
@@ -645,7 +635,7 @@ ul.messagelist li.error {
 }
 
 .errornote {
-    font-size: 0.875rem;
+    font-size: 14px;
     font-weight: 700;
     display: block;
     padding: 10px 12px;
@@ -666,7 +656,7 @@ ul.errorlist {
 }
 
 ul.errorlist li {
-    font-size: 0.8125rem;
+    font-size: 13px;
     display: block;
     margin-bottom: 4px;
     overflow-wrap: break-word;
@@ -707,7 +697,7 @@ td ul.errorlist + input, td ul.errorlist + select, td ul.errorlist + textarea {
 }
 
 .description {
-    font-size: 0.75rem;
+    font-size: 12px;
     padding: 5px 0 0 12px;
 }
 
@@ -736,11 +726,6 @@ div.breadcrumbs a:focus, div.breadcrumbs a:hover {
     background: url(../img/icon-viewlink.svg) 0 1px no-repeat;
 }
 
-.hidelink {
-    padding-left: 16px;
-    background: url(../img/icon-hidelink.svg) 0 1px no-repeat;
-}
-
 .addlink {
     padding-left: 16px;
     background: url(../img/icon-addlink.svg) 0 1px no-repeat;
@@ -768,7 +753,7 @@ a.deletelink:focus, a.deletelink:hover {
 /* OBJECT TOOLS */
 
 .object-tools {
-    font-size: 0.625rem;
+    font-size: 10px;
     font-weight: bold;
     padding-left: 0;
     float: right;
@@ -780,7 +765,7 @@ a.deletelink:focus, a.deletelink:hover {
     display: block;
     float: left;
     margin-left: 5px;
-    height: 1rem;
+    height: 16px;
 }
 
 .object-tools a {
@@ -794,7 +779,7 @@ a.deletelink:focus, a.deletelink:hover {
     background: var(--object-tools-bg);
     color: var(--object-tools-fg);
     font-weight: 400;
-    font-size: 0.6875rem;
+    font-size: 11px;
     text-transform: uppercase;
     letter-spacing: 0.5px;
 }
@@ -823,21 +808,14 @@ a.deletelink:focus, a.deletelink:hover {
 
 /* OBJECT HISTORY */
 
-#change-history table {
+table#change-history {
     width: 100%;
 }
 
-#change-history table tbody th {
+table#change-history 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 {
@@ -850,6 +828,10 @@ a.deletelink:focus, a.deletelink:hover {
     height: 100%;
 }
 
+#container > div {
+    flex-shrink: 0;
+}
+
 #container > .main {
     display: flex;
     flex: 1 0 auto;
@@ -860,20 +842,6 @@ a.deletelink:focus, a.deletelink:hover {
     max-width: 100%;
 }
 
-.skip-to-content-link {
-    position: absolute;
-    top: -999px;
-    margin: 5px;
-    padding: 5px;
-    background: var(--body-bg);
-    z-index: 1;
-}
-
-.skip-to-content-link:focus {
-    left: 0px;
-    top: 0px;
-}
-
 #content {
     padding: 20px 40px;
 }
@@ -894,10 +862,9 @@ a.deletelink:focus, a.deletelink:hover {
     margin-right: -300px;
 }
 
-@media (forced-colors: active) {
+#footer {
-  #content-related {
+    clear: both;
-      border: 1px solid;
+    padding: 10px;
-  }
 }
 
 /* COLUMN TYPES */
@@ -935,9 +902,10 @@ a.deletelink:focus, a.deletelink:hover {
     padding: 10px 40px;
     background: var(--header-bg);
     color: var(--header-color);
+    overflow: hidden;
 }
 
-#header a:link, #header a:visited, #logout-form button {
+#header a:link, #header a:visited {
     color: var(--header-link-color);
 }
 
@@ -945,32 +913,25 @@ a.deletelink:focus, a.deletelink:hover {
     text-decoration: underline;
 }
 
-@media (forced-colors: active) {
-  #header {
-      border-bottom: 1px solid;
-  }
-}
-
 #branding {
-    display: flex;
+    float: left;
 }
 
-#site-name {
+#branding h1 {
     padding: 0;
-    margin: 0;
+    margin: 0 20px 0 0;
-    margin-inline-end: 20px;
     font-weight: 300;
-    font-size: 1.5rem;
+    font-size: 24px;
-    color: var(--header-branding-color);
+    color: var(--accent);
 }
 
-#site-name a:link, #site-name a:visited {
+#branding h1, #branding h1 a:link, #branding h1 a:visited {
     color: var(--accent);
 }
 
 #branding h2 {
     padding: 0 10px;
-    font-size: 0.875rem;
+    font-size: 14px;
     margin: -8px 0 8px 0;
     font-weight: normal;
     color: var(--header-color);
@@ -980,43 +941,25 @@ a.deletelink:focus, a.deletelink:hover {
     text-decoration: none;
 }
 
-#logout-form {
-    display: inline;
-}
-
-#logout-form button {
-    background: none;
-    border: 0;
-    cursor: pointer;
-    font-family: var(--font-family-primary);
-}
-
 #user-tools {
     float: right;
+    padding: 0;
     margin: 0 0 0 20px;
+    font-weight: 300;
+    font-size: 11px;
+    letter-spacing: 0.5px;
+    text-transform: uppercase;
     text-align: right;
 }
 
-#user-tools, #logout-form button{
+#user-tools a {
-    padding: 0;
-    font-weight: 300;
-    font-size: 0.6875rem;
-    letter-spacing: 0.5px;
-    text-transform: uppercase;
-}
-
-#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: 0;
+    border-bottom-color: var(--primary);
-}
+    color: var(--primary);
-
-#logout-form button:active, #logout-form button:hover {
-    margin-bottom: 1px;
 }
 
 /* SIDEBAR */
@@ -1036,7 +979,7 @@ a.deletelink:focus, a.deletelink:hover {
 }
 
 #content-related h4 {
-    font-size: 0.8125rem;
+    font-size: 13px;
 }
 
 #content-related p {
@@ -1060,7 +1003,7 @@ a.deletelink:focus, a.deletelink:hover {
     padding: 16px;
     margin-bottom: 16px;
     border-bottom: 1px solid var(--hairline-color);
-    font-size: 1.125rem;
+    font-size: 18px;
     color: var(--body-fg);
 }
 
@@ -1080,8 +1023,8 @@ a.deletelink:focus, a.deletelink:hover {
 .delete-confirmation form .cancel-link {
     display: inline-block;
     vertical-align: middle;
-    height: 0.9375rem;
+    height: 15px;
-    line-height: 0.9375rem;
+    line-height: 15px;
     border-radius: 4px;
     padding: 10px 15px;
     color: var(--button-fg);
@@ -1107,74 +1050,3 @@ a.deletelink:focus, a.deletelink:hover {
 .popup #header {
     padding: 10px 20px;
 }
-
-/* PAGINATOR */
-
-.paginator {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-    font-size: 0.8125rem;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    line-height: 22px;
-    margin: 0;
-    border-top: 1px solid var(--hairline-color);
-    width: 100%;
-    box-sizing: border-box;
-}
-
-.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);
-}
-
-.paginator input {
-    margin-left: auto;
-}
-
-.base-svgs {
-    display: none;
-}
-
-.visually-hidden {
-    position: absolute;
-    width: 1px;
-    height: 1px;
-    padding: 0;
-    overflow: hidden;
-    clip: rect(0,0,0,0);
-    white-space: nowrap;
-    border: 0;
-    color: var(--body-fg);
-    background-color: var(--body-bg);
-}

assets/admin/css/changelists.css

@@ -84,18 +84,18 @@
 
 #toolbar form input {
     border-radius: 4px;
-    font-size: 0.875rem;
+    font-size: 14px;
     padding: 5px;
     color: var(--body-fg);
 }
 
 #toolbar #searchbar {
-    height: 1.1875rem;
+    height: 19px;
     border: 1px solid var(--border-color);
     padding: 2px 5px;
     margin: 0;
     vertical-align: top;
-    font-size: 0.8125rem;
+    font-size: 13px;
     max-width: 100%;
 }
 
@@ -105,7 +105,7 @@
 
 #toolbar form input[type="submit"] {
     border: 1px solid var(--border-color);
-    font-size: 0.8125rem;
+    font-size: 13px;
     padding: 4px 8px;
     margin: 0;
     vertical-align: middle;
@@ -139,14 +139,8 @@
     margin: 0 0 0 30px;
 }
 
-@media (forced-colors: active) {
-  #changelist-filter {
-      border: 1px solid;
-  }
-}
-
 #changelist-filter h2 {
-    font-size: 0.875rem;
+    font-size: 14px;
     text-transform: uppercase;
     letter-spacing: 0.5px;
     padding: 5px 15px;
@@ -154,35 +148,12 @@
     border-bottom: none;
 }
 
-#changelist-filter h3,
+#changelist-filter h3 {
-#changelist-filter details summary {
     font-weight: 400;
     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;
@@ -202,7 +173,8 @@
 #changelist-filter a {
     display: block;
     color: var(--body-quiet-color);
-    word-break: break-word;
+    text-overflow: ellipsis;
+    overflow-x: hidden;
 }
 
 #changelist-filter li.selected {
@@ -221,35 +193,84 @@
     color: var(--link-hover-color);
 }
 
-#changelist-filter #changelist-filter-extra-actions {
+#changelist-filter #changelist-filter-clear a {
-    font-size: 0.8125rem;
+    font-size: 13px;
-    margin-bottom: 10px;
+    padding-bottom: 10px;
     border-bottom: 1px solid var(--hairline-color);
 }
 
 /* DATE DRILLDOWN */
 
-.change-list .toplinks {
+.change-list ul.toplinks {
-    display: flex;
+    display: block;
-    padding-bottom: 5px;
+    float: left;
-    flex-wrap: wrap;
+    padding: 0;
-    gap: 3px 17px;
+    margin: 0;
+    width: 100%;
+}
+
+.change-list ul.toplinks li {
+    padding: 3px 6px;
     font-weight: bold;
+    list-style-type: none;
+    display: inline-block;
 }
 
-.change-list .toplinks a {
+.change-list ul.toplinks .date-back a {
-    font-size: 0.8125rem;
-}
-
-.change-list .toplinks .date-back {
     color: var(--body-quiet-color);
 }
 
-.change-list .toplinks .date-back:focus,
+.change-list ul.toplinks .date-back a:focus,
-.change-list .toplinks .date-back:hover {
+.change-list ul.toplinks .date-back a:hover {
     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 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: 13px;
+    vertical-align: top;
+}
+
+.paginator a:focus, .paginator a:hover {
+    color: white;
+    background: var(--link-hover-color);
+}
+
 /* ACTIONS */
 
 .filtered .actions {
@@ -261,40 +282,31 @@
     vertical-align: baseline;
 }
 
-/* Once the :has() pseudo-class is supported by all browsers, the tr.selected
+#changelist table tbody tr.selected {
-   selector and the JS adding the class can be removed. */
-#changelist tbody tr.selected {
     background-color: var(--selected-row);
 }
 
-#changelist tbody tr:has(.action-select:checked) {
-    background-color: var(--selected-row);
-}
-
-@media (forced-colors: active) {
-    #changelist tbody tr.selected {
-        background-color: SelectedItem;
-    }
-    #changelist tbody tr:has(.action-select:checked) {
-        background-color: SelectedItem;
-    }
-}
-
 #changelist .actions {
     padding: 10px;
     background: var(--body-bg);
     border-top: none;
     border-bottom: none;
-    line-height: 1.5rem;
+    line-height: 24px;
     color: var(--body-quiet-color);
     width: 100%;
 }
 
+#changelist .actions.selected { /* XXX Probably unused? */
+    background: var(--body-bg);
+    border-top: 1px solid var(--body-bg);
+    border-bottom: 1px solid #edecd6;
+}
+
 #changelist .actions span.all,
 #changelist .actions span.action-counter,
 #changelist .actions span.clear,
 #changelist .actions span.question {
-    font-size: 0.8125rem;
+    font-size: 13px;
     margin: 0 0.5em;
 }
 
@@ -304,11 +316,11 @@
 
 #changelist .actions select {
     vertical-align: top;
-    height: 1.5rem;
+    height: 24px;
     color: var(--body-fg);
     border: 1px solid var(--border-color);
     border-radius: 4px;
-    font-size: 0.875rem;
+    font-size: 14px;
     padding: 0 0 0 4px;
     margin: 0;
     margin-left: 10px;
@@ -321,17 +333,17 @@
 #changelist .actions label {
     display: inline-block;
     vertical-align: middle;
-    font-size: 0.8125rem;
+    font-size: 13px;
 }
 
 #changelist .actions .button {
-    font-size: 0.8125rem;
+    font-size: 13px;
     border: 1px solid var(--border-color);
     border-radius: 4px;
     background: var(--body-bg);
     box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset;
     cursor: pointer;
-    height: 1.5rem;
+    height: 24px;
     line-height: 1;
     padding: 4px 8px;
     margin: 0;

assets/admin/css/dark_mode.css

@@ -1,130 +0,0 @@
-@media (prefers-color-scheme: dark) {
-    :root {
-      --primary: #264b5d;
-      --primary-fg: #f7f7f7;
-  
-      --body-fg: #eeeeee;
-      --body-bg: #121212;
-      --body-quiet-color: #d0d0d0;
-      --body-medium-color: #e0e0e0;
-      --body-loud-color: #ffffff;
-  
-      --breadcrumbs-link-fg: #e0e0e0;
-      --breadcrumbs-bg: var(--primary);
-  
-      --link-fg: #81d4fa;
-      --link-hover-color: #4ac1f7;
-      --link-selected-fg: #6f94c6;
-  
-      --hairline-color: #272727;
-      --border-color: #353535;
-  
-      --error-fg: #e35f5f;
-      --message-success-bg: #006b1b;
-      --message-warning-bg: #583305;
-      --message-error-bg: #570808;
-  
-      --darkened-bg: #212121;
-      --selected-bg: #1b1b1b;
-      --selected-row: #00363a;
-  
-      --close-button-bg: #333333;
-      --close-button-hover-bg: #666666;
-
-      color-scheme: dark;
-    }
-  }
-
-
-html[data-theme="dark"] {
-    --primary: #264b5d;
-    --primary-fg: #f7f7f7;
-
-    --body-fg: #eeeeee;
-    --body-bg: #121212;
-    --body-quiet-color: #d0d0d0;
-    --body-medium-color: #e0e0e0;
-    --body-loud-color: #ffffff;
-
-    --breadcrumbs-link-fg: #e0e0e0;
-    --breadcrumbs-bg: var(--primary);
-
-    --link-fg: #81d4fa;
-    --link-hover-color: #4ac1f7;
-    --link-selected-fg: #6f94c6;
-
-    --hairline-color: #272727;
-    --border-color: #353535;
-
-    --error-fg: #e35f5f;
-    --message-success-bg: #006b1b;
-    --message-warning-bg: #583305;
-    --message-error-bg: #570808;
-
-    --darkened-bg: #212121;
-    --selected-bg: #1b1b1b;
-    --selected-row: #00363a;
-
-    --close-button-bg: #333333;
-    --close-button-hover-bg: #666666;
-
-    color-scheme: dark;
-}
-
-/* THEME SWITCH */
-.theme-toggle {
-    cursor: pointer;
-    border: none;
-    padding: 0;
-    background: transparent;
-    vertical-align: middle;
-    margin-inline-start: 5px;
-    margin-top: -1px;
-}
-
-.theme-toggle svg {
-    vertical-align: middle;
-    height: 1.5rem;
-    width: 1.5rem;
-    display: none;
-}
-
-/*
-Fully hide screen reader text so we only show the one matching the current
-theme.
-*/
-.theme-toggle .visually-hidden {
-    display: none;
-}
-
-html[data-theme="auto"] .theme-toggle .theme-label-when-auto {
-    display: block;
-}
-
-html[data-theme="dark"] .theme-toggle .theme-label-when-dark {
-    display: block;
-}
-
-html[data-theme="light"] .theme-toggle .theme-label-when-light {
-    display: block;
-}
-
-/* ICONS */
-.theme-toggle svg.theme-icon-when-auto,
-.theme-toggle svg.theme-icon-when-dark,
-.theme-toggle svg.theme-icon-when-light {
-    fill: var(--header-link-color);
-    color: var(--header-bg);
-}
-
-html[data-theme="auto"] .theme-toggle svg.theme-icon-when-auto {
-    display: block;
-}
-
-html[data-theme="dark"] .theme-toggle svg.theme-icon-when-dark {
-    display: block;
-}
-
-html[data-theme="light"] .theme-toggle svg.theme-icon-when-light {
-    display: block;
-}

assets/admin/css/dashboard.css

@@ -1,7 +1,4 @@
 /* DASHBOARD */
-.dashboard td, .dashboard th {
-    word-break: break-word;
-}
 
 .dashboard .module table th {
     width: 100%;

assets/admin/css/fonts.css

@@ -0,0 +1,20 @@
+@font-face {
+    font-family: 'Roboto';
+    src: url('../fonts/Roboto-Bold-webfont.woff');
+    font-weight: 700;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'Roboto';
+    src: url('../fonts/Roboto-Regular-webfont.woff');
+    font-weight: 400;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'Roboto';
+    src: url('../fonts/Roboto-Light-webfont.woff');
+    font-weight: 300;
+    font-style: normal;
+}

assets/admin/css/forms.css

@@ -5,7 +5,7 @@
 .form-row {
     overflow: hidden;
     padding: 10px;
-    font-size: 0.8125rem;
+    font-size: 13px;
     border-bottom: 1px solid var(--hairline-color);
 }
 
@@ -22,28 +22,17 @@ form .form-row p {
     padding-left: 0;
 }
 
-.flex-container {
-    display: flex;
-}
-
-.form-multiline {
-    flex-wrap: wrap;
-}
-
-.form-multiline > div {
-    padding-bottom: 10px;
-}
-
 /* FORM LABELS */
 
 label {
     font-weight: normal;
     color: var(--body-quiet-color);
-    font-size: 0.8125rem;
+    font-size: 13px;
 }
 
 .required label, label.required {
     font-weight: bold;
+    color: var(--body-fg);
 }
 
 /* RADIO BUTTONS */
@@ -75,41 +64,29 @@ form ul.inline li {
     padding-right: 7px;
 }
 
-/* FIELDSETS */
-
-fieldset .fieldset-heading,
-fieldset .inline-heading,
-:not(.inline-related) .collapse summary {
-    border: 1px solid var(--header-bg);
-    margin: 0;
-    padding: 8px;
-    font-weight: 400;
-    font-size: 0.8125rem;
-    background: var(--header-bg);
-    color: var(--header-link-color);
-}
-
 /* ALIGNED FIELDSETS */
 
 .aligned label {
     display: block;
     padding: 4px 10px 0 0;
-    min-width: 160px;
+    float: left;
     width: 160px;
     word-wrap: break-word;
+    line-height: 1;
 }
 
 .aligned label:not(.vCheckboxLabel):after {
     content: '';
     display: inline-block;
     vertical-align: middle;
+    height: 26px;
 }
 
-.aligned label + p, .aligned .checkbox-row + div.help, .aligned label + div.readonly {
+.aligned label + p, .aligned label + div.help, .aligned label + div.readonly {
     padding: 6px 0;
     margin-top: 0;
     margin-bottom: 0;
-    margin-left: 0;
+    margin-left: 170px;
     overflow-wrap: break-word;
 }
 
@@ -140,17 +117,16 @@ form .aligned div.radiolist {
 
 form .aligned p.help,
 form .aligned div.help {
+    clear: left;
     margin-top: 0;
     margin-left: 160px;
     padding-left: 10px;
 }
 
-form .aligned p.date div.help.timezonewarning,
+form .aligned label + p.help,
-form .aligned p.datetime div.help.timezonewarning,
+form .aligned label + div.help {
-form .aligned p.time div.help.timezonewarning {
     margin-left: 0;
     padding-left: 0;
-    font-weight: normal;
 }
 
 form .aligned p.help:last-child,
@@ -169,10 +145,6 @@ form .aligned select + div.help {
     padding-left: 10px;
 }
 
-form .aligned select option:checked {
-    background-color: var(--selected-row);
-}
-
 form .aligned ul li {
     list-style: none;
 }
@@ -183,7 +155,11 @@ form .aligned table p {
 }
 
 .aligned .vCheckboxLabel {
-    padding: 1px 0 0 5px;
+    float: none;
+    width: auto;
+    display: inline-block;
+    vertical-align: -3px;
+    padding: 0 0 5px 5px;
 }
 
 .aligned .vCheckboxLabel + p.help,
@@ -195,7 +171,14 @@ form .aligned table p {
     width: 610px;
 }
 
+.checkbox-row p.help,
+.checkbox-row div.help {
+    margin-left: 0;
+    padding-left: 0;
+}
+
 fieldset .fieldBox {
+    float: left;
     margin-right: 20px;
 }
 
@@ -205,10 +188,15 @@ fieldset .fieldBox {
     width: 200px;
 }
 
+form .wide p,
+form .wide input + p.help,
+form .wide input + div.help {
+    margin-left: 200px;
+}
+
 form .wide p.help,
-form .wide ul.errorlist,
 form .wide div.help {
-    padding-left: 50px;
+    padding-left: 38px;
 }
 
 form div.help ul {
@@ -220,36 +208,53 @@ form div.help ul {
     width: 450px;
 }
 
-/* COLLAPSIBLE FIELDSETS */
+/* COLLAPSED FIELDSETS */
 
-.collapse summary .fieldset-heading,
+fieldset.collapsed * {
-.collapse summary .inline-heading {
+    display: none;
+}
+
+fieldset.collapsed h2, fieldset.collapsed {
+    display: block;
+}
+
+fieldset.collapsed {
+    border: 1px solid var(--hairline-color);
+    border-radius: 4px;
+    overflow: hidden;
+}
+
+fieldset.collapsed h2 {
+    background: var(--darkened-bg);
+    color: var(--body-quiet-color);
+}
+
+fieldset .collapse-toggle {
+    color: var(--header-link-color);
+}
+
+fieldset.collapsed .collapse-toggle {
     background: transparent;
-    border: none;
-    color: currentColor;
     display: inline;
-    margin: 0;
+    color: var(--link-fg);
-    padding: 0;
 }
 
 /* MONOSPACE TEXTAREAS */
 
 fieldset.monospace textarea {
-    font-family: var(--font-family-monospace);
+    font-family: "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace;
 }
 
 /* SUBMIT ROW */
 
 .submit-row {
-    padding: 12px 14px 12px;
+    padding: 12px 14px;
     margin: 0 0 20px;
     background: var(--darkened-bg);
     border: 1px solid var(--hairline-color);
     border-radius: 4px;
+    text-align: right;
     overflow: hidden;
-    display: flex;
-    gap: 10px;
-    flex-wrap: wrap;
 }
 
 body.popup .submit-row {
@@ -257,29 +262,32 @@ body.popup .submit-row {
 }
 
 .submit-row input {
-    height: 2.1875rem;
+    height: 35px;
-    line-height: 0.9375rem;
+    line-height: 15px;
-}
+    margin: 0 0 0 5px;
-
-.submit-row input, .submit-row a {
-    margin: 0;
 }
 
 .submit-row input.default {
+    margin: 0 0 0 8px;
     text-transform: uppercase;
 }
 
-.submit-row a.deletelink {
+.submit-row p {
-    margin-left: auto;
+    margin: 0.3em;
+}
+
+.submit-row p.deletelink-box {
+    float: left;
+    margin: 0;
 }
 
 .submit-row a.deletelink {
     display: block;
     background: var(--delete-button-bg);
     border-radius: 4px;
-    padding: 0.625rem 0.9375rem;
+    padding: 10px 15px;
-    height: 0.9375rem;
+    height: 15px;
-    line-height: 0.9375rem;
+    line-height: 15px;
     color: var(--button-fg);
 }
 
@@ -288,8 +296,9 @@ body.popup .submit-row {
     background: var(--close-button-bg);
     border-radius: 4px;
     padding: 10px 15px;
-    height: 0.9375rem;
+    height: 15px;
-    line-height: 0.9375rem;
+    line-height: 15px;
+    margin: 0 0 0 5px;
     color: var(--button-fg);
 }
 
@@ -297,14 +306,12 @@ body.popup .submit-row {
 .submit-row a.deletelink:hover,
 .submit-row a.deletelink:active {
     background: var(--delete-button-hover-bg);
-    text-decoration: none;
 }
 
 .submit-row a.closelink:focus,
 .submit-row a.closelink:hover,
 .submit-row a.closelink:active {
     background: var(--close-button-hover-bg);
-    text-decoration: none;
 }
 
 /* CUSTOM FORM FIELDS */
@@ -346,6 +353,10 @@ body.popup .submit-row {
     width: 2.2em;
 }
 
+.vTextField, .vUUIDField {
+    width: 20em;
+}
+
 .vIntegerField {
     width: 5em;
 }
@@ -358,10 +369,6 @@ body.popup .submit-row {
     width: 5em;
 }
 
-.vTextField, .vUUIDField {
-    width: 20em;
-}
-
 /* INLINES */
 
 .inline-group {
@@ -381,16 +388,14 @@ body.popup .submit-row {
     position: relative;
 }
 
-.inline-related h4,
+.inline-related h3 {
-.inline-related:not(.tabular) .collapse summary {
     margin: 0;
-    color: var(--body-medium-color);
+    color: var(--body-quiet-color);
     padding: 5px;
-    font-size: 0.8125rem;
+    font-size: 13px;
     background: var(--darkened-bg);
-    border: 1px solid var(--hairline-color);
+    border-top: 1px solid var(--hairline-color);
-    border-left-color: var(--darkened-bg);
+    border-bottom: 1px solid var(--hairline-color);
-    border-right-color: var(--darkened-bg);
 }
 
 .inline-related h3 span.delete {
@@ -399,7 +404,7 @@ body.popup .submit-row {
 
 .inline-related h3 span.delete label {
     margin-left: 2px;
-    font-size: 0.6875rem;
+    font-size: 11px;
 }
 
 .inline-related fieldset {
@@ -409,6 +414,16 @@ body.popup .submit-row {
     width: 100%;
 }
 
+.inline-related fieldset.module h3 {
+    margin: 0;
+    padding: 2px 5px 3px 5px;
+    font-size: 11px;
+    text-align: left;
+    font-weight: bold;
+    background: #bcd;
+    color: var(--body-bg);
+}
+
 .inline-group .tabular fieldset.module {
     border: none;
 }
@@ -443,12 +458,23 @@ body.popup .submit-row {
     height: 1.1em;
     padding: 2px 9px;
     overflow: hidden;
-    font-size: 0.5625rem;
+    font-size: 9px;
     font-weight: bold;
     color: var(--body-quiet-color);
     _width: 700px;
 }
 
+.inline-group ul.tools {
+    padding: 0;
+    margin: 0;
+    list-style: none;
+}
+
+.inline-group ul.tools li {
+    display: inline;
+    padding: 0 5px;
+}
+
 .inline-group div.add-row,
 .inline-group .tabular tr.add-row td {
     color: var(--body-quiet-color);
@@ -462,9 +488,12 @@ body.popup .submit-row {
     border-bottom: 1px solid var(--hairline-color);
 }
 
+.inline-group ul.tools a.add,
 .inline-group div.add-row a,
 .inline-group .tabular tr.add-row td a {
-    font-size: 0.75rem;
+    background: url(../img/icon-addlink.svg) 0 1px no-repeat;
+    padding-left: 16px;
+    font-size: 12px;
 }
 
 .empty-form {
@@ -482,8 +511,8 @@ body.popup .submit-row {
 }
 
 .related-lookup {
-    width: 1rem;
+    width: 16px;
-    height: 1rem;
+    height: 16px;
     background-image: url(../img/search.svg);
 }
 

assets/admin/css/login.css

@@ -12,7 +12,7 @@
 }
 
 .login #header h1 {
-    font-size: 1.125rem;
+    font-size: 18px;
     margin: 0;
 }
 
@@ -21,7 +21,7 @@
 }
 
 .login #content {
-    padding: 20px;
+    padding: 20px 20px 0;
 }
 
 .login #container {

assets/admin/css/nav_sidebar.css

@@ -16,7 +16,7 @@
     border-right: 1px solid var(--hairline-color);
     background-color: var(--body-bg);
     cursor: pointer;
-    font-size: 1.25rem;
+    font-size: 20px;
     color: var(--link-fg);
     padding: 0;
 }
@@ -59,13 +59,8 @@
     content: '\00AB';
 }
 
-.main > #nav-sidebar {
-    visibility: hidden;
-}
-
 .main.shifted > #nav-sidebar {
     margin-left: 0;
-    visibility: visible;
 }
 
 [dir="rtl"] .main.shifted > #nav-sidebar {
@@ -102,12 +97,6 @@
     background: var(--selected-row);
 }
 
-@media (forced-colors: active) {
-    #nav-sidebar .current-model {
-        background-color: SelectedItem;
-    }
-}
-
 .main > #nav-sidebar + .content {
     max-width: calc(100% - 23px);
 }

assets/admin/css/responsive.css

@@ -14,11 +14,11 @@ input[type="submit"], button {
 
     td, th {
         padding: 10px;
-        font-size: 0.875rem;
+        font-size: 14px;
     }
 
     .small {
-        font-size: 0.75rem;
+        font-size: 12px;
     }
 
     /* Layout */
@@ -28,7 +28,7 @@ input[type="submit"], button {
     }
 
     #content {
-        padding: 15px 20px 20px;
+        padding: 20px 30px 30px;
     }
 
     div.breadcrumbs {
@@ -43,8 +43,9 @@ input[type="submit"], button {
         justify-content: flex-start;
     }
 
-    #site-name {
+    #branding h1 {
         margin: 0 0 8px;
+        font-size: 20px;
         line-height: 1.2;
     }
 
@@ -87,7 +88,7 @@ input[type="submit"], button {
     }
 
     td .changelink, td .addlink {
-        font-size: 0.8125rem;
+        font-size: 13px;
     }
 
     /* Changelist */
@@ -104,13 +105,13 @@ input[type="submit"], button {
     }
 
     #changelist-search label {
-        line-height: 1.375rem;
+        line-height: 22px;
     }
 
     #toolbar form #searchbar {
         flex: 1 0 auto;
         width: 0;
-        height: 1.375rem;
+        height: 22px;
         margin: 0 10px 0 6px;
     }
 
@@ -130,6 +131,10 @@ input[type="submit"], button {
         padding: 15px 0;
     }
 
+    #changelist .actions.selected {
+        border: none;
+    }
+
     #changelist .actions label {
         display: flex;
     }
@@ -147,7 +152,7 @@ input[type="submit"], button {
     #changelist .actions span.clear,
     #changelist .actions span.question,
     #changelist .actions span.action-counter {
-        font-size: 0.6875rem;
+        font-size: 11px;
         margin: 0 10px 0 0;
     }
 
@@ -171,14 +176,9 @@ input[type="submit"], button {
     /* Forms */
 
     label {
-        font-size: 1rem;
+        font-size: 14px;
     }
 
-    /*
-    Minifiers remove the default (text) "type" attribute from "input" HTML
-    tags. Add input:not([type]) to make the CSS stylesheet work the same.
-    */
-    .form-row input:not([type]),
     .form-row input[type=text],
     .form-row input[type=password],
     .form-row input[type=email],
@@ -191,12 +191,12 @@ input[type="submit"], button {
         box-sizing: border-box;
         margin: 0;
         padding: 6px 8px;
-        min-height: 2.25rem;
+        min-height: 36px;
-        font-size: 1rem;
+        font-size: 14px;
     }
 
     .form-row select {
-        height: 2.25rem;
+        height: 36px;
     }
 
     .form-row select[multiple] {
@@ -204,6 +204,12 @@ input[type="submit"], button {
         min-height: 0;
     }
 
+    fieldset .fieldBox {
+        float: none;
+        margin: 0 -10px;
+        padding: 0 10px;
+    }
+
     fieldset .fieldBox + .fieldBox {
         margin-top: 10px;
         padding-top: 10px;
@@ -230,16 +236,20 @@ input[type="submit"], button {
         margin-left: 2px;
     }
 
-    .submit-row {
+    /* Related widget */
-        padding: 8px;
+
+    .related-widget-wrapper {
+        float: none;
     }
 
-    .submit-row a.deletelink {
+    .related-widget-wrapper-link + .selector {
-        padding: 10px 7px;
+        max-width: calc(100% - 30px);
+        margin-right: 15px;
     }
 
-    .button, input[type=submit], input[type=button], .submit-row input, a.button {
+    select + .related-widget-wrapper-link,
-        padding: 7px;
+    .related-widget-wrapper-link + .related-widget-wrapper-link {
+        margin-left: 10px;
     }
 
     /* Selector */
@@ -254,8 +264,12 @@ input[type="submit"], button {
         align-items: center;
     }
 
+    .selector .selector-filter label {
+        margin: 0 8px 0 0;
+    }
+
     .selector .selector-filter input {
-        width: 100%;
+        width: auto;
         min-height: 0;
         flex: 1 1;
     }
@@ -273,7 +287,30 @@ input[type="submit"], button {
         margin-bottom: 5px;
     }
 
-    .selector-chooseall, .selector-clearall {
+    .selector ul.selector-chooser {
+        width: 26px;
+        height: 52px;
+        padding: 2px 0;
+        margin: auto 15px;
+        border-radius: 20px;
+        transform: translateY(-10px);
+    }
+
+    .selector-add, .selector-remove {
+        width: 20px;
+        height: 20px;
+        background-size: 20px auto;
+    }
+
+    .selector-add {
+        background-position: 0 -120px;
+    }
+
+    .selector-remove {
+        background-position: 0 -80px;
+    }
+
+    a.selector-chooseall, a.selector-clearall {
         align-self: center;
     }
 
@@ -295,7 +332,10 @@ input[type="submit"], button {
     }
 
     .stacked ul.selector-chooser {
+        width: 52px;
+        height: 26px;
         padding: 0 2px;
+        margin: 15px auto;
         transform: none;
     }
 
@@ -303,22 +343,62 @@ input[type="submit"], button {
         padding: 3px;
     }
 
+    .stacked .selector-add, .stacked .selector-remove {
+        background-size: 20px auto;
+    }
+
+    .stacked .selector-add {
+        background-position: 0 -40px;
+    }
+
+    .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 .selector-remove {
+        background-position: 0 0;
+    }
+
+    .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;
+    }
+
     .help-tooltip, .selector .help-icon {
         display: none;
     }
 
+    form .form-row p.datetime {
+        width: 100%;
+    }
+
     .datetime input {
         width: 50%;
         max-width: 120px;
     }
 
     .datetime span {
-        font-size: 0.8125rem;
+        font-size: 13px;
     }
 
     .datetime .timezonewarning {
         display: block;
-        font-size: 0.6875rem;
+        font-size: 11px;
         color: var(--body-quiet-color);
     }
 
@@ -355,7 +435,7 @@ input[type="submit"], button {
         padding: 15px 20px;
     }
 
-    .login #site-name {
+    .login #branding h1 {
         margin: 0;
     }
 
@@ -387,10 +467,14 @@ input[type="submit"], button {
 @media (max-width: 767px) {
     /* Layout */
 
-    #header, #content {
+    #header, #content, #footer {
         padding: 15px;
     }
 
+    #footer:empty {
+        padding: 0;
+    }
+
     div.breadcrumbs {
         padding: 10px 15px;
     }
@@ -412,7 +496,7 @@ input[type="submit"], button {
 
     #content-related .module h2 {
         padding: 10px 15px;
-        font-size: 1rem;
+        font-size: 16px;
     }
 
     /* Changelist */
@@ -473,6 +557,8 @@ input[type="submit"], button {
 
     .aligned .form-row,
     .aligned .form-row > div {
+        display: flex;
+        flex-wrap: wrap;
         max-width: 100vw;
     }
 
@@ -480,14 +566,6 @@ input[type="submit"], button {
         width: calc(100vw - 30px);
     }
 
-    .flex-container {
-        flex-flow: column;
-    }
-
-    .flex-container.checkbox-row {
-        flex-flow: row;
-    }
-
     textarea {
         max-width: none;
     }
@@ -501,9 +579,12 @@ input[type="submit"], button {
         padding-top: 15px;
     }
 
+    fieldset.collapsed .form-row {
+        display: none;
+    }
+
     .aligned label {
         width: 100%;
-        min-width: auto;
         padding: 0 0 10px;
     }
 
@@ -518,6 +599,10 @@ input[type="submit"], button {
         max-width: 100%;
     }
 
+    .aligned .checkbox-row {
+        align-items: center;
+    }
+
     .aligned .checkbox-row input {
         flex: 0 1 auto;
         margin: 0;
@@ -536,7 +621,8 @@ input[type="submit"], button {
     }
 
     .aligned p.file-upload {
-        font-size: 0.8125rem;
+        margin-left: 0;
+        font-size: 13px;
     }
 
     span.clearable-file-input {
@@ -544,7 +630,7 @@ input[type="submit"], button {
     }
 
     span.clearable-file-input label {
-        font-size: 0.8125rem;
+        font-size: 13px;
         padding-bottom: 0;
     }
 
@@ -559,8 +645,7 @@ input[type="submit"], button {
         padding: 0;
     }
 
-    form .aligned ul,
+    form .aligned ul {
-    form .aligned ul.errorlist {
         margin-left: 0;
         padding-left: 0;
     }
@@ -585,7 +670,6 @@ input[type="submit"], button {
 
     .related-widget-wrapper .selector {
         order: 1;
-        flex: 1 0 auto;
     }
 
     .related-widget-wrapper > a {
@@ -600,14 +684,23 @@ input[type="submit"], button {
         align-self: center;
     }
 
+    select + .related-widget-wrapper-link,
+    .related-widget-wrapper-link + .related-widget-wrapper-link {
+        margin-left: 15px;
+    }
+
     /* Selector */
 
     .selector {
         flex-direction: column;
-        gap: 10px 0;
+    }
+
+    .selector > * {
+        float: none;
     }
 
     .selector-available, .selector-chosen {
+        margin-bottom: 0;
         flex: 1 1 auto;
     }
 
@@ -616,10 +709,12 @@ input[type="submit"], button {
     }
 
     .selector ul.selector-chooser {
-        display: flex;
+        display: block;
-        width: 60px;
+        float: none;
-        height: 30px;
+        width: 52px;
+        height: 26px;
         padding: 0 2px;
+        margin: 15px auto 20px;
         transform: none;
     }
 
@@ -631,16 +726,16 @@ input[type="submit"], button {
         background-position: 0 0;
     }
 
-    :enabled.selector-remove:focus, :enabled.selector-remove:hover {
+    .active.selector-remove:focus, .active.selector-remove:hover {
-        background-position: 0 -24px;
+        background-position: 0 -20px;
     }
 
     .selector-add  {
-        background-position: 0 -48px;
+        background-position: 0 -40px;
     }
 
-    :enabled.selector-add:focus, :enabled.selector-add:hover {
+    .active.selector-add:focus, .active.selector-add:hover {
-        background-position: 0 -72px;
+        background-position: 0 -60px;
     }
 
     /* Inlines */
@@ -717,23 +812,28 @@ input[type="submit"], button {
     /* Submit row */
 
     .submit-row {
-        padding: 10px;
+        padding: 10px 10px 0;
         margin: 0 0 15px;
+        display: flex;
         flex-direction: column;
-        gap: 8px;
     }
 
-    .submit-row input, .submit-row input.default, .submit-row a {
+    .submit-row > * {
+        width: 100%;
+    }
+
+    .submit-row input, .submit-row input.default, .submit-row a, .submit-row a.closelink {
+        float: none;
+        margin: 0 0 10px;
         text-align: center;
     }
 
     .submit-row a.closelink {
         padding: 10px 0;
-        text-align: center;
     }
 
-    .submit-row a.deletelink {
+    .submit-row p.deletelink-box {
-        margin: 0;
+        order: 4;
     }
 
     /* Messages */
@@ -807,7 +907,7 @@ input[type="submit"], button {
     .errornote {
         margin: 0 0 20px;
         padding: 8px 12px;
-        font-size: 0.8125rem;
+        font-size: 13px;
     }
 
     /* Calendar and clock */
@@ -854,8 +954,8 @@ input[type="submit"], button {
 
     .calendar-shortcuts {
         padding: 10px 0;
-        font-size: 0.75rem;
+        font-size: 12px;
-        line-height: 0.75rem;
+        line-height: 12px;
     }
 
     .calendar-shortcuts a {
@@ -887,7 +987,7 @@ input[type="submit"], button {
     /* History */
 
     table#change-history tbody th, table#change-history tbody td {
-        font-size: 0.8125rem;
+        font-size: 13px;
         word-break: break-word;
     }
 
@@ -898,7 +998,7 @@ input[type="submit"], button {
     /* Docs */
 
     table.model tbody th, table.model tbody td {
-        font-size: 0.8125rem;
+        font-size: 13px;
         word-break: break-word;
     }
 }

assets/admin/css/responsive_rtl.css

@@ -28,12 +28,23 @@
         margin-left: 0;
     }
 
+    [dir="rtl"] .inline-group ul.tools a.add,
     [dir="rtl"] .inline-group div.add-row a,
     [dir="rtl"] .inline-group .tabular tr.add-row td a {
         padding: 8px 26px 8px 10px;
         background-position: calc(100% - 8px) 9px;
     }
 
+    [dir="rtl"] .related-widget-wrapper-link + .selector {
+        margin-right: 0;
+        margin-left: 15px;
+    }
+
+    [dir="rtl"] .selector .selector-filter label {
+        margin-right: 0;
+        margin-left: 8px;
+    }
+
     [dir="rtl"] .object-tools li {
         float: right;
     }
@@ -58,8 +69,7 @@
         margin-right: 15px;
     }
 
-    [dir="rtl"] .aligned ul,
+    [dir="rtl"] .aligned ul {
-    [dir="rtl"] form .aligned ul.errorlist {
         margin-right: 0;
     }
 
@@ -67,23 +77,4 @@
         margin-left: 0;
         margin-right: 0;
     }
-    [dir="rtl"] .aligned .vCheckboxLabel {
-        padding: 1px 5px 0 0;
-    }
-
-    [dir="rtl"] .selector-remove {
-        background-position: 0 0;
-    }
-
-    [dir="rtl"] :enabled.selector-remove:focus, :enabled.selector-remove:hover {
-        background-position: 0 -24px;
-    }
-
-    [dir="rtl"] .selector-add  {
-        background-position: 0 -48px;
-    }
-
-    [dir="rtl"] :enabled.selector-add:focus, :enabled.selector-add:hover {
-        background-position: 0 -72px;
-    }
 }

assets/admin/css/rtl.css

@@ -13,7 +13,7 @@ th {
     margin-right: 1.5em;
 }
 
-.viewlink, .addlink, .changelink, .hidelink {
+.viewlink, .addlink, .changelink {
     padding-left: 0;
     padding-right: 16px;
     background-position: 100% 1px;
@@ -107,25 +107,23 @@ thead th.sorted .text {
     border-left: none;
 }
 
-.paginator .end {
-    margin-left: 6px;
-    margin-right: 0;
-}
-
-.paginator input {
-    margin-left: 0;
-    margin-right: auto;
-}
-
 /* FORMS */
 
 .aligned label {
     padding: 0 0 3px 1em;
+    float: right;
 }
 
-.submit-row a.deletelink {
+.submit-row {
+    text-align: left
+}
+
+.submit-row p.deletelink-box {
+    float: right;
+}
+
+.submit-row input.default {
     margin-left: 0;
-    margin-right: auto;
 }
 
 .vDateField, .vTimeField {
@@ -136,11 +134,13 @@ thead th.sorted .text {
     margin-left: 5px;
 }
 
+form .aligned p.help, form .aligned div.help {
+    clear: right;
+}
+
 form .aligned ul {
     margin-right: 163px;
-    padding-right: 10px;
     margin-left: 0;
-    padding-left: 0;
 }
 
 form ul.inline li {
@@ -149,34 +149,12 @@ form ul.inline li {
     padding-left: 7px;
 }
 
-form .aligned p.help,
+input[type=submit].default, .submit-row input.default {
-form .aligned div.help {
+    float: left;
-    margin-left: 0;
-    margin-right: 160px;
-    padding-right: 10px;
-}
-
-form div.help ul,
-form .aligned .checkbox-row + .help,
-form .aligned p.date div.help.timezonewarning,
-form .aligned p.datetime div.help.timezonewarning,
-form .aligned p.time div.help.timezonewarning {
-    margin-right: 0;
-    padding-right: 0;
-}
-
-form .wide p.help,
-form .wide ul.errorlist,
-form .wide div.help {
-    padding-left: 0;
-    padding-right: 50px;
-}
-
-.submit-row {
-    text-align: right;
 }
 
 fieldset .fieldBox {
+    float: right;
     margin-left: 20px;
     margin-right: 0;
 }
@@ -197,14 +175,12 @@ fieldset .fieldBox {
     top: 0;
     left: auto;
     right: 10px;
-    background: url(../img/calendar-icons.svg) 0 -15px no-repeat;
 }
 
 .calendarnav-next {
     top: 0;
     right: auto;
     left: 10px;
-    background: url(../img/calendar-icons.svg) 0 0 no-repeat;
 }
 
 .calendar caption, .calendarbox h2 {
@@ -219,40 +195,6 @@ fieldset .fieldBox {
     text-align: right;
 }
 
-.selector-add {
-    background: url(../img/selector-icons.svg) 0 -96px no-repeat;
-    background-size: 24px auto;
-}
-
-:enabled.selector-add:focus, :enabled.selector-add:hover {
-    background-position: 0 -120px;
-}
-
-.selector-remove {
-    background: url(../img/selector-icons.svg) 0 -144px no-repeat;
-    background-size: 24px auto;
-}
-
-:enabled.selector-remove:focus, :enabled.selector-remove:hover {
-    background-position: 0 -168px;
-}
-
-.selector-chooseall {
-    background: url(../img/selector-icons.svg) right -128px no-repeat;
-}
-
-:enabled.selector-chooseall:focus, :enabled.selector-chooseall:hover {
-    background-position: 100% -144px;
-}
-
-.selector-clearall {
-    background: url(../img/selector-icons.svg) 0 -160px no-repeat;
-}
-
-:enabled.selector-clearall:focus, :enabled.selector-clearall:hover {
-    background-position: 0 -176px;
-}
-
 .inline-deletelink {
     float: left;
 }
@@ -283,11 +225,3 @@ form .form-row p.datetime {
     margin-left: inherit;
     margin-right: 2px;
 }
-
-.inline-group .tabular td.original p {
-    right: 0;
-}
-
-.selector .selector-chooser {
-    margin: 0;
-}

assets/admin/css/unusable_password_field.css

@@ -1,19 +0,0 @@
-/* Hide warnings fields if usable password is selected */
-form:has(#id_usable_password input[value="true"]:checked) .messagelist {
-    display: none;
-}
-
-/* Hide password fields if unusable password is selected */
-form:has(#id_usable_password input[value="false"]:checked) .field-password1,
-form:has(#id_usable_password input[value="false"]:checked) .field-password2 {
-    display: none;
-}
-
-/* Select appropriate submit button */
-form:has(#id_usable_password input[value="true"]:checked) input[type="submit"].unset-password {
-    display: none;
-}
-
-form:has(#id_usable_password input[value="false"]:checked) input[type="submit"].set-password {
-    display: none;
-}

assets/admin/css/widgets.css

@@ -1,67 +1,39 @@
 /* SELECTOR (FILTER INTERFACE) */
 
 .selector {
-    display: flex;
+    width: 800px;
-    flex: 1;
+    float: left;
-    gap: 0 10px;
 }
 
 .selector select {
+    width: 380px;
     height: 17.2em;
-    flex: 1 0 auto;
-    overflow: scroll;
-    width: 100%;
 }
 
 .selector-available, .selector-chosen {
-    display: flex;
+    float: left;
-    flex-direction: column;
+    width: 380px;
-    flex: 1 1;
+    text-align: center;
+    margin-bottom: 5px;
 }
 
-.selector-available-title, .selector-chosen-title {
+.selector-chosen select {
+    border-top: none;
+}
+
+.selector-available h2, .selector-chosen h2 {
     border: 1px solid var(--border-color);
     border-radius: 4px 4px 0 0;
 }
 
-.selector .helptext {
+.selector-chosen h2 {
-    font-size: 0.6875rem;
-}
-
-.selector-chosen .list-footer-display {
-    border: 1px solid var(--border-color);
-    border-top: none;
-    border-radius: 0 0 4px 4px;
-    margin: 0 0 10px;
-    padding: 8px;
-    text-align: center;
     background: var(--primary);
     color: var(--header-link-color);
-    cursor: pointer;
-}
-.selector-chosen .list-footer-display__clear {
-    color: var(--breadcrumbs-fg);
 }
 
-.selector-chosen-title {
+.selector .selector-available h2 {
-    background: var(--secondary);
-    color: var(--header-link-color);
-    padding: 8px;
-}
-
-.aligned .selector-chosen-title label {
-    color: var(--header-link-color);
-    width: 100%;
-}
-
-.selector-available-title {
     background: var(--darkened-bg);
     color: var(--body-quiet-color);
-    padding: 8px;
-}
-
-.aligned .selector-available-title label {
-    width: 100%;
 }
 
 .selector .selector-filter {
@@ -69,11 +41,9 @@
     border-width: 0 1px;
     padding: 8px;
     color: var(--body-quiet-color);
-    font-size: 0.625rem;
+    font-size: 10px;
     margin: 0;
     text-align: left;
-    display: flex;
-    gap: 8px;
 }
 
 .selector .selector-filter label,
@@ -85,21 +55,20 @@
     padding: 0;
     overflow: hidden;
     line-height: 1;
-    min-width: auto;
 }
 
-.selector-filter input {
+.selector .selector-available input {
-    flex-grow: 1;
+    width: 320px;
+    margin-left: 8px;
 }
 
 .selector ul.selector-chooser {
-    align-self: center;
+    float: left;
-    width: 30px;
+    width: 22px;
     background-color: var(--selected-bg);
     border-radius: 10px;
-    margin: 0;
+    margin: 10em 5px 0 5px;
     padding: 0;
-    transform: translateY(-17px);
 }
 
 .selector-chooser li {
@@ -113,97 +82,84 @@
     margin: 0 0 10px;
     border-radius: 0 0 4px 4px;
 }
-.selector .selector-chosen--with-filtered select {
-    margin: 0;
-    border-radius: 0;
-    height: 14em;
-}
-
-.selector .selector-chosen:not(.selector-chosen--with-filtered) .list-footer-display {
-    display: none;
-}
 
 .selector-add, .selector-remove {
-    width: 24px;
+    width: 16px;
-    height: 24px;
+    height: 16px;
     display: block;
     text-indent: -3000px;
     overflow: hidden;
     cursor: default;
     opacity: 0.55;
-    border: none;
 }
 
-:enabled.selector-add, :enabled.selector-remove {
+.active.selector-add, .active.selector-remove {
     opacity: 1;
 }
 
-:enabled.selector-add:hover, :enabled.selector-remove:hover {
+.active.selector-add:hover, .active.selector-remove:hover {
     cursor: pointer;
 }
 
 .selector-add {
-    background: url(../img/selector-icons.svg) 0 -144px no-repeat;
+    background: url(../img/selector-icons.svg) 0 -96px no-repeat;
-    background-size: 24px auto;
 }
 
-:enabled.selector-add:focus, :enabled.selector-add:hover {
+.active.selector-add:focus, .active.selector-add:hover {
-    background-position: 0 -168px;
+    background-position: 0 -112px;
 }
 
 .selector-remove {
-    background: url(../img/selector-icons.svg) 0 -96px no-repeat;
+    background: url(../img/selector-icons.svg) 0 -64px no-repeat;
-    background-size: 24px auto;
 }
 
-:enabled.selector-remove:focus, :enabled.selector-remove:hover {
+.active.selector-remove:focus, .active.selector-remove:hover {
-    background-position: 0 -120px;
+    background-position: 0 -80px;
 }
 
-.selector-chooseall, .selector-clearall {
+a.selector-chooseall, a.selector-clearall {
     display: inline-block;
     height: 16px;
     text-align: left;
-    margin: 0 auto;
+    margin: 1px auto 3px;
     overflow: hidden;
     font-weight: bold;
     line-height: 16px;
     color: var(--body-quiet-color);
     text-decoration: none;
     opacity: 0.55;
-    border: none;
 }
 
-:enabled.selector-chooseall:focus, :enabled.selector-clearall:focus,
+a.active.selector-chooseall:focus, a.active.selector-clearall:focus,
-:enabled.selector-chooseall:hover, :enabled.selector-clearall:hover {
+a.active.selector-chooseall:hover, a.active.selector-clearall:hover {
     color: var(--link-fg);
 }
 
-:enabled.selector-chooseall, :enabled.selector-clearall {
+a.active.selector-chooseall, a.active.selector-clearall {
     opacity: 1;
 }
 
-:enabled.selector-chooseall:hover, :enabled.selector-clearall:hover {
+a.active.selector-chooseall:hover, a.active.selector-clearall:hover {
     cursor: pointer;
 }
 
-.selector-chooseall {
+a.selector-chooseall {
     padding: 0 18px 0 0;
     background: url(../img/selector-icons.svg) right -160px no-repeat;
     cursor: default;
 }
 
-:enabled.selector-chooseall:focus, :enabled.selector-chooseall:hover {
+a.active.selector-chooseall:focus, a.active.selector-chooseall:hover {
     background-position: 100% -176px;
 }
 
-.selector-clearall {
+a.selector-clearall {
     padding: 0 0 0 18px;
     background: url(../img/selector-icons.svg) 0 -128px no-repeat;
     cursor: default;
 }
 
-:enabled.selector-clearall:focus, :enabled.selector-clearall:hover {
+a.active.selector-clearall:focus, a.active.selector-clearall:hover {
     background-position: 0 -144px;
 }
 
@@ -212,7 +168,6 @@
 .stacked {
     float: left;
     width: 490px;
-    display: block;
 }
 
 .stacked select {
@@ -233,13 +188,11 @@
 }
 
 .stacked ul.selector-chooser {
-    display: flex;
+    height: 22px;
-    height: 30px;
+    width: 50px;
-    width: 64px;
     margin: 0 0 10px 40%;
     background-color: #eee;
     border-radius: 10px;
-    transform: none;
 }
 
 .stacked .selector-chooser li {
@@ -252,34 +205,32 @@
 }
 
 .stacked .selector-add {
-    background: url(../img/selector-icons.svg) 0 -48px no-repeat;
+    background: url(../img/selector-icons.svg) 0 -32px no-repeat;
-    background-size: 24px auto;
     cursor: default;
 }
 
-.stacked :enabled.selector-add {
+.stacked .active.selector-add {
-    background-position: 0 -48px;
+    background-position: 0 -32px;
     cursor: pointer;
 }
 
-.stacked :enabled.selector-add:focus, .stacked :enabled.selector-add:hover {
+.stacked .active.selector-add:focus, .stacked .active.selector-add:hover {
-    background-position: 0 -72px;
+    background-position: 0 -48px;
     cursor: pointer;
 }
 
 .stacked .selector-remove {
     background: url(../img/selector-icons.svg) 0 0 no-repeat;
-    background-size: 24px auto;
     cursor: default;
 }
 
-.stacked :enabled.selector-remove {
+.stacked .active.selector-remove {
     background-position: 0 0px;
     cursor: pointer;
 }
 
-.stacked :enabled.selector-remove:focus, .stacked :enabled.selector-remove:hover {
+.stacked .active.selector-remove:focus, .stacked .active.selector-remove:hover {
-    background-position: 0 -24px;
+    background-position: 0 -16px;
     cursor: pointer;
 }
 
@@ -299,8 +250,8 @@
 .selector .search-label-icon {
     background: url(../img/search.svg) 0 0 no-repeat;
     display: inline-block;
-    height: 1.125rem;
+    height: 18px;
-    width: 1.125rem;
+    width: 18px;
 }
 
 /* DATE AND TIME */
@@ -316,7 +267,7 @@ p.datetime {
 .datetime span {
     white-space: nowrap;
     font-weight: normal;
-    font-size: 0.6875rem;
+    font-size: 11px;
     color: var(--body-quiet-color);
 }
 
@@ -326,7 +277,7 @@ p.datetime {
 }
 
 table p.datetime {
-    font-size: 0.6875rem;
+    font-size: 11px;
     margin-left: 0;
     padding-left: 0;
 }
@@ -335,34 +286,32 @@ table p.datetime {
     position: relative;
     display: inline-block;
     vertical-align: middle;
-    height: 24px;
+    height: 16px;
-    width: 24px;
+    width: 16px;
     overflow: hidden;
 }
 
 .datetimeshortcuts .clock-icon {
     background: url(../img/icon-clock.svg) 0 0 no-repeat;
-    background-size: 24px auto;
 }
 
 .datetimeshortcuts a:focus .clock-icon,
 .datetimeshortcuts a:hover .clock-icon {
-    background-position: 0 -24px;
+    background-position: 0 -16px;
 }
 
 .datetimeshortcuts .date-icon {
     background: url(../img/icon-calendar.svg) 0 0 no-repeat;
-    background-size: 24px auto;
     top: -1px;
 }
 
 .datetimeshortcuts a:focus .date-icon,
 .datetimeshortcuts a:hover .date-icon {
-    background-position: 0 -24px;
+    background-position: 0 -16px;
 }
 
 .timezonewarning {
-    font-size: 0.6875rem;
+    font-size: 11px;
     color: var(--body-quiet-color);
 }
 
@@ -373,7 +322,7 @@ p.url {
     margin: 0;
     padding: 0;
     color: var(--body-quiet-color);
-    font-size: 0.6875rem;
+    font-size: 11px;
     font-weight: bold;
 }
 
@@ -388,10 +337,14 @@ p.file-upload {
     margin: 0;
     padding: 0;
     color: var(--body-quiet-color);
-    font-size: 0.6875rem;
+    font-size: 11px;
     font-weight: bold;
 }
 
+.aligned p.file-upload {
+    margin-left: 170px;
+}
+
 .file-upload a {
     font-weight: normal;
 }
@@ -402,7 +355,7 @@ p.file-upload {
 
 span.clearable-file-input label {
     color: var(--body-fg);
-    font-size: 0.6875rem;
+    font-size: 11px;
     display: inline;
     float: none;
 }
@@ -411,7 +364,7 @@ span.clearable-file-input label {
 
 .calendarbox, .clockbox {
     margin: 5px auto;
-    font-size: 0.75rem;
+    font-size: 12px;
     width: 19em;
     text-align: center;
     background: var(--body-bg);
@@ -445,7 +398,7 @@ span.clearable-file-input label {
     text-align: center;
     border-top: none;
     font-weight: 700;
-    font-size: 0.75rem;
+    font-size: 12px;
     color: #333;
     background: var(--accent);
 }
@@ -455,14 +408,14 @@ span.clearable-file-input label {
     background: var(--darkened-bg);
     border-bottom: 1px solid var(--border-color);
     font-weight: 400;
-    font-size: 0.75rem;
+    font-size: 12px;
     text-align: center;
     color: var(--body-quiet-color);
 }
 
 .calendar td {
     font-weight: 400;
-    font-size: 0.75rem;
+    font-size: 12px;
     text-align: center;
     padding: 0;
     border-top: 1px solid var(--hairline-color);
@@ -470,7 +423,7 @@ span.clearable-file-input label {
 }
 
 .calendar td.selected a {
-    background: var(--secondary);
+    background: var(--primary);
     color: var(--button-fg);
 }
 
@@ -502,7 +455,7 @@ span.clearable-file-input label {
 }
 
 .calendarnav {
-    font-size: 0.625rem;
+    font-size: 10px;
     text-align: center;
     color: #ccc;
     margin: 0;
@@ -517,8 +470,8 @@ span.clearable-file-input label {
 .calendar-shortcuts {
     background: var(--body-bg);
     color: var(--body-quiet-color);
-    font-size: 0.6875rem;
+    font-size: 11px;
-    line-height: 0.6875rem;
+    line-height: 11px;
     border-top: 1px solid var(--hairline-color);
     padding: 8px 0;
 }
@@ -538,26 +491,36 @@ span.clearable-file-input label {
     background: url(../img/calendar-icons.svg) 0 0 no-repeat;
 }
 
+.calendarbox .calendarnav-previous:focus,
+.calendarbox .calendarnav-previous:hover {
+    background-position: 0 -15px;
+}
+
 .calendarnav-next {
     right: 10px;
-    background: url(../img/calendar-icons.svg) 0 -15px no-repeat;
+    background: url(../img/calendar-icons.svg) 0 -30px no-repeat;
+}
+
+.calendarbox .calendarnav-next:focus,
+.calendarbox .calendarnav-next:hover {
+    background-position: 0 -45px;
 }
 
 .calendar-cancel {
     margin: 0;
     padding: 4px 0;
-    font-size: 0.75rem;
+    font-size: 12px;
-    background: var(--close-button-bg);
+    background: #eee;
     border-top: 1px solid var(--border-color);
-    color: var(--button-fg);
+    color: var(--body-fg);
 }
 
 .calendar-cancel:focus, .calendar-cancel:hover {
-    background: var(--close-button-hover-bg);
+    background: #ddd;
 }
 
 .calendar-cancel a {
-    color: var(--button-fg);
+    color: black;
     display: block;
 }
 
@@ -577,10 +540,9 @@ ul.timelist, .timelist li {
     float: right;
     text-indent: -9999px;
     background: url(../img/inline-delete.svg) 0 0 no-repeat;
-    width: 1.5rem;
+    width: 16px;
-    height: 1.5rem;
+    height: 16px;
     border: 0px none;
-    margin-bottom: .25rem;
 }
 
 .inline-deletelink:focus, .inline-deletelink:hover {
@@ -589,25 +551,24 @@ ul.timelist, .timelist li {
 
 /* RELATED WIDGET WRAPPER */
 .related-widget-wrapper {
-    display: flex;
+    float: left;       /* display properly in form rows with multiple fields */
-    gap: 0 10px;
+    overflow: hidden;  /* clear floated contents */
-    flex-grow: 1;
-    flex-wrap: wrap;
-    margin-bottom: 5px;
 }
 
 .related-widget-wrapper-link {
-    opacity: .6;
+    opacity: 0.3;
-    filter: grayscale(1);
 }
 
 .related-widget-wrapper-link:link {
-    opacity: 1;
+    opacity: .8;
-    filter: grayscale(0);
 }
 
-/* GIS MAPS */
+.related-widget-wrapper-link:link:focus,
-.dj_map {
+.related-widget-wrapper-link:link:hover {
-    width: 600px;
+    opacity: 1;
-    height: 400px;
+}
+
+select + .related-widget-wrapper-link,
+.related-widget-wrapper-link + .related-widget-wrapper-link {
+    margin-left: 7px;
 }

assets/admin/fonts/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

assets/admin/fonts/README.txt

@@ -0,0 +1,3 @@
+Roboto webfont source: https://www.google.com/fonts/specimen/Roboto
+WOFF files extracted using https://github.com/majodev/google-webfonts-helper
+Weights used in this project: Light (300), Regular (400), Bold (700)

assets/admin/img/README.txt

@@ -1,4 +1,4 @@
-All icons are taken from Font Awesome (https://fontawesome.com/) project.
+All icons are taken from Font Awesome (http://fontawesome.io/) project.
 The Font Awesome font is licensed under the SIL OFL 1.1:
 - https://scripts.sil.org/OFL
 

assets/admin/img/calendar-icons.svg

@@ -1,63 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="15" height="60" viewBox="0 0 1792 7168" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<svg
+  <defs>
-   width="15"
+    <g id="previous">
-   height="30"
+      <path d="M1037 1395l102-102q19-19 19-45t-19-45l-307-307 307-307q19-19 19-45t-19-45l-102-102q-19-19-45-19t-45 19l-454 454q-19 19-19 45t19 45l454 454q19 19 45 19t45-19zm627-499q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
-   viewBox="0 0 1792 3584"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="calendar-icons.svg"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview5"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="13.3"
-     inkscape:cx="15.526316"
-     inkscape:cy="20.977444"
-     inkscape:window-width="1920"
-     inkscape:window-height="1011"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
-  <defs
-     id="defs2">
-    <g
-       id="previous">
-      <path
-         d="m 1037,1395 102,-102 q 19,-19 19,-45 0,-26 -19,-45 L 832,896 1139,589 q 19,-19 19,-45 0,-26 -19,-45 L 1037,397 q -19,-19 -45,-19 -26,0 -45,19 L 493,851 q -19,19 -19,45 0,26 19,45 l 454,454 q 19,19 45,19 26,0 45,-19 z m 627,-499 q 0,209 -103,385.5 Q 1458,1458 1281.5,1561 1105,1664 896,1664 687,1664 510.5,1561 334,1458 231,1281.5 128,1105 128,896 128,687 231,510.5 334,334 510.5,231 687,128 896,128 1105,128 1281.5,231 1458,334 1561,510.5 1664,687 1664,896 Z"
-         id="path1" />
     </g>
-    <g
+    <g id="next">
-       id="next">
+      <path d="M845 1395l454-454q19-19 19-45t-19-45l-454-454q-19-19-45-19t-45 19l-102 102q-19 19-19 45t19 45l307 307-307 307q-19 19-19 45t19 45l102 102q19 19 45 19t45-19zm819-499q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
-      <path
-         d="m 845,1395 454,-454 q 19,-19 19,-45 0,-26 -19,-45 L 845,397 q -19,-19 -45,-19 -26,0 -45,19 L 653,499 q -19,19 -19,45 0,26 19,45 l 307,307 -307,307 q -19,19 -19,45 0,26 19,45 l 102,102 q 19,19 45,19 26,0 45,-19 z m 819,-499 q 0,209 -103,385.5 Q 1458,1458 1281.5,1561 1105,1664 896,1664 687,1664 510.5,1561 334,1458 231,1281.5 128,1105 128,896 128,687 231,510.5 334,334 510.5,231 687,128 896,128 1105,128 1281.5,231 1458,334 1561,510.5 1664,687 1664,896 Z"
-         id="path2" />
     </g>
   </defs>
-  <use
+  <use xlink:href="#previous" x="0" y="0" fill="#333333" />
-     xlink:href="#next"
+  <use xlink:href="#previous" x="0" y="1792" fill="#000000" />
-     x="0"
+  <use xlink:href="#next" x="0" y="3584" fill="#333333" />
-     y="5376"
+  <use xlink:href="#next" x="0" y="5376" fill="#000000" />
-     fill="#000000"
-     id="use5"
-     transform="translate(0,-3584)" />
-  <use
-     xlink:href="#previous"
-     x="0"
-     y="0"
-     fill="#333333"
-     id="use2"
-     style="fill:#000000;fill-opacity:1" />
 </svg>

assets/admin/img/icon-addlink.svg

@@ -1,3 +1,3 @@
 <svg width="13" height="13" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
-  <path fill="#5fa225" d="M1600 796v192q0 40-28 68t-68 28h-416v416q0 40-28 68t-68 28h-192q-40 0-68-28t-28-68v-416h-416q-40 0-68-28t-28-68v-192q0-40 28-68t68-28h416v-416q0-40 28-68t68-28h192q40 0 68 28t28 68v416h416q40 0 68 28t28 68z"/>
+  <path fill="#70bf2b" d="M1600 796v192q0 40-28 68t-68 28h-416v416q0 40-28 68t-68 28h-192q-40 0-68-28t-28-68v-416h-416q-40 0-68-28t-28-68v-192q0-40 28-68t68-28h416v-416q0-40 28-68t68-28h192q40 0 68 28t28 68v416h416q40 0 68 28t28 68z"/>
 </svg>

assets/admin/img/icon-changelink.svg

@@ -1,3 +1,3 @@
 <svg width="13" height="13" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
-  <path fill="#b48c08" d="M491 1536l91-91-235-235-91 91v107h128v128h107zm523-928q0-22-22-22-10 0-17 7l-542 542q-7 7-7 17 0 22 22 22 10 0 17-7l542-542q7-7 7-17zm-54-192l416 416-832 832h-416v-416zm683 96q0 53-37 90l-166 166-416-416 166-165q36-38 90-38 53 0 91 38l235 234q37 39 37 91z"/>
+  <path fill="#efb80b" d="M491 1536l91-91-235-235-91 91v107h128v128h107zm523-928q0-22-22-22-10 0-17 7l-542 542q-7 7-7 17 0 22 22 22 10 0 17-7l542-542q7-7 7-17zm-54-192l416 416-832 832h-416v-416zm683 96q0 53-37 90l-166 166-416-416 166-165q36-38 90-38 53 0 91 38l235 234q37 39 37 91z"/>
 </svg>

assets/admin/img/icon-hidelink.svg

@@ -1,3 +0,0 @@
-<svg width="13" height="13" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
-  <path fill="#2b70bf" d="m555 1335 78-141q-87-63-136-159t-49-203q0-121 61-225-229 117-381 353 167 258 427 375zm389-759q0-20-14-34t-34-14q-125 0-214.5 89.5T592 832q0 20 14 34t34 14 34-14 14-34q0-86 61-147t147-61q20 0 34-14t14-34zm363-191q0 7-1 9-105 188-315 566t-316 567l-49 89q-10 16-28 16-12 0-134-70-16-10-16-28 0-12 44-87-143-65-263.5-173T20 1029Q0 998 0 960t20-69q153-235 380-371t496-136q89 0 180 17l54-97q10-16 28-16 5 0 18 6t31 15.5 33 18.5 31.5 18.5T1291 358q16 10 16 27zm37 447q0 139-79 253.5T1056 1250l280-502q8 45 8 84zm448 128q0 35-20 69-39 64-109 145-150 172-347.5 267T896 1536l74-132q212-18 392.5-137T1664 960q-115-179-282-294l63-112q95 64 182.5 153T1772 891q20 34 20 69z"/>
-</svg>

assets/admin/img/inline-delete.svg

@@ -1,3 +1,3 @@
-<svg viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
   <path fill="#999999" d="M1277 1122q0-26-19-45l-181-181 181-181q19-19 19-45 0-27-19-46l-90-90q-19-19-46-19-26 0-45 19l-181 181-181-181q-19-19-45-19-27 0-46 19l-90 90q-19 19-19 46 0 26 19 45l181 181-181 181q-19 19-19 45 0 27 19 46l90 90q19 19 46 19 26 0 45-19l181-181 181 181q19 19 45 19 27 0 46-19l90-90q19-19 19-46zm387-226q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
 </svg>

assets/admin/js/SelectBox.js

@@ -41,10 +41,6 @@
             }
             SelectBox.redisplay(id);
         },
-        get_hidden_node_count(id) {
-            const cache = SelectBox.cache[id] || [];
-            return cache.filter(node => node.displayed === 0).length;
-        },
         delete_from_cache: function(id, value) {
             let delete_index = null;
             const cache = SelectBox.cache[id];

assets/admin/js/SelectFilter2.js

@@ -1,4 +1,4 @@
-/*global SelectBox, gettext, ngettext, interpolate, quickElement, SelectFilter*/
+/*global SelectBox, gettext, interpolate, quickElement, SelectFilter*/
 /*
 SelectFilter2 - Turns a multiple-select box into a filter interface.
 
@@ -15,7 +15,6 @@ Requires core.js and SelectBox.js.
             const from_box = document.getElementById(field_id);
             from_box.id += '_from'; // change its ID
             from_box.className = 'filtered';
-            from_box.setAttribute('aria-labelledby', field_id + '_from_title');
 
             for (const p of from_box.parentNode.getElementsByTagName('p')) {
                 if (p.classList.contains("info")) {
@@ -31,23 +30,23 @@ Requires core.js and SelectBox.js.
 
             // <div class="selector"> or <div class="selector stacked">
             const selector_div = quickElement('div', from_box.parentNode);
-            // Make sure the selector div is at the beginning so that the
-            // add link would be displayed to the right of the widget.
-            from_box.parentNode.prepend(selector_div);
             selector_div.className = is_stacked ? 'selector stacked' : 'selector';
 
             // <div class="selector-available">
             const selector_available = quickElement('div', selector_div);
             selector_available.className = 'selector-available';
-            const selector_available_title = quickElement('div', selector_available);
+            const title_available = quickElement('h2', selector_available, interpolate(gettext('Available %s') + ' ', [field_name]));
-            selector_available_title.id = field_id + '_from_title';
-            selector_available_title.className = 'selector-available-title';
-            quickElement('label', selector_available_title, interpolate(gettext('Available %s') + ' ', [field_name]), 'for', field_id + '_from');
             quickElement(
-                'p',
+                'span', title_available, '',
-                selector_available_title,
+                'class', 'help help-tooltip help-icon',
-                interpolate(gettext('Choose %s by selecting them and then select the "Choose" arrow button.'), [field_name]),
+                'title', interpolate(
-                'class', 'helptext'
+                    gettext(
+                        'This is the list of available %s. You may choose some by ' +
+                        'selecting them in the box below and then clicking the ' +
+                        '"Choose" arrow between the two boxes.'
+                    ),
+                    [field_name]
+                )
             );
 
             const filter_p = quickElement('p', selector_available, '', 'id', field_id + '_filter');
@@ -58,7 +57,7 @@ Requires core.js and SelectBox.js.
             quickElement(
                 'span', search_filter_label, '',
                 'class', 'help-tooltip search-label-icon',
-                'aria-label', interpolate(gettext("Type into this box to filter down the list of available %s."), [field_name])
+                'title', interpolate(gettext("Type into this box to filter down the list of available %s."), [field_name])
             );
 
             filter_p.appendChild(document.createTextNode(' '));
@@ -67,135 +66,69 @@ Requires core.js and SelectBox.js.
             filter_input.id = field_id + '_input';
 
             selector_available.appendChild(from_box);
-            const choose_all = quickElement(
+            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');
-                'button',
+            choose_all.className = 'selector-chooseall';
-                selector_available,
-                interpolate(gettext('Choose all %s'), [field_name]),
-                'id', field_id + '_add_all',
-                'class', 'selector-chooseall',
-                'type', 'button'
-            );
 
             // <ul class="selector-chooser">
             const selector_chooser = quickElement('ul', selector_div);
             selector_chooser.className = 'selector-chooser';
-            const add_button = quickElement(
+            const add_link = quickElement('a', quickElement('li', selector_chooser), gettext('Choose'), 'title', gettext('Choose'), 'href', '#', 'id', field_id + '_add_link');
-                'button',
+            add_link.className = 'selector-add';
-                quickElement('li', selector_chooser),
+            const remove_link = quickElement('a', quickElement('li', selector_chooser), gettext('Remove'), 'title', gettext('Remove'), 'href', '#', 'id', field_id + '_remove_link');
-                interpolate(gettext('Choose selected %s'), [field_name]),
+            remove_link.className = 'selector-remove';
-                'id', field_id + '_add',
-                'class', 'selector-add',
-                'type', 'button'
-            );
-            const remove_button = quickElement(
-                'button',
-                quickElement('li', selector_chooser),
-                interpolate(gettext('Remove selected %s'), [field_name]),
-                'id', field_id + '_remove',
-                'class', 'selector-remove',
-                'type', 'button'
-            );
 
             // <div class="selector-chosen">
-            const selector_chosen = quickElement('div', selector_div, '', 'id', field_id + '_selector_chosen');
+            const selector_chosen = quickElement('div', selector_div);
             selector_chosen.className = 'selector-chosen';
-            const selector_chosen_title = quickElement('div', selector_chosen);
+            const title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s') + ' ', [field_name]));
-            selector_chosen_title.className = 'selector-chosen-title';
-            selector_chosen_title.id = field_id + '_to_title';
-            quickElement('label', selector_chosen_title, interpolate(gettext('Chosen %s') + ' ', [field_name]), 'for', field_id + '_to');
             quickElement(
-                'p',
+                'span', title_chosen, '',
-                selector_chosen_title,
+                'class', 'help help-tooltip help-icon',
-                interpolate(gettext('Remove %s by selecting them and then select the "Remove" arrow button.'), [field_name]),
+                'title', interpolate(
-                'class', 'helptext'
+                    gettext(
-            );
+                        'This is the list of chosen %s. You may remove some by ' +
-            
+                        'selecting them in the box below and then clicking the ' +
-            const filter_selected_p = quickElement('p', selector_chosen, '', 'id', field_id + '_filter_selected');
+                        '"Remove" arrow between the two boxes.'
-            filter_selected_p.className = 'selector-filter';
+                    ),
-
+                    [field_name]
-            const search_filter_selected_label = quickElement('label', filter_selected_p, '', 'for', field_id + '_selected_input');
+                )
-
-            quickElement(
-                'span', search_filter_selected_label, '',
-                'class', 'help-tooltip search-label-icon',
-                'aria-label', interpolate(gettext("Type into this box to filter down the list of selected %s."), [field_name])
             );
 
-            filter_selected_p.appendChild(document.createTextNode(' '));
+            const to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', '', 'size', from_box.size, 'name', from_box.name);
-
+            to_box.className = 'filtered';
-            const filter_selected_input = quickElement('input', filter_selected_p, '', 'type', 'text', 'placeholder', gettext("Filter"));
+            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');
-            filter_selected_input.id = field_id + '_selected_input';
+            clear_all.className = 'selector-clearall';
-
-            quickElement(
-                'select',
-                selector_chosen,
-                '',
-                'id', field_id + '_to',
-                'multiple', '',
-                'size', from_box.size,
-                'name', from_box.name,
-                'aria-labelledby', field_id + '_to_title',
-                'class', 'filtered'
-            );
-            const warning_footer = quickElement('div', selector_chosen, '', 'class', 'list-footer-display');
-            quickElement('span', warning_footer, '', 'id', field_id + '_list-footer-display-text');
-            quickElement('span', warning_footer, ' ' + gettext('(click to clear)'), 'class', 'list-footer-display__clear');
-            const clear_all = quickElement(
-                'button',
-                selector_chosen,
-                interpolate(gettext('Remove all %s'), [field_name]),
-                'id', field_id + '_remove_all',
-                'class', 'selector-clearall',
-                'type', 'button'
-            );
 
             from_box.name = from_box.name + '_old';
 
             // Set up the JavaScript event handlers for the select box filter interface
             const move_selection = function(e, elem, move_func, from, to) {
-                if (!elem.hasAttribute('disabled')) {
+                if (elem.classList.contains('active')) {
                     move_func(from, to);
                     SelectFilter.refresh_icons(field_id);
-                    SelectFilter.refresh_filtered_selects(field_id);
-                    SelectFilter.refresh_filtered_warning(field_id);
                 }
                 e.preventDefault();
             };
             choose_all.addEventListener('click', function(e) {
                 move_selection(e, this, SelectBox.move_all, field_id + '_from', field_id + '_to');
             });
-            add_button.addEventListener('click', function(e) {
+            add_link.addEventListener('click', function(e) {
                 move_selection(e, this, SelectBox.move, field_id + '_from', field_id + '_to');
             });
-            remove_button.addEventListener('click', function(e) {
+            remove_link.addEventListener('click', function(e) {
                 move_selection(e, this, SelectBox.move, field_id + '_to', field_id + '_from');
             });
             clear_all.addEventListener('click', function(e) {
                 move_selection(e, this, SelectBox.move_all, field_id + '_to', field_id + '_from');
             });
-            warning_footer.addEventListener('click', function(e) {
-                filter_selected_input.value = '';
-                SelectBox.filter(field_id + '_to', '');
-                SelectFilter.refresh_filtered_warning(field_id);
-                SelectFilter.refresh_icons(field_id);
-            });
             filter_input.addEventListener('keypress', function(e) {
-                SelectFilter.filter_key_press(e, field_id, '_from', '_to');
+                SelectFilter.filter_key_press(e, field_id);
             });
             filter_input.addEventListener('keyup', function(e) {
-                SelectFilter.filter_key_up(e, field_id, '_from');
+                SelectFilter.filter_key_up(e, field_id);
             });
             filter_input.addEventListener('keydown', function(e) {
-                SelectFilter.filter_key_down(e, field_id, '_from', '_to');
+                SelectFilter.filter_key_down(e, field_id);
-            });
-            filter_selected_input.addEventListener('keypress', function(e) {
-                SelectFilter.filter_key_press(e, field_id, '_to', '_from');
-            });
-            filter_selected_input.addEventListener('keyup', function(e) {
-                SelectFilter.filter_key_up(e, field_id, '_to', '_selected_input');
-            });
-            filter_selected_input.addEventListener('keydown', function(e) {
-                SelectFilter.filter_key_down(e, field_id, '_to', '_from');
             });
             selector_div.addEventListener('change', function(e) {
                 if (e.target.tagName === 'SELECT') {
@@ -213,7 +146,6 @@ Requires core.js and SelectBox.js.
                 }
             });
             from_box.closest('form').addEventListener('submit', function() {
-                SelectBox.filter(field_id + '_to', '');
                 SelectBox.select_all(field_id + '_to');
             });
             SelectBox.init(field_id + '_from');
@@ -221,6 +153,24 @@ Requires core.js and SelectBox.js.
             // 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.
+                const j_from_box = document.getElementById(field_id + '_from');
+                const j_to_box = document.getElementById(field_id + '_to');
+                let height = filter_p.offsetHeight + j_from_box.offsetHeight;
+
+                const j_to_box_style = window.getComputedStyle(j_to_box);
+                if (j_to_box_style.getPropertyValue('box-sizing') === 'border-box') {
+                    // Add the padding and border to the final height.
+                    height += parseInt(j_to_box_style.getPropertyValue('padding-top'), 10)
+                        + parseInt(j_to_box_style.getPropertyValue('padding-bottom'), 10)
+                        + parseInt(j_to_box_style.getPropertyValue('border-top-width'), 10)
+                        + parseInt(j_to_box_style.getPropertyValue('border-bottom-width'), 10);
+                }
+
+                j_to_box.style.height = height + 'px';
+            }
+
             // Initial icon refresh
             SelectFilter.refresh_icons(field_id);
         },
@@ -231,73 +181,48 @@ Requires core.js and SelectBox.js.
             field.required = false;
             return any_selected;
         },
-        refresh_filtered_warning: function(field_id) {
-            const count = SelectBox.get_hidden_node_count(field_id + '_to');
-            const selector = document.getElementById(field_id + '_selector_chosen');
-            const warning = document.getElementById(field_id + '_list-footer-display-text');
-            selector.className = selector.className.replace('selector-chosen--with-filtered', '');
-            warning.textContent = interpolate(ngettext(
-                '%s selected option not visible',
-                '%s selected options not visible',
-                count
-            ), [count]);
-            if(count > 0) {
-                selector.className += ' selector-chosen--with-filtered';
-            }
-        },
-        refresh_filtered_selects: function(field_id) {
-            SelectBox.filter(field_id + '_from', document.getElementById(field_id + "_input").value);
-            SelectBox.filter(field_id + '_to', document.getElementById(field_id + "_selected_input").value);
-        },
         refresh_icons: function(field_id) {
             const from = document.getElementById(field_id + '_from');
             const to = document.getElementById(field_id + '_to');
-            // Disabled if no items are selected.
+            // Active if at least one item is selected
-            document.getElementById(field_id + '_add').disabled = !SelectFilter.any_selected(from);
+            document.getElementById(field_id + '_add_link').classList.toggle('active', SelectFilter.any_selected(from));
-            document.getElementById(field_id + '_remove').disabled = !SelectFilter.any_selected(to);
+            document.getElementById(field_id + '_remove_link').classList.toggle('active', SelectFilter.any_selected(to));
-            // Disabled if the corresponding box is empty.
+            // Active if the corresponding box isn't empty
-            document.getElementById(field_id + '_add_all').disabled = !from.querySelector('option');
+            document.getElementById(field_id + '_add_all_link').classList.toggle('active', from.querySelector('option'));
-            document.getElementById(field_id + '_remove_all').disabled = !to.querySelector('option');
+            document.getElementById(field_id + '_remove_all_link').classList.toggle('active', to.querySelector('option'));
         },
-        filter_key_press: function(event, field_id, source, target) {
+        filter_key_press: function(event, field_id) {
-            const source_box = document.getElementById(field_id + source);
+            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)) {
-                source_box.selectedIndex = 0;
+                from.selectedIndex = 0;
-                SelectBox.move(field_id + source, field_id + target);
+                SelectBox.move(field_id + '_from', field_id + '_to');
-                source_box.selectedIndex = 0;
+                from.selectedIndex = 0;
                 event.preventDefault();
             }
         },
-        filter_key_up: function(event, field_id, source, filter_input) {
+        filter_key_up: function(event, field_id) {
-            const input = filter_input || '_input';
+            const from = document.getElementById(field_id + '_from');
-            const source_box = document.getElementById(field_id + source);
+            const temp = from.selectedIndex;
-            const temp = source_box.selectedIndex;
+            SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value);
-            SelectBox.filter(field_id + source, document.getElementById(field_id + input).value);
+            from.selectedIndex = temp;
-            source_box.selectedIndex = temp;
-            SelectFilter.refresh_filtered_warning(field_id);
-            SelectFilter.refresh_icons(field_id);
         },
-        filter_key_down: function(event, field_id, source, target) {
+        filter_key_down: function(event, field_id) {
-            const source_box = document.getElementById(field_id + source);
+            const from = document.getElementById(field_id + '_from');
-            // right key (39) or left key (37)
-            const direction = source === '_from' ? 39 : 37;
             // right arrow -- move across
-            if ((event.which && event.which === direction) || (event.keyCode && event.keyCode === direction)) {
+            if ((event.which && event.which === 39) || (event.keyCode && event.keyCode === 39)) {
-                const old_index = source_box.selectedIndex;
+                const old_index = from.selectedIndex;
-                SelectBox.move(field_id + source, field_id + target);
+                SelectBox.move(field_id + '_from', field_id + '_to');
-                SelectFilter.refresh_filtered_selects(field_id);
+                from.selectedIndex = (old_index === from.length) ? from.length - 1 : old_index;
-                SelectFilter.refresh_filtered_warning(field_id);
-                source_box.selectedIndex = (old_index === source_box.length) ? source_box.length - 1 : old_index;
                 return;
             }
             // down arrow -- wrap around
             if ((event.which && event.which === 40) || (event.keyCode && event.keyCode === 40)) {
-                source_box.selectedIndex = (source_box.length === source_box.selectedIndex + 1) ? 0 : source_box.selectedIndex + 1;
+                from.selectedIndex = (from.length === from.selectedIndex + 1) ? 0 : from.selectedIndex + 1;
             }
             // up arrow -- wrap around
             if ((event.which && event.which === 38) || (event.keyCode && event.keyCode === 38)) {
-                source_box.selectedIndex = (source_box.selectedIndex === 0) ? source_box.length - 1 : source_box.selectedIndex - 1;
+                from.selectedIndex = (from.selectedIndex === 0) ? from.length - 1 : from.selectedIndex - 1;
             }
         }
     };

assets/admin/js/actions.js

@@ -1,4 +1,4 @@
-/*global gettext, interpolate, ngettext, Actions*/
+/*global gettext, interpolate, ngettext*/
 'use strict';
 {
     function show(selector) {
@@ -179,9 +179,6 @@
                 }
             });
         }
-        // Sync counter when navigating to the page, such as through the back
-        // button.
-        window.addEventListener('pageshow', (event) => updateCounter(actionCheckboxes, options));
     };
 
     // Call function fn when the DOM is loaded and ready. If it is already

assets/admin/js/admin/DateTimeShortcuts.js

@@ -90,9 +90,10 @@
             }
             message = interpolate(message, [timezoneOffset]);
 
-            const warning = document.createElement('div');
+            const warning = document.createElement('span');
-            warning.classList.add('help', warningClass);
+            warning.className = warningClass;
             warning.textContent = message;
+            inp.parentNode.appendChild(document.createElement('br'));
             inp.parentNode.appendChild(warning);
         },
         // Add clock widget to a given field
@@ -387,7 +388,13 @@
             DateTimeShortcuts.calendars[num].drawNextMonth();
         },
         handleCalendarCallback: function(num) {
-            const format = get_format('DATE_INPUT_FORMATS')[0];
+            let 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();

assets/admin/js/admin/RelatedObjectLookups.js

@@ -4,43 +4,14 @@
 '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 addPopupIndex(name) {
-        return name + "__" + (popupIndex + 1);
-    }
-
-    function removePopupIndex(name) {
-        return name.replace(new RegExp("__" + (popupIndex + 1) + "$"), '');
-    }
 
     function showAdminPopup(triggeringLink, name_regexp, add_popup) {
-        const name = addPopupIndex(triggeringLink.id.replace(name_regexp, ''));
+        const name = triggeringLink.id.replace(name_regexp, '');
         const href = new URL(triggeringLink.href);
         if (add_popup) {
             href.searchParams.set('_popup', 1);
         }
         const win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
-        relatedWindows.push(win);
         win.focus();
         return false;
     }
@@ -50,17 +21,12 @@
     }
 
     function dismissRelatedLookupPopup(win, chosenId) {
-        const name = removePopupIndex(win.name);
+        const name = win.name;
         const elem = document.getElementById(name);
         if (elem.classList.contains('vManyToManyRawIdAdminField') && elem.value) {
             elem.value += ',' + chosenId;
         } else {
-            elem.value = chosenId;
+            document.getElementById(name).value = chosenId;
-        }
-        $(elem).trigger('change');
-        const index = relatedWindows.indexOf(win);
-        if (index > -1) {
-            relatedWindows.splice(index, 1);
         }
         win.close();
     }
@@ -80,57 +46,19 @@
             siblings.each(function() {
                 const elm = $(this);
                 elm.attr('href', elm.attr('data-href-template').replace('__fk__', value));
-                elm.removeAttr('aria-disabled');
             });
         } else {
             siblings.removeAttr('href');
-            siblings.attr('aria-disabled', true);
         }
     }
 
-    function updateRelatedSelectsOptions(currentSelect, win, objId, newRepr, newId, skipIds = []) {
-        // 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)];
-        // Select elements with a specific model reference and context of "available-source".
-        const selectsRelated = document.querySelectorAll(`[data-model-ref="${modelName}"] [data-context="available-source"]`);
-
-        selectsRelated.forEach(function(select) {
-            if (currentSelect === select || skipIds && skipIds.includes(select.id)) {
-                return;
-            }
-
-            let option = select.querySelector(`option[value="${objId}"]`);
-
-            if (!option) {
-                option = new Option(newRepr, newId);
-                select.options.add(option);
-                // Update SelectBox cache for related fields.
-                if (window.SelectBox !== undefined && !SelectBox.cache[currentSelect.id]) {
-                    SelectBox.add_to_cache(select.id, option);
-                    SelectBox.redisplay(select.id);
-                }
-                return;
-            }
-
-            option.textContent = newRepr;
-            option.value = newId;
-        });
-    }
-
     function dismissAddRelatedObjectPopup(win, newId, newRepr) {
-        const name = removePopupIndex(win.name);
+        const name = win.name;
         const elem = document.getElementById(name);
         if (elem) {
             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.classList.contains('vManyToManyRawIdAdminField') && elem.value) {
                     elem.value += ',' + newId;
@@ -142,24 +70,15 @@
             $(elem).trigger('change');
         } else {
             const toId = name + "_to";
-            const toElem = document.getElementById(toId);
             const o = new Option(newRepr, newId);
             SelectBox.add_to_cache(toId, o);
             SelectBox.redisplay(toId);
-            if (toElem && toElem.nodeName.toUpperCase() === 'SELECT') {
-                const skipIds = [name + "_from"];
-                updateRelatedSelectsOptions(toElem, win, null, newRepr, newId, skipIds);
-            }
-        }
-        const index = relatedWindows.indexOf(win);
-        if (index > -1) {
-            relatedWindows.splice(index, 1);
         }
         win.close();
     }
 
     function dismissChangeRelatedObjectPopup(win, objId, newRepr, newId) {
-        const id = removePopupIndex(win.name.replace(/^edit_/, ''));
+        const id = win.name.replace(/^edit_/, '');
         const selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
         const selects = $(selectsSelector);
         selects.find('option').each(function() {
@@ -167,23 +86,18 @@
                 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) {
-        const id = removePopupIndex(win.name.replace(/^delete_/, ''));
+        const id = win.name.replace(/^delete_/, '');
         const selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
         const selects = $(selectsSelector);
         selects.find('option').each(function() {
@@ -191,10 +105,6 @@
                 $(this).remove();
             }
         }).trigger('change');
-        const index = relatedWindows.indexOf(win);
-        if (index > -1) {
-            relatedWindows.splice(index, 1);
-        }
         win.close();
     }
 
@@ -205,24 +115,17 @@
     window.dismissAddRelatedObjectPopup = dismissAddRelatedObjectPopup;
     window.dismissChangeRelatedObjectPopup = dismissChangeRelatedObjectPopup;
     window.dismissDeleteRelatedObjectPopup = dismissDeleteRelatedObjectPopup;
-    window.dismissChildPopups = dismissChildPopups;
-    window.relatedWindows = relatedWindows;
 
     // 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[data-popup="yes"]', function(e) {
+        $('body').on('click', '.related-widget-wrapper-link', function(e) {
             e.preventDefault();
             if (this.href) {
                 const event = $.Event('django:show-related', {href: this.href});

assets/admin/js/autocomplete.js

@@ -27,7 +27,9 @@
         $('.admin-autocomplete').not('[name*=__prefix__]').djangoAdminSelect2();
     });
 
-    document.addEventListener('formset:added', (event) => {
+    $(document).on('formset:added', (function() {
-        $(event.target).find('.admin-autocomplete').djangoAdminSelect2();
+        return function(event, $newFormset) {
-    });
+            return $newFormset.find('.admin-autocomplete').djangoAdminSelect2();
+        };
+    })(this));
 }

assets/admin/js/calendar.js

@@ -36,24 +36,6 @@ depends on core.js for utility functions like removeChildren or quickElement
             pgettext('abbrev. month December', 'Dec')
         ],
         daysOfWeek: [
-            gettext('Sunday'),
-            gettext('Monday'),
-            gettext('Tuesday'),
-            gettext('Wednesday'),
-            gettext('Thursday'),
-            gettext('Friday'),
-            gettext('Saturday')
-        ],
-        daysOfWeekAbbrev: [
-            pgettext('abbrev. day Sunday', 'Sun'),
-            pgettext('abbrev. day Monday', 'Mon'),
-            pgettext('abbrev. day Tuesday', 'Tue'),
-            pgettext('abbrev. day Wednesday', 'Wed'),
-            pgettext('abbrev. day Thursday', 'Thur'),
-            pgettext('abbrev. day Friday', 'Fri'),
-            pgettext('abbrev. day Saturday', 'Sat')
-        ],
-        daysOfWeekInitial: [
             pgettext('one letter Sunday', 'S'),
             pgettext('one letter Monday', 'M'),
             pgettext('one letter Tuesday', 'T'),
@@ -116,7 +98,7 @@ depends on core.js for utility functions like removeChildren or quickElement
             // Draw days-of-week header
             let tableRow = quickElement('tr', tableBody);
             for (let i = 0; i < 7; i++) {
-                quickElement('th', tableRow, CalendarNamespace.daysOfWeekInitial[(i + CalendarNamespace.firstDayOfWeek) % 7]);
+                quickElement('th', tableRow, CalendarNamespace.daysOfWeek[(i + CalendarNamespace.firstDayOfWeek) % 7]);
             }
 
             const startingPos = new Date(year, month - 1, 1 - CalendarNamespace.firstDayOfWeek).getDay();

assets/admin/js/collapse.js

@@ -0,0 +1,43 @@
+/*global gettext*/
+'use strict';
+{
+    window.addEventListener('load', function() {
+        // Add anchor tag for Show/Hide link
+        const fieldsets = document.querySelectorAll('fieldset.collapse');
+        for (const [i, elem] of fieldsets.entries()) {
+            // Don't hide if fields in this fieldset have errors
+            if (elem.querySelectorAll('div.errors, ul.errorlist').length === 0) {
+                elem.classList.add('collapsed');
+                const h2 = elem.querySelector('h2');
+                const link = document.createElement('a');
+                link.id = 'fieldsetcollapser' + i;
+                link.className = 'collapse-toggle';
+                link.href = '#';
+                link.textContent = gettext('Show');
+                h2.appendChild(document.createTextNode(' ('));
+                h2.appendChild(link);
+                h2.appendChild(document.createTextNode(')'));
+            }
+        }
+        // Add toggle to hide/show anchor tag
+        const toggleFunc = function(ev) {
+            if (ev.target.matches('.collapse-toggle')) {
+                ev.preventDefault();
+                ev.stopPropagation();
+                const fieldset = ev.target.closest('fieldset');
+                if (fieldset.classList.contains('collapsed')) {
+                    // Show
+                    ev.target.textContent = gettext('Hide');
+                    fieldset.classList.remove('collapsed');
+                } else {
+                    // Hide
+                    ev.target.textContent = gettext('Show');
+                    fieldset.classList.add('collapsed');
+                }
+            }
+        };
+        document.querySelectorAll('fieldset.module').forEach(function(el) {
+            el.addEventListener('click', toggleFunc);
+        });
+    });
+}

assets/admin/js/core.js

@@ -85,18 +85,6 @@ function findPosY(obj) {
         return (this.getSeconds() < 10) ? '0' + this.getSeconds() : this.getSeconds();
     };
 
-    Date.prototype.getAbbrevDayName = function() {
-        return typeof window.CalendarNamespace === "undefined"
-            ? '0' + this.getDay()
-            : window.CalendarNamespace.daysOfWeekAbbrev[this.getDay()];
-    };
-
-    Date.prototype.getFullDayName = function() {
-        return typeof window.CalendarNamespace === "undefined"
-            ? '0' + this.getDay()
-            : window.CalendarNamespace.daysOfWeek[this.getDay()];
-    };
-
     Date.prototype.getAbbrevMonthName = function() {
         return typeof window.CalendarNamespace === "undefined"
             ? this.getTwoDigitMonth()
@@ -111,8 +99,6 @@ function findPosY(obj) {
 
     Date.prototype.strftime = function(format) {
         const fields = {
-            a: this.getAbbrevDayName(),
-            A: this.getFullDayName(),
             b: this.getAbbrevMonthName(),
             B: this.getFullMonthName(),
             c: this.toString(),
@@ -133,11 +119,11 @@ function findPosY(obj) {
         let result = '', i = 0;
         while (i < format.length) {
             if (format.charAt(i) === '%') {
-                result += fields[format.charAt(i + 1)];
+                result = result + fields[format.charAt(i + 1)];
                 ++i;
             }
             else {
-                result += format.charAt(i);
+                result = result + format.charAt(i);
             }
             ++i;
         }

assets/admin/js/filters.js

@@ -1,30 +0,0 @@
-/**
- * Persist changelist filters state (collapsed/expanded).
- */
-'use strict';
-{
-    // Init filters.
-    let filters = JSON.parse(sessionStorage.getItem('django.admin.filtersState'));
-
-    if (!filters) {
-        filters = {};
-    }
-
-    Object.entries(filters).forEach(([key, value]) => {
-        const detailElement = document.querySelector(`[data-filter-title='${CSS.escape(key)}']`);
-
-        // Check if the filter is present, it could be from other view.
-        if (detailElement) {
-            value ? detailElement.setAttribute('open', '') : detailElement.removeAttribute('open');
-        }
-    });
-
-    // Save filter state when clicks.
-    const details = document.querySelectorAll('details');
-    details.forEach(detail => {
-        detail.addEventListener('toggle', event => {
-            filters[`${event.target.dataset.filterTitle}`] = detail.open;
-            sessionStorage.setItem('django.admin.filtersState', JSON.stringify(filters));
-        });
-    });
-}

assets/admin/js/inlines.js

@@ -50,11 +50,11 @@
                     // If forms are laid out as table rows, insert the
                     // "add" button in a new table row:
                     const numCols = $this.eq(-1).children().length;
-                    $parent.append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a role="button" class="addlink" href="#">' + options.addText + "</a></tr>");
+                    $parent.append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a href="#">' + options.addText + "</a></tr>");
                     addButton = $parent.find("tr:last a");
                 } else {
                     // Otherwise, insert it immediately after the last form:
-                    $this.filter(":last").after('<div class="' + options.addCssClass + '"><a role="button" class="addlink" href="#">' + options.addText + "</a></div>");
+                    $this.filter(":last").after('<div class="' + options.addCssClass + '"><a href="#">' + options.addText + "</a></div>");
                     addButton = $this.filter(":last").next().find("a");
                 }
             }
@@ -88,12 +88,7 @@
             if (options.added) {
                 options.added(row);
             }
-            row.get(0).dispatchEvent(new CustomEvent("formset:added", {
+            $(document).trigger('formset:added', [row, options.prefix]);
-                bubbles: true,
-                detail: {
-                    formsetName: options.prefix
-                }
-            }));
         };
 
         /**
@@ -104,15 +99,15 @@
             if (row.is("tr")) {
                 // If the forms are laid out in table rows, insert
                 // the remove button into the last table cell:
-                row.children(":last").append('<div><a role="button" class="' + options.deleteCssClass + '" href="#">' + options.deleteText + "</a></div>");
+                row.children(":last").append('<div><a class="' + options.deleteCssClass + '" href="#">' + options.deleteText + "</a></div>");
             } else if (row.is("ul") || row.is("ol")) {
                 // If they're laid out as an ordered/unordered list,
                 // insert an <li> after the last list item:
-                row.append('<li><a role="button" class="' + options.deleteCssClass + '" href="#">' + options.deleteText + "</a></li>");
+                row.append('<li><a class="' + options.deleteCssClass + '" href="#">' + options.deleteText + "</a></li>");
             } else {
                 // Otherwise, just insert the remove button as the
                 // last child element of the form's container:
-                row.children(":first").append('<span><a role="button" class="' + options.deleteCssClass + '" href="#">' + options.deleteText + "</a></span>");
+                row.children(":first").append('<span><a class="' + options.deleteCssClass + '" href="#">' + options.deleteText + "</a></span>");
             }
             // Add delete handler for each row.
             row.find("a." + options.deleteCssClass).on('click', inlineDeleteHandler.bind(this));
@@ -135,11 +130,7 @@
             if (options.removed) {
                 options.removed(row);
             }
-            document.dispatchEvent(new CustomEvent("formset:removed", {
+            $(document).trigger('formset:removed', [row, options.prefix]);
-                detail: {
-                    formsetName: options.prefix
-                }
-            }));
             // Update the TOTAL_FORMS form count.
             const forms = $("." + options.formCssClass);
             $("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length);
@@ -305,13 +296,7 @@
                     dependency_list = input.data('dependency_list') || [],
                     dependencies = [];
                 $.each(dependency_list, function(i, field_name) {
-                    // Dependency in a fieldset.
+                    dependencies.push('#' + row.find('.form-row .field-' + field_name).find('input, select, textarea').attr('id'));
-                    let field_element = row.find('.form-row .field-' + field_name);
-                    // Dependency without a fieldset.
-                    if (!field_element.length) {
-                        field_element = row.find('.form-row.field-' + field_name);
-                    }
-                    dependencies.push('#' + field_element.find('input, select, textarea').attr('id'));
                 });
                 if (dependencies.length) {
                     input.prepopulate(dependencies, input.attr('maxlength'));

assets/admin/js/nav_sidebar.js

@@ -2,24 +2,47 @@
 {
     const toggleNavSidebar = document.getElementById('toggle-nav-sidebar');
     if (toggleNavSidebar !== null) {
-        const navSidebar = document.getElementById('nav-sidebar');
+        const navLinks = document.querySelectorAll('#nav-sidebar a');
+        function disableNavLinkTabbing() {
+            for (const navLink of navLinks) {
+                navLink.tabIndex = -1;
+            }
+        }
+        function enableNavLinkTabbing() {
+            for (const navLink of navLinks) {
+                navLink.tabIndex = 0;
+            }
+        }
+        function disableNavFilterTabbing() {
+            document.getElementById('nav-filter').tabIndex = -1;
+        }
+        function enableNavFilterTabbing() {
+            document.getElementById('nav-filter').tabIndex = 0;
+        }
+
         const main = document.getElementById('main');
         let navSidebarIsOpen = localStorage.getItem('django.admin.navSidebarIsOpen');
         if (navSidebarIsOpen === null) {
             navSidebarIsOpen = 'true';
         }
+        if (navSidebarIsOpen === 'false') {
+            disableNavLinkTabbing();
+            disableNavFilterTabbing();
+        }
         main.classList.toggle('shifted', navSidebarIsOpen === 'true');
-        navSidebar.setAttribute('aria-expanded', navSidebarIsOpen);
 
         toggleNavSidebar.addEventListener('click', function() {
             if (navSidebarIsOpen === 'true') {
                 navSidebarIsOpen = 'false';
+                disableNavLinkTabbing();
+                disableNavFilterTabbing();
             } else {
                 navSidebarIsOpen = 'true';
+                enableNavLinkTabbing();
+                enableNavFilterTabbing();
             }
             localStorage.setItem('django.admin.navSidebarIsOpen', navSidebarIsOpen);
             main.classList.toggle('shifted');
-            navSidebar.setAttribute('aria-expanded', navSidebarIsOpen);
         });
     }
 

assets/admin/js/popup_response.js

@@ -1,3 +1,4 @@
+/*global opener */
 'use strict';
 {
     const initData = JSON.parse(document.getElementById('django-admin-popup-response-constants').dataset.popupResponse);

assets/admin/js/prepopulate_init.js

@@ -3,11 +3,7 @@
     const $ = django.jQuery;
     const fields = $('#django-admin-prepopulated-fields-constants').data('prepopulatedFields');
     $.each(fields, function(index, field) {
-        $(
+        $('.empty-form .form-row .field-' + field.name + ', .empty-form.form-row .field-' + field.name).addClass('prepopulated_field');
-            '.empty-form .form-row .field-' + field.name +
-            ', .empty-form.form-row .field-' + field.name +
-            ', .empty-form .form-row.field-' + field.name
-        ).addClass('prepopulated_field');
         $(field.id).data('dependency_list', field.dependency_list).prepopulate(
             field.dependency_ids, field.maxLength, field.allowUnicode
         );

assets/admin/js/theme.js

@@ -1,51 +0,0 @@
-'use strict';
-{
-    function setTheme(mode) {
-        if (mode !== "light" && mode !== "dark" && mode !== "auto") {
-            console.error(`Got invalid theme mode: ${mode}. Resetting to auto.`);
-            mode = "auto";
-        }
-        document.documentElement.dataset.theme = mode;
-        localStorage.setItem("theme", mode);
-    }
-
-    function cycleTheme() {
-        const currentTheme = localStorage.getItem("theme") || "auto";
-        const prefersDark = window.matchMedia("(prefers-color-scheme: dark)").matches;
-
-        if (prefersDark) {
-            // Auto (dark) -> Light -> Dark
-            if (currentTheme === "auto") {
-                setTheme("light");
-            } else if (currentTheme === "light") {
-                setTheme("dark");
-            } else {
-                setTheme("auto");
-            }
-        } else {
-            // Auto (light) -> Dark -> Light
-            if (currentTheme === "auto") {
-                setTheme("dark");
-            } else if (currentTheme === "dark") {
-                setTheme("light");
-            } else {
-                setTheme("auto");
-            }
-        }
-    }
-
-    function initTheme() {
-        // set theme defined in localStorage if there is one, or fallback to auto mode
-        const currentTheme = localStorage.getItem("theme");
-        currentTheme ? setTheme(currentTheme) : setTheme("auto");
-    }
-
-    window.addEventListener('load', function(_) {
-        const buttons = document.getElementsByClassName("theme-toggle");
-        Array.from(buttons).forEach((btn) => {
-            btn.addEventListener("click", cycleTheme);
-        });
-    });
-
-    initTheme();
-}

assets/admin/js/unusable_password_field.js

@@ -1,29 +0,0 @@
-"use strict";
-// Fallback JS for browsers which do not support :has selector used in
-// admin/css/unusable_password_fields.css
-// Remove file once all supported browsers support :has selector
-try {
-    // If browser does not support :has selector this will raise an error
-    document.querySelector("form:has(input)");
-} catch (error) {
-    console.log("Defaulting to javascript for usable password form management: " + error);
-    // JS replacement for unsupported :has selector
-    document.querySelectorAll('input[name="usable_password"]').forEach(option => {
-        option.addEventListener('change', function() {
-            const usablePassword = (this.value === "true" ? this.checked : !this.checked);
-            const submit1 = document.querySelector('input[type="submit"].set-password');
-            const submit2 = document.querySelector('input[type="submit"].unset-password');
-            const messages = document.querySelector('#id_unusable_warning');
-            document.getElementById('id_password1').closest('.form-row').hidden = !usablePassword;
-            document.getElementById('id_password2').closest('.form-row').hidden = !usablePassword;
-            if (messages) {
-                messages.hidden = usablePassword;
-            }
-            if (submit1 && submit2) {
-                submit1.hidden = !usablePassword;
-                submit2.hidden = usablePassword;
-            }
-        });
-        option.dispatchEvent(new Event('change'));
-    });
-}

assets/admin/js/urlify.js

@@ -163,7 +163,8 @@
         s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
         s = s.replace(/[-\s]+/g, '-'); // convert spaces to hyphens
         s = s.substring(0, num_chars); // trim to first num_chars chars
-        return s.replace(/-+$/g, ''); // trim any trailing hyphens
+        s = s.replace(/-+$/g, ''); // trim any trailing hyphens
+        return s;
     }
     window.URLify = URLify;
 }

assets/admin/js/vendor/xregexp/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2007-present Steven Levithan <http://xregexp.com/>
+Copyright (c) 2007-2017 Steven Levithan <http://xregexp.com/>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

assets/ckeditor/ckeditor-init.js

@@ -24,7 +24,7 @@
 
   function initialiseCKEditor() {
     var textareas = Array.prototype.slice.call(
-      document.querySelectorAll("textarea[data-type=ckeditortype]"),
+      document.querySelectorAll("textarea[data-type=ckeditortype]")
     )
     for (var i = 0; i < textareas.length; ++i) {
       var t = textareas[i]

assets/ckeditor/ckeditor.css

@@ -1,19 +0,0 @@
-/* Fix for Django dark theme background */
-/* See https://github.com/django-ckeditor/django-ckeditor/issues/670 */
-.cke_reset_all tr:nth-child(even),
-.cke_reset_all tr:nth-child(odd),
-.cke_reset_all .row-form-errors,
-.cke_reset_all tr:nth-child(even) .errorlist,
-.cke_reset_all tr:nth-child(odd) + .row-form-errors,
-.cke_reset_all tr:nth-child(odd) + .row-form-errors .errorlist,
-.cke_reset_all input[type="text"],
-.cke_reset_all input[type="password"] {
-  background: inherit;
-  color: inherit;
-}
-
-/* Fix for CKEditor source editor with Django dark theme */
-/* See https://github.com/django-ckeditor/django-ckeditor/issues/741 */
-textarea.cke_source {
-  color: revert;
-}