From 7189ab5b3135b5a08a305f15886d0bac11e071d0 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Fri, 3 Apr 2026 02:30:39 +0200 Subject: [PATCH 1/2] Rename "nut.svg" and other logo variants more structurally Signed-off-by: Jim Klimov --- UPGRADING.adoc | 4 +++- data/htmlcgi/Makefile.am | 2 +- data/htmlcgi/index.html | 2 +- docs/Makefile.am | 2 +- docs/images/{nut-logo.png => nut-logo-60x60.png} | Bin docs/images/{nut.svg => nut-logo-original-A4.svg} | 0 docs/images/{nut-squared.svg => nut-logo.svg} | 0 docs/nut.dict | 3 ++- 8 files changed, 8 insertions(+), 5 deletions(-) rename docs/images/{nut-logo.png => nut-logo-60x60.png} (100%) rename docs/images/{nut.svg => nut-logo-original-A4.svg} (100%) rename docs/images/{nut-squared.svg => nut-logo.svg} (100%) diff --git a/UPGRADING.adoc b/UPGRADING.adoc index d840bee5c0..c5b379c046 100644 --- a/UPGRADING.adoc +++ b/UPGRADING.adoc @@ -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 diff --git a/data/htmlcgi/Makefile.am b/data/htmlcgi/Makefile.am index 29649c404a..fa307b202b 100644 --- a/data/htmlcgi/Makefile.am +++ b/data/htmlcgi/Makefile.am @@ -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 diff --git a/data/htmlcgi/index.html b/data/htmlcgi/index.html index eb68a2927c..56d3fb935c 100644 --- a/data/htmlcgi/index.html +++ b/data/htmlcgi/index.html @@ -2,7 +2,7 @@ - + Network UPS Tools -- https://www.networkupstools.org diff --git a/docs/Makefile.am b/docs/Makefile.am index 9a9c735abc..b95a32ffdf 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -50,7 +50,7 @@ IMAGE_FILES = \ images/asciidoc.png \ images/hostedby.png \ images/nut_layering.png \ - images/nut-logo.png \ + images/nut-logo-60x60.png \ images/note.png \ images/warning.png \ images/blue-arrow.png \ diff --git a/docs/images/nut-logo.png b/docs/images/nut-logo-60x60.png similarity index 100% rename from docs/images/nut-logo.png rename to docs/images/nut-logo-60x60.png diff --git a/docs/images/nut.svg b/docs/images/nut-logo-original-A4.svg similarity index 100% rename from docs/images/nut.svg rename to docs/images/nut-logo-original-A4.svg diff --git a/docs/images/nut-squared.svg b/docs/images/nut-logo.svg similarity index 100% rename from docs/images/nut-squared.svg rename to docs/images/nut-logo.svg diff --git a/docs/nut.dict b/docs/nut.dict index 8875a29277..0e074861bd 100644 --- a/docs/nut.dict +++ b/docs/nut.dict @@ -1,4 +1,4 @@ -personal_ws-1.1 en 3727 utf-8 +personal_ws-1.1 en 3728 utf-8 AAC AAS ABI @@ -2143,6 +2143,7 @@ failover fallthrough fasttrack fatalx +favicon fbbf fc fcb From 05f3a903d9575e2807132742f861a4a74950c9ac Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Fri, 3 Apr 2026 02:32:23 +0200 Subject: [PATCH 2/2] Add docs/images/nut-logo-256x256.png rendition and distribute this and nut-logo.svg per se Signed-off-by: Jim Klimov --- docs/Makefile.am | 2 ++ docs/images/nut-logo-256x256.png | Bin 0 -> 217788 bytes 2 files changed, 2 insertions(+) create mode 100644 docs/images/nut-logo-256x256.png diff --git a/docs/Makefile.am b/docs/Makefile.am index b95a32ffdf..7fac198e35 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -50,7 +50,9 @@ IMAGE_FILES = \ images/asciidoc.png \ images/hostedby.png \ images/nut_layering.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 \ diff --git a/docs/images/nut-logo-256x256.png b/docs/images/nut-logo-256x256.png new file mode 100644 index 0000000000000000000000000000000000000000..4293c946d59c46ef17c0431b3097c6e24a292bc7 GIT binary patch literal 217788 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