Asciidoc bootstrap - dual targeting by jimklimov · Pull Request #41 · networkupstools/nut-website

jimklimov · 2023-07-30T19:31:02Z

Take over #31 to have it both ways - be able to build the current NUT web-site design (or eventually, rebuild "historic release" sites with this design) and to iterate with the remaining issues of the new bootstrap one.

Closes: #30
(like its predecessor)

Currently set to build the legacy web-layout by default.

Per #31 (comment) at least the following quests remain for bootstrap mode:

missing menu
- Download
- Features
- documentation
Some URLs vanished (download, doc)
Support sub menu doesn't work
Footer to be restored
Adapt HCL
Back to blue?
Missing reference target (from bootstrap.conf):

Generating source/old/smartupstools/index.html due to: source/old/smartupstools/index.txt bootstrap.conf historic-release.txt
asciidoc: WARNING: index.txt: line 5: {include:/home/jim/nut-website/source/old/smartupstools/navinfo.html}: file does not exist

The intent is to have the NUT website adapted to mobile devices and smaller screens than PC. As per my original research for NUT, and actual application to the 42ITy project Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

…asciidoc-bootstrap

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

It generates the same filename as .html, and align for jumbotron integration Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Sub-sites may need some better alignment though Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

… or new "bootstrap" design

…p-dual as of 2023-07-30

…ats for the current site build Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…LS and COUNT_HCL_MANUFACTURERS stats for the current site build Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…_MODELS and COUNT_HCL_MANUFACTURERS stats for the current site build Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Include changes for the bootstrap website reorganization (no website.txt) Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…ptions Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…web-layout" for 2.7.x and 2.8.0 historic releases, if not specified by caller)

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…/else/endif Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…ake ifeq/else/endif" This reverts commit bd2e3d1.

THIS should force automake scripts not squash variable and recipe definitions into nonsense. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

… relative links to help varied LAYOUT builds Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

The jumbo div heading for new bootstrap layout has the NUT logo. Legacy "in-line" sort of layout does not, there is a logo nearby in the page heading section. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…stead of relative links to help varied LAYOUT builds" This reverts commit 51e3f99 : Embedded URIs in subdir index pages become build-host dependent. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…ces under Support, add Sponsor NUT) Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov · 2023-07-30T19:42:30Z

Note: Per quick visual review (click through pages) the currently published "legacy" site and one generated locally as web-layout seem sufficiently identical.

jimklimov · 2023-07-30T19:43:58Z

TODO:

Some change about index-jumbo (adding a file for LAYOUT-dependent heading) broke the div which now shows asciidoc markup, not the expected contents. Need to figure out the commands involved, or glue together the practically used file via Makefile.

…p-dual Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…p-dual Import HTML-rendered blocks of older website.txt (notes on GitHub Stars and rolling vs. historic sites); merge recipe changes since last effort. Overall bring in NUT v2.8.2 (and a bit later) baseline. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…mit 3c70163 and nut-website commit beb7a64 Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov · 2024-04-15T12:29:19Z

Noted while experimenting with new spins on this code:

asciidoc: WARNING: OMNI900LCD.txt: line 1: {include:/home/jim/nut-website/ddl/Tripp_Lite/navinfo.html}: file does not exist

