diff options
| author | elky <mail@elky.me> | 2015-09-04 00:57:52 +0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-04 08:55:36 -0400 |
| commit | 86cd89095a9e92074d7eb93f2786e765ccb843e4 (patch) | |
| tree | e22c026faa27f6dade342156c641fdfc77486c89 | |
| parent | 8a780ec84721c1fc17433313bc024f34c9969e48 (diff) | |
Fixed #25348 -- Removed unused gif/png images from contrib.admin.
64 files changed, 42 insertions, 40 deletions
diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css index decc1c6d8b..1f1ef8bb19 100644 --- a/django/contrib/admin/static/admin/css/base.css +++ b/django/contrib/admin/static/admin/css/base.css @@ -371,7 +371,7 @@ table thead th.sorted .sortoptions a { width: 14px; height: 14px; display: inline-block; - background: url(../img/svg/sorting-icons.svg) 0 0 no-repeat; + background: url(../img/sorting-icons.svg) 0 0 no-repeat; background-size: 14px auto; } @@ -571,18 +571,18 @@ ul.messagelist li { font-size: 13px; padding: 10px 10px 10px 65px; margin: 0 0 10px 0; - background: #dfd url(../img/svg/icon-yes.svg) 40px 12px no-repeat; + background: #dfd url(../img/icon-yes.svg) 40px 12px no-repeat; background-size: 16px auto; color: #333; } ul.messagelist li.warning { - background: #ffc url(../img/svg/icon-alert.svg) 40px 14px no-repeat; + background: #ffc url(../img/icon-alert.svg) 40px 14px no-repeat; background-size: 14px auto; } ul.messagelist li.error { - background: #ffefef url(../img/svg/icon-no.svg) 40px 12px no-repeat; + background: #ffefef url(../img/icon-no.svg) 40px 12px no-repeat; background-size: 16px auto; } @@ -656,7 +656,7 @@ div.system-message p.system-message-title { padding: 4px 5px 4px 25px; margin: 0; color: #c11; - background: #ffefef url(../img/svg/icon-no.svg) 5px 5px no-repeat; + background: #ffefef url(../img/icon-no.svg) 5px 5px no-repeat; } .description { @@ -687,17 +687,17 @@ div.breadcrumbs a:hover { .addlink { padding-left: 16px; - background: url(../img/svg/icon-addlink.svg) 0 1px no-repeat; + background: url(../img/icon-addlink.svg) 0 1px no-repeat; } .changelink, .inlinechangelink { padding-left: 16px; - background: url(../img/svg/icon-changelink.svg) 0 1px no-repeat; + background: url(../img/icon-changelink.svg) 0 1px no-repeat; } .deletelink { padding-left: 16px; - background: url(../img/svg/icon-deletelink.svg) 0 1px no-repeat; + background: url(../img/icon-deletelink.svg) 0 1px no-repeat; } a.deletelink:link, a.deletelink:visited { @@ -755,12 +755,12 @@ a.deletelink:hover { } .object-tools a.viewsitelink, .object-tools a.golink { - background: #999 url(../img/svg/tooltag-arrowright.svg) 93% center no-repeat; + background: #999 url(../img/tooltag-arrowright.svg) 93% center no-repeat; padding-right: 26px; } .object-tools a.addlink { - background: #999 url(../img/svg/tooltag-add.svg) 93% center no-repeat; + background: #999 url(../img/tooltag-add.svg) 93% center no-repeat; padding-right: 26px; } diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css index 7121b2432f..142ef9ed64 100644 --- a/django/contrib/admin/static/admin/css/forms.css +++ b/django/contrib/admin/static/admin/css/forms.css @@ -463,7 +463,7 @@ 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/svg/icon-addlink.svg) 0 1px no-repeat; + background: url(../img/icon-addlink.svg) 0 1px no-repeat; padding-left: 16px; font-size: 12px; outline: 0; /* Remove dotted border around link */ @@ -486,13 +486,13 @@ body.popup .submit-row { .add-another { width: 16px; height: 16px; - background-image: url(../img/svg/icon-addlink.svg); + background-image: url(../img/icon-addlink.svg); } .related-lookup { width: 16px; height: 16px; - background-image: url(../img/svg/search.svg); + background-image: url(../img/search.svg); } form .related-widget-wrapper ul { diff --git a/django/contrib/admin/static/admin/css/widgets.css b/django/contrib/admin/static/admin/css/widgets.css index 1e694f6b02..e0665dcdad 100644 --- a/django/contrib/admin/static/admin/css/widgets.css +++ b/django/contrib/admin/static/admin/css/widgets.css @@ -93,7 +93,7 @@ } .selector-add { - background: url(../img/svg/selector-icons.svg) 0 -96px no-repeat; + background: url(../img/selector-icons.svg) 0 -96px no-repeat; cursor: default; } @@ -103,7 +103,7 @@ } .selector-remove { - background: url(../img/svg/selector-icons.svg) 0 -64px no-repeat; + background: url(../img/selector-icons.svg) 0 -64px no-repeat; cursor: default; } @@ -136,7 +136,7 @@ a.active.selector-chooseall:hover, a.active.selector-clearall:hover { } a.selector-chooseall { - background: url(../img/svg/selector-icons.svg) right -160px no-repeat; + background: url(../img/selector-icons.svg) right -160px no-repeat; cursor: default; } @@ -146,7 +146,7 @@ a.active.selector-chooseall { } a.selector-clearall { - background: url(../img/svg/selector-icons.svg) 0 -128px no-repeat; + background: url(../img/selector-icons.svg) 0 -128px no-repeat; cursor: default; } @@ -197,7 +197,7 @@ a.active.selector-clearall { } .stacked .selector-add { - background: url(../img/svg/selector-icons.svg) 0 0 no-repeat; + background: url(../img/selector-icons.svg) 0 0 no-repeat; cursor: default; } @@ -207,7 +207,7 @@ a.active.selector-clearall { } .stacked .selector-remove { - background: url(../img/svg/selector-icons.svg) 0 -32px no-repeat; + background: url(../img/selector-icons.svg) 0 -32px no-repeat; cursor: default; } @@ -217,7 +217,7 @@ a.active.selector-clearall { } .selector .help-icon { - background: url(../img/svg/icon-unknown.svg) 0 0 no-repeat; + background: url(../img/icon-unknown.svg) 0 0 no-repeat; display: inline-block; vertical-align: middle; margin: -2px 0 0 2px; @@ -226,11 +226,11 @@ a.active.selector-clearall { } .selector .selector-chosen .help-icon { - background: url(../img/svg/icon-unknown-alt.svg) 0 0 no-repeat; + background: url(../img/icon-unknown-alt.svg) 0 0 no-repeat; } .selector .search-label-icon { - background: url(../img/svg/search.svg) 0 0 no-repeat; + background: url(../img/search.svg) 0 0 no-repeat; display: inline-block; height: 18px; width: 18px; @@ -282,7 +282,7 @@ table p.datetime { } .datetimeshortcuts .clock-icon { - background: url(../img/svg/icon-clock.svg) 0 0 no-repeat; + background: url(../img/icon-clock.svg) 0 0 no-repeat; } .datetimeshortcuts a:hover .clock-icon { @@ -290,7 +290,7 @@ table p.datetime { } .datetimeshortcuts .date-icon { - background: url(../img/svg/icon-calendar.svg) 0 0 no-repeat; + background: url(../img/icon-calendar.svg) 0 0 no-repeat; top: -1px; } @@ -473,7 +473,7 @@ span.clearable-file-input label { .calendarnav-previous { left: 10px; - background: url(../img/svg/calendar-icons.svg) 0 0 no-repeat; + background: url(../img/calendar-icons.svg) 0 0 no-repeat; } .calendarbox .calendarnav-previous:hover { @@ -482,7 +482,7 @@ span.clearable-file-input label { .calendarnav-next { right: 10px; - background: url(../img/svg/calendar-icons.svg) 0 -30px no-repeat; + background: url(../img/calendar-icons.svg) 0 -30px no-repeat; } .calendarbox .calendarnav-next:hover { @@ -587,7 +587,7 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover { .inline-deletelink { float: right; text-indent: -9999px; - background: url(../img/svg/inline-delete.svg) 0 0 no-repeat; + background: url(../img/inline-delete.svg) 0 0 no-repeat; width: 16px; height: 16px; border: 0px none; diff --git a/django/contrib/admin/static/admin/img/svg/LICENSE b/django/contrib/admin/static/admin/img/LICENSE index a4faaa1dfa..a4faaa1dfa 100644 --- a/django/contrib/admin/static/admin/img/svg/LICENSE +++ b/django/contrib/admin/static/admin/img/LICENSE diff --git a/django/contrib/admin/static/admin/img/svg/README.txt b/django/contrib/admin/static/admin/img/README.txt index 43373ad1c2..43373ad1c2 100644 --- a/django/contrib/admin/static/admin/img/svg/README.txt +++ b/django/contrib/admin/static/admin/img/README.txt diff --git a/django/contrib/admin/static/admin/img/svg/calendar-icons.svg b/django/contrib/admin/static/admin/img/calendar-icons.svg index dbf21c39d2..dbf21c39d2 100644 --- a/django/contrib/admin/static/admin/img/svg/calendar-icons.svg +++ b/django/contrib/admin/static/admin/img/calendar-icons.svg diff --git a/django/contrib/admin/static/admin/img/changelist-bg.gif b/django/contrib/admin/static/admin/img/changelist-bg.gif Binary files differdeleted file mode 100644 index 94e09f7715..0000000000 --- a/django/contrib/admin/static/admin/img/changelist-bg.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/changelist-bg_rtl.gif b/django/contrib/admin/static/admin/img/changelist-bg_rtl.gif Binary files differdeleted file mode 100644 index 237971257f..0000000000 --- a/django/contrib/admin/static/admin/img/changelist-bg_rtl.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/default-bg-reverse.gif b/django/contrib/admin/static/admin/img/default-bg-reverse.gif Binary files differdeleted file mode 100644 index a28f4ad51a..0000000000 --- a/django/contrib/admin/static/admin/img/default-bg-reverse.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/default-bg.gif b/django/contrib/admin/static/admin/img/default-bg.gif Binary files differdeleted file mode 100644 index 91c819b350..0000000000 --- a/django/contrib/admin/static/admin/img/default-bg.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/deleted-overlay.gif b/django/contrib/admin/static/admin/img/deleted-overlay.gif Binary files differdeleted file mode 100644 index dc3828fe06..0000000000 --- a/django/contrib/admin/static/admin/img/deleted-overlay.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/gis/move_vertex_off.png b/django/contrib/admin/static/admin/img/gis/move_vertex_off.png Binary files differdeleted file mode 100644 index 296b2e29c9..0000000000 --- a/django/contrib/admin/static/admin/img/gis/move_vertex_off.png +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/gis/move_vertex_off.svg b/django/contrib/admin/static/admin/img/gis/move_vertex_off.svg new file mode 100644 index 0000000000..228854f3b0 --- /dev/null +++ b/django/contrib/admin/static/admin/img/gis/move_vertex_off.svg @@ -0,0 +1 @@ +<svg width="24" height="22" viewBox="0 0 847 779" xmlns="http://www.w3.org/2000/svg"><g><path fill="#EBECE6" d="M120 1h607c66 0 120 54 120 120v536c0 66-54 120-120 120h-607c-66 0-120-54-120-120v-536c0-66 54-120 120-120z"/><path fill="#9E9E93" d="M120 1h607c66 0 120 54 120 120v536c0 66-54 120-120 120h-607c-66 0-120-54-120-120v-536c0-66 54-120 120-120zm607 25h-607c-26 0-50 11-67 28-17 18-28 41-28 67v536c0 27 11 50 28 68 17 17 41 27 67 27h607c26 0 49-10 67-27 17-18 28-41 28-68v-536c0-26-11-49-28-67-18-17-41-28-67-28z"/><path stroke="#A9A8A4" stroke-width="20" d="M706 295l-68 281"/><path stroke="#E47474" stroke-width="20" d="M316 648l390-353M141 435l175 213"/><path stroke="#C9C9C9" stroke-width="20" d="M319 151l-178 284M706 295l-387-144"/><g fill="#040405"><path d="M319 111c22 0 40 18 40 40s-18 40-40 40-40-18-40-40 18-40 40-40zM141 395c22 0 40 18 40 40s-18 40-40 40c-23 0-41-18-41-40s18-40 41-40zM316 608c22 0 40 18 40 40 0 23-18 41-40 41s-40-18-40-41c0-22 18-40 40-40zM706 254c22 0 40 18 40 41 0 22-18 40-40 40s-40-18-40-40c0-23 18-41 40-41zM638 536c22 0 40 18 40 40s-18 40-40 40-40-18-40-40 18-40 40-40z"/></g></g></svg>
\ No newline at end of file diff --git a/django/contrib/admin/static/admin/img/gis/move_vertex_on.png b/django/contrib/admin/static/admin/img/gis/move_vertex_on.png Binary files differdeleted file mode 100644 index 21f4758d9c..0000000000 --- a/django/contrib/admin/static/admin/img/gis/move_vertex_on.png +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/gis/move_vertex_on.svg b/django/contrib/admin/static/admin/img/gis/move_vertex_on.svg new file mode 100644 index 0000000000..96b87fdd70 --- /dev/null +++ b/django/contrib/admin/static/admin/img/gis/move_vertex_on.svg @@ -0,0 +1 @@ +<svg width="24" height="22" viewBox="0 0 847 779" xmlns="http://www.w3.org/2000/svg"><g><path fill="#F1C02A" d="M120 1h607c66 0 120 54 120 120v536c0 66-54 120-120 120h-607c-66 0-120-54-120-120v-536c0-66 54-120 120-120z"/><path fill="#9E9E93" d="M120 1h607c66 0 120 54 120 120v536c0 66-54 120-120 120h-607c-66 0-120-54-120-120v-536c0-66 54-120 120-120zm607 25h-607c-26 0-50 11-67 28-17 18-28 41-28 67v536c0 27 11 50 28 68 17 17 41 27 67 27h607c26 0 49-10 67-27 17-18 28-41 28-68v-536c0-26-11-49-28-67-18-17-41-28-67-28z"/><path stroke="#A9A8A4" stroke-width="20" d="M706 295l-68 281"/><path stroke="#E47474" stroke-width="20" d="M316 648l390-353M141 435l175 213"/><path stroke="#C9A741" stroke-width="20" d="M319 151l-178 284M706 295l-387-144"/><g fill="#040405"><path d="M319 111c22 0 40 18 40 40s-18 40-40 40-40-18-40-40 18-40 40-40zM141 395c22 0 40 18 40 40s-18 40-40 40c-23 0-41-18-41-40s18-40 41-40zM316 608c22 0 40 18 40 40 0 23-18 41-40 41s-40-18-40-41c0-22 18-40 40-40zM706 254c22 0 40 18 40 41 0 22-18 40-40 40s-40-18-40-40c0-23 18-41 40-41zM638 536c22 0 40 18 40 40s-18 40-40 40-40-18-40-40 18-40 40-40z"/></g></g></svg>
\ No newline at end of file diff --git a/django/contrib/admin/static/admin/img/svg/icon-addlink.svg b/django/contrib/admin/static/admin/img/icon-addlink.svg index e004fb1626..e004fb1626 100644 --- a/django/contrib/admin/static/admin/img/svg/icon-addlink.svg +++ b/django/contrib/admin/static/admin/img/icon-addlink.svg diff --git a/django/contrib/admin/static/admin/img/svg/icon-alert.svg b/django/contrib/admin/static/admin/img/icon-alert.svg index e51ea83f5b..e51ea83f5b 100644 --- a/django/contrib/admin/static/admin/img/svg/icon-alert.svg +++ b/django/contrib/admin/static/admin/img/icon-alert.svg diff --git a/django/contrib/admin/static/admin/img/svg/icon-calendar.svg b/django/contrib/admin/static/admin/img/icon-calendar.svg index 97910a9949..97910a9949 100644 --- a/django/contrib/admin/static/admin/img/svg/icon-calendar.svg +++ b/django/contrib/admin/static/admin/img/icon-calendar.svg diff --git a/django/contrib/admin/static/admin/img/svg/icon-changelink.svg b/django/contrib/admin/static/admin/img/icon-changelink.svg index bbb137aa08..bbb137aa08 100644 --- a/django/contrib/admin/static/admin/img/svg/icon-changelink.svg +++ b/django/contrib/admin/static/admin/img/icon-changelink.svg diff --git a/django/contrib/admin/static/admin/img/svg/icon-clock.svg b/django/contrib/admin/static/admin/img/icon-clock.svg index bf9985d3f4..bf9985d3f4 100644 --- a/django/contrib/admin/static/admin/img/svg/icon-clock.svg +++ b/django/contrib/admin/static/admin/img/icon-clock.svg diff --git a/django/contrib/admin/static/admin/img/svg/icon-deletelink.svg b/django/contrib/admin/static/admin/img/icon-deletelink.svg index 4059b15544..4059b15544 100644 --- a/django/contrib/admin/static/admin/img/svg/icon-deletelink.svg +++ b/django/contrib/admin/static/admin/img/icon-deletelink.svg diff --git a/django/contrib/admin/static/admin/img/icon-no.gif b/django/contrib/admin/static/admin/img/icon-no.gif Binary files differdeleted file mode 100644 index 1b4ee58145..0000000000 --- a/django/contrib/admin/static/admin/img/icon-no.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/svg/icon-no.svg b/django/contrib/admin/static/admin/img/icon-no.svg index 2e0d3832c9..2e0d3832c9 100644 --- a/django/contrib/admin/static/admin/img/svg/icon-no.svg +++ b/django/contrib/admin/static/admin/img/icon-no.svg diff --git a/django/contrib/admin/static/admin/img/svg/icon-unknown-alt.svg b/django/contrib/admin/static/admin/img/icon-unknown-alt.svg index 1c6b99fc09..1c6b99fc09 100644 --- a/django/contrib/admin/static/admin/img/svg/icon-unknown-alt.svg +++ b/django/contrib/admin/static/admin/img/icon-unknown-alt.svg diff --git a/django/contrib/admin/static/admin/img/icon-unknown.gif b/django/contrib/admin/static/admin/img/icon-unknown.gif Binary files differdeleted file mode 100644 index cfd2b02ad9..0000000000 --- a/django/contrib/admin/static/admin/img/icon-unknown.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/svg/icon-unknown.svg b/django/contrib/admin/static/admin/img/icon-unknown.svg index 50b4f97276..50b4f97276 100644 --- a/django/contrib/admin/static/admin/img/svg/icon-unknown.svg +++ b/django/contrib/admin/static/admin/img/icon-unknown.svg diff --git a/django/contrib/admin/static/admin/img/icon-yes.gif b/django/contrib/admin/static/admin/img/icon-yes.gif Binary files differdeleted file mode 100644 index 7399282740..0000000000 --- a/django/contrib/admin/static/admin/img/icon-yes.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/svg/icon-yes.svg b/django/contrib/admin/static/admin/img/icon-yes.svg index 5883d877e8..5883d877e8 100644 --- a/django/contrib/admin/static/admin/img/svg/icon-yes.svg +++ b/django/contrib/admin/static/admin/img/icon-yes.svg diff --git a/django/contrib/admin/static/admin/img/icon_addlink.gif b/django/contrib/admin/static/admin/img/icon_addlink.gif Binary files differdeleted file mode 100644 index ee70e1adba..0000000000 --- a/django/contrib/admin/static/admin/img/icon_addlink.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/icon_alert.gif b/django/contrib/admin/static/admin/img/icon_alert.gif Binary files differdeleted file mode 100644 index a1dde26254..0000000000 --- a/django/contrib/admin/static/admin/img/icon_alert.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/icon_calendar.gif b/django/contrib/admin/static/admin/img/icon_calendar.gif Binary files differdeleted file mode 100644 index 7587b305a4..0000000000 --- a/django/contrib/admin/static/admin/img/icon_calendar.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/icon_changelink.gif b/django/contrib/admin/static/admin/img/icon_changelink.gif Binary files differdeleted file mode 100644 index e1b9afde65..0000000000 --- a/django/contrib/admin/static/admin/img/icon_changelink.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/icon_clock.gif b/django/contrib/admin/static/admin/img/icon_clock.gif Binary files differdeleted file mode 100644 index ff2d57e0a3..0000000000 --- a/django/contrib/admin/static/admin/img/icon_clock.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/icon_deletelink.gif b/django/contrib/admin/static/admin/img/icon_deletelink.gif Binary files differdeleted file mode 100644 index 72523e3a3b..0000000000 --- a/django/contrib/admin/static/admin/img/icon_deletelink.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/icon_error.gif b/django/contrib/admin/static/admin/img/icon_error.gif Binary files differdeleted file mode 100644 index 3730a00b26..0000000000 --- a/django/contrib/admin/static/admin/img/icon_error.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/icon_searchbox.png b/django/contrib/admin/static/admin/img/icon_searchbox.png Binary files differdeleted file mode 100644 index f87f308f26..0000000000 --- a/django/contrib/admin/static/admin/img/icon_searchbox.png +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/icon_success.gif b/django/contrib/admin/static/admin/img/icon_success.gif Binary files differdeleted file mode 100644 index 5cf90a15aa..0000000000 --- a/django/contrib/admin/static/admin/img/icon_success.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/inline-delete.png b/django/contrib/admin/static/admin/img/inline-delete.png Binary files differdeleted file mode 100644 index c5fe53c4e3..0000000000 --- a/django/contrib/admin/static/admin/img/inline-delete.png +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/svg/inline-delete.svg b/django/contrib/admin/static/admin/img/inline-delete.svg index 17d1ad67cd..17d1ad67cd 100644 --- a/django/contrib/admin/static/admin/img/svg/inline-delete.svg +++ b/django/contrib/admin/static/admin/img/inline-delete.svg diff --git a/django/contrib/admin/static/admin/img/inline-restore-8bit.png b/django/contrib/admin/static/admin/img/inline-restore-8bit.png Binary files differdeleted file mode 100644 index d29fe1da63..0000000000 --- a/django/contrib/admin/static/admin/img/inline-restore-8bit.png +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/inline-restore.png b/django/contrib/admin/static/admin/img/inline-restore.png Binary files differdeleted file mode 100644 index 2a67788840..0000000000 --- a/django/contrib/admin/static/admin/img/inline-restore.png +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/inline-splitter-bg.gif b/django/contrib/admin/static/admin/img/inline-splitter-bg.gif Binary files differdeleted file mode 100644 index 2fc918db98..0000000000 --- a/django/contrib/admin/static/admin/img/inline-splitter-bg.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/nav-bg-grabber.gif b/django/contrib/admin/static/admin/img/nav-bg-grabber.gif Binary files differdeleted file mode 100644 index 0a784fa769..0000000000 --- a/django/contrib/admin/static/admin/img/nav-bg-grabber.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/nav-bg-reverse.gif b/django/contrib/admin/static/admin/img/nav-bg-reverse.gif Binary files differdeleted file mode 100644 index 19913fb0b0..0000000000 --- a/django/contrib/admin/static/admin/img/nav-bg-reverse.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/nav-bg-selected.gif b/django/contrib/admin/static/admin/img/nav-bg-selected.gif Binary files differdeleted file mode 100644 index 98c5672ab3..0000000000 --- a/django/contrib/admin/static/admin/img/nav-bg-selected.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/nav-bg.gif b/django/contrib/admin/static/admin/img/nav-bg.gif Binary files differdeleted file mode 100644 index d7e22ff1b3..0000000000 --- a/django/contrib/admin/static/admin/img/nav-bg.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/svg/search.svg b/django/contrib/admin/static/admin/img/search.svg index c8c69b2acc..c8c69b2acc 100644 --- a/django/contrib/admin/static/admin/img/svg/search.svg +++ b/django/contrib/admin/static/admin/img/search.svg diff --git a/django/contrib/admin/static/admin/img/selector-icons.gif b/django/contrib/admin/static/admin/img/selector-icons.gif Binary files differdeleted file mode 100644 index 8809c4fb9a..0000000000 --- a/django/contrib/admin/static/admin/img/selector-icons.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/svg/selector-icons.svg b/django/contrib/admin/static/admin/img/selector-icons.svg index 926b8e21b5..926b8e21b5 100644 --- a/django/contrib/admin/static/admin/img/svg/selector-icons.svg +++ b/django/contrib/admin/static/admin/img/selector-icons.svg diff --git a/django/contrib/admin/static/admin/img/selector-search.gif b/django/contrib/admin/static/admin/img/selector-search.gif Binary files differdeleted file mode 100644 index 6d5f4c7492..0000000000 --- a/django/contrib/admin/static/admin/img/selector-search.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/sorting-icons.gif b/django/contrib/admin/static/admin/img/sorting-icons.gif Binary files differdeleted file mode 100644 index 451aae5987..0000000000 --- a/django/contrib/admin/static/admin/img/sorting-icons.gif +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/svg/sorting-icons.svg b/django/contrib/admin/static/admin/img/sorting-icons.svg index 7c31ec9114..7c31ec9114 100644 --- a/django/contrib/admin/static/admin/img/svg/sorting-icons.svg +++ b/django/contrib/admin/static/admin/img/sorting-icons.svg diff --git a/django/contrib/admin/static/admin/img/tooltag-add.png b/django/contrib/admin/static/admin/img/tooltag-add.png Binary files differdeleted file mode 100644 index 1488ecf2ef..0000000000 --- a/django/contrib/admin/static/admin/img/tooltag-add.png +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/svg/tooltag-add.svg b/django/contrib/admin/static/admin/img/tooltag-add.svg index 1ca64ae5b0..1ca64ae5b0 100644 --- a/django/contrib/admin/static/admin/img/svg/tooltag-add.svg +++ b/django/contrib/admin/static/admin/img/tooltag-add.svg diff --git a/django/contrib/admin/static/admin/img/tooltag-arrowright.png b/django/contrib/admin/static/admin/img/tooltag-arrowright.png Binary files differdeleted file mode 100644 index 2f05598f53..0000000000 --- a/django/contrib/admin/static/admin/img/tooltag-arrowright.png +++ /dev/null diff --git a/django/contrib/admin/static/admin/img/svg/tooltag-arrowright.svg b/django/contrib/admin/static/admin/img/tooltag-arrowright.svg index b664d61937..b664d61937 100644 --- a/django/contrib/admin/static/admin/img/svg/tooltag-arrowright.svg +++ b/django/contrib/admin/static/admin/img/tooltag-arrowright.svg diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html index 4d83c25939..682ea4d57e 100644 --- a/django/contrib/admin/templates/admin/edit_inline/tabular.html +++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html @@ -10,7 +10,7 @@ {% for field in inline_admin_formset.fields %} {% if not field.widget.is_hidden %} <th{% if forloop.first %} colspan="2"{% endif %}{% if field.required %} class="required"{% endif %}>{{ field.label|capfirst }} - {% if field.help_text %} <img src="{% static "admin/img/svg/icon-unknown.svg" %}" class="help help-tooltip" width="10" height="10" alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}" />{% endif %} + {% if field.help_text %} <img src="{% static "admin/img/icon-unknown.svg" %}" class="help help-tooltip" width="10" height="10" alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}" />{% endif %} </th> {% endif %} {% endfor %} diff --git a/django/contrib/admin/templates/admin/related_widget_wrapper.html b/django/contrib/admin/templates/admin/related_widget_wrapper.html index 54e43f8e99..502bede036 100644 --- a/django/contrib/admin/templates/admin/related_widget_wrapper.html +++ b/django/contrib/admin/templates/admin/related_widget_wrapper.html @@ -6,21 +6,21 @@ <a class="related-widget-wrapper-link change-related" id="change_id_{{ name }}" data-href-template="{{ change_related_template_url }}?{{ url_params }}" title="{% blocktrans %}Change selected {{ model }}{% endblocktrans %}"> - <img src="{% static 'admin/img/svg/icon-changelink.svg' %}" alt="{% trans 'Change' %}"/> + <img src="{% static 'admin/img/icon-changelink.svg' %}" alt="{% trans 'Change' %}"/> </a> {% endif %} {% if can_add_related %} <a class="related-widget-wrapper-link add-related" id="add_id_{{ name }}" href="{{ add_related_url }}?{{ url_params }}" title="{% blocktrans %}Add another {{ model }}{% endblocktrans %}"> - <img src="{% static 'admin/img/svg/icon-addlink.svg' %}" alt="{% trans 'Add' %}"/> + <img src="{% static 'admin/img/icon-addlink.svg' %}" alt="{% trans 'Add' %}"/> </a> {% endif %} {% if can_delete_related %} <a class="related-widget-wrapper-link delete-related" id="delete_id_{{ name }}" data-href-template="{{ delete_related_template_url }}?{{ url_params }}" title="{% blocktrans %}Delete selected {{ model }}{% endblocktrans %}"> - <img src="{% static 'admin/img/svg/icon-deletelink.svg' %}" alt="{% trans 'Delete' %}"/> + <img src="{% static 'admin/img/icon-deletelink.svg' %}" alt="{% trans 'Delete' %}"/> </a> {% endif %} {% endblock %} diff --git a/django/contrib/admin/templates/admin/search_form.html b/django/contrib/admin/templates/admin/search_form.html index 59d5fc12da..b3cb2c7a7a 100644 --- a/django/contrib/admin/templates/admin/search_form.html +++ b/django/contrib/admin/templates/admin/search_form.html @@ -2,7 +2,7 @@ {% if cl.search_fields %} <div id="toolbar"><form id="changelist-search" action="" method="get"> <div><!-- DIV needed for valid HTML --> -<label for="searchbar"><img src="{% static "admin/img/svg/search.svg" %}" alt="Search" /></label> +<label for="searchbar"><img src="{% static "admin/img/search.svg" %}" alt="Search" /></label> <input type="text" size="40" name="{{ search_var }}" value="{{ cl.query }}" id="searchbar" /> <input type="submit" value="{% trans 'Search' %}" /> {% if show_result_count %} diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index ca161b41c4..3332fe1a35 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -174,7 +174,7 @@ def result_headers(cl): def _boolean_icon(field_val): - icon_url = static('admin/img/svg/icon-%s.svg' % + icon_url = static('admin/img/icon-%s.svg' % {True: 'yes', False: 'no', None: 'unknown'}[field_val]) return format_html('<img src="{}" alt="{}" />', icon_url, field_val) diff --git a/django/contrib/gis/templates/gis/admin/openlayers.html b/django/contrib/gis/templates/gis/admin/openlayers.html index 78e874720e..56bb50b0bf 100644 --- a/django/contrib/gis/templates/gis/admin/openlayers.html +++ b/django/contrib/gis/templates/gis/admin/openlayers.html @@ -6,11 +6,11 @@ #{{ id }}_admin_map { position: relative; vertical-align: top; float: {{ LANGUAGE_BIDI|yesno:"right,left" }}; } {% if not display_wkt %}#{{ id }} { display: none; }{% endif %} .olControlEditingToolbar .olControlModifyFeatureItemActive { - background-image: url("{% static "admin/img/gis/move_vertex_on.png" %}"); + background-image: url("{% static "admin/img/gis/move_vertex_on.svg" %}"); background-repeat: no-repeat; } .olControlEditingToolbar .olControlModifyFeatureItemInactive { - background-image: url("{% static "admin/img/gis/move_vertex_off.png" %}"); + background-image: url("{% static "admin/img/gis/move_vertex_off.svg" %}"); background-repeat: no-repeat; } </style> diff --git a/django/contrib/gis/templates/gis/openlayers.html b/django/contrib/gis/templates/gis/openlayers.html index cbefb3a9f2..02fa988737 100644 --- a/django/contrib/gis/templates/gis/openlayers.html +++ b/django/contrib/gis/templates/gis/openlayers.html @@ -4,11 +4,11 @@ #{{ id }}_div_map { position: relative; vertical-align: top; float: {{ LANGUAGE_BIDI|yesno:"right,left" }}; } {% if not display_raw %}#{{ id }} { display: none; }{% endif %} .olControlEditingToolbar .olControlModifyFeatureItemActive { - background-image: url("{% static "admin/img/gis/move_vertex_on.png" %}); + background-image: url("{% static "admin/img/gis/move_vertex_on.svg" %}); background-repeat: no-repeat; } .olControlEditingToolbar .olControlModifyFeatureItemInactive { - background-image: url("{% static "admin/img/gis/move_vertex_off.png" %}); + background-image: url("{% static "admin/img/gis/move_vertex_off.svg" %}); background-repeat: no-repeat; }{% endblock %} </style> diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py index 04bd2f06d7..98d37a7e24 100644 --- a/tests/admin_inlines/tests.py +++ b/tests/admin_inlines/tests.py @@ -143,10 +143,10 @@ class TestInline(TestDataMixin, TestCase): """ response = self.client.get(reverse('admin:admin_inlines_holder4_add')) self.assertContains(response, '<p class="help">Awesome stacked help text is awesome.</p>', 4) - self.assertContains(response, '<img src="/static/admin/img/svg/icon-unknown.svg" class="help help-tooltip" width="10" height="10" alt="(Awesome tabular help text is awesome.)" title="Awesome tabular help text is awesome." />', 1) + self.assertContains(response, '<img src="/static/admin/img/icon-unknown.svg" class="help help-tooltip" width="10" height="10" alt="(Awesome tabular help text is awesome.)" title="Awesome tabular help text is awesome." />', 1) # ReadOnly fields response = self.client.get(reverse('admin:admin_inlines_capofamiglia_add')) - self.assertContains(response, '<img src="/static/admin/img/svg/icon-unknown.svg" class="help help-tooltip" width="10" height="10" alt="(Help text for ReadOnlyInline)" title="Help text for ReadOnlyInline" />', 1) + self.assertContains(response, '<img src="/static/admin/img/icon-unknown.svg" class="help help-tooltip" width="10" height="10" alt="(Help text for ReadOnlyInline)" title="Help text for ReadOnlyInline" />', 1) def test_inline_hidden_field_no_column(self): """#18263 -- Make sure hidden fields don't get a column in tabular inlines""" diff --git a/tests/admin_utils/tests.py b/tests/admin_utils/tests.py index c38141c897..7fb490dd2a 100644 --- a/tests/admin_utils/tests.py +++ b/tests/admin_utils/tests.py @@ -166,7 +166,7 @@ class UtilsTests(SimpleTestCase): # Regression test for #13071: NullBooleanField has special # handling. display_value = display_for_field(None, models.NullBooleanField(), self.empty_value) - expected = '<img src="%sadmin/img/svg/icon-unknown.svg" alt="None" />' % settings.STATIC_URL + expected = '<img src="%sadmin/img/icon-unknown.svg" alt="None" />' % settings.STATIC_URL self.assertHTMLEqual(display_value, expected) display_value = display_for_field(None, models.DecimalField(), self.empty_value) |
