diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index a67118b..203236d 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1,3 @@ -github: [agusmakmun] patreon: ko_fi: liberapay: diff --git a/.travis.yml b/.travis.yml index e9211e6..1f508f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,26 +3,19 @@ sudo: false matrix: include: - - python: 2.7 - env: DJANGO=1.10.* - - python: 2.7 - env: DJANGO=1.11.* - - - python: 3.5 - env: DJANGO=1.10.* - - python: 3.5 - env: DJANGO=1.11.* - python: 3.5 env: DJANGO=2.0.* - python: 3.5 env: DJANGO=2.1.* - python: 3.5 env: DJANGO=2.2.* + - python: 3.5 + env: DJANGO=3.0.* + - python: 3.5 + env: DJANGO=3.1.* + - python: 3.5 + env: DJANGO=3.2.* - - python: 3.6 - env: DJANGO=1.10.* - - python: 3.6 - env: DJANGO=1.11.* - python: 3.6 env: DJANGO=2.0.* - python: 3.6 @@ -33,11 +26,9 @@ matrix: env: DJANGO=3.0.* - python: 3.6 env: DJANGO=3.1.* + - python: 3.6 + env: DJANGO=3.2.* - - python: 3.7 - env: DJANGO=1.10.* - - python: 3.7 - env: DJANGO=1.11.* - python: 3.7 env: DJANGO=2.0.* - python: 3.7 @@ -48,10 +39,38 @@ matrix: env: DJANGO=3.0.* - python: 3.7 env: DJANGO=3.1.* + - python: 3.7 + env: DJANGO=3.2.* + + - python: 3.8 + env: DJANGO=2.0.* + - python: 3.8 + env: DJANGO=2.1.* + - python: 3.8 + env: DJANGO=2.2.* + - python: 3.8 + env: DJANGO=3.0.* + - python: 3.8 + env: DJANGO=3.1.* + - python: 3.8 + env: DJANGO=3.2.* + + - python: 3.9 + env: DJANGO=2.0.* + - python: 3.9 + env: DJANGO=2.1.* + - python: 3.9 + env: DJANGO=2.2.* + - python: 3.9 + env: DJANGO=3.0.* + - python: 3.9 + env: DJANGO=3.1.* + - python: 3.9 + env: DJANGO=3.2.* - os: osx language: generic - env: DJANGO=3.1.* + env: DJANGO=3.2.* # Perform the manual steps on OSX to install Python3 and activate venv: # Since Python versions have been tested on Linux and it is only a matter of diff --git a/README.rst b/README.rst index b5dd54f..221de86 100644 --- a/README.rst +++ b/README.rst @@ -36,7 +36,7 @@ Quick start :: - path('admin/log_viewer/', include('log_viewer.urls')), + path('logs/', include('log_viewer.urls')), 4. In your ``settings.py`` file create the following value @@ -48,7 +48,7 @@ Quick start LOG_VIEWER_FILES_DIR = os.path.join(BASE_DIR, '../logs') LOG_VIEWER_MAX_READ_LINES = 1000 # total log lines will be read LOG_VIEWER_PAGE_LENGTH = 25 # total log lines per-page - LOG_VIEWER_PATTERNS = [']OFNI[', ']GUBED[', ']GNINRAW[', ']RORRE[', ']LACITIRC['] + LOG_VIEWER_PATTERNS = ['[INFO]', '[DEBUG]', '[WARNING]', '[ERROR]', '[CRITICAL]'] # Optionally you can set the next variables in order to customize the admin: @@ -73,7 +73,7 @@ Quick start python manage.py collectstatic -7. Start the development server and visit http://127.0.0.1:8000/admin/log_viewer/ +7. Start the development server and visit http://127.0.0.1:8000/logs/ .. |pypi version| image:: https://img.shields.io/pypi/v/django-log-viewer.svg diff --git a/log_viewer/__init__.py b/log_viewer/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/log_viewer/locale/en/LC_MESSAGES/django.po b/log_viewer/locale/en/LC_MESSAGES/django.po index 7588ae8..39e8880 100644 --- a/log_viewer/locale/en/LC_MESSAGES/django.po +++ b/log_viewer/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-30 17:54+0700\n" +"POT-Creation-Date: 2021-07-06 21:39+0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,35 +18,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: templates/log_viewer/logfile_viewer.html:6 -msgid "Home" -msgstr "" - -#: templates/log_viewer/logfile_viewer.html:8 -#: templates/log_viewer/logfile_viewer.html:39 +#: templates/log_viewer/logfile_viewer.html:3 +#: templates/log_viewer/logfile_viewer.html:9 +#: templates/log_viewer/logfile_viewer.html:35 msgid "Django Log Viewer" msgstr "" -#: templates/log_viewer/logfile_viewer.html:32 -msgid "Log Files" +#: templates/log_viewer/logfile_viewer.html:7 +msgid "Home" msgstr "" -#: templates/log_viewer/logfile_viewer.html:41 +#: templates/log_viewer/logfile_viewer.html:37 msgid "Download all Log Files" msgstr "" -#: templates/log_viewer/logfile_viewer.html:42 +#: templates/log_viewer/logfile_viewer.html:38 msgid "Download this Log File" msgstr "" -#: templates/log_viewer/logfile_viewer.html:48 +#: templates/log_viewer/logfile_viewer.html:44 msgid "No." msgstr "" -#: templates/log_viewer/logfile_viewer.html:49 +#: templates/log_viewer/logfile_viewer.html:45 msgid "Log entries" msgstr "" -#: templates/log_viewer/logfile_viewer.html:53 +#: templates/log_viewer/logfile_viewer.html:49 msgid "No entries!" msgstr "" + +#: templates/log_viewer/logfile_viewer.html:55 +msgid "Log Files" +msgstr "" diff --git a/log_viewer/locale/id/LC_MESSAGES/django.po b/log_viewer/locale/id/LC_MESSAGES/django.po index 7a8882a..ebf44d4 100644 --- a/log_viewer/locale/id/LC_MESSAGES/django.po +++ b/log_viewer/locale/id/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-30 17:54+0700\n" +"POT-Creation-Date: 2021-07-06 21:39+0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,35 +18,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: templates/log_viewer/logfile_viewer.html:6 -msgid "Home" -msgstr "Beranda" - -#: templates/log_viewer/logfile_viewer.html:8 -#: templates/log_viewer/logfile_viewer.html:39 +#: templates/log_viewer/logfile_viewer.html:3 +#: templates/log_viewer/logfile_viewer.html:9 +#: templates/log_viewer/logfile_viewer.html:35 msgid "Django Log Viewer" msgstr "Penampil Log Django" -#: templates/log_viewer/logfile_viewer.html:32 -msgid "Log Files" -msgstr "File log" +#: templates/log_viewer/logfile_viewer.html:7 +msgid "Home" +msgstr "Beranda" -#: templates/log_viewer/logfile_viewer.html:41 +#: templates/log_viewer/logfile_viewer.html:37 msgid "Download all Log Files" msgstr "Unduh seluruh File Log" -#: templates/log_viewer/logfile_viewer.html:42 +#: templates/log_viewer/logfile_viewer.html:38 msgid "Download this Log File" msgstr "Unduh File Log ini" -#: templates/log_viewer/logfile_viewer.html:48 +#: templates/log_viewer/logfile_viewer.html:44 msgid "No." msgstr "No." -#: templates/log_viewer/logfile_viewer.html:49 +#: templates/log_viewer/logfile_viewer.html:45 msgid "Log entries" msgstr "Entri log" -#: templates/log_viewer/logfile_viewer.html:53 +#: templates/log_viewer/logfile_viewer.html:49 msgid "No entries!" msgstr "Tidak ada entri!" + +#: templates/log_viewer/logfile_viewer.html:55 +msgid "Log Files" +msgstr "File log" diff --git a/log_viewer/settings.py b/log_viewer/settings.py index a8a4f17..68235e5 100644 --- a/log_viewer/settings.py +++ b/log_viewer/settings.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -import os - from django.conf import settings LOG_VIEWER_FILES = getattr(settings, 'LOG_VIEWER_FILES', []) @@ -12,5 +10,5 @@ LOG_VIEWER_MAX_READ_LINES = getattr(settings, 'LOG_VIEWER_MAX_READ_LINES', 1000) LOG_VIEWER_FILE_LIST_TITLE = getattr(settings, 'LOG_VIEWER_FILE_LIST_TITLE', None) LOG_VIEWER_FILE_LIST_STYLES = getattr(settings, 'LOG_VIEWER_FILE_LIST_STYLES', None) -LOG_VIEWER_PATTERNS = getattr(settings, 'LOG_VIEWER_PATTERNS', [']OFNI[', ']GUBED[', ']GNINRAW[', - ']RORRE[', ']LACITIRC[']) +LOG_VIEWER_PATTERNS = getattr(settings, 'LOG_VIEWER_PATTERNS', ['[INFO]', '[DEBUG]', '[WARNING]', + '[ERROR]', '[CRITICAL]']) diff --git a/log_viewer/templates/log_viewer/logfile_viewer.html b/log_viewer/templates/log_viewer/logfile_viewer.html index e420537..008916d 100644 --- a/log_viewer/templates/log_viewer/logfile_viewer.html +++ b/log_viewer/templates/log_viewer/logfile_viewer.html @@ -1,5 +1,6 @@ {% extends "admin/base_site.html" %} {% load static i18n %} +{% block title %}{% trans "Django Log Viewer" %} - {{ block.super }}{% endblock %} {% block breadcrumbs %}
@@ -25,15 +26,10 @@ {% endblock %} {% block content %} -
+
-
-

{% trans 'Log Files' %}

-
-
-
-
+

{% if custom_file_list_title %}{{ custom_file_list_title }}{% else %}{% trans "Django Log Viewer" %}{% endif %}

@@ -55,6 +51,11 @@

