From ef1b007c860eb53f8ed30d70e65ecffbe608df85 Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Jan 08 2022 19:50:13 +0000 Subject: [PATCH 1/4] Sync stg with prod Update logo Add Infra docs & EPEL Add Workstation SIG docs Update WS SIG branch Switch EPEL from master to main use the 'main' branch for commops Add package maintainers support an easy way to add an announcement to the top of every page Update UI with new license info F35 docs New repo for Fedora Websites Add Server WG docs --- diff --git a/site.yml b/site.yml index 7bccdfc..df508ff 100644 --- a/site.yml +++ b/site.yml @@ -14,6 +14,7 @@ content: - url: https://pagure.io/fedora-docs/release-docs-home.git branches: - master + - f35 - f34 - f33 - f32 @@ -26,6 +27,7 @@ content: - url: https://pagure.io/fedora-docs/install-guide.git branches: - master + - f35 - f34 - f33 - f32 @@ -38,6 +40,7 @@ content: - url: https://pagure.io/fedora-docs/system-administrators-guide.git branches: - master + - f35 - f34 - f33 - f32 @@ -50,6 +53,7 @@ content: - url: https://pagure.io/fedora-docs/release-notes.git branches: - master + - f35 - f34 - f33 - f32 @@ -63,6 +67,10 @@ content: - url: https://pagure.io/mentored-projects.git - url: https://pagure.io/fedora-commops.git start_path: docs + branches: main + - url: https://pagure.io/fedora-websites.git + start_path: docs + branches: main - url: https://pagure.io/Fedora-Council/council-docs.git start_path: council branches: main @@ -72,6 +80,7 @@ content: - url: https://pagure.io/Fedora-Council/status_reports.git branches: main - url: https://pagure.io/fedora-docs/modularity.git + - url: https://pagure.io/fedora-docs/package-maintainer-docs.git - url: https://github.com/fedora-silverblue/silverblue-docs.git - url: https://pagure.io/fedora-kde/kinoite-docs branches: main @@ -102,7 +111,6 @@ content: branches: main - url: https://pagure.io/cpe/rawhide-gating-docs.git - url: https://pagure.io/cpe/docs.git - - url: https://pagure.io/fedora-docs/websites.git - url: https://pagure.io/fedora-qa/qa-docs.git - url: https://pagure.io/fedora-pgm/pgm_docs.git branches: main @@ -122,6 +130,14 @@ content: - url: https://pagure.io/fedora-server.git branches: stg start_path: docs + - url: https://pagure.io/fedora-server.git + branches: stg + start_path: wg + - url: https://pagure.io/epel.git + branches: main + - url: https://pagure.io/infra-docs-fpo.git + - url: https://pagure.io/fedora-workstation/workstation-docs.git + branches: main ui: bundle: url: https://asamalik.fedorapeople.org/docs-translations/ui-bundle.zip diff --git a/supplemental-ui/img/docs_logo.png b/supplemental-ui/img/docs_logo.png new file mode 100644 index 0000000..ea87697 Binary files /dev/null and b/supplemental-ui/img/docs_logo.png differ diff --git a/supplemental-ui/layouts/homepage.hbs b/supplemental-ui/layouts/homepage.hbs new file mode 100644 index 0000000..bd2c4d7 --- /dev/null +++ b/supplemental-ui/layouts/homepage.hbs @@ -0,0 +1,59 @@ + + + + + + {{{detag (or page.title 'Untitled')}}}{{#if site.title}} :: {{site.title}}{{/if}} + {{#if page.canonicalUrl}} + + {{/if}} + {{#if page.description}} + + {{/if}} + {{#if page.keywords}} + + {{/if}} + {{#if (or antoraVersion site.antoraVersion)}} + + {{/if}} + +{{> head}} + + +{{> announcement}} +{{> header}} + + + +
+
+ +
+{{#if (eq page.layout '404')}} +
+

The page you're looking for does not exist. It may have been moved.

+
+
+

If you arrived on this page by clicking on a link, please notify the owner of the site that the link is broken. +If you typed the URL of this page manually, please double check that you entered the address correctly.

+
+{{else}} + +{{{page.contents}}} +{{/if}} +
+
+
+ + +{{> footer}} + + diff --git a/supplemental-ui/layouts/with_menu.hbs b/supplemental-ui/layouts/with_menu.hbs new file mode 100644 index 0000000..316c7c6 --- /dev/null +++ b/supplemental-ui/layouts/with_menu.hbs @@ -0,0 +1,28 @@ + + + + + + {{{detag (or page.title 'Untitled')}}}{{#if site.title}} :: {{site.title}}{{/if}} + {{#if page.canonicalUrl}} + + {{/if}} + {{#if page.description}} + + {{/if}} + {{#if page.keywords}} + + {{/if}} + {{#if (or antoraVersion site.antoraVersion)}} + + {{/if}} + +{{> head}} + + +{{> announcement}} +{{> header}} +{{> main}} +{{> footer}} + + diff --git a/supplemental-ui/layouts/without_menu.hbs b/supplemental-ui/layouts/without_menu.hbs new file mode 100644 index 0000000..910fb6c --- /dev/null +++ b/supplemental-ui/layouts/without_menu.hbs @@ -0,0 +1,35 @@ + + + + + + {{{detag (or page.title 'Untitled')}}}{{#if site.title}} :: {{site.title}}{{/if}} + {{#if page.canonicalUrl}} + + {{/if}} + {{#if page.description}} + + {{/if}} + {{#if page.keywords}} + + {{/if}} + {{#if (or antoraVersion site.antoraVersion)}} + + {{/if}} + +{{> head}} + + +{{> announcement}} +{{> header}} +
+ +
+{{> toolbar}} +{{> article}} +
+
+ +{{> footer}} + + diff --git a/supplemental-ui/partials/announcement.hbs b/supplemental-ui/partials/announcement.hbs new file mode 100644 index 0000000..0237325 --- /dev/null +++ b/supplemental-ui/partials/announcement.hbs @@ -0,0 +1 @@ + diff --git a/supplemental-ui/partials/footer-content.hbs b/supplemental-ui/partials/footer-content.hbs new file mode 100644 index 0000000..8488b7b --- /dev/null +++ b/supplemental-ui/partials/footer-content.hbs @@ -0,0 +1,4 @@ + From edc81a48bcc1f9764cf758cae167665d10f62149 Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Jan 08 2022 19:51:03 +0000 Subject: [PATCH 2/4] Upgrade to Antora 3.0.0 & node 16 --- diff --git a/Dockerfile b/Dockerfile index 455cdda..dbc89f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM fedora:34 -RUN dnf -y module install nodejs:14 && \ +RUN dnf -y module install nodejs:16 && \ dnf clean all -RUN npm i -g @antora/cli@2.3 @antora/site-generator-default@2.3 +RUN npm i -g @antora/cli@3.0.0 @antora/site-generator-default@3.0.0 WORKDIR /antora ENTRYPOINT [ "antora" ] diff --git a/build-scripts/Dockerfile b/build-scripts/Dockerfile index 4fa459f..bc1cfea 100644 --- a/build-scripts/Dockerfile +++ b/build-scripts/Dockerfile @@ -1,10 +1,10 @@ FROM fedora:34 -RUN dnf -y module install nodejs:14/default && \ +RUN dnf -y module install nodejs:16/default && \ dnf -y install git python3-yaml && \ dnf clean all -RUN npm i -g @antora/cli@2.3 @antora/site-generator-default@2.3 +RUN npm i -g @antora/cli@3.0.0 @antora/site-generator-default@3.0.0 ADD rebuild-site.py /antora/rebuild-site.py diff --git a/site.yml b/site.yml index df508ff..5e23aef 100644 --- a/site.yml +++ b/site.yml @@ -150,7 +150,7 @@ output: destinations: - provider: archive runtime: - pull: true + fetch: true cache_dir: ./cache asciidoc: extensions: From e9e422459c4185c82d1d9f2fce0177ffcaa88ff5 Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Jan 25 2022 11:56:11 +0000 Subject: [PATCH 3/4] Use fixed antora version for local build --- diff --git a/build.sh b/build.sh index f4ecfe4..07fbd4a 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/sh -image="docker.io/antora/antora" +image="docker.io/antora/antora:3.0.0" cmd="--html-url-extension-style=indexify site.yml" if [ "$(uname)" = "Darwin" ]; then From dc0f9d764ecc856cc6d7ed55a1ad1de8f413308c Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Jan 25 2022 11:56:52 +0000 Subject: [PATCH 4/4] Update ui-bundle to 1.01 --- diff --git a/site.yml b/site.yml index 5e23aef..beaa39d 100644 --- a/site.yml +++ b/site.yml @@ -140,7 +140,7 @@ content: branches: main ui: bundle: - url: https://asamalik.fedorapeople.org/docs-translations/ui-bundle.zip + url: https://releases.pagure.org/fedora-docs/fedora-docs-ui/ui-bundle-1.01.zip snapshot: true default_layout: with_menu supplemental_files: ./supplemental-ui