From 87ab54b488cb58d810939112f208bb37068710e0 Mon Sep 17 00:00:00 2001 From: Pablo Bengoechea Date: Tue, 10 Dec 2024 17:30:06 +0100 Subject: [PATCH] Fixed #35829 -- Updated admin icons using Font Awesome Free version 6.7.2. Co-authored-by: Stefan <96178532+stefan6419846@users.noreply.github.com> --- django/contrib/admin/static/admin/img/LICENSE | 20 ----- .../contrib/admin/static/admin/img/README.md | 78 ++++++++++++++++ .../contrib/admin/static/admin/img/README.txt | 7 -- .../admin/static/admin/img/calendar-icons.svg | 89 ++++++++----------- .../admin/static/admin/img/icon-addlink.svg | 10 ++- .../admin/static/admin/img/icon-alert.svg | 10 ++- .../admin/static/admin/img/icon-calendar.svg | 12 ++- .../static/admin/img/icon-changelink.svg | 10 ++- .../admin/static/admin/img/icon-clock.svg | 16 ++-- .../static/admin/img/icon-deletelink.svg | 12 ++- .../admin/static/admin/img/icon-hidelink.svg | 10 ++- .../admin/static/admin/img/icon-no.svg | 10 ++- .../static/admin/img/icon-unknown-alt.svg | 10 ++- .../admin/static/admin/img/icon-unknown.svg | 10 ++- .../admin/static/admin/img/icon-viewlink.svg | 10 ++- .../admin/static/admin/img/icon-yes.svg | 10 ++- .../admin/static/admin/img/inline-delete.svg | 10 ++- .../contrib/admin/static/admin/img/search.svg | 10 ++- .../admin/static/admin/img/selector-icons.svg | 71 ++++++++++----- .../admin/static/admin/img/sorting-icons.svg | 34 +++++-- .../admin/static/admin/img/tooltag-add.svg | 10 ++- .../static/admin/img/tooltag-arrowright.svg | 10 ++- docs/releases/6.0.txt | 3 +- 23 files changed, 325 insertions(+), 147 deletions(-) delete mode 100644 django/contrib/admin/static/admin/img/LICENSE create mode 100644 django/contrib/admin/static/admin/img/README.md delete mode 100644 django/contrib/admin/static/admin/img/README.txt diff --git a/django/contrib/admin/static/admin/img/LICENSE b/django/contrib/admin/static/admin/img/LICENSE deleted file mode 100644 index a4faaa1dfa..0000000000 --- a/django/contrib/admin/static/admin/img/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/README.md b/django/contrib/admin/static/admin/img/README.md new file mode 100644 index 0000000000..74756a4b4e --- /dev/null +++ b/django/contrib/admin/static/admin/img/README.md @@ -0,0 +1,78 @@ +# Information about icons in this directoy + +## License + +All icons in this directory are provided by +[Font Awesome Free](https://fontawesome.com), version 6.7.2. + +- The icons are licensed under the [Creative Commons Attribution 4.0 + International (CC-BY-4.0)](https://creativecommons.org/licenses/by/4.0/) + license. +- This license allows you to use, modify, and distribute the icons, provided + proper attribution is given. + +## Usage + +- You may use, modify, and distribute the icons in this repository in + compliance with the [Creative Commons Attribution 4.0 International + (CC-BY-4.0)](https://creativecommons.org/licenses/by/4.0/) license. + +## Modifications + +- These icons have been resized, recolored, or otherwise modified to fit the + requirements of this project. + +- These modifications alter the appearance of the original icons but remain + covered under the terms of the + [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) license. + +## Contributing SVG Icons + +To ensure visual consistency, traceability, and proper license attribution, +follow these guidelines when adding or modifying icons. + +## ⚠️ Important: Changing Font Awesome Version + +If you update to a different Font Awesome version, you must **update all SVG +files** and **comments inside the files** to reflect the new version number and +licensing URL accordingly. For example: + +* Original: +```xml + +``` +* Updated: +```xml + +``` + +## Adding a new icon + +1. Use only [Font Awesome Free Icons](https://fontawesome.com/icons). +2. Save the icon as a .svg file in this directory. +3. Include the following attribution comment at the top of the file (do not change it): +```xml + +``` +4. Right before the `` element, add the following metadata comment, using the correct values: +```xml + +``` + +### Example SVG Structure + +```xml + + + + + +``` diff --git a/django/contrib/admin/static/admin/img/README.txt b/django/contrib/admin/static/admin/img/README.txt deleted file mode 100644 index bf81f35bee..0000000000 --- a/django/contrib/admin/static/admin/img/README.txt +++ /dev/null @@ -1,7 +0,0 @@ -All icons are taken from Font Awesome (https://fontawesome.com/) project. -The Font Awesome font is licensed under the SIL OFL 1.1: -- https://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 index 04c02741ad..7845abbdc9 100644 --- a/django/contrib/admin/static/admin/img/calendar-icons.svg +++ b/django/contrib/admin/static/admin/img/calendar-icons.svg @@ -1,63 +1,44 @@ - - - - + width="15" + height="30" + viewBox="0 0 512 1024" + version="1.1" + id="svg5" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg"> + + + + + d="M512 256A256 256 0 1 0 0 256a256 256 0 1 0 512 0zM271 135c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9l-87 87 87 87c9.4 9.4 9.4 24.6 0 33.9s-24.6 9.4-33.9 0L167 273c-9.4-9.4-9.4-24.6 0-33.9L271 135z" + id="path2" /> - + + + d="M0 256a256 256 0 1 0 512 0A256 256 0 1 0 0 256zM241 377c-9.4 9.4-24.6 9.4-33.9 0s-9.4-24.6 0-33.9l87-87-87-87c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0L345 239c9.4 9.4 9.4 24.6 0 33.9L241 377z" + id="path1" /> + xlink:href="#next" + x="0" + y="512" + fill="#000000" + id="use5" /> + xlink:href="#previous" + x="0" + y="0" + fill="#333333" + id="use2" /> diff --git a/django/contrib/admin/static/admin/img/icon-addlink.svg b/django/contrib/admin/static/admin/img/icon-addlink.svg index 8d5c6a3a9f..20fb814749 100644 --- a/django/contrib/admin/static/admin/img/icon-addlink.svg +++ b/django/contrib/admin/static/admin/img/icon-addlink.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/django/contrib/admin/static/admin/img/icon-alert.svg b/django/contrib/admin/static/admin/img/icon-alert.svg index e51ea83f5b..a6365f5ac8 100644 --- a/django/contrib/admin/static/admin/img/icon-alert.svg +++ b/django/contrib/admin/static/admin/img/icon-alert.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/django/contrib/admin/static/admin/img/icon-calendar.svg b/django/contrib/admin/static/admin/img/icon-calendar.svg index 97910a9949..827ca5d214 100644 --- a/django/contrib/admin/static/admin/img/icon-calendar.svg +++ b/django/contrib/admin/static/admin/img/icon-calendar.svg @@ -1,9 +1,15 @@ - + + - + + - + diff --git a/django/contrib/admin/static/admin/img/icon-changelink.svg b/django/contrib/admin/static/admin/img/icon-changelink.svg index 592b093bc3..631670240a 100644 --- a/django/contrib/admin/static/admin/img/icon-changelink.svg +++ b/django/contrib/admin/static/admin/img/icon-changelink.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/django/contrib/admin/static/admin/img/icon-clock.svg b/django/contrib/admin/static/admin/img/icon-clock.svg index bf9985d3f4..51f4db46ec 100644 --- a/django/contrib/admin/static/admin/img/icon-clock.svg +++ b/django/contrib/admin/static/admin/img/icon-clock.svg @@ -1,9 +1,15 @@ - - + + + - + + - - + + diff --git a/django/contrib/admin/static/admin/img/icon-deletelink.svg b/django/contrib/admin/static/admin/img/icon-deletelink.svg index 4059b15544..eac19d7507 100644 --- a/django/contrib/admin/static/admin/img/icon-deletelink.svg +++ b/django/contrib/admin/static/admin/img/icon-deletelink.svg @@ -1,3 +1,11 @@ - - + + + + + + diff --git a/django/contrib/admin/static/admin/img/icon-hidelink.svg b/django/contrib/admin/static/admin/img/icon-hidelink.svg index 2a8b404b60..9462691c8d 100644 --- a/django/contrib/admin/static/admin/img/icon-hidelink.svg +++ b/django/contrib/admin/static/admin/img/icon-hidelink.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/django/contrib/admin/static/admin/img/icon-no.svg b/django/contrib/admin/static/admin/img/icon-no.svg index 2e0d3832c9..27089244ce 100644 --- a/django/contrib/admin/static/admin/img/icon-no.svg +++ b/django/contrib/admin/static/admin/img/icon-no.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/django/contrib/admin/static/admin/img/icon-unknown-alt.svg b/django/contrib/admin/static/admin/img/icon-unknown-alt.svg index 1c6b99fc09..a7a51e7a34 100644 --- a/django/contrib/admin/static/admin/img/icon-unknown-alt.svg +++ b/django/contrib/admin/static/admin/img/icon-unknown-alt.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/django/contrib/admin/static/admin/img/icon-unknown.svg b/django/contrib/admin/static/admin/img/icon-unknown.svg index 50b4f97276..3acf303143 100644 --- a/django/contrib/admin/static/admin/img/icon-unknown.svg +++ b/django/contrib/admin/static/admin/img/icon-unknown.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/django/contrib/admin/static/admin/img/icon-viewlink.svg b/django/contrib/admin/static/admin/img/icon-viewlink.svg index a1ca1d3f4e..40c86be0f7 100644 --- a/django/contrib/admin/static/admin/img/icon-viewlink.svg +++ b/django/contrib/admin/static/admin/img/icon-viewlink.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/django/contrib/admin/static/admin/img/icon-yes.svg b/django/contrib/admin/static/admin/img/icon-yes.svg index 5883d877e8..4ee7cbae90 100644 --- a/django/contrib/admin/static/admin/img/icon-yes.svg +++ b/django/contrib/admin/static/admin/img/icon-yes.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/django/contrib/admin/static/admin/img/inline-delete.svg b/django/contrib/admin/static/admin/img/inline-delete.svg index 875115056e..93e7e9d9bd 100644 --- a/django/contrib/admin/static/admin/img/inline-delete.svg +++ b/django/contrib/admin/static/admin/img/inline-delete.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/django/contrib/admin/static/admin/img/search.svg b/django/contrib/admin/static/admin/img/search.svg index c8c69b2acc..75c21a5134 100644 --- a/django/contrib/admin/static/admin/img/search.svg +++ b/django/contrib/admin/static/admin/img/search.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/django/contrib/admin/static/admin/img/selector-icons.svg b/django/contrib/admin/static/admin/img/selector-icons.svg index 926b8e21b5..6ed1d55864 100644 --- a/django/contrib/admin/static/admin/img/selector-icons.svg +++ b/django/contrib/admin/static/admin/img/selector-icons.svg @@ -1,34 +1,65 @@ - + + - + + - - - - + + - + + + + + + - + + - + + - - - - - - - - - - - + + + + + + + + + + + diff --git a/django/contrib/admin/static/admin/img/sorting-icons.svg b/django/contrib/admin/static/admin/img/sorting-icons.svg index 7c31ec9114..c3baa4ab31 100644 --- a/django/contrib/admin/static/admin/img/sorting-icons.svg +++ b/django/contrib/admin/static/admin/img/sorting-icons.svg @@ -1,19 +1,35 @@ - + + - + + - + + - + + - - - - - + + + + + diff --git a/django/contrib/admin/static/admin/img/tooltag-add.svg b/django/contrib/admin/static/admin/img/tooltag-add.svg index 1ca64ae5b0..49cce19291 100644 --- a/django/contrib/admin/static/admin/img/tooltag-add.svg +++ b/django/contrib/admin/static/admin/img/tooltag-add.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/django/contrib/admin/static/admin/img/tooltag-arrowright.svg b/django/contrib/admin/static/admin/img/tooltag-arrowright.svg index b664d61937..55ed8e5019 100644 --- a/django/contrib/admin/static/admin/img/tooltag-arrowright.svg +++ b/django/contrib/admin/static/admin/img/tooltag-arrowright.svg @@ -1,3 +1,9 @@ - - + + + + diff --git a/docs/releases/6.0.txt b/docs/releases/6.0.txt index ec2fa37f6f..7dd9a1dc51 100644 --- a/docs/releases/6.0.txt +++ b/docs/releases/6.0.txt @@ -43,7 +43,8 @@ Minor features :mod:`django.contrib.admin` ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* ... +* The Font Awesome Free icon set (version 6.7.2) is now used for the admin + interface icons. :mod:`django.contrib.admindocs` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~