I suppose navinfo or some sort of index in the DDL directories must be spelled as a prerequisite for actual DDL page builds, or the include reference must lead to one instance of the file in top_builddir?

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…p-dual Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…only relevant to nut-website (for asciidoc-bootstrap-dual branch) [networkupstools/nut#2402] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…p-dual Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

aquette and others added 30 commits March 13, 2023 18:19

First attempt at Bootstrap NUT website

e09786a

The intent is to have the NUT website adapted to mobile devices and smaller screens than PC. As per my original research for NUT, and actual application to the 42ITy project Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Adjustments and fixes

cc32368

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Menu addition

da62fdd

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Refine git ignored files

e070e3a

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Merge branch 'master' of github.com:networkupstools/nut-website into …

79e59f0

…asciidoc-bootstrap

Add specific options for index.html (jumbotron)

b0aa418

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Complete navigation info (menu)

db62a8d

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Update jumbotron (NUT welcome message)

d5fe36b

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Fix navinfo menu

630e303

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Remove welcome message, now that it's in Jumbotron

1304957

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Rename website.txt to index.txt

e1eb734

It generates the same filename as .html, and align for jumbotron integration Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Fix wrongs dirs

dafa86c

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Fix and complete welcome message

c58d90b

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Fix menu

75d8834

Sub-sites may need some better alignment though Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Fix ToC position, and add fonts

aaa3445

Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>

Makefile.am: prepare for dual modality builds - with old "web-layout"…

af32a0e

… or new "bootstrap" design

navinfo.html, scripts/asciidoc.js: cosmetic fixes

b9a666c

autogen.sh, Makefile.am: hide GNU make conditionals from automake

88ee8bf

Merge remote-tracking branch 'upstream/master' into asciidoc-bootstra…

bfd9f13

…p-dual as of 2023-07-30

configure.ac: prepare COUNT_HCL_MODELS and COUNT_HCL_MANUFACTURERS st…

4d55db1

…ats for the current site build Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

index-jumboinfo.html.in: make it a template which uses COUNT_HCL_MODE…

681bad8

…LS and COUNT_HCL_MANUFACTURERS stats for the current site build Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

index.html: drop obsolete comment as we now do auto-prepare COUNT_HCL…

99fb1a3

…_MODELS and COUNT_HCL_MANUFACTURERS stats for the current site build Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Merge branch 'auto-stats' into asciidoc-bootstrap-dual

05b5c96

Include changes for the bootstrap website reorganization (no website.txt) Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

index.txt, Makefile.am: fix index.html builds with different LAYOUT o…

9275496

…ptions Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

ci_build.sh: pass LAYOUT envvar to make if specified (or bolt it as "…

1588e43

…web-layout" for 2.7.x and 2.8.0 historic releases, if not specified by caller)

Makefile.am: rectify SCRIPT_FILES for WEBLAYOUT vs BOOTSTRAP

a6bdeb0

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Makefile.am: fix if/else to separate if/endif clauses

b13e841

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Makefile.am, autogen.sh: try different sed patterns for automake ifeq…

bd2e3d1

…/else/endif Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Revert "Makefile.am, autogen.sh: try different sed patterns for autom…

3796cc9

…ake ifeq/else/endif" This reverts commit bd2e3d1.

Makefile.am: revise use of "# HIDE FROM AUTOMAKE #" for defaults

0c0b3bd

THIS should force automake scripts not squash variable and recipe definitions into nonsense. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov added 10 commits July 30, 2023 18:47

Makefile.am: fix ADOC_PARAMS_DDL_L1/L2 to use "top_srcdir" instead of…

51e3f99

… relative links to help varied LAYOUT builds Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Makefile.am etc: Fix use of index-jumboinfo-header-$(LAYOUT).html

513f471

The jumbo div heading for new bootstrap layout has the NUT logo. Legacy "in-line" sort of layout does not, there is a logo nearby in the page heading section. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

web-layout.conf: fix reference to historic sites for URLs to render well

fbeed52

projects.txt: refer to NUT GitHub Wiki page

d71867c

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Merge branch 'master' into asciidoc-bootstrap-dual

f857b0e

Makefile.am: set LAYOUT=web-layout (legacy) as default for now

f1d877f

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

README.asciidoc: update regarding ci_build.sh support for LAYOUT envvar

e984cdb

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Jenkinsfile-infra: add a toggle to select the LAYOUT to build

80864dd

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Revise some page links relative to asciidoc {root}

c86a2fc

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Revert "Makefile.am: fix ADOC_PARAMS_DDL_L1/L2 to use "top_srcdir" in…

17de929

…stead of relative links to help varied LAYOUT builds" This reverts commit 51e3f99 : Embedded URIs in subdir index pages become build-host dependent. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov added the enhancement label Jul 30, 2023

jimklimov requested a review from aquette July 30, 2023 19:31

navinfo.html: update similar to web-layout.conf (detail GitHub resour…

0ace348

…ces under Support, add Sponsor NUT) Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov added 4 commits August 3, 2023 14:46

Merge remote-tracking branch 'upstream/master' into asciidoc-bootstra…

9a73819

…p-dual Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Regenerate site 20240415T084834Z vs nut commit 7cbcef70b, nut-ddl com…

8bf212f

…mit 3c70163 and nut-website commit beb7a64 Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Merge branch 'nut-website-dict' into asciidoc-bootstrap-dual

5125826

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov added the bootstrap-rendering New NUT website design based on bootstrap (2023+) label Apr 15, 2024

jimklimov added 2 commits April 15, 2024 14:44

GitIgnore index-jumboinfo.html.in-spellchecked

7836208

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Merge remote-tracking branch 'upstream/master' into asciidoc-bootstra…

4e868c1

…p-dual Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov mentioned this pull request Apr 15, 2024

Rendered nut-website did not update after 2.8.2 release (or along with master actually) in its entirety, at least for man pages #47

Closed

jimklimov added 4 commits April 17, 2024 21:20

Merge branch 'dict-report' into asciidoc-bootstrap-dual

eccb592

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

nut-website.dict.addon: update with keywords from nut::docs/nut.dict …

32ff17d

…only relevant to nut-website (for asciidoc-bootstrap-dual branch) [networkupstools/nut#2402] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Merge remote-tracking branch 'upstream/master' into asciidoc-bootstra…

c2c310e

…p-dual Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Merge branch 'master' into asciidoc-bootstrap-dual

22093a3

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Asciidoc bootstrap - dual targeting#41

Asciidoc bootstrap - dual targeting#41
jimklimov wants to merge 51 commits intonetworkupstools:masterfrom
jimklimov:asciidoc-bootstrap-dual

jimklimov commented Jul 30, 2023 •

edited

Loading

Uh oh!

jimklimov commented Jul 30, 2023

Uh oh!

jimklimov commented Jul 30, 2023

Uh oh!

jimklimov commented Apr 15, 2024 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

jimklimov commented Jul 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jimklimov commented Jul 30, 2023

Uh oh!

jimklimov commented Jul 30, 2023

Uh oh!

jimklimov commented Apr 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jimklimov commented Jul 30, 2023 •

edited

Loading

jimklimov commented Apr 15, 2024 •

edited

Loading