Skip to content

Rename nut-logo related files consistently, distribute more of them in tarball #3393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimklimov merged 2 commits into from
Apr 4, 2026
Merged

Rename nut-logo related files consistently, distribute more of them in tarball #3393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7189ab5
Rename "nut.svg" and other logo variants more structurally
jimklimov Apr 3, 2026
05f3a90
Add docs/images/nut-logo-256x256.png rendition and distribute this an…
jimklimov Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion UPGRADING.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ Changes from 2.8.4 to 2.8.5
- Source directory `data/html` was renamed to `data/htmlcgi` in order to better
reflect its contents and purpose, compared to documentation-oriented `html*`
directories (and recipe variable names). This may impact some packaging
recipes which do not rely on `make install` alone. [#3049]
recipes which do not rely on `make install` alone. Note that more files
feature in the installation, e.g. a NUT logo rendition to use as favicon.
[#3049, #3249]

- Some fixes were applied to HTML templates for NUT CGI clients. It can be
useful for NUT deployments being upgraded to compare the files they have
Expand Down
2 changes: 1 addition & 1 deletion data/htmlcgi/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ EXTRA_DIST = README.adoc
if WITH_CGI
dist_htmlcgi_DATA = index.html bottom.html nut-banner.png
# Note: logo is not really generated, just nodist for THIS directory:
nodist_htmlcgi_DATA = header.html $(top_srcdir)/docs/images/nut-logo.png
nodist_htmlcgi_DATA = header.html $(top_srcdir)/docs/images/nut-logo-60x60.png
else
EXTRA_DIST += index.html bottom.html nut-banner.png header.html.in
endif
Expand Down
2 changes: 1 addition & 1 deletion data/htmlcgi/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="icon" href="nut-logo.png" size="60x60" type="image/png"/>
<link rel="icon" href="nut-logo-60x60.png" size="60x60" type="image/png"/>
<title>Network UPS Tools -- https://www.networkupstools.org</title>
</head>

Expand Down
4 changes: 3 additions & 1 deletion docs/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ IMAGE_FILES = \
images/asciidoc.png \
images/hostedby.png \
images/nut_layering.png \
images/nut-logo.png \
images/nut-logo.svg \
images/nut-logo-60x60.png \
images/nut-logo-256x256.png \
images/note.png \
images/warning.png \
images/blue-arrow.png \
Expand Down
Binary file added docs/images/nut-logo-256x256.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 docs/images/nut-logo.png → docs/images/nut-logo-60x60.png
View file
Open in desktop
File renamed without changes
0 docs/images/nut.svg → docs/images/nut-logo-original-A4.svg
View file
Open in desktop
File renamed without changes
0 docs/images/nut-squared.svg → docs/images/nut-logo.svg
View file
Open in desktop
File renamed without changes
3 changes: 2 additions & 1 deletion docs/nut.dict
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
personal_ws-1.1 en 3727 utf-8
personal_ws-1.1 en 3728 utf-8
AAC
AAS
ABI
Expand Down Expand Up @@ -2143,6 +2143,7 @@ failover
fallthrough
fasttrack
fatalx
favicon
fbbf
fc
fcb
Expand Down
Loading