summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2025-03-27 11:13:57 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2025-06-13 18:08:06 +0200
commitdb174e7f376a3687cb6cd84339592231ceae0ee0 (patch)
treef9846c12f13359732bdd35164e7003bcd6566ebb
parent19dc514fe68ceec31bedda93c83751ddbd0d67e0 (diff)
downloadIshtar-db174e7f376a3687cb6cd84339592231ceae0ee0.tar.bz2
Ishtar-db174e7f376a3687cb6cd84339592231ceae0ee0.zip
♻️ adapt admin customization for django v4.2
-rw-r--r--ishtar_common/static/admin/css/base.css1161
-rw-r--r--ishtar_common/templates/admin/app_list.html45
-rw-r--r--ishtar_common/templates/admin/index.html104
3 files changed, 1206 insertions, 104 deletions
diff --git a/ishtar_common/static/admin/css/base.css b/ishtar_common/static/admin/css/base.css
new file mode 100644
index 000000000..f0969670a
--- /dev/null
+++ b/ishtar_common/static/admin/css/base.css
@@ -0,0 +1,1161 @@
+/*
+ DJANGO Admin styles
+*/
+
+/* ishtar begin */
+tr:nth-child(2n+1).admin-section,
+tr:nth-child(2n+1).admin-section,
+tr:nth-child(2n).admin-section {
+ background: #a6c2d0;
+ color: #fff;
+}
+.admin-section th {
+ font-size: 12px;
+ font-weight: normal;
+ letter-spacing: 0.5px;
+ text-transform: uppercase;
+ padding: 6px 10px;
+}
+/* ishtar end */
+
+/* VARIABLE DEFINITIONS */
+html[data-theme="light"],
+: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: #417893;
+ --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: #747474;
+ --close-button-hover-bg: #333;
+ --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);
+
+ --font-family-primary:
+ -apple-system,
+ BlinkMacSystemFont,
+ "Segoe UI",
+ system-ui,
+ Roboto,
+ "Helvetica Neue",
+ Arial,
+ sans-serif,
+ "Apple Color Emoji",
+ "Segoe UI Emoji",
+ "Segoe UI Symbol",
+ "Noto Color Emoji";
+ --font-family-monospace:
+ ui-monospace,
+ Menlo,
+ Monaco,
+ "Cascadia Mono",
+ "Segoe UI Mono",
+ "Roboto Mono",
+ "Oxygen Mono",
+ "Ubuntu Monospace",
+ "Source Code Pro",
+ "Fira Mono",
+ "Droid Sans Mono",
+ "Courier New",
+ monospace,
+ "Apple Color Emoji",
+ "Segoe UI Emoji",
+ "Segoe UI Symbol",
+ "Noto Color Emoji";
+}
+
+html, body {
+ height: 100%;
+}
+
+body {
+ margin: 0;
+ padding: 0;
+ font-size: 0.875rem;
+ font-family: var(--font-family-primary);
+ color: var(--body-fg);
+ background: var(--body-bg);
+}
+
+/* LINKS */
+
+a:link, a:visited {
+ color: var(--link-fg);
+ text-decoration: none;
+ transition: color 0.15s, background 0.15s;
+}
+
+a:focus, a:hover {
+ color: var(--link-hover-color);
+}
+
+a:focus {
+ text-decoration: underline;
+}
+
+a img {
+ border: none;
+}
+
+a.section:link, a.section:visited {
+ color: var(--header-link-color);
+ text-decoration: none;
+}
+
+a.section:focus, a.section:hover {
+ text-decoration: underline;
+}
+
+/* GLOBAL DEFAULTS */
+
+p, ol, ul, dl {
+ margin: .2em 0 .8em 0;
+}
+
+p {
+ padding: 0;
+ line-height: 140%;
+}
+
+h1,h2,h3,h4,h5 {
+ font-weight: bold;
+}
+
+h1 {
+ margin: 0 0 20px;
+ font-weight: 300;
+ font-size: 1.25rem;
+ color: var(--body-quiet-color);
+}
+
+h2 {
+ font-size: 1rem;
+ margin: 1em 0 .5em 0;
+}
+
+h2.subhead {
+ font-weight: normal;
+ margin-top: 0;
+}
+
+h3 {
+ font-size: 0.875rem;
+ margin: .8em 0 .3em 0;
+ color: var(--body-quiet-color);
+ font-weight: bold;
+}
+
+h4 {
+ font-size: 0.75rem;
+ margin: 1em 0 .8em 0;
+ padding-bottom: 3px;
+}
+
+h5 {
+ font-size: 0.625rem;
+ margin: 1.5em 0 .5em 0;
+ color: var(--body-quiet-color);
+ text-transform: uppercase;
+ letter-spacing: 1px;
+}
+
+ul > li {
+ list-style-type: square;
+ padding: 1px 0;
+}
+
+li ul {
+ margin-bottom: 0;
+}
+
+li, dt, dd {
+ font-size: 0.8125rem;
+ line-height: 1.25rem;
+}
+
+dt {
+ font-weight: bold;
+ margin-top: 4px;
+}
+
+dd {
+ margin-left: 0;
+}
+
+form {
+ margin: 0;
+ padding: 0;
+}
+
+fieldset {
+ margin: 0;
+ min-width: 0;
+ padding: 0;
+ border: none;
+ border-top: 1px solid var(--hairline-color);
+}
+
+blockquote {
+ font-size: 0.6875rem;
+ color: #777;
+ margin-left: 2px;
+ padding-left: 10px;
+ border-left: 5px solid #ddd;
+}
+
+code, pre {
+ font-family: var(--font-family-monospace);
+ color: var(--body-quiet-color);
+ font-size: 0.75rem;
+ overflow-x: auto;
+}
+
+pre.literal-block {
+ margin: 10px;
+ background: var(--darkened-bg);
+ padding: 6px 8px;
+}
+
+code strong {
+ color: #930;
+}
+
+hr {
+ clear: both;
+ color: var(--hairline-color);
+ background-color: var(--hairline-color);
+ height: 1px;
+ border: none;
+ margin: 0;
+ padding: 0;
+ line-height: 1px;
+}
+
+/* TEXT STYLES & MODIFIERS */
+
+.small {
+ font-size: 0.6875rem;
+}
+
+.mini {
+ font-size: 0.625rem;
+}
+
+.help, p.help, form p.help, div.help, form div.help, div.help li {
+ font-size: 0.6875rem;
+ color: var(--body-quiet-color);
+}
+
+div.help ul {
+ margin-bottom: 0;
+}
+
+.help-tooltip {
+ cursor: help;
+}
+
+p img, h1 img, h2 img, h3 img, h4 img, td img {
+ vertical-align: middle;
+}
+
+.quiet, a.quiet:link, a.quiet:visited {
+ color: var(--body-quiet-color);
+ font-weight: normal;
+}
+
+.clear {
+ clear: both;
+}
+
+.nowrap {
+ white-space: nowrap;
+}
+
+.hidden {
+ display: none !important;
+}
+
+/* TABLES */
+
+table {
+ border-collapse: collapse;
+ border-color: var(--border-color);
+}
+
+td, th {
+ font-size: 0.8125rem;
+ line-height: 1rem;
+ border-bottom: 1px solid var(--hairline-color);
+ vertical-align: top;
+ padding: 8px;
+}
+
+th {
+ font-weight: 600;
+ text-align: left;
+}
+
+thead th,
+tfoot td {
+ color: var(--body-quiet-color);
+ padding: 5px 10px;
+ font-size: 0.6875rem;
+ background: var(--body-bg);
+ border: none;
+ border-top: 1px solid var(--hairline-color);
+ border-bottom: 1px solid var(--hairline-color);
+}
+
+tfoot td {
+ border-bottom: none;
+ border-top: 1px solid var(--hairline-color);
+}
+
+thead th.required {
+ color: var(--body-loud-color);
+}
+
+tr.alt {
+ background: var(--darkened-bg);
+}
+
+tr:nth-child(odd), .row-form-errors {
+ 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: var(--darkened-bg);
+}
+
+/* SORTABLE TABLES */
+
+thead th {
+ padding: 5px 10px;
+ line-height: normal;
+ text-transform: uppercase;
+ background: var(--darkened-bg);
+}
+
+thead th a:link, thead th a:visited {
+ color: var(--body-quiet-color);
+}
+
+thead th.sorted {
+ background: var(--selected-bg);
+}
+
+thead th.sorted .text {
+ padding-right: 42px;
+}
+
+table thead th .text span {
+ padding: 8px 10px;
+ display: block;
+}
+
+table thead th .text a {
+ display: block;
+ cursor: pointer;
+ padding: 8px 10px;
+}
+
+table thead th .text a:focus, table thead th .text a:hover {
+ background: var(--selected-bg);
+}
+
+thead th.sorted a.sortremove {
+ visibility: hidden;
+}
+
+table thead th.sorted:hover a.sortremove {
+ visibility: visible;
+}
+
+table thead th.sorted .sortoptions {
+ display: block;
+ padding: 9px 5px 0 5px;
+ float: right;
+ text-align: right;
+}
+
+table thead th.sorted .sortpriority {
+ font-size: .8em;
+ min-width: 12px;
+ text-align: center;
+ vertical-align: 3px;
+ margin-left: 2px;
+ margin-right: 2px;
+}
+
+table thead th.sorted .sortoptions a {
+ position: relative;
+ width: 14px;
+ height: 14px;
+ display: inline-block;
+ background: url(../img/sorting-icons.svg) 0 0 no-repeat;
+ background-size: 14px auto;
+}
+
+table thead th.sorted .sortoptions a.sortremove {
+ background-position: 0 0;
+}
+
+table thead th.sorted .sortoptions a.sortremove:after {
+ content: '\\';
+ position: absolute;
+ top: -6px;
+ left: 3px;
+ font-weight: 200;
+ font-size: 1.125rem;
+ color: var(--body-quiet-color);
+}
+
+table thead th.sorted .sortoptions a.sortremove:focus:after,
+table thead th.sorted .sortoptions a.sortremove:hover:after {
+ color: var(--link-fg);
+}
+
+table thead th.sorted .sortoptions a.sortremove:focus,
+table thead th.sorted .sortoptions a.sortremove:hover {
+ background-position: 0 -14px;
+}
+
+table thead th.sorted .sortoptions a.ascending {
+ background-position: 0 -28px;
+}
+
+table thead th.sorted .sortoptions a.ascending:focus,
+table thead th.sorted .sortoptions a.ascending:hover {
+ background-position: 0 -42px;
+}
+
+table thead th.sorted .sortoptions a.descending {
+ top: 1px;
+ background-position: 0 -56px;
+}
+
+table thead th.sorted .sortoptions a.descending:focus,
+table thead th.sorted .sortoptions a.descending:hover {
+ background-position: 0 -70px;
+}
+
+/* FORM DEFAULTS */
+
+input, textarea, select, .form-row p, form .button {
+ margin: 2px 0;
+ padding: 2px 3px;
+ vertical-align: middle;
+ font-family: var(--font-family-primary);
+ font-weight: normal;
+ font-size: 0.8125rem;
+}
+.form-row div.help {
+ padding: 2px 3px;
+}
+
+textarea {
+ vertical-align: top;
+}
+
+input[type=text], input[type=password], input[type=email], input[type=url],
+input[type=number], input[type=tel], textarea, select, .vTextField {
+ border: 1px solid var(--border-color);
+ border-radius: 4px;
+ padding: 5px 6px;
+ 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: var(--body-quiet-color);
+}
+
+select {
+ height: 1.875rem;
+}
+
+select[multiple] {
+ /* Allow HTML size attribute to override the height in the rule above. */
+ height: auto;
+ min-height: 150px;
+}
+
+/* FORM BUTTONS */
+
+.button, input[type=submit], input[type=button], .submit-row input, a.button {
+ background: var(--button-bg);
+ padding: 10px 15px;
+ border: none;
+ border-radius: 4px;
+ color: var(--button-fg);
+ cursor: pointer;
+ transition: background 0.15s;
+}
+
+a.button {
+ padding: 4px 5px;
+}
+
+.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: var(--button-hover-bg);
+}
+
+.button[disabled], input[type=submit][disabled], input[type=button][disabled] {
+ opacity: 0.4;
+}
+
+.button.default, input[type=submit].default, .submit-row input.default {
+ border: none;
+ font-weight: 400;
+ 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: var(--default-button-hover-bg);
+}
+
+.button[disabled].default,
+input[type=submit][disabled].default,
+input[type=button][disabled].default {
+ opacity: 0.4;
+}
+
+
+/* MODULES */
+
+.module {
+ border: none;
+ margin-bottom: 30px;
+ background: var(--body-bg);
+}
+
+.module p, .module ul, .module h3, .module h4, .module dl, .module pre {
+ padding-left: 10px;
+ padding-right: 10px;
+}
+
+.module blockquote {
+ margin-left: 12px;
+}
+
+.module ul, .module ol {
+ margin-left: 1.5em;
+}
+
+.module h3 {
+ margin-top: .6em;
+}
+
+.module h2, .module caption, .inline-group h2 {
+ margin: 0;
+ padding: 8px;
+ font-weight: 400;
+ font-size: 0.8125rem;
+ text-align: left;
+ background: var(--primary);
+ color: var(--header-link-color);
+}
+
+.module caption,
+.inline-group h2 {
+ font-size: 0.75rem;
+ letter-spacing: 0.5px;
+ text-transform: uppercase;
+}
+
+.module table {
+ border-collapse: collapse;
+}
+
+/* MESSAGES & ERRORS */
+
+ul.messagelist {
+ padding: 0;
+ margin: 0;
+}
+
+ul.messagelist li {
+ display: block;
+ font-weight: 400;
+ font-size: 0.8125rem;
+ padding: 10px 10px 10px 65px;
+ margin: 0 0 10px 0;
+ background: var(--message-success-bg) url(../img/icon-yes.svg) 40px 12px no-repeat;
+ background-size: 16px auto;
+ color: var(--body-fg);
+ word-break: break-word;
+}
+
+ul.messagelist li.warning {
+ background: var(--message-warning-bg) url(../img/icon-alert.svg) 40px 14px no-repeat;
+ background-size: 14px auto;
+}
+
+ul.messagelist li.error {
+ background: var(--message-error-bg) url(../img/icon-no.svg) 40px 12px no-repeat;
+ background-size: 16px auto;
+}
+
+.errornote {
+ font-size: 0.875rem;
+ font-weight: 700;
+ display: block;
+ padding: 10px 12px;
+ margin: 0 0 10px 0;
+ color: var(--error-fg);
+ border: 1px solid var(--error-fg);
+ border-radius: 4px;
+ background-color: var(--body-bg);
+ background-position: 5px 12px;
+ overflow-wrap: break-word;
+}
+
+ul.errorlist {
+ margin: 0 0 4px;
+ padding: 0;
+ color: var(--error-fg);
+ background: var(--body-bg);
+}
+
+ul.errorlist li {
+ font-size: 0.8125rem;
+ display: block;
+ margin-bottom: 4px;
+ overflow-wrap: break-word;
+}
+
+ul.errorlist li:first-child {
+ margin-top: 0;
+}
+
+ul.errorlist li a {
+ color: inherit;
+ text-decoration: underline;
+}
+
+td ul.errorlist {
+ margin: 0;
+ padding: 0;
+}
+
+td ul.errorlist li {
+ margin: 0;
+}
+
+.form-row.errors {
+ margin: 0;
+ border: none;
+ border-bottom: 1px solid var(--hairline-color);
+ background: none;
+}
+
+.form-row.errors ul.errorlist li {
+ padding-left: 0;
+}
+
+.errors input, .errors select, .errors textarea,
+td ul.errorlist + input, td ul.errorlist + select, td ul.errorlist + textarea {
+ border: 1px solid var(--error-fg);
+}
+
+.description {
+ font-size: 0.75rem;
+ padding: 5px 0 0 12px;
+}
+
+/* BREADCRUMBS */
+
+div.breadcrumbs {
+ background: var(--breadcrumbs-bg);
+ padding: 10px 40px;
+ border: none;
+ color: var(--breadcrumbs-fg);
+ text-align: left;
+}
+
+div.breadcrumbs a {
+ color: var(--breadcrumbs-link-fg);
+}
+
+div.breadcrumbs a:focus, div.breadcrumbs a:hover {
+ color: var(--breadcrumbs-fg);
+}
+
+/* ACTION ICONS */
+
+.viewlink, .inlineviewlink {
+ padding-left: 16px;
+ background: url(../img/icon-viewlink.svg) 0 1px no-repeat;
+}
+
+.addlink {
+ padding-left: 16px;
+ background: url(../img/icon-addlink.svg) 0 1px no-repeat;
+}
+
+.changelink, .inlinechangelink {
+ padding-left: 16px;
+ background: url(../img/icon-changelink.svg) 0 1px no-repeat;
+}
+
+.deletelink {
+ padding-left: 16px;
+ background: url(../img/icon-deletelink.svg) 0 1px no-repeat;
+}
+
+a.deletelink:link, a.deletelink:visited {
+ color: #CC3434; /* XXX Probably unused? */
+}
+
+a.deletelink:focus, a.deletelink:hover {
+ color: #993333; /* XXX Probably unused? */
+ text-decoration: none;
+}
+
+/* OBJECT TOOLS */
+
+.object-tools {
+ font-size: 0.625rem;
+ font-weight: bold;
+ padding-left: 0;
+ float: right;
+ position: relative;
+ margin-top: -48px;
+}
+
+.object-tools li {
+ display: block;
+ float: left;
+ margin-left: 5px;
+ height: 1rem;
+}
+
+.object-tools a {
+ border-radius: 15px;
+}
+
+.object-tools a:link, .object-tools a:visited {
+ display: block;
+ float: left;
+ padding: 3px 12px;
+ background: var(--object-tools-bg);
+ color: var(--object-tools-fg);
+ font-weight: 400;
+ font-size: 0.6875rem;
+ text-transform: uppercase;
+ letter-spacing: 0.5px;
+}
+
+.object-tools a:focus, .object-tools a:hover {
+ background-color: var(--object-tools-hover-bg);
+}
+
+.object-tools a:focus{
+ text-decoration: none;
+}
+
+.object-tools a.viewsitelink, .object-tools a.addlink {
+ background-repeat: no-repeat;
+ background-position: right 7px center;
+ padding-right: 26px;
+}
+
+.object-tools a.viewsitelink {
+ background-image: url(../img/tooltag-arrowright.svg);
+}
+
+.object-tools a.addlink {
+ background-image: url(../img/tooltag-add.svg);
+}
+
+/* OBJECT HISTORY */
+
+#change-history table {
+ width: 100%;
+}
+
+#change-history table tbody th {
+ width: 16em;
+}
+
+#change-history .paginator {
+ color: var(--body-quiet-color);
+ border-bottom: 1px solid var(--hairline-color);
+ background: var(--body-bg);
+ overflow: hidden;
+}
+
+/* PAGE STRUCTURE */
+
+#container {
+ position: relative;
+ width: 100%;
+ min-width: 980px;
+ padding: 0;
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+}
+
+#container > div {
+ flex-shrink: 0;
+}
+
+#container > .main {
+ display: flex;
+ flex: 1 0 auto;
+}
+
+.main > .content {
+ flex: 1 0;
+ max-width: 100%;
+}
+
+.skip-to-content-link {
+ position: absolute;
+ top: -999px;
+ margin: 5px;
+ padding: 5px;
+ background: var(--body-bg);
+ z-index: 1;
+}
+
+.skip-to-content-link:focus {
+ left: 0px;
+ top: 0px;
+}
+
+#content {
+ padding: 20px 40px;
+}
+
+.dashboard #content {
+ width: 600px;
+}
+
+#content-main {
+ float: left;
+ width: 100%;
+}
+
+#content-related {
+ float: right;
+ width: 260px;
+ position: relative;
+ margin-right: -300px;
+}
+
+#footer {
+ clear: both;
+ padding: 10px;
+}
+
+/* COLUMN TYPES */
+
+.colMS {
+ margin-right: 300px;
+}
+
+.colSM {
+ margin-left: 300px;
+}
+
+.colSM #content-related {
+ float: left;
+ margin-right: 0;
+ margin-left: -300px;
+}
+
+.colSM #content-main {
+ float: right;
+}
+
+.popup .colM {
+ width: auto;
+}
+
+/* HEADER */
+
+#header {
+ width: auto;
+ height: auto;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 10px 40px;
+ background: var(--header-bg);
+ color: var(--header-color);
+ overflow: hidden;
+}
+
+#header a:link, #header a:visited, #logout-form button {
+ color: var(--header-link-color);
+}
+
+#header a:focus , #header a:hover {
+ text-decoration: underline;
+}
+
+#branding {
+ display: flex;
+}
+
+#branding h1 {
+ padding: 0;
+ margin: 0;
+ margin-inline-end: 20px;
+ font-weight: 300;
+ font-size: 1.5rem;
+ color: var(--header-branding-color);
+}
+
+#branding h1 a:link, #branding h1 a:visited {
+ color: var(--accent);
+}
+
+#branding h2 {
+ padding: 0 10px;
+ font-size: 0.875rem;
+ margin: -8px 0 8px 0;
+ font-weight: normal;
+ color: var(--header-color);
+}
+
+#branding a:hover {
+ text-decoration: none;
+}
+
+#logout-form {
+ display: inline;
+}
+
+#logout-form button {
+ background: none;
+ border: 0;
+ cursor: pointer;
+ font-family: var(--font-family-primary);
+}
+
+#user-tools {
+ float: right;
+ margin: 0 0 0 20px;
+ text-align: right;
+}
+
+#user-tools, #logout-form button{
+ padding: 0;
+ font-weight: 300;
+ font-size: 0.6875rem;
+ letter-spacing: 0.5px;
+ text-transform: uppercase;
+}
+
+#user-tools a, #logout-form button {
+ border-bottom: 1px solid rgba(255, 255, 255, 0.25);
+}
+
+#user-tools a:focus, #user-tools a:hover,
+#logout-form button:active, #logout-form button:hover {
+ text-decoration: none;
+ border-bottom: 0;
+}
+
+#logout-form button:active, #logout-form button:hover {
+ margin-bottom: 1px;
+}
+
+/* SIDEBAR */
+
+#content-related {
+ background: var(--darkened-bg);
+}
+
+#content-related .module {
+ background: none;
+}
+
+#content-related h3 {
+ color: var(--body-quiet-color);
+ padding: 0 16px;
+ margin: 0 0 16px;
+}
+
+#content-related h4 {
+ font-size: 0.8125rem;
+}
+
+#content-related p {
+ padding-left: 16px;
+ padding-right: 16px;
+}
+
+#content-related .actionlist {
+ padding: 0;
+ margin: 16px;
+}
+
+#content-related .actionlist li {
+ line-height: 1.2;
+ margin-bottom: 10px;
+ padding-left: 18px;
+}
+
+#content-related .module h2 {
+ background: none;
+ padding: 16px;
+ margin-bottom: 16px;
+ border-bottom: 1px solid var(--hairline-color);
+ font-size: 1.125rem;
+ color: var(--body-fg);
+}
+
+.delete-confirmation form input[type="submit"] {
+ background: var(--delete-button-bg);
+ border-radius: 4px;
+ padding: 10px 15px;
+ 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: var(--delete-button-hover-bg);
+}
+
+.delete-confirmation form .cancel-link {
+ display: inline-block;
+ vertical-align: middle;
+ height: 0.9375rem;
+ line-height: 0.9375rem;
+ border-radius: 4px;
+ padding: 10px 15px;
+ 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: var(--close-button-hover-bg);
+}
+
+/* POPUP */
+.popup #content {
+ padding: 20px;
+}
+
+.popup #container {
+ min-width: 0;
+}
+
+.popup #header {
+ padding: 10px 20px;
+}
+
+/* PAGINATOR */
+
+.paginator {
+ display: flex;
+ align-items: center;
+ gap: 4px;
+ font-size: 0.8125rem;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ line-height: 22px;
+ margin: 0;
+ border-top: 1px solid var(--hairline-color);
+ width: 100%;
+}
+
+.paginator a:link, .paginator a:visited {
+ padding: 2px 6px;
+ background: var(--button-bg);
+ text-decoration: none;
+ color: var(--button-fg);
+}
+
+.paginator a.showall {
+ border: none;
+ background: none;
+ color: var(--link-fg);
+}
+
+.paginator a.showall:focus, .paginator a.showall:hover {
+ background: none;
+ color: var(--link-hover-color);
+}
+
+.paginator .end {
+ margin-right: 6px;
+}
+
+.paginator .this-page {
+ padding: 2px 6px;
+ font-weight: bold;
+ font-size: 0.8125rem;
+ vertical-align: top;
+}
+
+.paginator a:focus, .paginator a:hover {
+ color: white;
+ background: var(--link-hover-color);
+}
+
+.paginator input {
+ margin-left: auto;
+}
+
+.base-svgs {
+ display: none;
+}
diff --git a/ishtar_common/templates/admin/app_list.html b/ishtar_common/templates/admin/app_list.html
new file mode 100644
index 000000000..115c682cd
--- /dev/null
+++ b/ishtar_common/templates/admin/app_list.html
@@ -0,0 +1,45 @@
+{% load i18n %}
+
+{% if app_list %}
+ {% for app in app_list %}
+ <div class="app-{{ app.app_label }} module{% if app.app_url in request.path|urlencode %} current-app{% endif %}">
+ <table>
+ <caption>
+ <a href="{{ app.app_url }}" class="section" title="{% blocktranslate with name=app.name %}Models in the {{ name }} application{% endblocktranslate %}">{{ app.name }}</a>
+ </caption>
+ {% for model in app.models %}
+ {# Ishtar #}
+ {% ifchanged model.admin_section %}
+ {% if model.admin_section or forloop.counter0 %}<tr class="admin-section"><th colspan="3">{% if model.admin_section %}{{ model.admin_section }}{% else %}&nbsp;{% endif %}</th></tr>{% endif %}
+ {% endifchanged %}
+ {# Ishtar end #}
+ <tr class="model-{{ model.object_name|lower }}{% if model.admin_url in request.path|urlencode %} current-model{% endif %}">
+ {% if model.admin_url %}
+ <th scope="row"><a href="{{ model.admin_url }}"{% if model.admin_url in request.path|urlencode %} aria-current="page"{% endif %}>{{ model.name }}</a></th>
+ {% else %}
+ <th scope="row">{{ model.name }}</th>
+ {% endif %}
+
+ {% if model.add_url %}
+ <td><a href="{{ model.add_url }}" class="addlink">{% translate 'Add' %}</a></td>
+ {% else %}
+ <td></td>
+ {% endif %}
+
+ {% if model.admin_url and show_changelinks %}
+ {% if model.view_only %}
+ <td><a href="{{ model.admin_url }}" class="viewlink">{% translate 'View' %}</a></td>
+ {% else %}
+ <td><a href="{{ model.admin_url }}" class="changelink">{% translate 'Change' %}</a></td>
+ {% endif %}
+ {% elif show_changelinks %}
+ <td></td>
+ {% endif %}
+ </tr>
+ {% endfor %}
+ </table>
+ </div>
+ {% endfor %}
+{% else %}
+ <p>{% translate 'You don’t have permission to view or edit anything.' %}</p>
+{% endif %}
diff --git a/ishtar_common/templates/admin/index.html b/ishtar_common/templates/admin/index.html
deleted file mode 100644
index 1c5b0dd84..000000000
--- a/ishtar_common/templates/admin/index.html
+++ /dev/null
@@ -1,104 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n static %}
-
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}">
-<style>
- .admin-section {
- background: #a6c2d0;
- color: #fff;
- }
- .admin-section th {
- font-size: 12px;
- font-weight: normal;
- letter-spacing: 0.5px;
- text-transform: uppercase;
- padding: 6px 10px;
- }
-</style>{% endblock %}
-
-{% block coltype %}colMS{% endblock %}
-
-{% block bodyclass %}{{ block.super }} dashboard{% endblock %}
-
-{% block breadcrumbs %}{% endblock %}
-
-{% block content %}
-<div id="content-main">
-
-{% if app_list %}
- {% for app in app_list %}
- <div class="app-{{ app.app_label }} module">
- <table>
- <caption>
- <a href="{{ app.app_url }}" class="section" title="{% blocktrans with name=app.name %}Models in the {{ name }} application{% endblocktrans %}">{{ app.name }}</a>
- </caption>
- {% for model in app.models %}
- {# Ishtar #}
- {% ifchanged model.admin_section %}
- {% if model.admin_section or forloop.counter0 %}<tr class="admin-section"><th colspan="3">{% if model.admin_section %}{{ model.admin_section }}{% else %}&nbsp;{% endif %}</th></tr>{% endif %}
- {% endifchanged %}
- {# Ishtar end #}
- <tr class="model-{{ model.object_name|lower }}">
- {% if model.admin_url %}
- <th scope="row"><a href="{{ model.admin_url }}">{{ model.name }}</a></th>
- {% else %}
- <th scope="row">{{ model.name }}</th>
- {% endif %}
-
- {% if model.add_url %}
- <td><a href="{{ model.add_url }}" class="addlink">{% trans 'Add' %}</a></td>
- {% else %}
- <td>&nbsp;</td>
- {% endif %}
-
- {% if model.admin_url %}
- {% if model.view_only %}
- <td><a href="{{ model.admin_url }}" class="viewlink">{% trans 'View' %}</a></td>
- {% else %}
- <td><a href="{{ model.admin_url }}" class="changelink">{% trans 'Change' %}</a></td>
- {% endif %}
- {% else %}
- <td>&nbsp;</td>
- {% endif %}
- </tr>
- {% endfor %}
- </table>
- </div>
- {% endfor %}
-{% else %}
- <p>{% trans "You don't have permission to view or edit anything." %}</p>
-{% endif %}
-</div>
-{% endblock %}
-
-{% block sidebar %}
-<div id="content-related">
- <div class="module" id="recent-actions-module">
- <h2>{% trans 'Recent actions' %}</h2>
- <h3>{% trans 'My actions' %}</h3>
- {% load log %}
- {% get_admin_log 10 as admin_log for_user user %}
- {% if not admin_log %}
- <p>{% trans 'None available' %}</p>
- {% else %}
- <ul class="actionlist">
- {% for entry in admin_log %}
- <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">
- {% if entry.is_deletion or not entry.get_admin_url %}
- {{ entry.object_repr }}
- {% else %}
- <a href="{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>
- {% endif %}
- <br>
- {% if entry.content_type %}
- <span class="mini quiet">{% filter capfirst %}{{ entry.content_type }}{% endfilter %}</span>
- {% else %}
- <span class="mini quiet">{% trans 'Unknown content' %}</span>
- {% endif %}
- </li>
- {% endfor %}
- </ul>
- {% endif %}
- </div>
-</div>
-{% endblock %}