Skip to content

Commit

Permalink
feat: reword wizard using GitHub Copilot
Browse files Browse the repository at this point in the history
Use AI suggestions to improve wording.

Drop unused (old) HTML templates.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
  • Loading branch information
smira committed Sep 3, 2024
1 parent fe9134a commit d98b007
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 222 deletions.
16 changes: 8 additions & 8 deletions internal/frontend/http/templates/common.html
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ <h1 class="mb-4 mt-2 text-2xl font-bold">{{ . }}</h1>

{{ define "arch-description" }}
{{ if eq .Arch "amd64" }}
Intel, AMD CPUs. Also known as x86_64, if unsure, use this option.
{{ end }}
{{ if eq .Arch "arm64" }}
{{ if eq .Target "metal" }}
Ampere Computing and other arm64 CPUs. For Single Board Computers use 'SBC' option on the first screen. For AWS and GCP arm64 VMs use Cloud images.
{{ else }}
Various ARM64 manufacturers, also known as aarch64.
Compatible with Intel and AMD CPUs, also referred to as x86_64. If unsure, select this option.
{{ end }}
{{ if eq .Arch "arm64" }}
{{ if eq .Target "metal" }}
Suitable for Ampere Computing and other arm64 CPUs. For Single Board Computers, choose the 'SBC' option on the first screen. For AWS and GCP arm64 VMs, use Cloud images.
{{ else }}
Compatible with various ARM64 manufacturers, also known as aarch64.
{{ end }}
{{ end }}
{{ end }}
{{ end }}
6 changes: 2 additions & 4 deletions internal/frontend/http/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
<div class="prose dark:prose-invert mt-4">
<h1>Talos Linux Image Factory</h1>
<p>
Talos Linux Image Factory by <a href="https://siderolabs.com/">Sidero Labs, Inc.</a> provides a way
to download various boot assets for <a href="https://talos.dev/">Talos Linux</a>.
The Talos Linux Image Factory, developed by <a href="https://siderolabs.com/">Sidero Labs, Inc.</a>, offers a method to download various boot assets for <a href="https://talos.dev/">Talos Linux</a>.
</p>
<p>
To learn more about the API of the Image Factory and available image formats, please visit <a
href="https://github.com/siderolabs/image-factory">the GitHub repository</a>.
For more information about the Image Factory API and the available image formats, please visit <a href="https://github.com/siderolabs/image-factory">the GitHub repository</a>.
</p>
<p class="tracking-tight text-gray-500 text-xs dark:text-gray-400">
Version: {{ .Version }}
Expand Down
58 changes: 0 additions & 58 deletions internal/frontend/http/templates/schematic-config.html

This file was deleted.

124 changes: 0 additions & 124 deletions internal/frontend/http/templates/schematic.html

This file was deleted.

2 changes: 1 addition & 1 deletion internal/frontend/http/templates/wizard-arch.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<span class="ms-3 text-sm font-medium text-gray-900 dark:text-gray-300">SecureBoot</span>
</label>
<div class="ms-2 text-sm">
<p class="text-xs font-normal text-gray-500 dark:text-gray-300">Generate <a class="text-blue-600 dark:text-blue-500 underline" target="_blank" href="https://www.talos.dev/{{ short_version .Version }}/talos-guides/install/bare-metal-platforms/secureboot/">SecureBoot</a> image signed by the Sidero Labs official signing key. Requires UEFI boot and pre-configured hardware.</p>
<p class="text-xs font-normal text-gray-500 dark:text-gray-300">Create a <a class="text-blue-600 dark:text-blue-500 underline" target="_blank" href="https://www.talos.dev/{{ short_version .Version }}/talos-guides/install/bare-metal-platforms/secureboot/">SecureBoot</a> image signed with the official Sidero Labs signing key. This requires UEFI boot and pre-configured hardware.</p>
</div>
</div>
{{ end }}
Expand Down
15 changes: 6 additions & 9 deletions internal/frontend/http/templates/wizard-cmdline.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,16 @@

