diff --git a/log_viewer/locale/en/LC_MESSAGES/django.po b/log_viewer/locale/en/LC_MESSAGES/django.po index 6021e60..7588ae8 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-09-01 13:55+0700\n" +"POT-Creation-Date: 2020-10-30 17:54+0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/log_viewer/locale/id/LC_MESSAGES/django.po b/log_viewer/locale/id/LC_MESSAGES/django.po index da9d1f1..7a8882a 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-09-01 13:55+0700\n" +"POT-Creation-Date: 2020-10-30 17:54+0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/log_viewer_demo/static/admin/css/changelists.css b/log_viewer_demo/static/admin/css/changelists.css index abd2640..1bda965 100644 --- a/log_viewer_demo/static/admin/css/changelists.css +++ b/log_viewer_demo/static/admin/css/changelists.css @@ -1,8 +1,14 @@ /* CHANGELISTS */ #changelist { - position: relative; - width: 100%; + display: flex; + align-items: flex-start; + justify-content: space-between; +} + +#changelist .changelist-form-container { + flex: 1 1 auto; + min-width: 0; } #changelist table { @@ -21,7 +27,6 @@ .change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { - margin-right: 280px; width: auto; } @@ -30,7 +35,8 @@ } #changelist-form .results { - overflow-x: auto; + overflow-x: auto; + width: 100%; } #changelist .toplinks { @@ -67,7 +73,7 @@ /* TOOLBAR */ -#changelist #toolbar { +#toolbar { padding: 8px 10px; margin-bottom: 15px; border-top: 1px solid #eee; @@ -76,27 +82,28 @@ color: #666; } -#changelist #toolbar form input { +#toolbar form input { border-radius: 4px; font-size: 14px; padding: 5px; color: #333; } -#changelist #toolbar form #searchbar { +#searchbar { height: 19px; border: 1px solid #ccc; padding: 2px 5px; margin: 0; vertical-align: top; font-size: 13px; + max-width: 100%; } -#changelist #toolbar form #searchbar:focus { +#searchbar:focus { border-color: #999; } -#changelist #toolbar form input[type="submit"] { +#toolbar form input[type="submit"] { border: 1px solid #ccc; font-size: 13px; padding: 4px 8px; @@ -108,12 +115,12 @@ color: #333; } -#changelist #toolbar form input[type="submit"]:focus, -#changelist #toolbar form input[type="submit"]:hover { +#toolbar form input[type="submit"]:focus, +#toolbar form input[type="submit"]:hover { border-color: #999; } -#changelist #changelist-search img { +#changelist-search img { vertical-align: middle; margin-right: 4px; } @@ -121,14 +128,11 @@ /* FILTER COLUMN */ #changelist-filter { - position: absolute; - top: 0; - right: 0; - z-index: 1000; + order: 1; width: 240px; background: #f8f8f8; border-left: none; - margin: 0; + margin: 0 0 0 30px; } #changelist-filter h2 { @@ -227,6 +231,7 @@ line-height: 22px; margin: 0; border-top: 1px solid #ddd; + width: 100%; } .paginator a:link, .paginator a:visited { @@ -266,7 +271,6 @@ /* ACTIONS */ .filtered .actions { - margin-right: 280px; border-right: none; } @@ -286,6 +290,7 @@ border-bottom: none; line-height: 24px; color: #999; + width: 100%; } #changelist .actions.selected { diff --git a/log_viewer_demo/static/admin/css/forms.css b/log_viewer_demo/static/admin/css/forms.css index 06acd42..89d5748 100644 --- a/log_viewer_demo/static/admin/css/forms.css +++ b/log_viewer_demo/static/admin/css/forms.css @@ -430,6 +430,7 @@ body.popup .submit-row { .inline-related.tabular fieldset.module table { width: 100%; + overflow-x: scroll; } .last-related fieldset { diff --git a/log_viewer_demo/static/admin/css/nav_sidebar.css b/log_viewer_demo/static/admin/css/nav_sidebar.css index 7d4c75f..784d087 100644 --- a/log_viewer_demo/static/admin/css/nav_sidebar.css +++ b/log_viewer_demo/static/admin/css/nav_sidebar.css @@ -71,6 +71,7 @@ #nav-sidebar .module th { width: 100%; + overflow-wrap: anywhere; } #nav-sidebar .module th, @@ -78,6 +79,10 @@ padding-left: 16px; } +#nav-sidebar .module td { + white-space: nowrap; +} + [dir="rtl"] #nav-sidebar .module th, [dir="rtl"] #nav-sidebar .module caption { padding-left: 8px; @@ -94,8 +99,21 @@ background: #ffc; } +.main > #nav-sidebar + .content { + max-width: calc(100% - 23px); +} + +.main.shifted > #nav-sidebar + .content { + max-width: calc(100% - 299px); +} + @media (max-width: 767px) { #nav-sidebar, #toggle-nav-sidebar { display: none; } + + .main > #nav-sidebar + .content, + .main.shifted > #nav-sidebar + .content { + max-width: 100%; + } } diff --git a/log_viewer_demo/static/admin/css/responsive.css b/log_viewer_demo/static/admin/css/responsive.css index e1ce9c2..d745eae 100644 --- a/log_viewer_demo/static/admin/css/responsive.css +++ b/log_viewer_demo/static/admin/css/responsive.css @@ -93,14 +93,14 @@ input[type="submit"], button { /* Changelist */ - #changelist #toolbar { + #toolbar { border: none; padding: 15px; } #changelist-search > div { display: flex; - flex-wrap: wrap; + flex-wrap: nowrap; max-width: 480px; } @@ -108,13 +108,17 @@ input[type="submit"], button { line-height: 22px; } - #changelist #toolbar form #searchbar { + #toolbar form #searchbar { flex: 1 0 auto; width: 0; height: 22px; margin: 0 10px 0 6px; } + #toolbar form input[type=submit] { + flex: 0 1 auto; + } + #changelist-search .quiet { width: 100%; margin: 5px 0 0 25px; @@ -159,9 +163,6 @@ input[type="submit"], button { .change-list .filtered .paginator, .filtered #toolbar, .filtered .actions, - .filtered div.xfull { - margin-right: 230px; - } #changelist .paginator { border-top-color: #eee; @@ -500,25 +501,16 @@ input[type="submit"], button { /* Changelist */ #changelist { - display: flex; + align-items: stretch; flex-direction: column; } - #changelist #toolbar { - order: 1; + #toolbar { padding: 10px; } - #changelist .xfull { - order: 2; - } - - #changelist-form { - order: 3; - } - #changelist-filter { - order: 4; + margin-left: 0; } #changelist .actions label { @@ -534,11 +526,6 @@ input[type="submit"], button { flex: 1 0 100%; } - .change-list .filtered .results, .change-list .filtered .paginator, - .filtered #toolbar, .filtered .actions, .filtered div.xfull { - margin-right: 0; - } - #changelist-filter { position: static; width: auto; @@ -570,7 +557,6 @@ input[type="submit"], button { .aligned .form-row, .aligned .form-row > div { display: flex; - flex-wrap: wrap; max-width: 100vw; } diff --git a/log_viewer_demo/static/admin/css/responsive_rtl.css b/log_viewer_demo/static/admin/css/responsive_rtl.css index 66fcc3c..66d3c2f 100644 --- a/log_viewer_demo/static/admin/css/responsive_rtl.css +++ b/log_viewer_demo/static/admin/css/responsive_rtl.css @@ -23,9 +23,9 @@ [dir="rtl"] .change-list .filtered .paginator, [dir="rtl"] .filtered #toolbar, [dir="rtl"] .filtered div.xfull, - [dir="rtl"] .filtered .actions { - margin-right: 0; - margin-left: 230px; + [dir="rtl"] .filtered .actions, + [dir="rtl"] #changelist-filter { + margin-left: 0; } [dir="rtl"] .inline-group ul.tools a.add, @@ -63,14 +63,6 @@ /* MOBILE */ @media (max-width: 767px) { - [dir="rtl"] .change-list .filtered .results, - [dir="rtl"] .change-list .filtered .paginator, - [dir="rtl"] .filtered #toolbar, - [dir="rtl"] .filtered div.xfull, - [dir="rtl"] .filtered .actions { - margin-left: 0; - } - [dir="rtl"] .aligned .related-lookup, [dir="rtl"] .aligned .datetimeshortcuts { margin-left: 0; @@ -80,4 +72,9 @@ [dir="rtl"] .aligned ul { margin-right: 0; } + + [dir="rtl"] #changelist-filter { + margin-left: 0; + margin-right: 0; + } } diff --git a/log_viewer_demo/static/admin/css/rtl.css b/log_viewer_demo/static/admin/css/rtl.css index f4916d3..a40aad0 100644 --- a/log_viewer_demo/static/admin/css/rtl.css +++ b/log_viewer_demo/static/admin/css/rtl.css @@ -109,15 +109,10 @@ thead th.sorted .text { } #changelist-filter { - right: auto; - left: 0; border-left: none; border-right: none; -} - -.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { - margin-right: 0; - margin-left: 280px; + margin-left: 0; + margin-right: 30px; } #changelist-filter li.selected { @@ -129,11 +124,6 @@ thead th.sorted .text { margin-right: -15px; } -.filtered .actions { - margin-left: 280px; - margin-right: 0; -} - #changelist table tbody td:first-child, #changelist table tbody th:first-child { border-right: none; border-left: none; diff --git a/log_viewer_demo/static/admin/fonts/LICENSE.txt.py b/log_viewer_demo/static/admin/fonts/LICENSE.txt.py new file mode 100644 index 0000000..60dd7e8 --- /dev/null +++ b/log_viewer_demo/static/admin/fonts/LICENSE.txt.py @@ -0,0 +1,202 @@ + + 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 new file mode 100644 index 0000000..6853cce --- /dev/null +++ b/log_viewer_demo/static/admin/fonts/README.txt.py @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..f9b1a35 --- /dev/null +++ b/log_viewer_demo/static/admin/img/README.txt.py @@ -0,0 +1,7 @@ +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/timeparse.js b/log_viewer_demo/static/admin/js/timeparse.js new file mode 100755 index 0000000..3cdc7ec --- /dev/null +++ b/log_viewer_demo/static/admin/js/timeparse.js @@ -0,0 +1,106 @@ +(function() { + 'use strict'; + var timeParsePatterns = [ + // 9 + { + re: /^\d{1,2}$/i, + handler: function(bits) { + if (bits[0].length === 1) { + return '0' + bits[0] + ':00'; + } else { + return bits[0] + ':00'; + } + } + }, + // 13:00 + { + re: /^\d{2}[:.]\d{2}$/i, + handler: function(bits) { + return bits[0].replace('.', ':'); + } + }, + // 9:00 + { + re: /^\d[:.]\d{2}$/i, + handler: function(bits) { + return '0' + bits[0].replace('.', ':'); + } + }, + // 3 am / 3 a.m. / 3am + { + re: /^(\d+)\s*([ap])(?:.?m.?)?$/i, + handler: function(bits) { + var hour = parseInt(bits[1]); + if (hour === 12) { + hour = 0; + } + if (bits[2].toLowerCase() === 'p') { + if (hour === 12) { + hour = 0; + } + return (hour + 12) + ':00'; + } else { + if (hour < 10) { + return '0' + hour + ':00'; + } else { + return hour + ':00'; + } + } + } + }, + // 3.30 am / 3:15 a.m. / 3.00am + { + re: /^(\d+)[.:](\d{2})\s*([ap]).?m.?$/i, + handler: function(bits) { + var hour = parseInt(bits[1]); + var mins = parseInt(bits[2]); + if (mins < 10) { + mins = '0' + mins; + } + if (hour === 12) { + hour = 0; + } + if (bits[3].toLowerCase() === 'p') { + if (hour === 12) { + hour = 0; + } + return (hour + 12) + ':' + mins; + } else { + if (hour < 10) { + return '0' + hour + ':' + mins; + } else { + return hour + ':' + mins; + } + } + } + }, + // noon + { + re: /^no/i, + handler: function(bits) { + return '12:00'; + } + }, + // midnight + { + re: /^mid/i, + handler: function(bits) { + return '00:00'; + } + } + ]; + + function parseTimeString(s) { + for (var i = 0; i < timeParsePatterns.length; i++) { + var re = timeParsePatterns[i].re; + var handler = timeParsePatterns[i].handler; + var bits = re.exec(s); + if (bits) { + return handler(bits); + } + } + return s; + } + + window.parseTimeString = parseTimeString; +})(); diff --git a/log_viewer_demo/static/admin/js/vendor/jquery/LICENSE.txt.py b/log_viewer_demo/static/admin/js/vendor/jquery/LICENSE.txt.py new file mode 100644 index 0000000..3002833 --- /dev/null +++ b/log_viewer_demo/static/admin/js/vendor/jquery/LICENSE.txt.py @@ -0,0 +1,20 @@ +XXXXXXXXX XX XXXXXXXXXX XXX XXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX + +XXXXXXXXXX XX XXXXXX XXXXXXXX XXXX XX XXXXXXX XX XXX XXXXXX XXXXXXXXX +X XXXX XX XXXX XXXXXXXX XXX XXXXXXXXXX XXXXXXXXXXXXX XXXXX XXXX +XXXXXXXXXXXX XX XXXX XX XXX XXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXXXXXX +XXXXXXX XXXXXXXXXX XXX XXXXXX XX XXXX XXXXX XXXXXXX XXXXXX XXXXXXXX +XXXXXXXXXXX XXXXXXXXXXX XXXXXX XXXX XXXXXX XX XXX XXXXXXXXX XXX XX +XXXXXX XXXXXXX XX XXXX XXX XXXXXXXX XX XXXXXXXXX XX XX XXX XXXXXXX XX +XXX XXXXXXXXX XXXXXXXXXXX + +XXX XXXXX XXXXXXXXX XXXXXX XXX XXXX XXXXXXXXXX XXXXXX XXXXX XX +XXXXXXXX XX XXX XXXXXX XX XXXXXXXXXXX XXXXXXXX XX XXX XXXXXXXXX + +XXX XXXXXXXX XX XXXXXXXX XXX XXXX XXXXXXX XXXXXXXX XX XXX XXXXX +XXXXXXX XX XXXXXXXX XXXXXXXXX XXX XXX XXXXXXX XX XXX XXXXXXXXXX XX +XXXXXXXXXXXXXXXX XXXXXXX XXX X XXXXXXXXXX XXXXXXX XXX +XXXXXXXXXXXXXXXX XX XX XXXXX XXXXX XXX XXXXXXX XX XXXXXXXXX XXXXXXX XX +XXXXXX XXX XXX XXXXXX XXXXXXX XX XXXXX XXXXXXXXXX XXXXXXX XX XX XXXXXX +XX XXXXXXXXX XXXX XX XXXXXXXXXX XXXXXXX XXXXX XXX XX XX XX XXXXXXXXXX +XXXX XXX XXXXXXXX XX XXX XXX XX XXXXX XXXXXXXX XX XXX XXXXXXXXX diff --git a/log_viewer_demo/static/admin/js/vendor/xregexp/LICENSE.txt.py b/log_viewer_demo/static/admin/js/vendor/xregexp/LICENSE.txt.py new file mode 100644 index 0000000..e73ef8b --- /dev/null +++ b/log_viewer_demo/static/admin/js/vendor/xregexp/LICENSE.txt.py @@ -0,0 +1,21 @@ +XXX XXX XXXXXXX + +XXXXXXXXX XXX XXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXX + +XXXXXXXXXX XX XXXXXX XXXXXXXX XXXX XX XXXXXXX XX XXX XXXXXX XXXXXXXXX X XXXX +XX XXXX XXXXXXXX XXX XXXXXXXXXX XXXXXXXXXXXXX XXXXX XXXX XXXXXXXXXXXX XX XXXX +XX XXX XXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXX XXXXXXXXXX XXX XXXXXX +XX XXXX XXXXX XXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXX XXXX +XXXXXX XX XXX XXXXXXXXX XXX XX XXXXXX XXXXXXX XX XXXX XXX XXXXXXXX XX +XXXXXXXXX XX XX XXX XXXXXXX XX XXX XXXXXXXXX XXXXXXXXXXX + +XXX XXXXX XXXXXXXXX XXXXXX XXX XXXX XXXXXXXXXX XXXXXX XXXXX XX XXXXXXXX XX +XXX XXXXXX XX XXXXXXXXXXX XXXXXXXX XX XXX XXXXXXXXX + +XXX XXXXXXXX XX XXXXXXXX XXX XXXX XXXXXXX XXXXXXXX XX XXX XXXXX XXXXXXX XX +XXXXXXXX XXXXXXXXX XXX XXX XXXXXXX XX XXX XXXXXXXXXX XX XXXXXXXXXXXXXXXX +XXXXXXX XXX X XXXXXXXXXX XXXXXXX XXX XXXXXXXXXXXXXXXX XX XX XXXXX XXXXX XXX +XXXXXXX XX XXXXXXXXX XXXXXXX XX XXXXXX XXX XXX XXXXXX XXXXXXX XX XXXXX +XXXXXXXXXX XXXXXXX XX XX XXXXXX XX XXXXXXXXX XXXX XX XXXXXXXXXX XXXXXXX XXXXX +XXX XX XX XX XXXXXXXXXX XXXX XXX XXXXXXXX XX XXX XXX XX XXXXX XXXXXXXX XX +XXX XXXXXXXXX diff --git a/log_viewer_demo/static/log_viewer/css/log-viewer.css b/log_viewer_demo/static/log_viewer/css/log-viewer.css index dd48a89..4a7be17 100644 --- a/log_viewer_demo/static/log_viewer/css/log-viewer.css +++ b/log_viewer_demo/static/log_viewer/css/log-viewer.css @@ -23,6 +23,7 @@ https://github.com/agusmakmun/django-log-viewer .django__log__viewer .btn-download { color: #fff; margin: .5em; + margin-top: 0; font-size: 13px; text-align: center; padding: 8px 12px; diff --git a/setup.py b/setup.py index 20963bc..8473d1c 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import (setup, find_packages) -__version__ = '1.1.1' +__version__ = '1.1.2' setup( name='django-log-viewer', @@ -33,7 +33,10 @@ 'Programming Language :: Python', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Development Status :: 5 - Production/Stable', 'Topic :: Software Development :: Libraries :: Python Modules', 'License :: OSI Approved :: MIT License',