{% if custom_file_list_title %}{{ custom_file_list_title }

+
+

{% trans 'Log Files' %}

+
+
+
diff --git a/log_viewer/tests/tests.py b/log_viewer/tests/tests.py index 2fd6dfe..59b05fa 100644 --- a/log_viewer/tests/tests.py +++ b/log_viewer/tests/tests.py @@ -1,8 +1,34 @@ -from django.test import TestCase +from django.urls import reverse +from django.test import TestCase, Client +from django.contrib.auth import get_user_model +User = get_user_model() -class SimpleTest(TestCase): + +class TestLogsViewer(TestCase): + + def setUp(self): + self.user = User.objects.create_user( + username='john', + password='Foobar@1234', + is_active=True, + is_staff=True, + is_superuser=True + ) + self.client_login = Client() + self.client_login.force_login(self.user) + self.client_anon = Client() + self.url = reverse('log_file_view') def test_redirection(self): - response = self.client.get('/') + response = self.client_anon.get(self.url) self.assertEqual(response.status_code, 302) + + def test_logs_viewer(self): + # response = self.client_login.get(self.url) + # self.assertEqual(response.status_code, 200) + # self.assertContains(response, 'Django Log Viewer') + # self.assertTemplateUsed(response, 'log_viewer/logfile_viewer.html') + + # FIXME: django.urls.exceptions.NoReverseMatch: 'admin' is not a registered namespace + ... diff --git a/log_viewer/utils.py b/log_viewer/utils.py index 16d2794..e195d9a 100644 --- a/log_viewer/utils.py +++ b/log_viewer/utils.py @@ -29,9 +29,14 @@ def readlines_reverse(qfile, exclude=''): """ Read file lines from bottom to top """ + # support custom patterns (fixed issue #4) + patterns = settings.LOG_VIEWER_PATTERNS + reversed_patterns = [x[::-1] for x in patterns] + qfile.seek(0, os.SEEK_END) position = qfile.tell() line = '' + while position >= 0: qfile.seek(position) next_char = qfile.read(1) @@ -48,10 +53,7 @@ def readlines_reverse(qfile, exclude=''): # modified if next_char == '\n' and line: - # support custom patterns (fixed issue #4) - patterns = settings.LOG_VIEWER_PATTERNS - - if any([line.endswith(p) for p in patterns]): + if any([line.endswith(p) for p in reversed_patterns]): if exclude in line[::-1]: line = '' else: diff --git a/log_viewer_demo/log_viewer_demo/asgi.py b/log_viewer_demo/log_viewer_demo/asgi.py new file mode 100644 index 0000000..fac37da --- /dev/null +++ b/log_viewer_demo/log_viewer_demo/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for log_viewer_demo project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'log_viewer_demo.settings') + +application = get_asgi_application() diff --git a/log_viewer_demo/log_viewer_demo/settings.py b/log_viewer_demo/log_viewer_demo/settings.py index 8d5e218..1a32865 100644 --- a/log_viewer_demo/log_viewer_demo/settings.py +++ b/log_viewer_demo/log_viewer_demo/settings.py @@ -1,13 +1,13 @@ """ Django settings for log_viewer_demo project. -Generated by 'django-admin startproject' using Django 3.1. +Generated by 'django-admin startproject' using Django 3.2.5. For more information on this file, see -https://docs.djangoproject.com/en/3.1/topics/settings/ +https://docs.djangoproject.com/en/3.2/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/3.1/ref/settings/ +https://docs.djangoproject.com/en/3.2/ref/settings/ """ import os @@ -15,14 +15,14 @@ from log_viewer_demo.logger import LOGGING # Build paths inside the project like this: BASE_DIR / 'subdir'. -BASE_DIR = Path(__file__).resolve(strict=True).parent.parent +BASE_DIR = Path(__file__).resolve().parent.parent # Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ +# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'j)s1pg_jhv22p(-38*r9d_@#sm+^k=+q29e0gis4ph(bioelc*' +SECRET_KEY = 'django-insecure-3k68@_zbsw#f$%tvg$g=h3r4_#rk8_5aamhwgz1gyf997fsye1' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -31,15 +31,12 @@ LOGIN_REDIRECT_URL = '/' LOGGING = LOGGING - # Django log viewer LOG_VIEWER_FILES_DIR = 'logs' LOG_VIEWER_PAGE_LENGTH = 25 LOG_VIEWER_MAX_READ_LINES = 1000 - # Application definition - INSTALLED_APPS = [ 'django.contrib.admin', 'django.contrib.auth', @@ -83,7 +80,7 @@ # Database -# https://docs.djangoproject.com/en/3.1/ref/settings/#databases +# https://docs.djangoproject.com/en/3.2/ref/settings/#databases DATABASES = { 'default': { @@ -94,7 +91,7 @@ # Password validation -# https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators +# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators AUTH_PASSWORD_VALIDATORS = [ { @@ -113,7 +110,7 @@ # Internationalization -# https://docs.djangoproject.com/en/3.1/topics/i18n/ +# https://docs.djangoproject.com/en/3.2/topics/i18n/ LANGUAGE_CODE = 'en-us' @@ -127,7 +124,11 @@ # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/3.1/howto/static-files/ +# https://docs.djangoproject.com/en/3.2/howto/static-files/ STATIC_URL = '/static/' STATIC_ROOT = os.path.join(BASE_DIR, 'static/') + +# Default primary key field type +# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/log_viewer_demo/log_viewer_demo/urls.py b/log_viewer_demo/log_viewer_demo/urls.py index 64b6d4c..841e147 100644 --- a/log_viewer_demo/log_viewer_demo/urls.py +++ b/log_viewer_demo/log_viewer_demo/urls.py @@ -1,7 +1,7 @@ """log_viewer_demo URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/3.1/topics/http/urls/ + https://docs.djangoproject.com/en/3.2/topics/http/urls/ Examples: Function views 1. Add an import: from my_app import views @@ -18,5 +18,5 @@ urlpatterns = [ path('admin/', admin.site.urls), - path('admin/log_viewer/', include('log_viewer.urls')), + path('logs/', include('log_viewer.urls')), ] diff --git a/log_viewer_demo/log_viewer_demo/wsgi.py b/log_viewer_demo/log_viewer_demo/wsgi.py index 7881849..82e4ae2 100644 --- a/log_viewer_demo/log_viewer_demo/wsgi.py +++ b/log_viewer_demo/log_viewer_demo/wsgi.py @@ -4,7 +4,7 @@ It exposes the WSGI callable as a module-level variable named ``application``. For more information on this file, see -https://docs.djangoproject.com/en/3.1/howto/deployment/wsgi/ +https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/ """ import os diff --git a/log_viewer_demo/manage.py b/log_viewer_demo/manage.py index 7f79f3b..88a0f63 100755 --- a/log_viewer_demo/manage.py +++ b/log_viewer_demo/manage.py @@ -1,8 +1,11 @@ #!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" import os import sys -if __name__ == '__main__': + +def main(): + """Run administrative tasks.""" os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'log_viewer_demo.settings') try: from django.core.management import execute_from_command_line @@ -13,3 +16,7 @@ "forget to activate a virtual environment?" ) from exc execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/log_viewer_demo/static/admin/css/autocomplete.css b/log_viewer_demo/static/admin/css/autocomplete.css index 3ef95d1..69c94e7 100644 --- a/log_viewer_demo/static/admin/css/autocomplete.css +++ b/log_viewer_demo/static/admin/css/autocomplete.css @@ -14,7 +14,7 @@ select.admin-autocomplete { .select2-container--admin-autocomplete.select2-container--focus .select2-selection, .select2-container--admin-autocomplete.select2-container--open .select2-selection { - border-color: #999; + border-color: var(--body-quiet-color); min-height: 30px; } @@ -29,13 +29,13 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-selection--single { - background-color: #fff; - border: 1px solid #ccc; + background-color: var(--body-bg); + border: 1px solid var(--border-color); border-radius: 4px; } .select2-container--admin-autocomplete .select2-selection--single .select2-selection__rendered { - color: #444; + color: var(--body-fg); line-height: 30px; } @@ -46,7 +46,7 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-selection--single .select2-selection__placeholder { - color: #999; + color: var(--body-quiet-color); } .select2-container--admin-autocomplete .select2-selection--single .select2-selection__arrow { @@ -80,7 +80,7 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete.select2-container--disabled .select2-selection--single { - background-color: #eee; + background-color: var(--darkened-bg); cursor: default; } @@ -94,8 +94,8 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-selection--multiple { - background-color: white; - border: 1px solid #ccc; + background-color: var(--body-bg); + border: 1px solid var(--border-color); border-radius: 4px; cursor: text; } @@ -104,8 +104,10 @@ select.admin-autocomplete { box-sizing: border-box; list-style: none; margin: 0; - padding: 0 5px; + padding: 0 10px 5px 5px; width: 100%; + display: flex; + flex-wrap: wrap; } .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__rendered li { @@ -113,7 +115,7 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__placeholder { - color: #999; + color: var(--body-quiet-color); margin-top: 5px; float: left; } @@ -123,11 +125,13 @@ select.admin-autocomplete { float: right; font-weight: bold; margin: 5px; + position: absolute; + right: 0; } .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice { - background-color: #e4e4e4; - border: 1px solid #ccc; + background-color: var(--darkened-bg); + border: 1px solid var(--border-color); border-radius: 4px; cursor: default; float: left; @@ -137,7 +141,7 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice__remove { - color: #999; + color: var(--body-quiet-color); cursor: pointer; display: inline-block; font-weight: bold; @@ -145,7 +149,7 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice__remove:hover { - color: #333; + color: var(--body-fg); } .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-search--inline { @@ -163,12 +167,12 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete.select2-container--focus .select2-selection--multiple { - border: solid #999 1px; + border: solid var(--body-quiet-color) 1px; outline: 0; } .select2-container--admin-autocomplete.select2-container--disabled .select2-selection--multiple { - background-color: #eee; + background-color: var(--darkened-bg); cursor: default; } @@ -186,12 +190,20 @@ select.admin-autocomplete { border-bottom-right-radius: 0; } +.select2-container--admin-autocomplete .select2-search--dropdown { + background: var(--darkened-bg); +} + .select2-container--admin-autocomplete .select2-search--dropdown .select2-search__field { - border: 1px solid #ccc; + background: var(--body-bg); + color: var(--body-fg); + border: 1px solid var(--border-color); + border-radius: 4px; } .select2-container--admin-autocomplete .select2-search--inline .select2-search__field { background: transparent; + color: var(--body-fg); border: none; outline: 0; box-shadow: none; @@ -201,6 +213,8 @@ select.admin-autocomplete { .select2-container--admin-autocomplete .select2-results > .select2-results__options { max-height: 200px; overflow-y: auto; + color: var(--body-fg); + background: var(--body-bg); } .select2-container--admin-autocomplete .select2-results__option[role=group] { @@ -208,11 +222,12 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-results__option[aria-disabled=true] { - color: #999; + color: var(--body-quiet-color); } .select2-container--admin-autocomplete .select2-results__option[aria-selected=true] { - background-color: #ddd; + background-color: var(--selected-bg); + color: var(--body-fg); } .select2-container--admin-autocomplete .select2-results__option .select2-results__option { @@ -249,8 +264,8 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-results__option--highlighted[aria-selected] { - background-color: #79aec8; - color: white; + background-color: var(--primary); + color: var(--primary-fg); } .select2-container--admin-autocomplete .select2-results__group { diff --git a/log_viewer_demo/static/admin/css/base.css b/log_viewer_demo/static/admin/css/base.css index c428519..1cb3acd 100644 --- a/log_viewer_demo/static/admin/css/base.css +++ b/log_viewer_demo/static/admin/css/base.css @@ -4,6 +4,93 @@ @import url(fonts.css); +/* VARIABLE DEFINITIONS */ +:root { + --primary: #79aec8; + --secondary: #417690; + --accent: #f5dd5d; + --primary-fg: #fff; + + --body-fg: #333; + --body-bg: #fff; + --body-quiet-color: #666; + --body-loud-color: #000; + + --header-color: #ffc; + --header-branding-color: var(--accent); + --header-bg: var(--secondary); + --header-link-color: var(--primary-fg); + + --breadcrumbs-fg: #c4dce8; + --breadcrumbs-link-fg: var(--body-bg); + --breadcrumbs-bg: var(--primary); + + --link-fg: #447e9b; + --link-hover-color: #036; + --link-selected-fg: #5b80b2; + + --hairline-color: #e8e8e8; + --border-color: #ccc; + + --error-fg: #ba2121; + + --message-success-bg: #dfd; + --message-warning-bg: #ffc; + --message-error-bg: #ffefef; + + --darkened-bg: #f8f8f8; /* A bit darker than --body-bg */ + --selected-bg: #e4e4e4; /* E.g. selected table cells */ + --selected-row: #ffc; + + --button-fg: #fff; + --button-bg: var(--primary); + --button-hover-bg: #609ab6; + --default-button-bg: var(--secondary); + --default-button-hover-bg: #205067; + --close-button-bg: #888; /* Previously #bbb, contrast 1.92 */ + --close-button-hover-bg: #747474; + --delete-button-bg: #ba2121; + --delete-button-hover-bg: #a41515; + + --object-tools-fg: var(--button-fg); + --object-tools-bg: var(--close-button-bg); + --object-tools-hover-bg: var(--close-button-hover-bg); +} + +@media (prefers-color-scheme: dark) { + :root { + --primary: #264b5d; + --primary-fg: #eee; + + --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 { height: 100%; } @@ -13,19 +100,20 @@ body { padding: 0; font-size: 14px; font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif; - color: #333; - background: #fff; + color: var(--body-fg); + background: var(--body-bg); } /* LINKS */ a:link, a:visited { - color: #447e9b; + color: var(--link-fg); text-decoration: none; + transition: color 0.15s, background 0.15s; } a:focus, a:hover { - color: #036; + color: var(--link-hover-color); } a:focus { @@ -37,7 +125,7 @@ a img { } a.section:link, a.section:visited { - color: #fff; + color: var(--header-link-color); text-decoration: none; } @@ -64,7 +152,7 @@ h1 { margin: 0 0 20px; font-weight: 300; font-size: 20px; - color: #666; + color: var(--body-quiet-color); } h2 { @@ -80,7 +168,7 @@ h2.subhead { h3 { font-size: 14px; margin: .8em 0 .3em 0; - color: #666; + color: var(--body-quiet-color); font-weight: bold; } @@ -93,7 +181,7 @@ h4 { h5 { font-size: 10px; margin: 1.5em 0 .5em 0; - color: #666; + color: var(--body-quiet-color); text-transform: uppercase; letter-spacing: 1px; } @@ -131,7 +219,7 @@ fieldset { min-width: 0; padding: 0; border: none; - border-top: 1px solid #eee; + border-top: 1px solid var(--hairline-color); } blockquote { @@ -144,14 +232,14 @@ blockquote { code, pre { font-family: "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; - color: #666; + color: var(--body-quiet-color); font-size: 12px; overflow-x: auto; } pre.literal-block { margin: 10px; - background: #eee; + background: var(--darkened-bg); padding: 6px 8px; } @@ -161,8 +249,8 @@ code strong { hr { clear: both; - color: #eee; - background-color: #eee; + color: var(--hairline-color); + background-color: var(--hairline-color); height: 1px; border: none; margin: 0; @@ -183,7 +271,7 @@ hr { .help, p.help, form p.help, div.help, form div.help, div.help li { font-size: 11px; - color: #999; + color: var(--body-quiet-color); } div.help ul { @@ -199,7 +287,7 @@ p img, h1 img, h2 img, h3 img, h4 img, td img { } .quiet, a.quiet:link, a.quiet:visited { - color: #999; + color: var(--body-quiet-color); font-weight: normal; } @@ -211,20 +299,23 @@ p img, h1 img, h2 img, h3 img, h4 img, td img { white-space: nowrap; } +.hidden { + display: none; +} + /* TABLES */ table { border-collapse: collapse; - border-color: #ccc; + border-color: var(--border-color); } td, th { font-size: 13px; line-height: 16px; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--hairline-color); vertical-align: top; padding: 8px; - font-family: "Roboto", "Lucida Grande", Verdana, Arial, sans-serif; } th { @@ -234,37 +325,37 @@ th { thead th, tfoot td { - color: #666; + color: var(--body-quiet-color); padding: 5px 10px; font-size: 11px; - background: #fff; + background: var(--body-bg); border: none; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; + border-top: 1px solid var(--hairline-color); + border-bottom: 1px solid var(--hairline-color); } tfoot td { border-bottom: none; - border-top: 1px solid #eee; + border-top: 1px solid var(--hairline-color); } thead th.required { - color: #000; + color: var(--body-loud-color); } tr.alt { - background: #f6f6f6; + background: var(--darkened-bg); } tr:nth-child(odd), .row-form-errors { - background: #fff; + background: var(--body-bg); } tr:nth-child(even), tr:nth-child(even) .errorlist, tr:nth-child(odd) + .row-form-errors, tr:nth-child(odd) + .row-form-errors .errorlist { - background: #f9f9f9; + background: var(--darkened-bg); } /* SORTABLE TABLES */ @@ -273,15 +364,15 @@ thead th { padding: 5px 10px; line-height: normal; text-transform: uppercase; - background: #f6f6f6; + background: var(--darkened-bg); } thead th a:link, thead th a:visited { - color: #666; + color: var(--body-quiet-color); } thead th.sorted { - background: #eee; + background: var(--selected-bg); } thead th.sorted .text { @@ -300,7 +391,7 @@ table thead th .text a { } table thead th .text a:focus, table thead th .text a:hover { - background: #eee; + background: var(--selected-bg); } thead th.sorted a.sortremove { @@ -347,12 +438,12 @@ table thead th.sorted .sortoptions a.sortremove:after { left: 3px; font-weight: 200; font-size: 18px; - color: #999; + color: var(--body-quiet-color); } table thead th.sorted .sortoptions a.sortremove:focus:after, table thead th.sorted .sortoptions a.sortremove:hover:after { - color: #447e9b; + color: var(--link-fg); } table thead th.sorted .sortoptions a.sortremove:focus, @@ -399,16 +490,18 @@ textarea { input[type=text], input[type=password], input[type=email], input[type=url], input[type=number], input[type=tel], textarea, select, .vTextField { - border: 1px solid #ccc; + border: 1px solid var(--border-color); border-radius: 4px; padding: 5px 6px; margin-top: 0; + color: var(--body-fg); + background-color: var(--body-bg); } input[type=text]:focus, input[type=password]:focus, input[type=email]:focus, input[type=url]:focus, input[type=number]:focus, input[type=tel]:focus, textarea:focus, select:focus, .vTextField:focus { - border-color: #999; + border-color: var(--body-quiet-color); } select { @@ -424,12 +517,13 @@ select[multiple] { /* FORM BUTTONS */ .button, input[type=submit], input[type=button], .submit-row input, a.button { - background: #79aec8; + background: var(--button-bg); padding: 10px 15px; border: none; border-radius: 4px; - color: #fff; + color: var(--button-fg); cursor: pointer; + transition: background 0.15s; } a.button { @@ -439,7 +533,7 @@ a.button { .button:active, input[type=submit]:active, input[type=button]:active, .button:focus, input[type=submit]:focus, input[type=button]:focus, .button:hover, input[type=submit]:hover, input[type=button]:hover { - background: #609ab6; + background: var(--button-hover-bg); } .button[disabled], input[type=submit][disabled], input[type=button][disabled] { @@ -450,13 +544,13 @@ a.button { float: right; border: none; font-weight: 400; - background: #417690; + background: var(--default-button-bg); } .button.default:active, input[type=submit].default:active, .button.default:focus, input[type=submit].default:focus, .button.default:hover, input[type=submit].default:hover { - background: #205067; + background: var(--default-button-hover-bg); } .button[disabled].default, @@ -471,7 +565,7 @@ input[type=button][disabled].default { .module { border: none; margin-bottom: 30px; - background: #fff; + background: var(--body-bg); } .module p, .module ul, .module h3, .module h4, .module dl, .module pre { @@ -497,8 +591,8 @@ input[type=button][disabled].default { font-weight: 400; font-size: 13px; text-align: left; - background: #79aec8; - color: #fff; + background: var(--primary); + color: var(--header-link-color); } .module caption, @@ -525,18 +619,18 @@ ul.messagelist li { font-size: 13px; padding: 10px 10px 10px 65px; margin: 0 0 10px 0; - background: #dfd url(../img/icon-yes.svg) 40px 12px no-repeat; + background: var(--message-success-bg) url(../img/icon-yes.svg) 40px 12px no-repeat; background-size: 16px auto; - color: #333; + color: var(--body-fg); } ul.messagelist li.warning { - background: #ffc url(../img/icon-alert.svg) 40px 14px no-repeat; + background: var(--message-warning-bg) url(../img/icon-alert.svg) 40px 14px no-repeat; background-size: 14px auto; } ul.messagelist li.error { - background: #ffefef url(../img/icon-no.svg) 40px 12px no-repeat; + background: var(--message-error-bg) url(../img/icon-no.svg) 40px 12px no-repeat; background-size: 16px auto; } @@ -546,24 +640,26 @@ ul.messagelist li.error { display: block; padding: 10px 12px; margin: 0 0 10px 0; - color: #ba2121; - border: 1px solid #ba2121; + color: var(--error-fg); + border: 1px solid var(--error-fg); border-radius: 4px; - background-color: #fff; + background-color: var(--body-bg); background-position: 5px 12px; + overflow-wrap: break-word; } ul.errorlist { margin: 0 0 4px; padding: 0; - color: #ba2121; - background: #fff; + color: var(--error-fg); + background: var(--body-bg); } ul.errorlist li { font-size: 13px; display: block; margin-bottom: 4px; + overflow-wrap: break-word; } ul.errorlist li:first-child { @@ -587,7 +683,7 @@ td ul.errorlist li { .form-row.errors { margin: 0; border: none; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--hairline-color); background: none; } @@ -597,7 +693,7 @@ td ul.errorlist li { .errors input, .errors select, .errors textarea, td ul.errorlist + input, td ul.errorlist + select, td ul.errorlist + textarea { - border: 1px solid #ba2121; + border: 1px solid var(--error-fg); } .description { @@ -608,20 +704,19 @@ td ul.errorlist + input, td ul.errorlist + select, td ul.errorlist + textarea { /* BREADCRUMBS */ div.breadcrumbs { - background: #79aec8; + background: var(--breadcrumbs-bg); padding: 10px 40px; border: none; - font-size: 14px; - color: #c4dce8; + color: var(--breadcrumbs-fg); text-align: left; } div.breadcrumbs a { - color: #fff; + color: var(--breadcrumbs-link-fg); } div.breadcrumbs a:focus, div.breadcrumbs a:hover { - color: #c4dce8; + color: var(--breadcrumbs-fg); } /* ACTION ICONS */ @@ -647,11 +742,11 @@ div.breadcrumbs a:focus, div.breadcrumbs a:hover { } a.deletelink:link, a.deletelink:visited { - color: #CC3434; + color: #CC3434; /* XXX Probably unused? */ } a.deletelink:focus, a.deletelink:hover { - color: #993333; + color: #993333; /* XXX Probably unused? */ text-decoration: none; } @@ -666,14 +761,6 @@ a.deletelink:focus, a.deletelink:hover { margin-top: -48px; } -.form-row .object-tools { - margin-top: 5px; - margin-bottom: 5px; - float: none; - height: 2em; - padding-left: 3.5em; -} - .object-tools li { display: block; float: left; @@ -689,29 +776,29 @@ a.deletelink:focus, a.deletelink:hover { display: block; float: left; padding: 3px 12px; - background: #999; + background: var(--object-tools-bg); + color: var(--object-tools-fg); font-weight: 400; font-size: 11px; text-transform: uppercase; letter-spacing: 0.5px; - color: #fff; } .object-tools a:focus, .object-tools a:hover { - background-color: #417690; + background-color: var(--object-tools-hover-bg); } .object-tools a:focus{ text-decoration: none; } -.object-tools a.viewsitelink, .object-tools a.golink,.object-tools a.addlink { +.object-tools a.viewsitelink, .object-tools a.addlink { background-repeat: no-repeat; background-position: right 7px center; padding-right: 26px; } -.object-tools a.viewsitelink, .object-tools a.golink { +.object-tools a.viewsitelink { background-image: url(../img/tooltag-arrowright.svg); } @@ -813,13 +900,13 @@ table#change-history tbody th { justify-content: space-between; align-items: center; padding: 10px 40px; - background: #417690; - color: #ffc; + background: var(--header-bg); + color: var(--header-color); overflow: hidden; } #header a:link, #header a:visited { - color: #fff; + color: var(--header-link-color); } #header a:focus , #header a:hover { @@ -835,11 +922,11 @@ table#change-history tbody th { margin: 0 20px 0 0; font-weight: 300; font-size: 24px; - color: #f5dd5d; + color: var(--accent); } #branding h1, #branding h1 a:link, #branding h1 a:visited { - color: #f5dd5d; + color: var(--accent); } #branding h2 { @@ -847,7 +934,7 @@ table#change-history tbody th { font-size: 14px; margin: -8px 0 8px 0; font-weight: normal; - color: #ffc; + color: var(--header-color); } #branding a:hover { @@ -871,14 +958,14 @@ table#change-history tbody th { #user-tools a:focus, #user-tools a:hover { text-decoration: none; - border-bottom-color: #79aec8; - color: #79aec8; + border-bottom-color: var(--primary); + color: var(--primary); } /* SIDEBAR */ #content-related { - background: #f8f8f8; + background: var(--darkened-bg); } #content-related .module { @@ -886,8 +973,7 @@ table#change-history tbody th { } #content-related h3 { - font-size: 14px; - color: #666; + color: var(--body-quiet-color); padding: 0 16px; margin: 0 0 16px; } @@ -916,22 +1002,22 @@ table#change-history tbody th { background: none; padding: 16px; margin-bottom: 16px; - border-bottom: 1px solid #eaeaea; + border-bottom: 1px solid var(--hairline-color); font-size: 18px; - color: #333; + color: var(--body-fg); } .delete-confirmation form input[type="submit"] { - background: #ba2121; + background: var(--delete-button-bg); border-radius: 4px; padding: 10px 15px; - color: #fff; + color: var(--button-fg); } .delete-confirmation form input[type="submit"]:active, .delete-confirmation form input[type="submit"]:focus, .delete-confirmation form input[type="submit"]:hover { - background: #a41515; + background: var(--delete-button-hover-bg); } .delete-confirmation form .cancel-link { @@ -939,17 +1025,17 @@ table#change-history tbody th { vertical-align: middle; height: 15px; line-height: 15px; - background: #ddd; border-radius: 4px; padding: 10px 15px; - color: #333; + color: var(--button-fg); + background: var(--close-button-bg); margin: 0 0 0 10px; } .delete-confirmation form .cancel-link:active, .delete-confirmation form .cancel-link:focus, .delete-confirmation form .cancel-link:hover { - background: #ccc; + background: var(--close-button-hover-bg); } /* POPUP */ diff --git a/log_viewer_demo/static/admin/css/changelists.css b/log_viewer_demo/static/admin/css/changelists.css index 1bda965..b4a1557 100644 --- a/log_viewer_demo/static/admin/css/changelists.css +++ b/log_viewer_demo/static/admin/css/changelists.css @@ -40,13 +40,13 @@ } #changelist .toplinks { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid var(--hairline-color); } #changelist .paginator { - color: #666; - border-bottom: 1px solid #eee; - background: #fff; + color: var(--body-quiet-color); + border-bottom: 1px solid var(--hairline-color); + background: var(--body-bg); overflow: hidden; } @@ -68,7 +68,7 @@ } #changelist table tfoot { - color: #666; + color: var(--body-quiet-color); } /* TOOLBAR */ @@ -76,22 +76,22 @@ #toolbar { padding: 8px 10px; margin-bottom: 15px; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; - background: #f8f8f8; - color: #666; + border-top: 1px solid var(--hairline-color); + border-bottom: 1px solid var(--hairline-color); + background: var(--darkened-bg); + color: var(--body-quiet-color); } #toolbar form input { border-radius: 4px; font-size: 14px; padding: 5px; - color: #333; + color: var(--body-fg); } -#searchbar { +#toolbar #searchbar { height: 19px; - border: 1px solid #ccc; + border: 1px solid var(--border-color); padding: 2px 5px; margin: 0; vertical-align: top; @@ -99,25 +99,25 @@ max-width: 100%; } -#searchbar:focus { - border-color: #999; +#toolbar #searchbar:focus { + border-color: var(--body-quiet-color); } #toolbar form input[type="submit"] { - border: 1px solid #ccc; + border: 1px solid var(--border-color); font-size: 13px; padding: 4px 8px; margin: 0; vertical-align: middle; - background: #fff; + background: var(--body-bg); box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset; cursor: pointer; - color: #333; + color: var(--body-fg); } #toolbar form input[type="submit"]:focus, #toolbar form input[type="submit"]:hover { - border-color: #999; + border-color: var(--body-quiet-color); } #changelist-search img { @@ -128,9 +128,9 @@ /* FILTER COLUMN */ #changelist-filter { + flex: 0 0 240px; order: 1; - width: 240px; - background: #f8f8f8; + background: var(--darkened-bg); border-left: none; margin: 0 0 0 30px; } @@ -146,7 +146,6 @@ #changelist-filter h3 { font-weight: 400; - font-size: 14px; padding: 0 15px; margin-bottom: 10px; } @@ -154,7 +153,7 @@ #changelist-filter ul { margin: 5px 0; padding: 0 15px 15px; - border-bottom: 1px solid #eaeaea; + border-bottom: 1px solid var(--hairline-color); } #changelist-filter ul:last-child { @@ -169,31 +168,31 @@ #changelist-filter a { display: block; - color: #999; + color: var(--body-quiet-color); text-overflow: ellipsis; overflow-x: hidden; } #changelist-filter li.selected { - border-left: 5px solid #eaeaea; + border-left: 5px solid var(--hairline-color); padding-left: 10px; margin-left: -15px; } #changelist-filter li.selected a { - color: #5b80b2; + color: var(--link-selected-fg); } #changelist-filter a:focus, #changelist-filter a:hover, #changelist-filter li.selected a:focus, #changelist-filter li.selected a:hover { - color: #036; + color: var(--link-hover-color); } #changelist-filter #changelist-filter-clear a { font-size: 13px; padding-bottom: 10px; - border-bottom: 1px solid #eaeaea; + border-bottom: 1px solid var(--hairline-color); } /* DATE DRILLDOWN */ @@ -214,12 +213,12 @@ } .change-list ul.toplinks .date-back a { - color: #999; + color: var(--body-quiet-color); } .change-list ul.toplinks .date-back a:focus, .change-list ul.toplinks .date-back a:hover { - color: #036; + color: var(--link-hover-color); } /* PAGINATOR */ @@ -230,26 +229,26 @@ padding-bottom: 10px; line-height: 22px; margin: 0; - border-top: 1px solid #ddd; + border-top: 1px solid var(--hairline-color); width: 100%; } .paginator a:link, .paginator a:visited { padding: 2px 6px; - background: #79aec8; + background: var(--button-bg); text-decoration: none; - color: #fff; + color: var(--button-fg); } .paginator a.showall { border: none; background: none; - color: #5b80b2; + color: var(--link-fg); } .paginator a.showall:focus, .paginator a.showall:hover { background: none; - color: #036; + color: var(--link-hover-color); } .paginator .end { @@ -265,7 +264,7 @@ .paginator a:focus, .paginator a:hover { color: white; - background: #036; + background: var(--link-hover-color); } /* ACTIONS */ @@ -280,22 +279,22 @@ } #changelist table tbody tr.selected { - background-color: #FFFFCC; + background-color: var(--selected-row); } #changelist .actions { padding: 10px; - background: #fff; + background: var(--body-bg); border-top: none; border-bottom: none; line-height: 24px; - color: #999; + color: var(--body-quiet-color); width: 100%; } -#changelist .actions.selected { - background: #fffccf; - border-top: 1px solid #fffee8; +#changelist .actions.selected { /* XXX Probably unused? */ + background: var(--body-bg); + border-top: 1px solid var(--body-bg); border-bottom: 1px solid #edecd6; } @@ -305,7 +304,6 @@ #changelist .actions span.question { font-size: 13px; margin: 0 0.5em; - display: none; } #changelist .actions:last-child { @@ -315,9 +313,8 @@ #changelist .actions select { vertical-align: top; height: 24px; - background: none; - color: #000; - border: 1px solid #ccc; + color: var(--body-fg); + border: 1px solid var(--border-color); border-radius: 4px; font-size: 14px; padding: 0 0 0 4px; @@ -326,7 +323,7 @@ } #changelist .actions select:focus { - border-color: #999; + border-color: var(--body-quiet-color); } #changelist .actions label { @@ -337,18 +334,18 @@ #changelist .actions .button { font-size: 13px; - border: 1px solid #ccc; + border: 1px solid var(--border-color); border-radius: 4px; - background: #fff; + background: var(--body-bg); box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset; cursor: pointer; height: 24px; line-height: 1; padding: 4px 8px; margin: 0; - color: #333; + color: var(--body-fg); } #changelist .actions .button:focus, #changelist .actions .button:hover { - border-color: #999; + border-color: var(--body-quiet-color); } diff --git a/log_viewer_demo/static/admin/css/forms.css b/log_viewer_demo/static/admin/css/forms.css index 89d5748..89b2270 100644 --- a/log_viewer_demo/static/admin/css/forms.css +++ b/log_viewer_demo/static/admin/css/forms.css @@ -6,7 +6,7 @@ overflow: hidden; padding: 10px; font-size: 13px; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--hairline-color); } .form-row img, .form-row input { @@ -22,21 +22,17 @@ form .form-row p { padding-left: 0; } -.hidden { - display: none; -} - /* FORM LABELS */ label { font-weight: normal; - color: #666; + color: var(--body-quiet-color); font-size: 13px; } .required label, label.required { font-weight: bold; - color: #333; + color: var(--body-fg); } /* RADIO BUTTONS */ @@ -219,24 +215,24 @@ fieldset.collapsed h2, fieldset.collapsed { } fieldset.collapsed { - border: 1px solid #eee; + border: 1px solid var(--hairline-color); border-radius: 4px; overflow: hidden; } fieldset.collapsed h2 { - background: #f8f8f8; - color: #666; + background: var(--darkened-bg); + color: var(--body-quiet-color); } fieldset .collapse-toggle { - color: #fff; + color: var(--header-link-color); } fieldset.collapsed .collapse-toggle { background: transparent; display: inline; - color: #447e9b; + color: var(--link-fg); } /* MONOSPACE TEXTAREAS */ @@ -250,8 +246,8 @@ fieldset.monospace textarea { .submit-row { padding: 12px 14px; margin: 0 0 20px; - background: #f8f8f8; - border: 1px solid #eee; + background: var(--darkened-bg); + border: 1px solid var(--hairline-color); border-radius: 4px; text-align: right; overflow: hidden; @@ -283,35 +279,35 @@ body.popup .submit-row { .submit-row a.deletelink { display: block; - background: #ba2121; + background: var(--delete-button-bg); border-radius: 4px; padding: 10px 15px; height: 15px; line-height: 15px; - color: #fff; + color: var(--button-fg); } .submit-row a.closelink { display: inline-block; - background: #bbbbbb; + background: var(--close-button-bg); border-radius: 4px; padding: 10px 15px; height: 15px; line-height: 15px; margin: 0 0 0 5px; - color: #fff; + color: var(--button-fg); } .submit-row a.deletelink:focus, .submit-row a.deletelink:hover, .submit-row a.deletelink:active { - background: #a41515; + background: var(--delete-button-hover-bg); } .submit-row a.closelink:focus, .submit-row a.closelink:hover, .submit-row a.closelink:active { - background: #aaaaaa; + background: var(--close-button-hover-bg); } /* CUSTOM FORM FIELDS */ @@ -390,12 +386,12 @@ body.popup .submit-row { .inline-related h3 { margin: 0; - color: #666; + color: var(--body-quiet-color); padding: 5px; font-size: 13px; - background: #f8f8f8; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; + background: var(--darkened-bg); + border-top: 1px solid var(--hairline-color); + border-bottom: 1px solid var(--hairline-color); } .inline-related h3 span.delete { @@ -409,7 +405,7 @@ body.popup .submit-row { .inline-related fieldset { margin: 0; - background: #fff; + background: var(--body-bg); border: none; width: 100%; } @@ -421,7 +417,7 @@ body.popup .submit-row { text-align: left; font-weight: bold; background: #bcd; - color: #fff; + color: var(--body-bg); } .inline-group .tabular fieldset.module { @@ -460,7 +456,7 @@ body.popup .submit-row { overflow: hidden; font-size: 9px; font-weight: bold; - color: #666; + color: var(--body-quiet-color); _width: 700px; } @@ -477,15 +473,15 @@ body.popup .submit-row { .inline-group div.add-row, .inline-group .tabular tr.add-row td { - color: #666; - background: #f8f8f8; + color: var(--body-quiet-color); + background: var(--darkened-bg); padding: 8px 10px; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--hairline-color); } .inline-group .tabular tr.add-row td { padding: 8px 10px; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--hairline-color); } .inline-group ul.tools a.add, diff --git a/log_viewer_demo/static/admin/css/login.css b/log_viewer_demo/static/admin/css/login.css index 062b36e..10d9d22 100644 --- a/log_viewer_demo/static/admin/css/login.css +++ b/log_viewer_demo/static/admin/css/login.css @@ -1,7 +1,7 @@ /* LOGIN FORM */ .login { - background: #f8f8f8; + background: var(--darkened-bg); height: auto; } @@ -16,7 +16,7 @@ } .login #header h1 a { - color: #fff; + color: var(--header-link-color); } .login #content { @@ -24,8 +24,8 @@ } .login #container { - background: #fff; - border: 1px solid #eaeaea; + background: var(--body-bg); + border: 1px solid var(--hairline-color); border-radius: 4px; overflow: hidden; width: 28em; @@ -34,44 +34,25 @@ height: auto; } -.login #content-main { - width: 100%; -} - .login .form-row { padding: 4px 0; - float: left; - width: 100%; - border-bottom: none; } .login .form-row label { - padding-right: 0.5em; + display: block; line-height: 2em; - font-size: 1em; - clear: both; - color: #333; } .login .form-row #id_username, .login .form-row #id_password { - clear: both; padding: 8px; width: 100%; box-sizing: border-box; } -.login span.help { - font-size: 10px; - display: block; -} - .login .submit-row { - clear: both; - padding: 1em 0 0 9.4em; + padding: 1em 0 0 0; margin: 0; - border: none; - background: none; - text-align: left; + text-align: center; } .login .password-reset-link { diff --git a/log_viewer_demo/static/admin/css/nav_sidebar.css b/log_viewer_demo/static/admin/css/nav_sidebar.css index 784d087..f3c2fd8 100644 --- a/log_viewer_demo/static/admin/css/nav_sidebar.css +++ b/log_viewer_demo/static/admin/css/nav_sidebar.css @@ -12,22 +12,23 @@ justify-content: center; flex: 0 0 23px; width: 23px; - border-right: 1px solid #eaeaea; - background-color: #ffffff; + border: 0; + border-right: 1px solid var(--hairline-color); + background-color: var(--body-bg); cursor: pointer; font-size: 20px; - color: #447e9b; + color: var(--link-fg); padding: 0; } [dir="rtl"] .toggle-nav-sidebar { - border-left: 1px solid #eaeaea; + border-left: 1px solid var(--hairline-color); border-right: 0; } .toggle-nav-sidebar:hover, .toggle-nav-sidebar:focus { - background-color: #f6f6f6; + background-color: var(--darkened-bg); } #nav-sidebar { @@ -36,13 +37,13 @@ left: -276px; margin-left: -276px; border-top: 1px solid transparent; - border-right: 1px solid #eaeaea; - background-color: #ffffff; + border-right: 1px solid var(--hairline-color); + background-color: var(--body-bg); overflow: auto; } [dir="rtl"] #nav-sidebar { - border-left: 1px solid #eaeaea; + border-left: 1px solid var(--hairline-color); border-right: 0; left: 0; margin-left: 0; @@ -91,12 +92,12 @@ #nav-sidebar .current-app .section:link, #nav-sidebar .current-app .section:visited { - color: #ffc; + color: var(--header-color); font-weight: bold; } #nav-sidebar .current-model { - background: #ffc; + background: var(--selected-row); } .main > #nav-sidebar + .content { diff --git a/log_viewer_demo/static/admin/css/responsive.css b/log_viewer_demo/static/admin/css/responsive.css index d745eae..8c6dd81 100644 --- a/log_viewer_demo/static/admin/css/responsive.css +++ b/log_viewer_demo/static/admin/css/responsive.css @@ -120,7 +120,8 @@ input[type="submit"], button { } #changelist-search .quiet { - width: 100%; + width: 0; + flex: 1 0 auto; margin: 5px 0 0 25px; } @@ -139,7 +140,7 @@ input[type="submit"], button { } #changelist .actions select { - background: #fff; + background: var(--body-bg); } #changelist .actions .button { @@ -156,7 +157,7 @@ input[type="submit"], button { } #changelist-filter { - width: 200px; + flex-basis: 200px; } .change-list .filtered .results, @@ -165,7 +166,7 @@ input[type="submit"], button { .filtered .actions, #changelist .paginator { - border-top-color: #eee; + border-top-color: var(--hairline-color); /* XXX Is this used at all? */ } #changelist .results + .paginator { @@ -212,11 +213,11 @@ input[type="submit"], button { fieldset .fieldBox + .fieldBox { margin-top: 10px; padding-top: 10px; - border-top: 1px solid #eee; + border-top: 1px solid var(--hairline-color); } textarea { - max-width: 518px; + max-width: 100%; max-height: 120px; } @@ -398,11 +399,11 @@ input[type="submit"], button { .datetime .timezonewarning { display: block; font-size: 11px; - color: #999; + color: var(--body-quiet-color); } .datetimeshortcuts { - color: #ccc; + color: var(--border-color); /* XXX Redundant, .datetime span also sets #ccc */ } .form-row .datetime input.vDateField, .form-row .datetime input.vTimeField { @@ -557,6 +558,7 @@ input[type="submit"], button { .aligned .form-row, .aligned .form-row > div { display: flex; + flex-wrap: wrap; max-width: 100vw; } @@ -653,7 +655,7 @@ input[type="submit"], button { margin-bottom: -3px; } - form .aligned ul.radiolist li + li { + form .aligned ul.radiolist:not(.inline) li + li { margin-top: 5px; } @@ -738,7 +740,7 @@ input[type="submit"], button { /* Inlines */ .inline-group[data-inline-type="stacked"] .inline-related { - border: 2px solid #eee; + border: 1px solid var(--hairline-color); border-radius: 4px; margin-top: 15px; overflow: auto; @@ -748,18 +750,19 @@ input[type="submit"], button { box-sizing: border-box; } - .inline-group[data-inline-type="stacked"] .inline-related + .inline-related { - margin-top: 30px; - } - .inline-group[data-inline-type="stacked"] .inline-related .module { padding: 0 10px; } - .inline-group[data-inline-type="stacked"] .inline-related .module .form-row:last-child { + .inline-group[data-inline-type="stacked"] .inline-related .module .form-row { + border-top: 1px solid var(--hairline-color); border-bottom: none; } + .inline-group[data-inline-type="stacked"] .inline-related .module .form-row:first-child { + border-top: none; + } + .inline-group[data-inline-type="stacked"] .inline-related h3 { padding: 10px; border-top-width: 0; @@ -789,7 +792,7 @@ input[type="submit"], button { .inline-group[data-inline-type="stacked"] div.add-row { margin-top: 15px; - border: 1px solid #eee; + border: 1px solid var(--hairline-color); border-radius: 4px; } @@ -883,9 +886,7 @@ input[type="submit"], button { } .login .form-row label { - display: block; margin: 0 0 5px; - padding: 0; line-height: 1.2; } @@ -893,7 +894,7 @@ input[type="submit"], button { padding: 15px 0 0; } - .login br, .login .submit-row label { + .login br { display: none; } @@ -961,7 +962,7 @@ input[type="submit"], button { } .timelist a { - background: #fff; + background: var(--body-bg); padding: 4px; } diff --git a/log_viewer_demo/static/admin/css/rtl.css b/log_viewer_demo/static/admin/css/rtl.css index a40aad0..0447f89 100644 --- a/log_viewer_demo/static/admin/css/rtl.css +++ b/log_viewer_demo/static/admin/css/rtl.css @@ -1,25 +1,3 @@ -body { - direction: rtl; -} - -/* LOGIN */ - -.login .form-row { - float: right; -} - -.login .form-row label { - float: right; - padding-left: 0.5em; - padding-right: 0; - text-align: left; -} - -.login .submit-row { - clear: both; - padding: 1em 9.4em 0 0; -} - /* GLOBAL */ th { @@ -119,7 +97,7 @@ thead th.sorted .text { border-left: none; padding-left: 10px; margin-left: 0; - border-right: 5px solid #eaeaea; + border-right: 5px solid var(--hairline-color); padding-right: 10px; margin-right: -15px; } diff --git a/log_viewer_demo/static/admin/css/widgets.css b/log_viewer_demo/static/admin/css/widgets.css index 14ef12d..c7d6456 100644 --- a/log_viewer_demo/static/admin/css/widgets.css +++ b/log_viewer_demo/static/admin/css/widgets.css @@ -22,26 +22,25 @@ } .selector-available h2, .selector-chosen h2 { - border: 1px solid #ccc; + border: 1px solid var(--border-color); border-radius: 4px 4px 0 0; } .selector-chosen h2 { - background: #79aec8; - color: #fff; + background: var(--primary); + color: var(--header-link-color); } .selector .selector-available h2 { - background: #f8f8f8; - color: #666; + background: var(--darkened-bg); + color: var(--body-quiet-color); } .selector .selector-filter { - background: white; - border: 1px solid #ccc; + border: 1px solid var(--border-color); border-width: 0 1px; padding: 8px; - color: #999; + color: var(--body-quiet-color); font-size: 10px; margin: 0; text-align: left; @@ -66,7 +65,7 @@ .selector ul.selector-chooser { float: left; width: 22px; - background-color: #eee; + background-color: var(--selected-bg); border-radius: 10px; margin: 10em 5px 0 5px; padding: 0; @@ -91,7 +90,7 @@ text-indent: -3000px; overflow: hidden; cursor: default; - opacity: 0.3; + opacity: 0.55; } .active.selector-add, .active.selector-remove { @@ -126,14 +125,14 @@ a.selector-chooseall, a.selector-clearall { overflow: hidden; font-weight: bold; line-height: 16px; - color: #666; + color: var(--body-quiet-color); text-decoration: none; - opacity: 0.3; + opacity: 0.55; } a.active.selector-chooseall:focus, a.active.selector-clearall:focus, a.active.selector-chooseall:hover, a.active.selector-clearall:hover { - color: #447e9b; + color: var(--link-fg); } a.active.selector-chooseall, a.active.selector-clearall { @@ -261,7 +260,7 @@ p.datetime { line-height: 20px; margin: 0; padding: 0; - color: #666; + color: var(--body-quiet-color); font-weight: bold; } @@ -269,7 +268,7 @@ p.datetime { white-space: nowrap; font-weight: normal; font-size: 11px; - color: #ccc; + color: var(--body-quiet-color); } .datetime input, .form-row .datetime input.vDateField, .form-row .datetime input.vTimeField { @@ -313,7 +312,7 @@ table p.datetime { .timezonewarning { font-size: 11px; - color: #999; + color: var(--body-quiet-color); } /* URL */ @@ -322,7 +321,7 @@ p.url { line-height: 20px; margin: 0; padding: 0; - color: #666; + color: var(--body-quiet-color); font-size: 11px; font-weight: bold; } @@ -337,7 +336,7 @@ p.file-upload { line-height: 20px; margin: 0; padding: 0; - color: #666; + color: var(--body-quiet-color); font-size: 11px; font-weight: bold; } @@ -355,7 +354,7 @@ p.file-upload { } span.clearable-file-input label { - color: #333; + color: var(--body-fg); font-size: 11px; display: inline; float: none; @@ -368,8 +367,9 @@ span.clearable-file-input label { font-size: 12px; width: 19em; text-align: center; - background: white; - border: 1px solid #ddd; + background: var(--body-bg); + color: var(--body-fg); + border: 1px solid var(--hairline-color); border-radius: 4px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15); overflow: hidden; @@ -397,20 +397,20 @@ span.clearable-file-input label { margin: 0; text-align: center; border-top: none; - background: #f5dd5d; font-weight: 700; font-size: 12px; color: #333; + background: var(--accent); } .calendar th { padding: 8px 5px; - background: #f8f8f8; - border-bottom: 1px solid #ddd; + background: var(--darkened-bg); + border-bottom: 1px solid var(--border-color); font-weight: 400; font-size: 12px; text-align: center; - color: #666; + color: var(--body-quiet-color); } .calendar td { @@ -418,17 +418,17 @@ span.clearable-file-input label { font-size: 12px; text-align: center; padding: 0; - border-top: 1px solid #eee; + border-top: 1px solid var(--hairline-color); border-bottom: none; } .calendar td.selected a { - background: #79aec8; - color: #fff; + background: var(--primary); + color: var(--button-fg); } .calendar td.nonday { - background: #f8f8f8; + background: var(--darkened-bg); } .calendar td.today a { @@ -440,17 +440,17 @@ span.clearable-file-input label { font-weight: 400; padding: 6px; text-decoration: none; - color: #444; + color: var(--body-quiet-color); } .calendar td a:focus, .timelist a:focus, .calendar td a:hover, .timelist a:hover { - background: #79aec8; + background: var(--primary); color: white; } .calendar td a:active, .timelist a:active { - background: #417690; + background: var(--header-bg); color: white; } @@ -464,16 +464,16 @@ span.clearable-file-input label { .calendarnav a:link, #calendarnav a:visited, #calendarnav a:focus, #calendarnav a:hover { - color: #999; + color: var(--body-quiet-color); } .calendar-shortcuts { - background: white; + background: var(--body-bg); + color: var(--body-quiet-color); font-size: 11px; line-height: 11px; - border-top: 1px solid #eee; + border-top: 1px solid var(--hairline-color); padding: 8px 0; - color: #ccc; } .calendarbox .calendarnav-previous, .calendarbox .calendarnav-next { @@ -511,8 +511,8 @@ span.clearable-file-input label { padding: 4px 0; font-size: 12px; background: #eee; - border-top: 1px solid #ddd; - color: #333; + border-top: 1px solid var(--border-color); + color: var(--body-fg); } .calendar-cancel:focus, .calendar-cancel:hover { diff --git a/log_viewer_demo/static/admin/fonts/LICENSE.txt.py b/log_viewer_demo/static/admin/fonts/LICENSE.txt.py deleted file mode 100644 index 60dd7e8..0000000 --- a/log_viewer_demo/static/admin/fonts/LICENSE.txt.py +++ /dev/null @@ -1,202 +0,0 @@ - - XXXXXX XXXXXXX - XXXXXXX XXXX XXXXXXX XXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - XXXXX XXX XXXXXXXXXX XXX XXXX XXXXXXXXXXXXX XXX XXXXXXXXXXXX - - XX XXXXXXXXXXXX - - XXXXXXXXX XXXXX XXXX XXX XXXXX XXX XXXXXXXXXX XXX XXXX XXXXXXXXXXXXX - XXX XXXXXXXXXXXX XX XXXXXXX XX XXXXXXXX X XXXXXXX X XX XXXX XXXXXXXXX - - XXXXXXXXXX XXXXX XXXX XXX XXXXXXXXX XXXXX XX XXXXXX XXXXXXXXXX XX - XXX XXXXXXXXX XXXXX XXXX XX XXXXXXXX XXX XXXXXXXX - - XXXXXX XXXXXXX XXXXX XXXX XXX XXXXX XX XXX XXXXXX XXXXXX XXX XXX - XXXXX XXXXXXXX XXXX XXXXXXXX XXX XXXXXXXXXX XXX XX XXX XXXXX XXXXXX - XXXXXXX XXXX XXXX XXXXXXX XXX XXX XXXXXXXX XX XXXX XXXXXXXXXXX - XXXXXXXXX XXXXX XXX XXX XXXXXX XXXXXX XX XXXXXXXXX XX XXXXX XXX - XXXXXXXXX XX XXXXXXXXXX XX XXXX XXXXXXX XXXXXXX XX XXXXXXXX XX - XXXXXXXXXX XX XXXX XXXXXXXXX XX XXXXX XXXXXXX XXXXX XX XXXX XX XXX - XXXXXXXXXXX XXXXXXX XX XXXXX XXXXXXXXXX XXXXXXXXX XX XXXX XXXXXXX - - XXXXX XXX XXXXXXX XXXXX XXXX XX XXXXXXXXXX XX XXXXX XXXXXX - XXXXXXXXXX XXXXXXXXXXX XXXXXXX XX XXXX XXXXXXXX - - XXXXXXXX XXXX XXXXX XXXX XXX XXXXXXXXX XXXX XXX XXXXXX XXXXXXXXXXXXXX - XXXXXXXXX XXX XXX XXXXXXX XX XXXXXXXX XXXXXX XXXXX XXXXXXXXXXXXX - XXXXXXX XXX XXXXXXXXXXXXX XXXXXX - - XXXXXXXX XXXX XXXXX XXXX XXX XXXX XXXXXXXXX XXXX XXXXXXXXXX - XXXXXXXXXXXXXX XX XXXXXXXXXXX XX X XXXXXX XXXXX XXXXXXXXX XXX - XXX XXXXXXX XX XXXXXXXX XXXXXX XXXXX XXXXXXXXX XXXXXXXXXXXXXX - XXX XXXXXXXXXXX XX XXXXX XXXXX XXXXXX - - XXXXXX XXXXX XXXX XXX XXXX XX XXXXXXXXXXX XXXXXXX XX XXXXXX XX - XXXXXX XXXXX XXXX XXXXXXXXX XXXXX XXX XXXXXXXX XX XXXXXXXXX XX X - XXXXXXXXX XXXXXX XXXX XX XXXXXXXX XX XX XXXXXXXX XX XXX XXXX - XXX XXXXXXX XX XXXXXXXX XX XXX XXXXXXXX XXXXXXX - - XXXXXXXXXXX XXXXXX XXXXX XXXX XXX XXXXX XXXXXXX XX XXXXXX XX XXXXXX - XXXXX XXXX XX XXXXX XX XXX XXXXXXX XXXXX XXX XXXX XXX XXX XXXXX XXX - XXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX XX XXXXX XXXXXXXXXXXXX - XXXXXXXXXX XX X XXXXXX XX XXXXXXXX XXXX XX XXXXXXXXXXX XXX XXX XXXXXXXX - XX XXXX XXXXXXXX XXXXXXXXXX XXXXX XXXXX XXX XXXXXXX XXXXX XXXX XXXXXX - XXXXXXXXX XXXXX XX XXXXXX XXXX XXX XXXX XX XXXXX XX XXX XXXXXXXXXX XXX - XXX XXXX XXX XXXXXXXXXX XXXXX XXXXXXXX - - XXXXXXXXXXXXXX XXXXX XXXX XXX XXXX XX XXXXXXXXXXX XXXXXXXXX - XXX XXXXXXXX XXXXXXX XX XXX XXXX XXX XXX XXXXXXXXXXXXX XX XXXXXXXXX - XX XXXX XXXX XX XXXXXXXXXX XXXXX XXXXXXXX XXXX XX XXXXXXXXXXXXX - XXXXXXXXX XX XXXXXXXX XXX XXXXXXXXX XX XXX XXXX XX XXX XXXXXXXXX XXXXX - XX XX XX XXXXXXXXXX XX XXXXX XXXXXX XXXXXXXXXX XX XXXXXX XX XXXXXX XX - XXX XXXXXXXXX XXXXXX XXX XXX XXXXXXXX XX XXXX XXXXXXXXXXX XXXXXXXXXXX - XXXXX XXX XXXX XX XXXXXXXXXXX XXXXXXX XX XXXXXXX XXXXXXXXXXXXX XXXX - XX XXX XXXXXXXX XX XXX XXXXXXXXXXXXXXXX XXXXXXXXX XXX XXX XXXXXXX XX - XXXXXXXXXXXXX XX XXXXXXXXXX XXXXXXX XXXXXX XXXXXX XXXX XXXXXXX XXXXXXXX - XXX XXXXX XXXXXXXX XXXXXXX XXXX XXX XXXXXXX XXX XX XX XXXXXX XXX XXX - XXXXXXXX XXX XXX XXXXXXX XX XXXXXXXXXX XXX XXXXXXXXX XXX XXXXX XXX - XXXXXXXXX XXXXXXXXXXXXX XXXX XX XXXXXXXXXXXXX XXXXXX XX XXXXXXXXX - XXXXXXXXXX XX XXXXXXX XX XXX XXXXXXXXX XXXXX XX XXXX X XXXXXXXXXXXXXX - - XXXXXXXXXXXXX XXXXX XXXX XXXXXXXX XXX XXX XXXXXXXXXX XX XXXXX XXXXXX - XX XXXXXX XX XXXX X XXXXXXXXXXXX XXX XXXX XXXXXXXX XX XXXXXXXX XXX - XXXXXXXXXXXX XXXXXXXXXXXX XXXXXX XXX XXXXX - - XX XXXXX XX XXXXXXXXX XXXXXXXX XXXXXXX XX XXX XXXXX XXX XXXXXXXXXX XX - XXXX XXXXXXXX XXXX XXXXXXXXXXX XXXXXX XXXXXX XX XXX X XXXXXXXXXX - XXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXX - XXXXXXXXX XXXXXXX XX XXXXXXXXXX XXXXXXX XXXXXXXXXX XXXXX XXX - XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXXXXX XXX XXXXXXXXXX XXX - XXXX XXX XXXX XXXXXXXXXX XXXXX XX XXXXXX XX XXXXXX XXXXX - - XX XXXXX XX XXXXXX XXXXXXXX XXXXXXX XX XXX XXXXX XXX XXXXXXXXXX XX - XXXX XXXXXXXX XXXX XXXXXXXXXXX XXXXXX XXXXXX XX XXX X XXXXXXXXXX - XXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXX - XXXXXXX XX XXXXXX XX XXXX XXXXXXXX XXXXXX XXXXXXX XX XXXXX XXXX XXXXX - XXXX XXXXX XX XXXXX XXXXX XXXXXXX XXX XXXXXXXXX XXXXXXXX XXX XXXXX - XXXXX XXXX XXXXXXX XXXXXXX XXXX XX XXXXX XXXXXX XXXXXX XXXXXXXXXX - XX XXXX XXXXXXXXXXX XXXX XXX XXXXXXXXXXX XXXXXXXXX XX XXXXX - XXXXXXXXXXXXXXX XXXXX XX XX XXXXXXXXXXX XX XXXXX XXXXXXXXXXXXXXX - XXXX XXX XXXX XX XXXXX XXXX XXXXXXXXXXXXXXX XXX XXXXXXXXXX XX XXX - XXXXXXXXX XXXXXX XXXXXXXXXX XXXXXXX XXX XXXXXX XXXXXXXXXX X - XXXXXXXXXXX XX XXXXXXXXXXXX XX X XXXXXXXX XXXXXXXX XXXX XXX XXXX - XX X XXXXXXXXXXXX XXXXXXXXXXXX XXXXXX XXX XXXX XXXXXXXXXXX XXXXXX - XX XXXXXXXXXXXX XXXXXX XXXXXXXXXXXXX XXXX XXX XXXXXX XXXXXXXX - XXXXXXX XX XXX XXXXX XXXX XXXXXXX XXX XXXX XXXX XXXXX XXXXXXXXX - XX XX XXX XXXX XXXX XXXXXXXXXX XX XXXXXX - - XX XXXXXXXXXXXXXXX XXX XXX XXXXXXXXX XXX XXXXXXXXXX XXXXXX XX XXX - XXXX XX XXXXXXXXXX XXXXX XXXXXXX XX XXX XXXXXXX XXXX XX XXXXXXX - XXXXXXXXXXXXXX XXX XX XXXXXX XX XXXXXX XXXXX XXXXXXXX XXXX XXX - XXXX XXX XXXXXXXXX XXXXXXXXXXX - - XXX XXX XXXX XXXX XXX XXXXX XXXXXXXXXX XX XXX XXXX XX - XXXXXXXXXX XXXXX X XXXX XX XXXX XXXXXXXX XXX - - XXX XXX XXXX XXXXX XXX XXXXXXXX XXXXX XX XXXXX XXXXXXXXX XXXXXXX - XXXXXXX XXXX XXX XXXXXXX XXX XXXXXX XXX - - XXX XXX XXXX XXXXXXX XX XXX XXXXXX XXXX XX XXX XXXXXXXXXX XXXXX - XXXX XXX XXXXXXXXXXX XXX XXXXXXXXXX XXXXXXX XXXXXXXXXX XXX - XXXXXXXXXXX XXXXXXX XXXX XXX XXXXXX XXXX XX XXX XXXXX - XXXXXXXXX XXXXX XXXXXXX XXXX XX XXX XXXXXXX XX XXX XXXX XX - XXX XXXXXXXXXX XXXXXX XXX - - XXX XX XXX XXXX XXXXXXXX X XXXXXXXX XXXX XXXX XX XXXX XX XXX - XXXXXXXXXXXXX XXXX XXX XXXXXXXXXX XXXXX XXXX XXX XXXXXXXXXX XXXX - XXXXXXX X XXXXXXXX XXXX XX XXX XXXXXXXXXXX XXXXXXX XXXXXXXXX - XXXXXX XXXX XXXXXX XXXXX XXXXXXXXX XXXXX XXXXXXX XXXX XX XXX - XXXXXXX XX XXX XXXX XX XXX XXXXXXXXXX XXXXXX XX XX XXXXX XXX - XX XXX XXXXXXXXX XXXXXXX XXXXXX X XXXXXX XXXX XXXX XXXXXXXXXXX - XX XXXX XX XXX XXXXXXXXXX XXXXXX XXXXXX XXX XXXXXX XXXX XX - XXXXXXXXXXXXXX XX XXXXXXXX XXXXX XXXX XXX XXXXXXXXXX XXXXXX XXX - XXXXXX X XXXXXXX XXXXXXXXX XX XXX XXXXXXXXXX XXXXXX XX XXX - XXXXXXXX XXXX XXXXXXXXXXX XXXXXXX XXXXXXXX XXXXXXX XXX XXXXXXXX - XX XXX XXXXXX XXXX XXX XXX XXXXXXXXXXXXX XXXXXXXX XXXX XXX - XX XXX XXXXXX XXX XXXXXXXX XXX XXX XXX XXXX XXX XXXXXXXXXXX - XXXXXXX XXXXXX XXXXXXXXXX XXXXX XXXX XXX XXXXXXXXXXX XXXXXXXXX - XX XX XX XXXXXXXX XX XXX XXXXXX XXXX XXXX XXX XXXXX XXXXXXXX - XXXX XXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXX XX XXXXXXXXX - XX XXXXXXXXX XXX XXXXXXXX - - XXX XXX XXX XXXX XXX XXXXXXXXX XXXXXXXXX XX XXXX XXXXXXXXXXXXX XXX - XXX XXXXXXX XXXXXXXXXX XX XXXXXXXXX XXXXXXX XXXXX XXX XXXXXXXXXX - XXX XXXX XXXXXXXXXXXXX XX XXXXXXXXXXXX XX XXXX XXXXXXXXXXXXXX XX - XXX XXX XXXX XXXXXXXXXX XXXXX XX X XXXXXX XXXXXXXX XXXX XXXX - XXXXXXXXXXXXX XXX XXXXXXXXXXXX XX XXX XXXX XXXXXXXXX XXXXXXXX XXXX - XXX XXXXXXXXXX XXXXXX XX XXXX XXXXXXXX - - XX XXXXXXXXXX XX XXXXXXXXXXXXXX XXXXXX XXX XXXXXXXXXX XXXXX XXXXXXXXXX - XXX XXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXX XXX XXXXXXXXX XX XXX XXXX - XX XXX XX XXX XXXXXXXX XXXXX XX XXXXX XXX XXXXX XXX XXXXXXXXXX XX - XXXX XXXXXXXX XXXXXXX XXX XXXXXXXXXX XXXXX XX XXXXXXXXXXX - XXXXXXXXXXXXXXX XXX XXXXXX XXXXXXX XXXXXX XXXXX XXXXXXXXX XX XXXXXX - XXX XXXXX XX XXX XXXXXXXX XXXXXXX XXXXXXXXX XXX XXX XXXX XXXXXXXX - XXXX XXXXXXXX XXXXXXXXX XXXX XXXXXXXXXXXXXX - - XX XXXXXXXXXXX XXXX XXXXXXX XXXX XXX XXXXX XXXXXXXXXX XX XXX XXX XXXXX - XXXXXX XXXXXXXXXXX XXXXXXX XXXXXX XX XXXXXXX XXXXX XX XXX XXXXXXXXX - XXXXXX XX XXXXXXXX XXX XXXXXXXXXX XXX XXXXXXXXX XXX XX XXXXXXXXXX XXX - XXXXXX XX XXX XXXX XXX XXXXXXXXXXX XXX XXXXXXX XX XXX XXXXXX XXXXX - - XX XXXXXXXXXX XX XXXXXXXXX XXXXXX XXXXXXXX XX XXXXXXXXXX XXX XX - XXXXXX XX XX XXXXXXXX XXXXXXXX XXXXXXXX XXX XXXX XXXX XXXX - XXXXXXXXXXX XXXXXXXX XXX XXXXXXXXXXXXXX XX XX XXX XXX XXXXXX - XXXXXXX XXXXXXXXXX XX XXXXXXXXXX XX XXX XXXXX XXXXXX XXXXXXX XX - XXXXXXXX XXXXXXXXXX XXXXXXX XXXXXXXXXXX XXX XXXXXXXXXX XX XXXXXXXXXX - XX XXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XX XXXXXXX XXX X - XXXXXXXXXX XXXXXXXX XXX XXX XXXXXX XXXXXXXXXXX XXX XXXXXXXXXXX XXX - XXXXXXXXXXXXXXX XX XXXXX XX XXXXXXXXXXXXXX XXX XXXX XXX XXXXXX XXX - XXXXX XXXXXXXXXX XXXX XXXX XXXXXXXX XX XXXXXXXXXXX XXXXX XXXX XXXXXXXX - - XX XXXXXXXXXX XX XXXXXXXXXX XX XX XXXXX XXX XXXXX XX XXXXX XXXXXXX - XXXXXXX XX XXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XX XXXXXXXXXX - XXXXXX XXXXXXXX XX XXXXXXXXXX XXX XXXXX XX XXXXXXXXXX XXX XXXXXXX - XXXXXXXXX XXXXX XX XXXXXX XX XX XXXXXXXX XXXXX XXX XXXXXXXXXXX XX - XXXXXX XX XXX XXX XXXXXXXX XXXXXXXXX XXX XXXXXXX XXXXXXXXX XXXXXXXX - XXXXXXXXXXX XX XXXXXXXXXXXXX XXXXXXX XX XXX XXXXXXXXX XXXXXXX XX X - XXXXXX XX XXXX XXXXXXX XX XXX XX XXX XXX XX XXXXXXXXX XX XXX XXX - XXXX XXXXXXXXXX XXX XXX XXXXXXX XX XXXXXXX XXX XXXX XX XXXXXXXXX - XXXX XXXXXXXXX XXXXXXXX XXXXXXX XX XXXXXXXXXXXX XX XXX XXX XXX - XXXXX XXXXXXXXXX XXXXXXX XX XXXXXXXX XXXX XX XXXX XXXXXXXXXXX - XXX XXXX XXXXXXX XX XXX XXXXXXXXXXX XX XXXX XXXXXXXX - - XX XXXXXXXXX XXXXXXXX XX XXXXXXXXXX XXXXXXXXXX XXXXX XXXXXXXXXXXXXX - XXX XXXX XX XXXXXXXXXX XXXXX XXXXXXXX XXX XXX XXXXXX XX XXXXXX - XXX XXXXXX X XXX XXXX XXXXXXXXXX XX XXXXXXXX XXXXXXXXX XXXXXXXXXX - XX XXXXX XXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXX XXXXXXXXXX XXXX XXXX - XXXXXXXX XXXXXXXX XX XXXXXXXXX XXXX XXXXXXXXXXXX XXX XXX XXX XXXX - XX XXXX XXX XXXXXX XXX XX XXXX XXXX XXXXXXXXXXXXXXX XXX XX XXXXXX - XX XXX XXXXX XXXXXXXXXXXX XXX XXXX XX XXX XXXXX XX XXXXXXXXXX - XXXXXXX XXX XXXX XXXX XXXXXXXXXXX XXXXXXXX XXX XXX XXXXXXXXX - XXXXXXXX XXX XX XXXXXX XXXXXXXX XXXXXXXX XXXX XXXXXXXXXXX XX XXXXXX - XX XXXX XXXXXXXXX XXX XXXX XXXXXXXX XX XXXXXXXXXX XXXXXXXXXX - - XXX XX XXXXX XXX XXXXXXXXXX - - XXXXXXXXX XXX XX XXXXX XXX XXXXXX XXXXXXX XX XXXX XXXXX - - XX XXXXX XXX XXXXXX XXXXXXX XX XXXX XXXXX XXXXXX XXX XXXXXXXXX - XXXXXXXXXXX XXXXXXX XXXX XXX XXXXXX XXXXXXXX XX XXXXXXXX XXXX - XXXXXXXX XXXX XXXX XXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXX XXXXXXX - XXX XXXXXXXXXX XXX XXXX XXXXXX XX XXXXXXXX XX XXX XXXXXXXXXXX - XXXXXXX XXXXXX XXX XXX XXXX XXXXXXX XX XXXX XXXXXXXXX XXXX X - XXXX XX XXXXX XXXX XXX XXXXXXXXXXX XX XXXXXXX XX XXXXXXXX XX XXX - XXXX XXXXXXXX XXXXX XX XXX XXXXXXXXX XXXXXX XXX XXXXXX - XXXXXXXXXXXXXX XXXXXX XXXXXXXXXXX XXXXXXXXX - - XXXXXXXXX XXXXXX XXXXX XX XXXXXXXXX XXXXXX - - XXXXXXXX XXXXX XXX XXXXXX XXXXXXXX XXXXXXX XXX XXXX XXXXXXXXXXX - XXX XXX XXX XXX XXXX XXXX XXXXXX XX XXXXXXXXXX XXXX XXX XXXXXXXX - XXX XXX XXXXXX X XXXX XX XXX XXXXXXX XX - - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - XXXXXX XXXXXXXX XX XXXXXXXXXX XXX XX XXXXXX XX XX XXXXXXXX XXXXXXXX - XXXXXXXXXXX XXXXX XXX XXXXXXX XX XXXXXXXXXXX XX XX XXX XXX XXXXXX - XXXXXXX XXXXXXXXXX XX XXXXXXXXXX XX XXX XXXXX XXXXXX XXXXXXX XX XXXXXXXX - XXX XXX XXXXXXX XXX XXX XXXXXXXX XXXXXXXX XXXXXXXXX XXXXXXXXXXX XXX - XXXXXXXXXXX XXXXX XXX XXXXXXXX diff --git a/log_viewer_demo/static/admin/fonts/README.txt.py b/log_viewer_demo/static/admin/fonts/README.txt.py deleted file mode 100644 index 6853cce..0000000 --- a/log_viewer_demo/static/admin/fonts/README.txt.py +++ /dev/null @@ -1,3 +0,0 @@ -XXXXXX XXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -XXXX XXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -XXXXXXX XXXX XX XXXX XXXXXXXX XXXXX XXXXXX XXXXXXX XXXXXX XXXX XXXXX diff --git a/log_viewer_demo/static/admin/img/README.txt.py b/log_viewer_demo/static/admin/img/README.txt.py deleted file mode 100644 index f9b1a35..0000000 --- a/log_viewer_demo/static/admin/img/README.txt.py +++ /dev/null @@ -1,7 +0,0 @@ -XXX XXXXX XXX XXXXX XXXX XXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX -XXX XXXX XXXXXXX XXXX XX XXXXXXXX XXXXX XXX XXX XXX XXXX -X XXXXXXXXXXXXXXXXXXXXXXXXXXX - -XXX XXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -XXXXXXXXXXXXXXXXXXXX XX XXXXXXXX XXXXX XXX XXX XXXXXXX XXXX XXXX XXXXXXX -XX XXXXXXX XXXXXXXX diff --git a/log_viewer_demo/static/admin/js/SelectBox.js b/log_viewer_demo/static/admin/js/SelectBox.js index 1927b4c..ace6d9d 100644 --- a/log_viewer_demo/static/admin/js/SelectBox.js +++ b/log_viewer_demo/static/admin/js/SelectBox.js @@ -13,6 +13,7 @@ redisplay: function(id) { // Repopulate HTML select box from cache const box = document.getElementById(id); + const scroll_value_from_top = box.scrollTop; box.innerHTML = ''; for (const node of SelectBox.cache[id]) { if (node.displayed) { @@ -22,6 +23,7 @@ box.appendChild(new_option); } } + box.scrollTop = scroll_value_from_top; }, filter: function(id, text) { // Redisplay the HTML select box, displaying only the choices containing ALL @@ -31,7 +33,7 @@ node.displayed = 1; const node_text = node.text.toLowerCase(); for (const token of tokens) { - if (node_text.indexOf(token) === -1) { + if (!node_text.includes(token)) { node.displayed = 0; break; // Once the first token isn't found we're done } diff --git a/log_viewer_demo/static/admin/js/actions.js b/log_viewer_demo/static/admin/js/actions.js index dae6992..da1c310 100644 --- a/log_viewer_demo/static/admin/js/actions.js +++ b/log_viewer_demo/static/admin/js/actions.js @@ -1,154 +1,196 @@ /*global gettext, interpolate, ngettext*/ 'use strict'; { - const $ = django.jQuery; - let lastChecked; + function show(selector) { + document.querySelectorAll(selector).forEach(function(el) { + el.classList.remove('hidden'); + }); + } - $.fn.actions = function(opts) { - const options = $.extend({}, $.fn.actions.defaults, opts); - const actionCheckboxes = $(this); - let list_editable_changed = false; - const showQuestion = function() { - $(options.acrossClears).hide(); - $(options.acrossQuestions).show(); - $(options.allContainer).hide(); - }, - showClear = function() { - $(options.acrossClears).show(); - $(options.acrossQuestions).hide(); - $(options.actionContainer).toggleClass(options.selectedClass); - $(options.allContainer).show(); - $(options.counterContainer).hide(); - }, - reset = function() { - $(options.acrossClears).hide(); - $(options.acrossQuestions).hide(); - $(options.allContainer).hide(); - $(options.counterContainer).show(); - }, - clearAcross = function() { - reset(); - $(options.acrossInput).val(0); - $(options.actionContainer).removeClass(options.selectedClass); - }, - checker = function(checked) { - if (checked) { - showQuestion(); - } else { - reset(); - } - $(actionCheckboxes).prop("checked", checked) - .parent().parent().toggleClass(options.selectedClass, checked); - }, - updateCounter = function() { - const sel = $(actionCheckboxes).filter(":checked").length; - // data-actions-icnt is defined in the generated HTML - // and contains the total amount of objects in the queryset - const actions_icnt = $('.action-counter').data('actionsIcnt'); - $(options.counterContainer).html(interpolate( - ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), { - sel: sel, - cnt: actions_icnt - }, true)); - $(options.allToggle).prop("checked", function() { - let value; - if (sel === actionCheckboxes.length) { - value = true; - showQuestion(); - } else { - value = false; - clearAcross(); - } - return value; - }); - }; - // Show counter by default - $(options.counterContainer).show(); - // Check state of checkboxes and reinit state if needed - $(this).filter(":checked").each(function(i) { - $(this).parent().parent().toggleClass(options.selectedClass); - updateCounter(); - if ($(options.acrossInput).val() === 1) { - showClear(); - } + function hide(selector) { + document.querySelectorAll(selector).forEach(function(el) { + el.classList.add('hidden'); }); - $(options.allToggle).show().on('click', function() { - checker($(this).prop("checked")); - updateCounter(); + } + + function showQuestion(options) { + hide(options.acrossClears); + show(options.acrossQuestions); + hide(options.allContainer); + } + + function showClear(options) { + show(options.acrossClears); + hide(options.acrossQuestions); + document.querySelector(options.actionContainer).classList.remove(options.selectedClass); + show(options.allContainer); + hide(options.counterContainer); + } + + function reset(options) { + hide(options.acrossClears); + hide(options.acrossQuestions); + hide(options.allContainer); + show(options.counterContainer); + } + + function clearAcross(options) { + reset(options); + document.querySelector(options.acrossInput).value = 0; + document.querySelector(options.actionContainer).classList.remove(options.selectedClass); + } + + function checker(actionCheckboxes, options, checked) { + if (checked) { + showQuestion(options); + } else { + reset(options); + } + actionCheckboxes.forEach(function(el) { + el.checked = checked; + el.closest('tr').classList.toggle(options.selectedClass, checked); }); - $("a", options.acrossQuestions).on('click', function(event) { - event.preventDefault(); - $(options.acrossInput).val(1); - showClear(); + } + + function updateCounter(actionCheckboxes, options) { + const sel = Array.from(actionCheckboxes).filter(function(el) { + return el.checked; + }).length; + const counter = document.querySelector(options.counterContainer); + // data-actions-icnt is defined in the generated HTML + // and contains the total amount of objects in the queryset + const actions_icnt = Number(counter.dataset.actionsIcnt); + counter.textContent = interpolate( + ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), { + sel: sel, + cnt: actions_icnt + }, true); + const allToggle = document.getElementById(options.allToggleId); + allToggle.checked = sel === actionCheckboxes.length; + if (allToggle.checked) { + showQuestion(options); + } else { + clearAcross(options); + } + } + + const defaults = { + actionContainer: "div.actions", + counterContainer: "span.action-counter", + allContainer: "div.actions span.all", + acrossInput: "div.actions input.select-across", + acrossQuestions: "div.actions span.question", + acrossClears: "div.actions span.clear", + allToggleId: "action-toggle", + selectedClass: "selected" + }; + + window.Actions = function(actionCheckboxes, options) { + options = Object.assign({}, defaults, options); + let list_editable_changed = false; + let lastChecked = null; + let shiftPressed = false; + + document.addEventListener('keydown', (event) => { + shiftPressed = event.shiftKey; }); - $("a", options.acrossClears).on('click', function(event) { - event.preventDefault(); - $(options.allToggle).prop("checked", false); - clearAcross(); - checker(0); - updateCounter(); + + document.addEventListener('keyup', (event) => { + shiftPressed = event.shiftKey; }); - lastChecked = null; - $(actionCheckboxes).on('click', function(event) { - if (!event) { event = window.event; } - const target = event.target ? event.target : event.srcElement; - if (lastChecked && $.data(lastChecked) !== $.data(target) && event.shiftKey === true) { - let inrange = false; - $(lastChecked).prop("checked", target.checked) - .parent().parent().toggleClass(options.selectedClass, target.checked); - $(actionCheckboxes).each(function() { - if ($.data(this) === $.data(lastChecked) || $.data(this) === $.data(target)) { - inrange = (inrange) ? false : true; - } - if (inrange) { - $(this).prop("checked", target.checked) - .parent().parent().toggleClass(options.selectedClass, target.checked); - } - }); - } - $(target).parent().parent().toggleClass(options.selectedClass, target.checked); - lastChecked = target; - updateCounter(); + + document.getElementById(options.allToggleId).addEventListener('click', function(event) { + checker(actionCheckboxes, options, this.checked); + updateCounter(actionCheckboxes, options); }); - $('form#changelist-form table#result_list tr').on('change', 'td:gt(0) :input', function() { - list_editable_changed = true; + + document.querySelectorAll(options.acrossQuestions + " a").forEach(function(el) { + el.addEventListener('click', function(event) { + event.preventDefault(); + const acrossInput = document.querySelector(options.acrossInput); + acrossInput.value = 1; + showClear(options); + }); }); - $('form#changelist-form button[name="index"]').on('click', function(event) { - if (list_editable_changed) { - return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost.")); - } + + document.querySelectorAll(options.acrossClears + " a").forEach(function(el) { + el.addEventListener('click', function(event) { + event.preventDefault(); + document.getElementById(options.allToggleId).checked = false; + clearAcross(options); + checker(actionCheckboxes, options, false); + updateCounter(actionCheckboxes, options); + }); }); - $('form#changelist-form input[name="_save"]').on('click', function(event) { - let action_changed = false; - $('select option:selected', options.actionContainer).each(function() { - if ($(this).val()) { - action_changed = true; + + function affectedCheckboxes(target, withModifier) { + const multiSelect = (lastChecked && withModifier && lastChecked !== target); + if (!multiSelect) { + return [target]; + } + const checkboxes = Array.from(actionCheckboxes); + const targetIndex = checkboxes.findIndex(el => el === target); + const lastCheckedIndex = checkboxes.findIndex(el => el === lastChecked); + const startIndex = Math.min(targetIndex, lastCheckedIndex); + const endIndex = Math.max(targetIndex, lastCheckedIndex); + const filtered = checkboxes.filter((el, index) => (startIndex <= index) && (index <= endIndex)); + return filtered; + }; + + Array.from(document.getElementById('result_list').tBodies).forEach(function(el) { + el.addEventListener('change', function(event) { + const target = event.target; + if (target.classList.contains('action-select')) { + const checkboxes = affectedCheckboxes(target, shiftPressed); + checker(checkboxes, options, target.checked); + updateCounter(actionCheckboxes, options); + lastChecked = target; + } else { + list_editable_changed = true; } }); - if (action_changed) { - if (list_editable_changed) { - return confirm(gettext("You have selected an action, but you haven’t saved your changes to individual fields yet. Please click OK to save. You’ll need to re-run the action.")); - } else { - return confirm(gettext("You have selected an action, and you haven’t made any changes on individual fields. You’re probably looking for the Go button rather than the Save button.")); + }); + + document.querySelector('#changelist-form button[name=index]').addEventListener('click', function() { + if (list_editable_changed) { + const confirmed = confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost.")); + if (!confirmed) { + event.preventDefault(); } } }); + + const el = document.querySelector('#changelist-form input[name=_save]'); + // The button does not exist if no fields are editable. + if (el) { + el.addEventListener('click', function(event) { + if (document.querySelector('[name=action]').value) { + const text = list_editable_changed + ? gettext("You have selected an action, but you haven’t saved your changes to individual fields yet. Please click OK to save. You’ll need to re-run the action.") + : gettext("You have selected an action, and you haven’t made any changes on individual fields. You’re probably looking for the Go button rather than the Save button."); + if (!confirm(text)) { + event.preventDefault(); + } + } + }); + } }; - /* Setup plugin defaults */ - $.fn.actions.defaults = { - actionContainer: "div.actions", - counterContainer: "span.action-counter", - allContainer: "div.actions span.all", - acrossInput: "div.actions input.select-across", - acrossQuestions: "div.actions span.question", - acrossClears: "div.actions span.clear", - allToggle: "#action-toggle", - selectedClass: "selected" - }; - $(document).ready(function() { - const $actionsEls = $('tr input.action-select'); - if ($actionsEls.length > 0) { - $actionsEls.actions(); + + // Call function fn when the DOM is loaded and ready. If it is already + // loaded, call the function now. + // http://youmightnotneedjquery.com/#ready + function ready(fn) { + if (document.readyState !== 'loading') { + fn(); + } else { + document.addEventListener('DOMContentLoaded', fn); + } + } + + ready(function() { + const actionsEls = document.querySelectorAll('tr input.action-select'); + if (actionsEls.length > 0) { + Actions(actionsEls); } }); } diff --git a/log_viewer_demo/static/admin/js/actions.min.js b/log_viewer_demo/static/admin/js/actions.min.js deleted file mode 100644 index 29fd0d8..0000000 --- a/log_viewer_demo/static/admin/js/actions.min.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict';{const a=django.jQuery;let e;a.fn.actions=function(g){const b=a.extend({},a.fn.actions.defaults,g),f=a(this);let k=!1;const l=function(){a(b.acrossClears).hide();a(b.acrossQuestions).show();a(b.allContainer).hide()},m=function(){a(b.acrossClears).show();a(b.acrossQuestions).hide();a(b.actionContainer).toggleClass(b.selectedClass);a(b.allContainer).show();a(b.counterContainer).hide()},n=function(){a(b.acrossClears).hide();a(b.acrossQuestions).hide();a(b.allContainer).hide();a(b.counterContainer).show()}, -p=function(){n();a(b.acrossInput).val(0);a(b.actionContainer).removeClass(b.selectedClass)},q=function(c){c?l():n();a(f).prop("checked",c).parent().parent().toggleClass(b.selectedClass,c)},h=function(){const c=a(f).filter(":checked").length,d=a(".action-counter").data("actionsIcnt");a(b.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",c),{sel:c,cnt:d},!0));a(b.allToggle).prop("checked",function(){let a;c===f.length?(a=!0,l()):(a=!1,p());return a})}; -a(b.counterContainer).show();a(this).filter(":checked").each(function(c){a(this).parent().parent().toggleClass(b.selectedClass);h();1===a(b.acrossInput).val()&&m()});a(b.allToggle).show().on("click",function(){q(a(this).prop("checked"));h()});a("a",b.acrossQuestions).on("click",function(c){c.preventDefault();a(b.acrossInput).val(1);m()});a("a",b.acrossClears).on("click",function(c){c.preventDefault();a(b.allToggle).prop("checked",!1);p();q(0);h()});e=null;a(f).on("click",function(c){c||(c=window.event); -const d=c.target?c.target:c.srcElement;if(e&&a.data(e)!==a.data(d)&&!0===c.shiftKey){let c=!1;a(e).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked);a(f).each(function(){if(a.data(this)===a.data(e)||a.data(this)===a.data(d))c=c?!1:!0;c&&a(this).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,d.checked);e=d;h()});a("form#changelist-form table#result_list tr").on("change","td:gt(0) :input", -function(){k=!0});a('form#changelist-form button[name="index"]').on("click",function(a){if(k)return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."))});a('form#changelist-form input[name="_save"]').on("click",function(c){let d=!1;a("select option:selected",b.actionContainer).each(function(){a(this).val()&&(d=!0)});if(d)return k?confirm(gettext("You have selected an action, but you haven\u2019t saved your changes to individual fields yet. Please click OK to save. You\u2019ll need to re-run the action.")): -confirm(gettext("You have selected an action, and you haven\u2019t made any changes on individual fields. You\u2019re probably looking for the Go button rather than the Save button."))})};a.fn.actions.defaults={actionContainer:"div.actions",counterContainer:"span.action-counter",allContainer:"div.actions span.all",acrossInput:"div.actions input.select-across",acrossQuestions:"div.actions span.question",acrossClears:"div.actions span.clear",allToggle:"#action-toggle",selectedClass:"selected"};a(document).ready(function(){const g= -a("tr input.action-select");0=h.val()-f.val()&&k.parent().hide();p(d.closest(".inline-group"));a.added&&a.added(d);b(document).trigger("formset:added",[d,a.prefix])}, -r=function(b){b.is("tr")?b.children(":last").append('"):b.is("ul")||b.is("ol")?b.append('
  • '+a.deleteText+"
    • "):b.children(":first").append(''+a.deleteText+"");b.find("a."+a.deleteCssClass).on("click",u.bind(this))},u=function(g){g.preventDefault();var d=b(g.target).closest("."+a.formCssClass);g=d.closest(".inline-group"); -var f=d.prev();f.length&&f.hasClass("row-form-errors")&&f.remove();d.remove();--n;a.removed&&a.removed(d);b(document).trigger("formset:removed",[d,a.prefix]);d=b("."+a.formCssClass);b("#id_"+a.prefix+"-TOTAL_FORMS").val(d.length);(""===h.val()||0'+a.addText+"");k=l.find("tr:last a")}else e.filter(":last").after('
    '+a.addText+"
    "), -k=e.filter(":last").next().find("a");k.on("click",t)})();c=""===h.val()||0 tr.form-row",b(c).tabularFormset(c,a.options)}})})}; diff --git a/log_viewer_demo/static/admin/js/prepopulate.min.js b/log_viewer_demo/static/admin/js/prepopulate.min.js deleted file mode 100644 index 11ead49..0000000 --- a/log_viewer_demo/static/admin/js/prepopulate.min.js +++ /dev/null @@ -1 +0,0 @@ -'use strict';{const b=django.jQuery;b.fn.prepopulate=function(d,f,g){return this.each(function(){const a=b(this),h=function(){if(!a.data("_changed")){var e=[];b.each(d,function(a,c){c=b(c);0