From ad81d523b89eef2e06aef6a0aae40fa228cdf441 Mon Sep 17 00:00:00 2001 From: mominur-helios Date: Wed, 31 May 2023 12:36:06 +0600 Subject: [PATCH] fix inline formsets issue and add some icons --- admin_datta/static/assets/css/forms.css | 19 ++++++----- admin_datta/static/assets/css/widgets.css | 28 +++++++-------- .../static/assets/images/icon-addlink.svg | 3 ++ .../static/assets/images/icon-calendar.svg | 9 +++++ .../static/assets/images/icon-changelink.svg | 3 ++ .../static/assets/images/icon-clock.svg | 9 +++++ .../static/assets/images/icon-deletelink.svg | 3 ++ admin_datta/static/assets/images/icon-no.svg | 3 ++ .../static/assets/images/icon-unknown-alt.svg | 3 ++ .../static/assets/images/icon-unknown.svg | 3 ++ .../static/assets/images/icon-viewlink.svg | 3 ++ admin_datta/static/assets/images/icon-yes.svg | 3 ++ .../static/assets/images/inline-delete.svg | 3 ++ admin_datta/static/assets/images/search.svg | 3 ++ .../static/assets/images/selector-icons.svg | 34 +++++++++++++++++++ .../templates/admin/edit_inline/tabular.html | 3 +- admin_datta/templates/layouts/base.html | 6 ++++ 17 files changed, 114 insertions(+), 24 deletions(-) create mode 100644 admin_datta/static/assets/images/icon-addlink.svg create mode 100644 admin_datta/static/assets/images/icon-calendar.svg create mode 100644 admin_datta/static/assets/images/icon-changelink.svg create mode 100644 admin_datta/static/assets/images/icon-clock.svg create mode 100644 admin_datta/static/assets/images/icon-deletelink.svg create mode 100644 admin_datta/static/assets/images/icon-no.svg create mode 100644 admin_datta/static/assets/images/icon-unknown-alt.svg create mode 100644 admin_datta/static/assets/images/icon-unknown.svg create mode 100644 admin_datta/static/assets/images/icon-viewlink.svg create mode 100644 admin_datta/static/assets/images/icon-yes.svg create mode 100644 admin_datta/static/assets/images/inline-delete.svg create mode 100644 admin_datta/static/assets/images/search.svg create mode 100644 admin_datta/static/assets/images/selector-icons.svg diff --git a/admin_datta/static/assets/css/forms.css b/admin_datta/static/assets/css/forms.css index b472c2d..8c49125 100755 --- a/admin_datta/static/assets/css/forms.css +++ b/admin_datta/static/assets/css/forms.css @@ -7,11 +7,14 @@ padding: 10px; font-size: 13px; border-bottom: 1px solid #eee; + display: table-row !important; } - .form-row img, .form-row input { vertical-align: middle; } +.form-row .field-title { + padding-left: 0 !important; +} .form-row label input[type="checkbox"] { margin-top: 0; @@ -466,13 +469,13 @@ body.popup .submit-row { } .inline-group .tabular th.original { - width: 0px; - padding: 0; + width: 0px !important; + padding: 0 !important; } .inline-group .tabular td.original p { position: absolute; - right: 0; + left: 5px; /*height: 1.1em;*/ /*padding: 2px 9px;*/ overflow: hidden; @@ -509,13 +512,13 @@ body.popup .submit-row { .inline-group ul.tools a.add, .inline-group div.add-row a, .inline-group .tabular tr.add-row td a { - background: url(../img/icon-addlink.svg) 0 1px no-repeat; + background: url(../images/icon-addlink.svg) 0 1px no-repeat; padding-left: 16px; font-size: 12px; } .empty-form { - display: none; + display: none !important; } /* RELATED FIELD ADD ONE / LOOKUP */ @@ -531,13 +534,13 @@ body.popup .submit-row { .add-another { width: 16px; height: 16px; - background-image: url(../img/icon-addlink.svg); + background-image: url(../images/icon-addlink.svg); } .related-lookup { width: 16px; height: 16px; - background-image: url(../img/search.svg); + background-image: url(../images/search.svg); } form .related-widget-wrapper ul { diff --git a/admin_datta/static/assets/css/widgets.css b/admin_datta/static/assets/css/widgets.css index b4d235a..cdaac21 100755 --- a/admin_datta/static/assets/css/widgets.css +++ b/admin_datta/static/assets/css/widgets.css @@ -123,7 +123,7 @@ } .selector-add { - background: url(../img/selector-icons.svg) 0 -96px no-repeat; + background: url(../images/selector-icons.svg) 0 -96px no-repeat; } .active.selector-add:focus, .active.selector-add:hover { @@ -131,7 +131,7 @@ } .selector-remove { - background: url(../img/selector-icons.svg) 0 -64px no-repeat; + background: url(../images/selector-icons.svg) 0 -64px no-repeat; } .active.selector-remove:focus, .active.selector-remove:hover { @@ -166,7 +166,7 @@ a.active.selector-chooseall:hover, a.active.selector-clearall:hover { a.selector-chooseall { padding: 0 18px 0 0; - background: url(../img/selector-icons.svg) right -160px no-repeat; + background: url(../images/selector-icons.svg) right -160px no-repeat; cursor: default; } @@ -176,7 +176,7 @@ a.active.selector-chooseall:focus, a.active.selector-chooseall:hover { a.selector-clearall { padding: 0 0 0 18px; - background: url(../img/selector-icons.svg) 0 -128px no-repeat; + background: url(../images/selector-icons.svg) 0 -128px no-repeat; cursor: default; } @@ -226,7 +226,7 @@ a.active.selector-clearall:focus, a.active.selector-clearall:hover { } .stacked .selector-add { - background: url(../img/selector-icons.svg) 0 -32px no-repeat; + background: url(../images/selector-icons.svg) 0 -32px no-repeat; cursor: default; } @@ -236,7 +236,7 @@ a.active.selector-clearall:focus, a.active.selector-clearall:hover { } .stacked .selector-remove { - background: url(../img/selector-icons.svg) 0 0 no-repeat; + background: url(../images/selector-icons.svg) 0 0 no-repeat; cursor: default; } @@ -246,7 +246,7 @@ a.active.selector-clearall:focus, a.active.selector-clearall:hover { } .selector .help-icon { - background: url(../img/icon-unknown.svg) 0 0 no-repeat; + background: url(../images/icon-unknown.svg) 0 0 no-repeat; display: inline-block; vertical-align: middle; margin: -2px 0 0 2px; @@ -255,11 +255,11 @@ a.active.selector-clearall:focus, a.active.selector-clearall:hover { } .selector .selector-chosen .help-icon { - background: url(../img/icon-unknown-alt.svg) 0 0 no-repeat; + background: url(../images/icon-unknown-alt.svg) 0 0 no-repeat; } .selector .search-label-icon { - background: url(../img/search.svg) 0 0 no-repeat; + background: url(../images/search.svg) 0 0 no-repeat; display: inline-block; height: 25px; width: 25px; @@ -305,7 +305,7 @@ table p.datetime { } .datetimeshortcuts .clock-icon { - background: url(../img/icon-clock.svg) 0 0 no-repeat; + background: url(../images/icon-clock.svg) 0 0 no-repeat; } .datetimeshortcuts a:focus .clock-icon, @@ -314,7 +314,7 @@ table p.datetime { } .datetimeshortcuts .date-icon { - background: url(../img/icon-calendar.svg) 0 0 no-repeat; + background: url(../images/icon-calendar.svg) 0 0 no-repeat; top: -1px; } @@ -502,7 +502,7 @@ span.clearable-file-input label { .calendarnav-previous { left: 10px; - background: url(../img/calendar-icons.svg) 0 0 no-repeat; + background: url(../images/calendar-icons.svg) 0 0 no-repeat; } .calendarbox .calendarnav-previous:focus, @@ -512,7 +512,7 @@ span.clearable-file-input label { .calendarnav-next { right: 10px; - background: url(../img/calendar-icons.svg) 0 -30px no-repeat; + background: url(../images/calendar-icons.svg) 0 -30px no-repeat; } .calendarbox .calendarnav-next:focus, @@ -553,7 +553,7 @@ ul.timelist, .timelist li { .inline-deletelink { float: right; text-indent: -9999px; - background: url(../img/inline-delete.svg) 0 0 no-repeat; + background: url(../images/inline-delete.svg) 0 0 no-repeat; width: 16px; height: 16px; border: 0px none; diff --git a/admin_datta/static/assets/images/icon-addlink.svg b/admin_datta/static/assets/images/icon-addlink.svg new file mode 100644 index 0000000..e004fb1 --- /dev/null +++ b/admin_datta/static/assets/images/icon-addlink.svg @@ -0,0 +1,3 @@ + + + diff --git a/admin_datta/static/assets/images/icon-calendar.svg b/admin_datta/static/assets/images/icon-calendar.svg new file mode 100644 index 0000000..97910a9 --- /dev/null +++ b/admin_datta/static/assets/images/icon-calendar.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/admin_datta/static/assets/images/icon-changelink.svg b/admin_datta/static/assets/images/icon-changelink.svg new file mode 100644 index 0000000..bbb137a --- /dev/null +++ b/admin_datta/static/assets/images/icon-changelink.svg @@ -0,0 +1,3 @@ + + + diff --git a/admin_datta/static/assets/images/icon-clock.svg b/admin_datta/static/assets/images/icon-clock.svg new file mode 100644 index 0000000..bf9985d --- /dev/null +++ b/admin_datta/static/assets/images/icon-clock.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/admin_datta/static/assets/images/icon-deletelink.svg b/admin_datta/static/assets/images/icon-deletelink.svg new file mode 100644 index 0000000..4059b15 --- /dev/null +++ b/admin_datta/static/assets/images/icon-deletelink.svg @@ -0,0 +1,3 @@ + + + diff --git a/admin_datta/static/assets/images/icon-no.svg b/admin_datta/static/assets/images/icon-no.svg new file mode 100644 index 0000000..2e0d383 --- /dev/null +++ b/admin_datta/static/assets/images/icon-no.svg @@ -0,0 +1,3 @@ + + + diff --git a/admin_datta/static/assets/images/icon-unknown-alt.svg b/admin_datta/static/assets/images/icon-unknown-alt.svg new file mode 100644 index 0000000..1c6b99f --- /dev/null +++ b/admin_datta/static/assets/images/icon-unknown-alt.svg @@ -0,0 +1,3 @@ + + + diff --git a/admin_datta/static/assets/images/icon-unknown.svg b/admin_datta/static/assets/images/icon-unknown.svg new file mode 100644 index 0000000..50b4f97 --- /dev/null +++ b/admin_datta/static/assets/images/icon-unknown.svg @@ -0,0 +1,3 @@ + + + diff --git a/admin_datta/static/assets/images/icon-viewlink.svg b/admin_datta/static/assets/images/icon-viewlink.svg new file mode 100644 index 0000000..a1ca1d3 --- /dev/null +++ b/admin_datta/static/assets/images/icon-viewlink.svg @@ -0,0 +1,3 @@ + + + diff --git a/admin_datta/static/assets/images/icon-yes.svg b/admin_datta/static/assets/images/icon-yes.svg new file mode 100644 index 0000000..5883d87 --- /dev/null +++ b/admin_datta/static/assets/images/icon-yes.svg @@ -0,0 +1,3 @@ + + + diff --git a/admin_datta/static/assets/images/inline-delete.svg b/admin_datta/static/assets/images/inline-delete.svg new file mode 100644 index 0000000..17d1ad6 --- /dev/null +++ b/admin_datta/static/assets/images/inline-delete.svg @@ -0,0 +1,3 @@ + + + diff --git a/admin_datta/static/assets/images/search.svg b/admin_datta/static/assets/images/search.svg new file mode 100644 index 0000000..c8c69b2 --- /dev/null +++ b/admin_datta/static/assets/images/search.svg @@ -0,0 +1,3 @@ + + + diff --git a/admin_datta/static/assets/images/selector-icons.svg b/admin_datta/static/assets/images/selector-icons.svg new file mode 100644 index 0000000..926b8e2 --- /dev/null +++ b/admin_datta/static/assets/images/selector-icons.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/admin_datta/templates/admin/edit_inline/tabular.html b/admin_datta/templates/admin/edit_inline/tabular.html index 9450d6e..5e268c9 100644 --- a/admin_datta/templates/admin/edit_inline/tabular.html +++ b/admin_datta/templates/admin/edit_inline/tabular.html @@ -23,8 +23,7 @@

{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

{% for field in inline_admin_formset.fields %} {% if not field.widget.is_hidden %} - {{ field.label|capfirst }} + {{ field.label|capfirst }} {% if field.help_text %} ({{ field.help_text|striptags }}) +{% load i18n static admin_datta %} +{% get_current_language as LANGUAGE_CODE %} +{% get_current_language_bidi as LANGUAGE_BIDI %} +{% get_direction as direction %} +{% get_admin_setting as admin_setting %} {% include 'includes/head.html' %} {% block extrastyle %}{% endblock extrastyle %} + {% block extrahead %}{% endblock extrahead %}