diff --git a/debian/copyright b/debian/copyright index 52aac5e7c..f47a4f1a0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -101,14 +101,6 @@ Copyright: 2020 Adwaita Icon Theme Authors, GNOME Project Comment: https://github.com/GNOME/adwaita-icon-theme/ http://www.gnome.org License: LGPL-3 or CC-BY-SA-3.0-US -Files: static/themes/default/icons/f-droid.png - static/themes/default/icons/f-droid.svg -Copyright: 2012 William Theaker - 2013 Robert Martinez - 2015 Andrew Nayenko -Comment: https://gitlab.com/fdroid/artwork/blob/master/fdroid-logo-2015/fdroid-logo.svg -License: CC-BY-SA-3.0 or GPL-3+ - Files: plinth/modules/featherwiki/static/icons/featherwiki.png plinth/modules/featherwiki/static/icons/featherwiki.svg Copyright: 2022 Robbie Antenesse @@ -121,15 +113,6 @@ Copyright: 2010 Git Authors Comment: https://github.com/git/git/blob/master/gitweb/static/git-logo.png License: GPL-2 -Files: static/themes/default/icons/google-play.png -Copyright: Chameleon Design (https://thenounproject.com/Chamedesign/) -Comment: https://thenounproject.com/icon/887917/ -License: CC-BY-3.0-US - -Files: static/themes/default/icons/gnu-linux.png -Copyright: 2017 Cowemoji -License: CC0-1.0 - Files: plinth/modules/homeassistant/static/icons/homeassistant.png plinth/modules/homeassistant/static/icons/homeassistant.svg Copyright: Home Assistant Core Developers @@ -161,12 +144,6 @@ Copyright: 2020 The other Kiwix guy Comment: https://commons.wikimedia.org/wiki/File:Kiwix_logo_v3.svg License: CC-BY-SA-4.0 -Files: static/themes/default/icons/macos.png - static/themes/default/icons/macos.svg -Copyright: Vectors Market (https://thenounproject.com/vectorsmarket/) -Comment: https://thenounproject.com/icon/1203053/ -License: CC-BY-SA-3.0 - Files: plinth/modules/matrixsynapse/static/icons/matrixsynapse.png Copyright: 2017 Kishan Raval Comment: https://github.com/thekishanraval/Logos @@ -340,12 +317,6 @@ Copyright: 2011-2021 WordPress Contributors Comment: https://github.com/WordPress/wordpress-develop/blob/master/src/wp-admin/images/wordpress-logo.svg License: GPL-2+ -Files: static/themes/default/icons/windows.png - static/themes/default/icons/windows.svg -Copyright: 2007 ruli (https://thenounproject.com/2007ruli/) -Comment: https://thenounproject.com/icon/1206946/ -License: CC-BY-SA-3.0 - Files: plinth/modules/wireguard/static/icons/wireguard.png plinth/modules/wireguard/static/icons/wireguard.svg Copyright: 2019 WireGuard LLC @@ -357,6 +328,23 @@ Copyright: 2008 GNOME icon artists Comment: https://commons.wikimedia.org/wiki/File:Gnome-computer.svg License: LGPL-3+ or CC-BY-SA-3.0 +Files: static/themes/default/icons/android.svg + static/themes/default/icons/debian.svg + static/themes/default/icons/f-droid.svg + static/themes/default/icons/gnu-linux.svg + static/themes/default/icons/google-play.svg + static/themes/default/icons/macos.svg + static/themes/default/icons/windows.svg +Copyright: 2018, Fork Awesome +Comment: https://github.com/ForkAwesome/Fork-Awesome/tree/master/src/icons/svg/ +License: OFL-1.1 + +Files: static/themes/default/icons/fedora.svg + static/themes/default/icons/homebrew.svg +Copyright: 2026, Simple Icons +Comment: https://github.com/simple-icons/simple-icons/ +License: CC0-1.0 + Files: debian/* Copyright: 2013 Tzafrir Cohen 2013-2026 FreedomBox Authors @@ -2848,3 +2836,94 @@ License: Zlib . 3. This notice may not be removed or altered from any source distribution. + +License: OFL-1.1 + This Font Software is licensed under the SIL Open Font License, + Version 1.1. + . + This license is copied below, and is also available with a FAQ at: + http://scripts.sil.org/OFL + . + SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + . + PREAMBLE The goals of the Open Font License (OFL) are to stimulate + worldwide development of collaborative font projects, to support the font + creation efforts of academic and linguistic communities, and to provide + a free and open framework in which fonts may be shared and improved in + partnership with others. + . + The OFL allows the licensed fonts to be used, studied, modified and + redistributed freely as long as they are not sold by themselves. + The fonts, including any derivative works, can be bundled, embedded, + redistributed and/or sold with any software provided that any reserved + names are not used by derivative works. The fonts and derivatives, + however, cannot be released under any other type of license. The + requirement for fonts to remain under this license does not apply to + any document created using the fonts or their derivatives. + . + DEFINITIONS + "Font Software" refers to the set of files released by the Copyright + Holder(s) under this license and clearly marked as such. + This may include source files, build scripts and documentation. + . + "Reserved Font Name" refers to any names specified as such after the + copyright statement(s). + . + "Original Version" refers to the collection of Font Software components + as distributed by the Copyright Holder(s). + . + "Modified Version" refers to any derivative made by adding to, deleting, + or substituting ? in part or in whole ? + any of the components of the Original Version, by changing formats or + by porting the Font Software to a new environment. + . + "Author" refers to any designer, engineer, programmer, technical writer + or other person who contributed to the Font Software. + . + PERMISSION & CONDITIONS + . + Permission is hereby granted, free of charge, to any person obtaining a + copy of the Font Software, to use, study, copy, merge, embed, modify, + redistribute, and sell modified and unmodified copies of the Font + Software, subject to the following conditions: + . + 1) Neither the Font Software nor any of its individual components, in + Original or Modified Versions, may be sold by itself. + . + 2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + . + 3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the + corresponding Copyright Holder. This restriction only applies to the + primary font name as presented to the users. + . + 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + . + 5) The Font Software, modified or unmodified, in part or in whole, must + be distributed entirely under this license, and must not be distributed + under any other license. The requirement for fonts to remain under + this license does not apply to any document created using the Font + Software. + . + TERMINATION + This license becomes null and void if any of the above conditions are not met. + . + DISCLAIMER + THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE + COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL + DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER + DEALINGS IN THE FONT SOFTWARE. diff --git a/plinth/templates/clients.html b/plinth/templates/clients.html index 0a33b55ad..7adb256c4 100644 --- a/plinth/templates/clients.html +++ b/plinth/templates/clients.html @@ -48,16 +48,14 @@ {% if platform.os == 'gnu-linux' or platform.os == 'macos' or platform.os == 'windows' %} - {% with 'theme/icons/'|add:platform.os|add:'.png' as icon %} - - {% if platform.os == 'gnu-linux' %} - {% trans 'GNU/Linux' %} - {% elif platform.os == 'windows' %} - {% trans 'Windows' %} - {% elif platform.os == 'macos' %} - {% trans 'macOS' %} - {% endif %} - {% endwith %} + {% icon platform.os %} + {% if platform.os == 'gnu-linux' %} + {% trans 'GNU/Linux' %} + {% elif platform.os == 'windows' %} + {% trans 'Windows' %} + {% elif platform.os == 'macos' %} + {% trans 'macOS' %} + {% endif %} {% endif %} @@ -80,26 +78,22 @@ {% if platform.type == 'download' and platform.os == 'android' %} - {% with 'theme/icons/'|add:platform.os|add:'.png' as icon %} - - {% trans 'Android APK' %} - {% endwith %} + {% icon platform.os %} + {% trans 'Android APK' %} {% endif %} {% if platform.type == 'store' and platform.os == 'android' or platform.os == 'ios' %} - {% with 'theme/icons/'|add:platform.store_name|add:'.png' as icon %} - - {% if platform.store_name == 'google-play' %} - {% trans 'Play Store' %} - {% elif platform.store_name == 'f-droid' %} - {% trans 'F-Droid' %} - {% elif platform.store_name == 'app-store' %} - {% trans 'App Store' %} - {% endif %} - {% endwith %} + {% icon platform.store_name %} + {% if platform.store_name == 'google-play' %} + {% trans 'Play Store' %} + {% elif platform.store_name == 'f-droid' %} + {% trans 'F-Droid' %} + {% elif platform.store_name == 'app-store' %} + {% trans 'App Store' %} + {% endif %} {% endif %} @@ -119,17 +113,20 @@ {% for platform in client.platforms %} {% if platform.type == 'package' %} -
+ {% if platform.format == 'deb' %} - {% trans "Debian:" %} {{ platform.name }} + {% icon 'debian' %} + {{ platform.name }} {% endif %} {% if platform.format == 'brew' %} - {% trans "Homebrew:" %} {{ platform.name }} + {% icon 'homebrew' %} + {{ platform.name }} {% endif %} {% if platform.format == 'rpm' %} - {% trans "RPM:" %} {{ platform.name }} + {% icon 'fedora' %} + {{ platform.name }} {% endif %} -
+ {% endif %} {% endfor %} diff --git a/plinth/templatetags/plinth_extras.py b/plinth/templatetags/plinth_extras.py index ea679a8fd..701cd4326 100644 --- a/plinth/templatetags/plinth_extras.py +++ b/plinth/templatetags/plinth_extras.py @@ -115,11 +115,15 @@ def icon(url: str, *args, **kwargs): path = web_server.resolve_static_path(url) try: - icon_lines = path.read_text().splitlines() + icon_text = path.read_text() except FileNotFoundError: raise ValueError(f'Icon {url} not found.') else: # Skip the line with header. - icon_text = add_attributes('\n'.join(icon_lines[1:])) + if icon_text and icon_text.startswith(' + + diff --git a/static/themes/default/icons/app-store.png b/static/themes/default/icons/app-store.png deleted file mode 100644 index 03b68c4de..000000000 Binary files a/static/themes/default/icons/app-store.png and /dev/null differ diff --git a/static/themes/default/icons/app-store.svg b/static/themes/default/icons/app-store.svg index 585314db5..8cd794296 100644 --- a/static/themes/default/icons/app-store.svg +++ b/static/themes/default/icons/app-store.svg @@ -1 +1,12 @@ - \ No newline at end of file + + + + diff --git a/static/themes/default/icons/debian.svg b/static/themes/default/icons/debian.svg new file mode 100644 index 000000000..bd7341937 --- /dev/null +++ b/static/themes/default/icons/debian.svg @@ -0,0 +1,11 @@ + + + diff --git a/static/themes/default/icons/f-droid.png b/static/themes/default/icons/f-droid.png deleted file mode 100644 index e8a6036b5..000000000 Binary files a/static/themes/default/icons/f-droid.png and /dev/null differ diff --git a/static/themes/default/icons/f-droid.svg b/static/themes/default/icons/f-droid.svg index cf403478e..29aa32f73 100644 --- a/static/themes/default/icons/f-droid.svg +++ b/static/themes/default/icons/f-droid.svg @@ -1,129 +1,10 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - + width="1536" + height="1516.325" + viewBox="0 0 1536 1516.325" + xmlns="http://www.w3.org/2000/svg"> + diff --git a/static/themes/default/icons/fedora.svg b/static/themes/default/icons/fedora.svg new file mode 100644 index 000000000..92ef1e37b --- /dev/null +++ b/static/themes/default/icons/fedora.svg @@ -0,0 +1,9 @@ + + Fedora + + diff --git a/static/themes/default/icons/gnu-linux.png b/static/themes/default/icons/gnu-linux.png deleted file mode 100644 index 090dbede0..000000000 Binary files a/static/themes/default/icons/gnu-linux.png and /dev/null differ diff --git a/static/themes/default/icons/gnu-linux.svg b/static/themes/default/icons/gnu-linux.svg new file mode 100644 index 000000000..c3abc179d --- /dev/null +++ b/static/themes/default/icons/gnu-linux.svg @@ -0,0 +1,10 @@ + + + diff --git a/static/themes/default/icons/google-play.png b/static/themes/default/icons/google-play.png deleted file mode 100644 index b16387fb1..000000000 Binary files a/static/themes/default/icons/google-play.png and /dev/null differ diff --git a/static/themes/default/icons/google-play.svg b/static/themes/default/icons/google-play.svg index 1bbc4b48c..df06eb927 100644 --- a/static/themes/default/icons/google-play.svg +++ b/static/themes/default/icons/google-play.svg @@ -1 +1,10 @@ - \ No newline at end of file + + + diff --git a/static/themes/default/icons/homebrew.svg b/static/themes/default/icons/homebrew.svg new file mode 100644 index 000000000..ff923b39a --- /dev/null +++ b/static/themes/default/icons/homebrew.svg @@ -0,0 +1,11 @@ + + + diff --git a/static/themes/default/icons/macos.png b/static/themes/default/icons/macos.png deleted file mode 100644 index 2a23d02c2..000000000 Binary files a/static/themes/default/icons/macos.png and /dev/null differ diff --git a/static/themes/default/icons/macos.svg b/static/themes/default/icons/macos.svg index 0657a9a6a..33c2b7a9a 100644 --- a/static/themes/default/icons/macos.svg +++ b/static/themes/default/icons/macos.svg @@ -1,57 +1,10 @@ - image/svg+xml \ No newline at end of file + viewBox="0 0 1285.8459 1536"> + + diff --git a/static/themes/default/icons/windows.png b/static/themes/default/icons/windows.png deleted file mode 100644 index d82caef65..000000000 Binary files a/static/themes/default/icons/windows.png and /dev/null differ diff --git a/static/themes/default/icons/windows.svg b/static/themes/default/icons/windows.svg index d2e361542..91adb3298 100644 --- a/static/themes/default/icons/windows.svg +++ b/static/themes/default/icons/windows.svg @@ -1,70 +1,10 @@ - image/svg+xml + viewBox="0 0 1536 1536"> + +