<div class="ms-2 prose dark:prose-invert prose-sm">
<p>
This step allows to customize the default <a target="_blank" href="https://www.talos.dev/{{ short_version .Version }}/reference/kernel/">kernel command line arguments</a>.
This step allows you to customize the default <a target="_blank" href="https://www.talos.dev/{{ short_version .Version }}/reference/kernel/">kernel command line arguments</a>.
</p>
<p>
The syntax accepted is the same as the kernel command line syntax, e.g. <code>console=ttyS0,115200</code>, but prefixing the argument with <code>-</code> removes the argument from the default command line (e.g. <code>-console</code>).
The syntax accepted is the same as the kernel command line syntax, e.g., <code>console=ttyS0,115200</code>. Prefixing an argument with <code>-</code> removes it from the default command line (e.g., <code>-console</code>).
</p>
{{ if eq .SecureBoot "true" }}
<p>With SecureBoot, the kernel command line is signed and cannot be modified, so this is the only opportunity to customize it.</p>
{{ else }}
<p>
Please note, that the kernel command line customization is only accepted for the initial boot images (ISO, PXE, disk image), and
ignored for <code>installer</code> images. For the upgrade/install command line customization, use the <code>machine.install.extraKernelArgs</code> machine
configuration field.
Please note that kernel command line customization is only accepted for the initial boot images (ISO, PXE, disk image) and is ignored for <code>installer</code> images. For upgrade/install command line customization, use the <code>machine.install.extraKernelArgs</code> machine configuration field.
</p>
{{ end }}
<p>
Expand All @@ -47,14 +45,13 @@

<div class="ms-2 prose dark:prose-invert prose-sm">
<p>
This step allows to customize the overlay options for <a target="_blank" href="https://github.com/{{ .BoardMeta.OverlayImage }}">{{ .BoardMeta.OverlayImage }} overlay</a>.
This step allows you to customize the overlay options for the <a target="_blank" href="https://github.com/{{ .BoardMeta.OverlayImage }}">{{ .BoardMeta.OverlayImage }} overlay</a>.
</p>
<p>
The syntax accepted is the YAML (JSON) key-value pairs.
The list of options available is specific to the overlay image used, and can be found in the overlay image documentation.
The accepted syntax is YAML (JSON) key-value pairs. The available options are specific to the overlay image and can be found in its documentation.
</p>
<p>
Skip this step if unsure.
If unsure, you can skip this step.
</p>
</div>
{{ end }}
Expand Down
4 changes: 2 additions & 2 deletions internal/frontend/http/templates/wizard-extensions.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<div class="mb-6 max-h-[500px] flex flex-col">
<div class="ms-2 text-sm">
<p class="text-xs font-normal text-gray-500 dark:text-gray-300">
<a class="text-blue-600 dark:text-blue-500 underline" target="_blank" href="https://github.com/siderolabs/extensions">System Extensions</a> extend the Talos Linux base image with additional feature: extra drivers, hardware firmware, container runtimes, guest agents, etc.
<a class="text-blue-600 dark:text-blue-500 underline" target="_blank" href="https://github.com/siderolabs/extensions">System Extensions</a> enhance the Talos Linux base image with additional features such as extra drivers, hardware firmware, container runtimes, guest agents, and more.
<br>
Pick the extensions that are required for your environment, skip this step if unsure.
Select the extensions needed for your environment. If unsure, you can skip this step.
</p>
</div>

Expand Down
20 changes: 10 additions & 10 deletions internal/frontend/http/templates/wizard-final.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<div class="mb-6 prose prose-sm dark:prose-invert max-w-none">
<h2>First Boot</h2>
{{ if eq .Target "metal" }}
<p>There are several options for the initial boot of Talos Linux on bare-metal machine (or generic virtual machine):</p>
<p>Here are the options for the initial boot of Talos Linux on a bare-metal machine or a generic virtual machine:</p>
{{ else if eq .Target "cloud" }}
<p>Options for the initial boot of Talos Linux on {{ .PlatformMeta.Label }}:</p>
<p>Here are the options for the initial boot of Talos Linux on {{ .PlatformMeta.Label }}:</p>
{{ else if eq .Target "sbc" }}
<p>Use the following disk image for {{ .BoardMeta.Label }}:</p>
<p>Use the following disk image for {{ .BoardMeta.Label }}:</p>
{{ end }}
<dl>
{{ if eq .Target "metal" }}
Expand Down Expand Up @@ -42,16 +42,16 @@ <h2>First Boot</h2>
</dl>

