From 86cd89095a9e92074d7eb93f2786e765ccb843e4 Mon Sep 17 00:00:00 2001 From: elky Date: Fri, 4 Sep 2015 00:57:52 +0500 Subject: Fixed #25348 -- Removed unused gif/png images from contrib.admin. --- django/contrib/admin/static/admin/css/base.css | 20 ++++++------ django/contrib/admin/static/admin/css/forms.css | 6 ++-- django/contrib/admin/static/admin/css/widgets.css | 28 ++++++++--------- django/contrib/admin/static/admin/img/LICENSE | 20 ++++++++++++ django/contrib/admin/static/admin/img/README.txt | 7 +++++ .../admin/static/admin/img/calendar-icons.svg | 14 +++++++++ .../admin/static/admin/img/changelist-bg.gif | Bin 50 -> 0 bytes .../admin/static/admin/img/changelist-bg_rtl.gif | Bin 75 -> 0 bytes .../admin/static/admin/img/default-bg-reverse.gif | Bin 835 -> 0 bytes .../contrib/admin/static/admin/img/default-bg.gif | Bin 836 -> 0 bytes .../admin/static/admin/img/deleted-overlay.gif | Bin 45 -> 0 bytes .../admin/static/admin/img/gis/move_vertex_off.png | Bin 711 -> 0 bytes .../admin/static/admin/img/gis/move_vertex_off.svg | 1 + .../admin/static/admin/img/gis/move_vertex_on.png | Bin 506 -> 0 bytes .../admin/static/admin/img/gis/move_vertex_on.svg | 1 + .../admin/static/admin/img/icon-addlink.svg | 3 ++ .../contrib/admin/static/admin/img/icon-alert.svg | 3 ++ .../admin/static/admin/img/icon-calendar.svg | 9 ++++++ .../admin/static/admin/img/icon-changelink.svg | 3 ++ .../contrib/admin/static/admin/img/icon-clock.svg | 9 ++++++ .../admin/static/admin/img/icon-deletelink.svg | 3 ++ django/contrib/admin/static/admin/img/icon-no.gif | Bin 176 -> 0 bytes django/contrib/admin/static/admin/img/icon-no.svg | 3 ++ .../admin/static/admin/img/icon-unknown-alt.svg | 3 ++ .../admin/static/admin/img/icon-unknown.gif | Bin 130 -> 0 bytes .../admin/static/admin/img/icon-unknown.svg | 3 ++ django/contrib/admin/static/admin/img/icon-yes.gif | Bin 299 -> 0 bytes django/contrib/admin/static/admin/img/icon-yes.svg | 3 ++ .../admin/static/admin/img/icon_addlink.gif | Bin 119 -> 0 bytes .../contrib/admin/static/admin/img/icon_alert.gif | Bin 145 -> 0 bytes .../admin/static/admin/img/icon_calendar.gif | Bin 192 -> 0 bytes .../admin/static/admin/img/icon_changelink.gif | Bin 119 -> 0 bytes .../contrib/admin/static/admin/img/icon_clock.gif | Bin 390 -> 0 bytes .../admin/static/admin/img/icon_deletelink.gif | Bin 181 -> 0 bytes .../contrib/admin/static/admin/img/icon_error.gif | Bin 319 -> 0 bytes .../admin/static/admin/img/icon_searchbox.png | Bin 368 -> 0 bytes .../admin/static/admin/img/icon_success.gif | Bin 341 -> 0 bytes .../admin/static/admin/img/inline-delete.png | Bin 707 -> 0 bytes .../admin/static/admin/img/inline-delete.svg | 3 ++ .../admin/static/admin/img/inline-restore-8bit.png | Bin 363 -> 0 bytes .../admin/static/admin/img/inline-restore.png | Bin 557 -> 0 bytes .../admin/static/admin/img/inline-splitter-bg.gif | Bin 94 -> 0 bytes .../admin/static/admin/img/nav-bg-grabber.gif | Bin 116 -> 0 bytes .../admin/static/admin/img/nav-bg-reverse.gif | Bin 178 -> 0 bytes .../admin/static/admin/img/nav-bg-selected.gif | Bin 265 -> 0 bytes django/contrib/admin/static/admin/img/nav-bg.gif | Bin 265 -> 0 bytes django/contrib/admin/static/admin/img/search.svg | 3 ++ .../admin/static/admin/img/selector-icons.gif | Bin 2771 -> 0 bytes .../admin/static/admin/img/selector-icons.svg | 34 +++++++++++++++++++++ .../admin/static/admin/img/selector-search.gif | Bin 552 -> 0 bytes .../admin/static/admin/img/sorting-icons.gif | Bin 369 -> 0 bytes .../admin/static/admin/img/sorting-icons.svg | 19 ++++++++++++ django/contrib/admin/static/admin/img/svg/LICENSE | 20 ------------ .../contrib/admin/static/admin/img/svg/README.txt | 7 ----- .../admin/static/admin/img/svg/calendar-icons.svg | 14 --------- .../admin/static/admin/img/svg/icon-addlink.svg | 3 -- .../admin/static/admin/img/svg/icon-alert.svg | 3 -- .../admin/static/admin/img/svg/icon-calendar.svg | 9 ------ .../admin/static/admin/img/svg/icon-changelink.svg | 3 -- .../admin/static/admin/img/svg/icon-clock.svg | 9 ------ .../admin/static/admin/img/svg/icon-deletelink.svg | 3 -- .../contrib/admin/static/admin/img/svg/icon-no.svg | 3 -- .../static/admin/img/svg/icon-unknown-alt.svg | 3 -- .../admin/static/admin/img/svg/icon-unknown.svg | 3 -- .../admin/static/admin/img/svg/icon-yes.svg | 3 -- .../admin/static/admin/img/svg/inline-delete.svg | 3 -- .../contrib/admin/static/admin/img/svg/search.svg | 3 -- .../admin/static/admin/img/svg/selector-icons.svg | 34 --------------------- .../admin/static/admin/img/svg/sorting-icons.svg | 19 ------------ .../admin/static/admin/img/svg/tooltag-add.svg | 3 -- .../static/admin/img/svg/tooltag-arrowright.svg | 3 -- .../contrib/admin/static/admin/img/tooltag-add.png | Bin 119 -> 0 bytes .../contrib/admin/static/admin/img/tooltag-add.svg | 3 ++ .../admin/static/admin/img/tooltag-arrowright.png | Bin 200 -> 0 bytes .../admin/static/admin/img/tooltag-arrowright.svg | 3 ++ .../admin/templates/admin/edit_inline/tabular.html | 2 +- .../templates/admin/related_widget_wrapper.html | 6 ++-- .../contrib/admin/templates/admin/search_form.html | 2 +- django/contrib/admin/templatetags/admin_list.py | 2 +- .../gis/templates/gis/admin/openlayers.html | 4 +-- django/contrib/gis/templates/gis/openlayers.html | 4 +-- tests/admin_inlines/tests.py | 4 +-- tests/admin_utils/tests.py | 2 +- 83 files changed, 190 insertions(+), 188 deletions(-) create mode 100644 django/contrib/admin/static/admin/img/LICENSE create mode 100644 django/contrib/admin/static/admin/img/README.txt create mode 100644 django/contrib/admin/static/admin/img/calendar-icons.svg delete mode 100644 django/contrib/admin/static/admin/img/changelist-bg.gif delete mode 100644 django/contrib/admin/static/admin/img/changelist-bg_rtl.gif delete mode 100644 django/contrib/admin/static/admin/img/default-bg-reverse.gif delete mode 100644 django/contrib/admin/static/admin/img/default-bg.gif delete mode 100644 django/contrib/admin/static/admin/img/deleted-overlay.gif delete mode 100644 django/contrib/admin/static/admin/img/gis/move_vertex_off.png create mode 100644 django/contrib/admin/static/admin/img/gis/move_vertex_off.svg delete mode 100644 django/contrib/admin/static/admin/img/gis/move_vertex_on.png create mode 100644 django/contrib/admin/static/admin/img/gis/move_vertex_on.svg create mode 100644 django/contrib/admin/static/admin/img/icon-addlink.svg create mode 100644 django/contrib/admin/static/admin/img/icon-alert.svg create mode 100644 django/contrib/admin/static/admin/img/icon-calendar.svg create mode 100644 django/contrib/admin/static/admin/img/icon-changelink.svg create mode 100644 django/contrib/admin/static/admin/img/icon-clock.svg create mode 100644 django/contrib/admin/static/admin/img/icon-deletelink.svg delete mode 100644 django/contrib/admin/static/admin/img/icon-no.gif create mode 100644 django/contrib/admin/static/admin/img/icon-no.svg create mode 100644 django/contrib/admin/static/admin/img/icon-unknown-alt.svg delete mode 100644 django/contrib/admin/static/admin/img/icon-unknown.gif create mode 100644 django/contrib/admin/static/admin/img/icon-unknown.svg delete mode 100644 django/contrib/admin/static/admin/img/icon-yes.gif create mode 100644 django/contrib/admin/static/admin/img/icon-yes.svg delete mode 100644 django/contrib/admin/static/admin/img/icon_addlink.gif delete mode 100644 django/contrib/admin/static/admin/img/icon_alert.gif delete mode 100644 django/contrib/admin/static/admin/img/icon_calendar.gif delete mode 100644 django/contrib/admin/static/admin/img/icon_changelink.gif delete mode 100644 django/contrib/admin/static/admin/img/icon_clock.gif delete mode 100644 django/contrib/admin/static/admin/img/icon_deletelink.gif delete mode 100644 django/contrib/admin/static/admin/img/icon_error.gif delete mode 100644 django/contrib/admin/static/admin/img/icon_searchbox.png delete mode 100644 django/contrib/admin/static/admin/img/icon_success.gif delete mode 100644 django/contrib/admin/static/admin/img/inline-delete.png create mode 100644 django/contrib/admin/static/admin/img/inline-delete.svg delete mode 100644 django/contrib/admin/static/admin/img/inline-restore-8bit.png delete mode 100644 django/contrib/admin/static/admin/img/inline-restore.png delete mode 100644 django/contrib/admin/static/admin/img/inline-splitter-bg.gif delete mode 100644 django/contrib/admin/static/admin/img/nav-bg-grabber.gif delete mode 100644 django/contrib/admin/static/admin/img/nav-bg-reverse.gif delete mode 100644 django/contrib/admin/static/admin/img/nav-bg-selected.gif delete mode 100644 django/contrib/admin/static/admin/img/nav-bg.gif create mode 100644 django/contrib/admin/static/admin/img/search.svg delete mode 100644 django/contrib/admin/static/admin/img/selector-icons.gif create mode 100644 django/contrib/admin/static/admin/img/selector-icons.svg delete mode 100644 django/contrib/admin/static/admin/img/selector-search.gif delete mode 100644 django/contrib/admin/static/admin/img/sorting-icons.gif create mode 100644 django/contrib/admin/static/admin/img/sorting-icons.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/LICENSE delete mode 100644 django/contrib/admin/static/admin/img/svg/README.txt delete mode 100644 django/contrib/admin/static/admin/img/svg/calendar-icons.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/icon-addlink.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/icon-alert.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/icon-calendar.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/icon-changelink.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/icon-clock.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/icon-deletelink.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/icon-no.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/icon-unknown-alt.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/icon-unknown.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/icon-yes.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/inline-delete.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/search.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/selector-icons.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/sorting-icons.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/tooltag-add.svg delete mode 100644 django/contrib/admin/static/admin/img/svg/tooltag-arrowright.svg delete mode 100644 django/contrib/admin/static/admin/img/tooltag-add.png create mode 100644 django/contrib/admin/static/admin/img/tooltag-add.svg delete mode 100644 django/contrib/admin/static/admin/img/tooltag-arrowright.png create mode 100644 django/contrib/admin/static/admin/img/tooltag-arrowright.svg 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/LICENSE b/django/contrib/admin/static/admin/img/LICENSE new file mode 100644 index 0000000000..a4faaa1dfa --- /dev/null +++ b/django/contrib/admin/static/admin/img/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2014 Code Charm Ltd + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/django/contrib/admin/static/admin/img/README.txt b/django/contrib/admin/static/admin/img/README.txt new file mode 100644 index 0000000000..43373ad1c2 --- /dev/null +++ b/django/contrib/admin/static/admin/img/README.txt @@ -0,0 +1,7 @@ +All icons are taken from Font Awesome (http://fontawesome.io/) project. +The Font Awesome font is licensed under the SIL OFL 1.1: +- http://scripts.sil.org/OFL + +SVG icons source: https://github.com/encharm/Font-Awesome-SVG-PNG +Font-Awesome-SVG-PNG is licensed under the MIT license (see file license +in current folder). diff --git a/django/contrib/admin/static/admin/img/calendar-icons.svg b/django/contrib/admin/static/admin/img/calendar-icons.svg new file mode 100644 index 0000000000..dbf21c39d2 --- /dev/null +++ b/django/contrib/admin/static/admin/img/calendar-icons.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/django/contrib/admin/static/admin/img/changelist-bg.gif b/django/contrib/admin/static/admin/img/changelist-bg.gif deleted file mode 100644 index 94e09f7715..0000000000 Binary files a/django/contrib/admin/static/admin/img/changelist-bg.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/changelist-bg_rtl.gif b/django/contrib/admin/static/admin/img/changelist-bg_rtl.gif deleted file mode 100644 index 237971257f..0000000000 Binary files a/django/contrib/admin/static/admin/img/changelist-bg_rtl.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/default-bg-reverse.gif b/django/contrib/admin/static/admin/img/default-bg-reverse.gif deleted file mode 100644 index a28f4ad51a..0000000000 Binary files a/django/contrib/admin/static/admin/img/default-bg-reverse.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/default-bg.gif b/django/contrib/admin/static/admin/img/default-bg.gif deleted file mode 100644 index 91c819b350..0000000000 Binary files a/django/contrib/admin/static/admin/img/default-bg.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/deleted-overlay.gif b/django/contrib/admin/static/admin/img/deleted-overlay.gif deleted file mode 100644 index dc3828fe06..0000000000 Binary files a/django/contrib/admin/static/admin/img/deleted-overlay.gif and /dev/null differ 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 deleted file mode 100644 index 296b2e29c9..0000000000 Binary files a/django/contrib/admin/static/admin/img/gis/move_vertex_off.png and /dev/null differ 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 @@ + \ 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 deleted file mode 100644 index 21f4758d9c..0000000000 Binary files a/django/contrib/admin/static/admin/img/gis/move_vertex_on.png and /dev/null differ 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 @@ + \ No newline at end of file diff --git a/django/contrib/admin/static/admin/img/icon-addlink.svg b/django/contrib/admin/static/admin/img/icon-addlink.svg new file mode 100644 index 0000000000..e004fb1626 --- /dev/null +++ b/django/contrib/admin/static/admin/img/icon-addlink.svg @@ -0,0 +1,3 @@ + + + diff --git a/django/contrib/admin/static/admin/img/icon-alert.svg b/django/contrib/admin/static/admin/img/icon-alert.svg new file mode 100644 index 0000000000..e51ea83f5b --- /dev/null +++ b/django/contrib/admin/static/admin/img/icon-alert.svg @@ -0,0 +1,3 @@ + + + diff --git a/django/contrib/admin/static/admin/img/icon-calendar.svg b/django/contrib/admin/static/admin/img/icon-calendar.svg new file mode 100644 index 0000000000..97910a9949 --- /dev/null +++ b/django/contrib/admin/static/admin/img/icon-calendar.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/django/contrib/admin/static/admin/img/icon-changelink.svg b/django/contrib/admin/static/admin/img/icon-changelink.svg new file mode 100644 index 0000000000..bbb137aa08 --- /dev/null +++ b/django/contrib/admin/static/admin/img/icon-changelink.svg @@ -0,0 +1,3 @@ + + + diff --git a/django/contrib/admin/static/admin/img/icon-clock.svg b/django/contrib/admin/static/admin/img/icon-clock.svg new file mode 100644 index 0000000000..bf9985d3f4 --- /dev/null +++ b/django/contrib/admin/static/admin/img/icon-clock.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/django/contrib/admin/static/admin/img/icon-deletelink.svg b/django/contrib/admin/static/admin/img/icon-deletelink.svg new file mode 100644 index 0000000000..4059b15544 --- /dev/null +++ b/django/contrib/admin/static/admin/img/icon-deletelink.svg @@ -0,0 +1,3 @@ + + + diff --git a/django/contrib/admin/static/admin/img/icon-no.gif b/django/contrib/admin/static/admin/img/icon-no.gif deleted file mode 100644 index 1b4ee58145..0000000000 Binary files a/django/contrib/admin/static/admin/img/icon-no.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/icon-no.svg b/django/contrib/admin/static/admin/img/icon-no.svg new file mode 100644 index 0000000000..2e0d3832c9 --- /dev/null +++ b/django/contrib/admin/static/admin/img/icon-no.svg @@ -0,0 +1,3 @@ + + + diff --git a/django/contrib/admin/static/admin/img/icon-unknown-alt.svg b/django/contrib/admin/static/admin/img/icon-unknown-alt.svg new file mode 100644 index 0000000000..1c6b99fc09 --- /dev/null +++ b/django/contrib/admin/static/admin/img/icon-unknown-alt.svg @@ -0,0 +1,3 @@ + + + diff --git a/django/contrib/admin/static/admin/img/icon-unknown.gif b/django/contrib/admin/static/admin/img/icon-unknown.gif deleted file mode 100644 index cfd2b02ad9..0000000000 Binary files a/django/contrib/admin/static/admin/img/icon-unknown.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/icon-unknown.svg b/django/contrib/admin/static/admin/img/icon-unknown.svg new file mode 100644 index 0000000000..50b4f97276 --- /dev/null +++ b/django/contrib/admin/static/admin/img/icon-unknown.svg @@ -0,0 +1,3 @@ + + + diff --git a/django/contrib/admin/static/admin/img/icon-yes.gif b/django/contrib/admin/static/admin/img/icon-yes.gif deleted file mode 100644 index 7399282740..0000000000 Binary files a/django/contrib/admin/static/admin/img/icon-yes.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/icon-yes.svg b/django/contrib/admin/static/admin/img/icon-yes.svg new file mode 100644 index 0000000000..5883d877e8 --- /dev/null +++ b/django/contrib/admin/static/admin/img/icon-yes.svg @@ -0,0 +1,3 @@ + + + diff --git a/django/contrib/admin/static/admin/img/icon_addlink.gif b/django/contrib/admin/static/admin/img/icon_addlink.gif deleted file mode 100644 index ee70e1adba..0000000000 Binary files a/django/contrib/admin/static/admin/img/icon_addlink.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/icon_alert.gif b/django/contrib/admin/static/admin/img/icon_alert.gif deleted file mode 100644 index a1dde26254..0000000000 Binary files a/django/contrib/admin/static/admin/img/icon_alert.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/icon_calendar.gif b/django/contrib/admin/static/admin/img/icon_calendar.gif deleted file mode 100644 index 7587b305a4..0000000000 Binary files a/django/contrib/admin/static/admin/img/icon_calendar.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/icon_changelink.gif b/django/contrib/admin/static/admin/img/icon_changelink.gif deleted file mode 100644 index e1b9afde65..0000000000 Binary files a/django/contrib/admin/static/admin/img/icon_changelink.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/icon_clock.gif b/django/contrib/admin/static/admin/img/icon_clock.gif deleted file mode 100644 index ff2d57e0a3..0000000000 Binary files a/django/contrib/admin/static/admin/img/icon_clock.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/icon_deletelink.gif b/django/contrib/admin/static/admin/img/icon_deletelink.gif deleted file mode 100644 index 72523e3a3b..0000000000 Binary files a/django/contrib/admin/static/admin/img/icon_deletelink.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/icon_error.gif b/django/contrib/admin/static/admin/img/icon_error.gif deleted file mode 100644 index 3730a00b26..0000000000 Binary files a/django/contrib/admin/static/admin/img/icon_error.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/icon_searchbox.png b/django/contrib/admin/static/admin/img/icon_searchbox.png deleted file mode 100644 index f87f308f26..0000000000 Binary files a/django/contrib/admin/static/admin/img/icon_searchbox.png and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/icon_success.gif b/django/contrib/admin/static/admin/img/icon_success.gif deleted file mode 100644 index 5cf90a15aa..0000000000 Binary files a/django/contrib/admin/static/admin/img/icon_success.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/inline-delete.png b/django/contrib/admin/static/admin/img/inline-delete.png deleted file mode 100644 index c5fe53c4e3..0000000000 Binary files a/django/contrib/admin/static/admin/img/inline-delete.png and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/inline-delete.svg b/django/contrib/admin/static/admin/img/inline-delete.svg new file mode 100644 index 0000000000..17d1ad67cd --- /dev/null +++ b/django/contrib/admin/static/admin/img/inline-delete.svg @@ -0,0 +1,3 @@ + + + diff --git a/django/contrib/admin/static/admin/img/inline-restore-8bit.png b/django/contrib/admin/static/admin/img/inline-restore-8bit.png deleted file mode 100644 index d29fe1da63..0000000000 Binary files a/django/contrib/admin/static/admin/img/inline-restore-8bit.png and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/inline-restore.png b/django/contrib/admin/static/admin/img/inline-restore.png deleted file mode 100644 index 2a67788840..0000000000 Binary files a/django/contrib/admin/static/admin/img/inline-restore.png and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/inline-splitter-bg.gif b/django/contrib/admin/static/admin/img/inline-splitter-bg.gif deleted file mode 100644 index 2fc918db98..0000000000 Binary files a/django/contrib/admin/static/admin/img/inline-splitter-bg.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/nav-bg-grabber.gif b/django/contrib/admin/static/admin/img/nav-bg-grabber.gif deleted file mode 100644 index 0a784fa769..0000000000 Binary files a/django/contrib/admin/static/admin/img/nav-bg-grabber.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/nav-bg-reverse.gif b/django/contrib/admin/static/admin/img/nav-bg-reverse.gif deleted file mode 100644 index 19913fb0b0..0000000000 Binary files a/django/contrib/admin/static/admin/img/nav-bg-reverse.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/nav-bg-selected.gif b/django/contrib/admin/static/admin/img/nav-bg-selected.gif deleted file mode 100644 index 98c5672ab3..0000000000 Binary files a/django/contrib/admin/static/admin/img/nav-bg-selected.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/nav-bg.gif b/django/contrib/admin/static/admin/img/nav-bg.gif deleted file mode 100644 index d7e22ff1b3..0000000000 Binary files a/django/contrib/admin/static/admin/img/nav-bg.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/search.svg b/django/contrib/admin/static/admin/img/search.svg new file mode 100644 index 0000000000..c8c69b2acc --- /dev/null +++ b/django/contrib/admin/static/admin/img/search.svg @@ -0,0 +1,3 @@ + + + diff --git a/django/contrib/admin/static/admin/img/selector-icons.gif b/django/contrib/admin/static/admin/img/selector-icons.gif deleted file mode 100644 index 8809c4fb9a..0000000000 Binary files a/django/contrib/admin/static/admin/img/selector-icons.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/selector-icons.svg b/django/contrib/admin/static/admin/img/selector-icons.svg new file mode 100644 index 0000000000..926b8e21b5 --- /dev/null +++ b/django/contrib/admin/static/admin/img/selector-icons.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/django/contrib/admin/static/admin/img/selector-search.gif b/django/contrib/admin/static/admin/img/selector-search.gif deleted file mode 100644 index 6d5f4c7492..0000000000 Binary files a/django/contrib/admin/static/admin/img/selector-search.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/sorting-icons.gif b/django/contrib/admin/static/admin/img/sorting-icons.gif deleted file mode 100644 index 451aae5987..0000000000 Binary files a/django/contrib/admin/static/admin/img/sorting-icons.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/sorting-icons.svg b/django/contrib/admin/static/admin/img/sorting-icons.svg new file mode 100644 index 0000000000..7c31ec9114 --- /dev/null +++ b/django/contrib/admin/static/admin/img/sorting-icons.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/django/contrib/admin/static/admin/img/svg/LICENSE b/django/contrib/admin/static/admin/img/svg/LICENSE deleted file mode 100644 index a4faaa1dfa..0000000000 --- a/django/contrib/admin/static/admin/img/svg/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 Code Charm Ltd - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/django/contrib/admin/static/admin/img/svg/README.txt b/django/contrib/admin/static/admin/img/svg/README.txt deleted file mode 100644 index 43373ad1c2..0000000000 --- a/django/contrib/admin/static/admin/img/svg/README.txt +++ /dev/null @@ -1,7 +0,0 @@ -All icons are taken from Font Awesome (http://fontawesome.io/) project. -The Font Awesome font is licensed under the SIL OFL 1.1: -- http://scripts.sil.org/OFL - -SVG icons source: https://github.com/encharm/Font-Awesome-SVG-PNG -Font-Awesome-SVG-PNG is licensed under the MIT license (see file license -in current folder). diff --git a/django/contrib/admin/static/admin/img/svg/calendar-icons.svg b/django/contrib/admin/static/admin/img/svg/calendar-icons.svg deleted file mode 100644 index dbf21c39d2..0000000000 --- a/django/contrib/admin/static/admin/img/svg/calendar-icons.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/django/contrib/admin/static/admin/img/svg/icon-addlink.svg b/django/contrib/admin/static/admin/img/svg/icon-addlink.svg deleted file mode 100644 index e004fb1626..0000000000 --- a/django/contrib/admin/static/admin/img/svg/icon-addlink.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/contrib/admin/static/admin/img/svg/icon-alert.svg b/django/contrib/admin/static/admin/img/svg/icon-alert.svg deleted file mode 100644 index e51ea83f5b..0000000000 --- a/django/contrib/admin/static/admin/img/svg/icon-alert.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/contrib/admin/static/admin/img/svg/icon-calendar.svg b/django/contrib/admin/static/admin/img/svg/icon-calendar.svg deleted file mode 100644 index 97910a9949..0000000000 --- a/django/contrib/admin/static/admin/img/svg/icon-calendar.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/django/contrib/admin/static/admin/img/svg/icon-changelink.svg b/django/contrib/admin/static/admin/img/svg/icon-changelink.svg deleted file mode 100644 index bbb137aa08..0000000000 --- a/django/contrib/admin/static/admin/img/svg/icon-changelink.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/contrib/admin/static/admin/img/svg/icon-clock.svg b/django/contrib/admin/static/admin/img/svg/icon-clock.svg deleted file mode 100644 index bf9985d3f4..0000000000 --- a/django/contrib/admin/static/admin/img/svg/icon-clock.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/django/contrib/admin/static/admin/img/svg/icon-deletelink.svg b/django/contrib/admin/static/admin/img/svg/icon-deletelink.svg deleted file mode 100644 index 4059b15544..0000000000 --- a/django/contrib/admin/static/admin/img/svg/icon-deletelink.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/contrib/admin/static/admin/img/svg/icon-no.svg b/django/contrib/admin/static/admin/img/svg/icon-no.svg deleted file mode 100644 index 2e0d3832c9..0000000000 --- a/django/contrib/admin/static/admin/img/svg/icon-no.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/contrib/admin/static/admin/img/svg/icon-unknown-alt.svg b/django/contrib/admin/static/admin/img/svg/icon-unknown-alt.svg deleted file mode 100644 index 1c6b99fc09..0000000000 --- a/django/contrib/admin/static/admin/img/svg/icon-unknown-alt.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/contrib/admin/static/admin/img/svg/icon-unknown.svg b/django/contrib/admin/static/admin/img/svg/icon-unknown.svg deleted file mode 100644 index 50b4f97276..0000000000 --- a/django/contrib/admin/static/admin/img/svg/icon-unknown.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/contrib/admin/static/admin/img/svg/icon-yes.svg b/django/contrib/admin/static/admin/img/svg/icon-yes.svg deleted file mode 100644 index 5883d877e8..0000000000 --- a/django/contrib/admin/static/admin/img/svg/icon-yes.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/contrib/admin/static/admin/img/svg/inline-delete.svg b/django/contrib/admin/static/admin/img/svg/inline-delete.svg deleted file mode 100644 index 17d1ad67cd..0000000000 --- a/django/contrib/admin/static/admin/img/svg/inline-delete.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/contrib/admin/static/admin/img/svg/search.svg b/django/contrib/admin/static/admin/img/svg/search.svg deleted file mode 100644 index c8c69b2acc..0000000000 --- a/django/contrib/admin/static/admin/img/svg/search.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/contrib/admin/static/admin/img/svg/selector-icons.svg b/django/contrib/admin/static/admin/img/svg/selector-icons.svg deleted file mode 100644 index 926b8e21b5..0000000000 --- a/django/contrib/admin/static/admin/img/svg/selector-icons.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/django/contrib/admin/static/admin/img/svg/sorting-icons.svg b/django/contrib/admin/static/admin/img/svg/sorting-icons.svg deleted file mode 100644 index 7c31ec9114..0000000000 --- a/django/contrib/admin/static/admin/img/svg/sorting-icons.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/django/contrib/admin/static/admin/img/svg/tooltag-add.svg b/django/contrib/admin/static/admin/img/svg/tooltag-add.svg deleted file mode 100644 index 1ca64ae5b0..0000000000 --- a/django/contrib/admin/static/admin/img/svg/tooltag-add.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/contrib/admin/static/admin/img/svg/tooltag-arrowright.svg b/django/contrib/admin/static/admin/img/svg/tooltag-arrowright.svg deleted file mode 100644 index b664d61937..0000000000 --- a/django/contrib/admin/static/admin/img/svg/tooltag-arrowright.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/django/contrib/admin/static/admin/img/tooltag-add.png b/django/contrib/admin/static/admin/img/tooltag-add.png deleted file mode 100644 index 1488ecf2ef..0000000000 Binary files a/django/contrib/admin/static/admin/img/tooltag-add.png and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/tooltag-add.svg b/django/contrib/admin/static/admin/img/tooltag-add.svg new file mode 100644 index 0000000000..1ca64ae5b0 --- /dev/null +++ b/django/contrib/admin/static/admin/img/tooltag-add.svg @@ -0,0 +1,3 @@ + + + diff --git a/django/contrib/admin/static/admin/img/tooltag-arrowright.png b/django/contrib/admin/static/admin/img/tooltag-arrowright.png deleted file mode 100644 index 2f05598f53..0000000000 Binary files a/django/contrib/admin/static/admin/img/tooltag-arrowright.png and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/tooltag-arrowright.svg b/django/contrib/admin/static/admin/img/tooltag-arrowright.svg new file mode 100644 index 0000000000..b664d61937 --- /dev/null +++ b/django/contrib/admin/static/admin/img/tooltag-arrowright.svg @@ -0,0 +1,3 @@ + + + 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 %} {{ field.label|capfirst }} - {% if field.help_text %} ({{ field.help_text|striptags }}){% endif %} + {% if field.help_text %} ({{ field.help_text|striptags }}){% endif %} {% 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 @@ - {% trans 'Change' %} + {% trans 'Change' %} {% endif %} {% if can_add_related %} - {% trans 'Add' %} + {% trans 'Add' %} {% endif %} {% if can_delete_related %} - {% trans 'Delete' %} + {% trans 'Delete' %} {% 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 %}