Skip to content
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.

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

Asciidoc bootstrap - dual targeting #41

Open
wants to merge 51 commits into
base: master
Choose a base branch
from

Conversation

jimklimov
Copy link
Member

@jimklimov jimklimov commented Jul 30, 2023

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          

aquette and others added 30 commits March 13, 2023 18:19
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>
Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>
Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>
Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>
Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>
Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>
Signed-off-by: Arnaud Quette <Arnaud.Quette@free.fr>
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>
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>
…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>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…/else/endif

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
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>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
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
Copy link
Member Author

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

@jimklimov
Copy link
Member Author

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
Copy link
Member Author

jimklimov commented Apr 15, 2024

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?

@jimklimov jimklimov added the bootstrap-rendering New NUT website design based on bootstrap (2023+) label Apr 15, 2024
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov added this to In Progress in NUT Website Bootstrap design Apr 15, 2024
…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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bootstrap-rendering New NUT website design based on bootstrap (2023+) enhancement
Projects
Development

Successfully merging this pull request may close these issues.

Apply the asciidoc + bootstrap approach used with 42ity.org
2 participants