{{ if or (eq .Target "metal") (and (eq .Target "cloud") .PlatformMeta.NotOnlyDiskImage) }}
<h2>Initial Install</h2>
<p>
For the initial Talos Linux install (doesn't apply to disk image boot) put the following installer image to the machine configuration:<br>
{{ template "installer-image" . }}
</p>
<h2>Initial Installation</h2>
<p>
For the initial installation of Talos Linux (not applicable for disk image boot), add the following installer image to the machine configuration:<br>
{{ template "installer-image" . }}
</p>
{{ end }}

<h2>Talos Linux Upgrade</h2>
<h2>Upgrading Talos Linux</h2>
<p>
Use the following image to <a href="https://www.talos.dev/{{ short_version .Version }}/talos-guides/upgrading-talos/" target="_blank">upgrade</a> Talos Linux on the machine:<br>
To <a href="https://www.talos.dev/{{ short_version .Version }}/talos-guides/upgrading-talos/" target="_blank">upgrade</a> Talos Linux on the machine, use the following image:<br>
{{ template "installer-image" . }}
</p>

Expand Down
6 changes: 3 additions & 3 deletions internal/frontend/http/templates/wizard-start.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{{ define "wizard-start" }}
{{ template "header" "Hardware Type" }}
<div class="mb-6">
{{ template "radio-with-description" dict "name" "target" "value" "metal" "current" .SelectedTarget "label" "Bare-metal Machine" "description" "x86-64, arm64 bare-metal machines, generic virtual machines. If unsure, use this option." }}
{{ template "radio-with-description" dict "name" "target" "value" "cloud" "current" .SelectedTarget "label" "Cloud Server" "description" "AWS, GCP, Azure, VMWare, Equinix Metal and others, including homelab clouds like Proxmox." }}
{{ template "radio-with-description" dict "name" "target" "value" "sbc" "current" .SelectedTarget "label" "Single Board Computer" "description" "Raspberry Pi, Pine64, Jetson Nano, etc." }}
{{ template "radio-with-description" dict "name" "target" "value" "metal" "current" .SelectedTarget "label" "Bare-metal Machine" "description" "Suitable for x86-64 and arm64 bare-metal machines, as well as generic virtual machines. If unsure, choose this option." }}
{{ template "radio-with-description" dict "name" "target" "value" "cloud" "current" .SelectedTarget "label" "Cloud Server" "description" "Compatible with AWS, GCP, Azure, VMWare, Equinix Metal, and other platforms, including homelab environments like Proxmox." }}
{{ template "radio-with-description" dict "name" "target" "value" "sbc" "current" .SelectedTarget "label" "Single Board Computer" "description" "Supports Raspberry Pi, Pine64, Jetson Nano, and similar devices." }}
{{ template "next-button" }}
</div>
{{ end }}
Expand Down
6 changes: 3 additions & 3 deletions internal/frontend/http/templates/wizard-versions.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</select>
<div class="mt-6">
<p class="text-xs font-normal text-gray-500 dark:text-gray-300">
It is always recommended to run the latest stable version of Talos Linux ({{ .Versions.LatestStable }}).
<br>
Pre-release versions can be used for testing, but not recommended for production use.
We strongly recommend using the latest stable version of Talos Linux ({{ .Versions.LatestStable }}).
<br>
Pre-release versions are suitable for testing purposes but are not advised for production environments.
</p>
</div>
<div class="mt-6" id="version-doc">
Expand Down

0 comments on commit d98b007

Please sign in to comment.