From e42ad09867f6e17076d0b373b2ebecb803c69b87 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 26 Sep 2026 15:00:42 +0800 Subject: [PATCH] Use bundled AlmaLinux logo in template cards --- README.md | 2 ++ static/almalinux-icon.svg | 25 ++++++++++++++++ static/app.js | 28 ++++++++++++----- static/index.html | 4 +-- static/styles.css | 1 + tests/test_template_frontend.py | 53 +++++++++++++++++++++++++++++++++ 6 files changed, 103 insertions(+), 10 deletions(-) create mode 100644 static/almalinux-icon.svg diff --git a/README.md b/README.md index df50e574..e05b6663 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,8 @@ SELECT id, username, email FROM users WHERE id = 1; ## 公网云镜像模板创建(无需手动安装) +创建与重装页面的 AlmaLinux 标识使用随项目保存的[官方圆形图标 SVG](https://almalinux.org/branding/AlmaLinux%20Icon%20Circle.svg),页面运行时不会从外网加载图标。该标识仅用于识别系统镜像;本面板并非 AlmaLinux OS Foundation 官方产品。 + 面板的“创建虚拟机”有独立的“公网云镜像”方式。先在宿主机设置中选择已工作的 Linux 网桥,例如 `bridge:br0`。只有管理员可进入侧栏的“云镜像模板”页面,填写 [AlmaLinux 官方 Generic Cloud qcow2 镜像](https://wiki.almalinux.org/cloud/Generic-cloud)在 `https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/` 或 `https://repo.almalinux.org/almalinux/10/cloud/x86_64/images/` 下的下载地址、发布方 SHA-256 和模板显示名;已保存的显示名也可在该页修改。地址必须是官方 HTTPS 直链,面板不会跟随重定向。面板服务器 A 需要能访问该地址。导入在后台运行,一次只允许一个任务,面板下载、校验 SHA-256 后通过当前 libvirt SSH 连接把模板镜像上传到 B 的磁盘池;无需登录 B 手工复制。模板目录记录加密保存在 MariaDB,绑定当前宿主机身份和磁盘池。改名不会改动镜像文件、模板 ID 或已经创建的虚拟机的系统名称记录,只影响后续创建和重装时的显示。普通用户只能在创建或重装页面从已导入的镜像卡片中选择具体版本,不能导入或改名。不要在导入期间关闭面板进程;若进程异常退出,运行中的导入任务记录不会恢复,可能需要检查项目 `data/` 中的 `.cloud-image-*` 临时文件和 B 磁盘池中 `panel-template-*` 卷,不要未经核对就删除。 选择镜像卡片并展开版本后,填写 VM 资源和 root 登录方式。宿主机公网地址池支持实际获配的 `/24` 至 `/30` 前缀。例如服务商分配 `123.123.123.112/28`、宿主机网关为 `123.123.123.113` 时,在宿主机设置填写该 `/28` 网段(填写 `123.123.123.113/28` 也会规范化为 `123.123.123.112/28`),网关填 `123.123.123.113`,DNS 按服务商要求填写。自动分配只考虑此 `/28` 的有效主机地址;扣除网关后是 `123.123.123.114` 至 `123.123.123.126`,还会跳过保留、已用及池内 DNS 地址。**不要填写 `123.123.123.114/24` 或 `123.123.123.0/24`,除非服务商确实分配了整个 `/24`。**设置页会预览输入前缀换算出的实际网段和主机地址范围。 diff --git a/static/almalinux-icon.svg b/static/almalinux-icon.svg new file mode 100644 index 00000000..2d3719fb --- /dev/null +++ b/static/almalinux-icon.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/static/app.js b/static/app.js index 74ad2891..7b6d2347 100644 --- a/static/app.js +++ b/static/app.js @@ -1932,6 +1932,20 @@ function templateSystem(item) { return { family, version }; } +function templateIcon(family, className) { + const icon = makeElement("span", `${className}${family === "AlmaLinux" ? " alma" : ""}`); + icon.setAttribute("aria-hidden", "true"); + if (family === "AlmaLinux") { + const logo = makeElement("img", "template-almalinux-logo"); + logo.src = "/static/almalinux-icon.svg"; + logo.alt = ""; + icon.append(logo); + } else { + icon.textContent = "◈"; + } + return icon; +} + function renderTemplateCatalog(inputId) { const input = byId(inputId); const container = byId(inputId === "vm-template" ? "vm-template-catalog" : "reinstall-template-catalog"); @@ -1959,21 +1973,20 @@ function renderTemplateCatalog(inputId) { card.dataset.family = family; card.open = opened.has(family) || entries.some(({ item }) => String(item.id) === input.value); const summary = makeElement("summary", "template-family-summary"); - const icon = makeElement("span", family === "AlmaLinux" ? "template-family-icon alma" : "template-family-icon", family === "AlmaLinux" ? "A" : "◈"); - icon.setAttribute("aria-hidden", "true"); + const icon = templateIcon(family, "template-family-icon"); summary.append(icon, makeElement("strong", "", family), makeElement("span", "template-family-arrow", "⌄")); const versions = makeElement("div", "template-versions"); versions.setAttribute("role", "group"); versions.setAttribute("aria-label", `${family} 可用版本`); - for (const { item, version } of entries) { + for (const { item } of entries) { const id = String(item.id); - const versionLabel = version ? `${family} ${version}` : "版本未标注"; + const name = String(item.name || id); const option = makeElement("button", "template-version-option"); option.type = "button"; option.dataset.templateId = id; option.setAttribute("aria-pressed", String(input.value === id)); - option.setAttribute("aria-label", `选择 ${versionLabel},${String(item.name || id)}`); - option.append(makeElement("strong", "", versionLabel), makeElement("small", "", String(item.name || id))); + option.setAttribute("aria-label", `选择模板 ${name}`); + option.append(makeElement("strong", "", name)); option.addEventListener("click", () => { input.value = id; container.querySelectorAll(".template-version-option").forEach((button) => { @@ -2004,8 +2017,7 @@ function renderTemplateAdminList() { const { family, version } = templateSystem(item); const row = makeElement("form", "template-admin-row"); const heading = makeElement("div", "template-admin-row-heading"); - const icon = makeElement("span", "template-admin-icon", family === "AlmaLinux" ? "A" : "◈"); - icon.setAttribute("aria-hidden", "true"); + const icon = templateIcon(family, "template-admin-icon"); heading.append(icon, makeElement("strong", "", `${family}${version ? ` ${version}` : ""}`)); const label = makeElement("label", "", "模板名称"); const name = makeElement("input", ""); diff --git a/static/index.html b/static/index.html index 7d6207e2..d41d612c 100644 --- a/static/index.html +++ b/static/index.html @@ -5,8 +5,8 @@ VirtPilot · 虚拟机管理 - - + +
diff --git a/static/styles.css b/static/styles.css index 3e586718..e2cd364b 100644 --- a/static/styles.css +++ b/static/styles.css @@ -143,6 +143,7 @@ tbody tr:hover{background:#fcfefe} .form-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:18px 17px}.field.full{grid-column:1/-1}.field label{display:block}.field label span{color:#dc5965}.field small{display:block;color:#a1adbb;font-size:10px;margin-top:7px;line-height:1.5}.field select{appearance:none;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='14' height='14' viewBox='0 0 24 24' fill='none' stroke='%2393a1ae' stroke-width='2'%3E%3Cpath d='m6 9 6 6 6-6'/%3E%3C/svg%3E");background-repeat:no-repeat;background-position:right 12px center;padding-right:35px} .create-source-picker{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:12px;border:0;padding:0;margin:0 0 23px;min-width:0}.create-source-picker legend{color:#34445a;font-size:13px;font-weight:700;padding:0;margin-bottom:10px}.create-source-picker label{position:relative;display:block;cursor:pointer}.create-source-picker input{position:absolute;opacity:0;width:1px;height:1px}.create-source-picker label span{display:block;border:1px solid #dce4eb;border-radius:9px;padding:12px 14px;min-height:65px;background:#fff}.create-source-picker input:checked+span{border-color:#3bb5bc;background:#effafa;box-shadow:0 0 0 2px rgba(20,166,175,.08)}.create-source-picker input:focus-visible+span{outline:3px solid rgba(18,166,176,.22);outline-offset:2px}.create-source-picker strong{display:block;color:#334a5f;font-size:12px}.create-source-picker small{display:block;color:#8999a8;font-size:10px;margin-top:5px} .template-field-label{display:block;color:#34445a;font-size:13px;font-weight:700;margin-bottom:10px}.template-field-label span{color:#dc5965}.template-catalog{display:grid;grid-template-columns:repeat(auto-fill,minmax(210px,1fr));gap:14px}.template-catalog-empty{grid-column:1/-1;margin:0;padding:17px;border:1px dashed #cbdbe3;border-radius:10px;background:#f8fbfc;color:#698094;font-size:12px}.template-family-card{min-width:0;border:1px solid #dce7ec;border-radius:12px;background:#fff;overflow:hidden}.template-family-card[open]{border-color:#46b6ba;box-shadow:0 0 0 2px rgba(20,166,175,.07)}.template-family-summary{display:flex;align-items:center;flex-direction:column;gap:9px;min-height:153px;padding:20px 13px 13px;cursor:pointer;text-align:center;list-style:none}.template-family-summary::-webkit-details-marker{display:none}.template-family-summary:focus-visible{outline:3px solid rgba(18,166,176,.22);outline-offset:-3px}.template-family-summary strong{color:#30465a;font-size:13px}.template-family-icon{display:flex;align-items:center;justify-content:center;width:65px;height:65px;border-radius:17px;background:linear-gradient(145deg,#2a6385,#173d58);color:#fff;font-size:31px;font-weight:800;box-shadow:0 6px 16px rgba(24,68,90,.15)}.template-family-icon.alma{background:conic-gradient(from 35deg,#32bac4 0 28%,#5277cb 28% 51%,#e7ad54 51% 72%,#3ea67b 72% 100%);border:5px solid #f5faf9;color:#fff;text-shadow:0 1px 4px rgba(8,45,65,.35)}.template-family-arrow{color:#258f9b;font-size:20px;line-height:1;transition:transform .2s}.template-family-card[open] .template-family-arrow{transform:rotate(180deg)}.template-versions{display:grid;gap:7px;padding:12px;border-top:1px solid #e7edf2;background:#fbfdfd}.template-version-option{width:100%;display:grid;gap:3px;padding:11px 12px;border:1px solid #dee8ed;border-radius:8px;background:#fff;text-align:left;color:#344e60}.template-version-option strong{font-size:12px}.template-version-option small{margin:0;color:#899cac;font-size:10px;overflow-wrap:anywhere}.template-version-option[aria-pressed="true"]{border-color:#35afb7;background:#eaf8f8;box-shadow:0 0 0 2px rgba(20,166,175,.09)}.template-version-option:hover{border-color:#48b6bd}.template-admin-grid{display:grid;grid-template-columns:minmax(0,.9fr) minmax(0,1.1fr);align-items:start;gap:19px}.template-admin-grid .host-card{min-width:0}.template-admin-grid .form-stack .button{align-self:flex-start}.template-field-help{display:block;margin:-16px 0 19px;color:#8b9bab;font-size:11px;line-height:1.55}.template-import-status{margin:0 0 14px;padding:10px 12px;border-radius:8px;background:#edf8f8;color:#317c85;font-size:11px;line-height:1.6}.template-admin-list{display:grid;gap:10px}.template-admin-list>.muted{margin:0}.template-admin-row{display:grid;grid-template-columns:minmax(0,1fr) auto;gap:9px 11px;align-items:end;padding:14px;border:1px solid #e0e9ee;border-radius:10px;background:#fbfdfd}.template-admin-row-heading{grid-column:1/-1;display:flex;align-items:center;gap:9px;margin-bottom:3px;color:#34495c;font-size:12px}.template-admin-icon{display:flex;align-items:center;justify-content:center;width:27px;height:27px;border-radius:7px;background:#e3f6f3;color:#138d8f;font-weight:800}.template-admin-row label{grid-column:1/-1;margin:0;color:#75899b;font-size:11px;font-weight:700}.template-admin-row input{width:100%;min-width:0;height:37px;padding:0 10px;border:1px solid #dce4eb;border-radius:7px;background:#fff;color:#20364a;font-size:12px}.template-admin-row .button{min-height:37px}.template-admin-row .form-error{grid-column:1/-1;margin:0} +.template-family-icon.alma,.template-admin-icon.alma{background:transparent;border:0;box-shadow:none;color:inherit;text-shadow:none}.template-almalinux-logo{display:block;width:100%;height:100%;object-fit:contain}.template-version-option{display:flex;align-items:center;justify-content:center;text-align:center}.template-version-option strong{overflow-wrap:anywhere} .cloud-fields{grid-column:1/-1;border-top:1px solid #e7edf2;padding-top:18px}.cloud-fields-heading{margin-bottom:17px}.cloud-fields-heading strong{display:block;color:#34445a;font-size:13px}.cloud-fields-heading small{display:block;color:#8798a7;font-size:10px;line-height:1.6;margin-top:6px} .vm-auto-public-pool{display:grid;gap:5px;margin:0 0 18px;padding:13px 15px;border:1px solid #cce9e0;border-radius:9px;background:#f0fbf8}.vm-auto-public-pool strong{font-size:12px;color:#217d6e}.vm-auto-public-pool span{font-size:11px;line-height:1.6;color:#5b837a}.vm-cloud-auth-fields{margin-top:18px} .input-suffix{position:relative}.input-suffix input{padding-right:48px}.input-suffix span{position:absolute;right:13px;top:13px;color:#97a4b2;font-size:12px} diff --git a/tests/test_template_frontend.py b/tests/test_template_frontend.py index a7b42945..e9e4d919 100644 --- a/tests/test_template_frontend.py +++ b/tests/test_template_frontend.py @@ -5,6 +5,7 @@ from __future__ import annotations from dataclasses import dataclass from html.parser import HTMLParser from pathlib import Path +import re import pytest @@ -116,6 +117,58 @@ def test_catalog_renders_expandable_family_and_version_cards() -> None: assert 'input.value = id;' in script +def test_almalinux_cards_use_local_vector_logo_instead_of_letter_placeholder() -> None: + script = (STATIC / "app.js").read_text(encoding="utf-8") + logo = STATIC / "almalinux-icon.svg" + assert logo.is_file() + artwork = logo.read_text(encoding="utf-8") + assert " None: + script = (STATIC / "app.js").read_text(encoding="utf-8") + catalog_code = script.split("function renderTemplateCatalog(inputId) {", 1)[1].split( + "function renderTemplateAdminList() {", 1 + )[0] + option_code = catalog_code.split('const name = String(item.name || id);', 1)[1].split( + 'option.addEventListener("click"', 1 + )[0] + visible_lines = [ + line for line in option_code.splitlines() + if "option.append(" in line or "option.textContent" in line + ] + assert len(visible_lines) == 1 + assert 'makeElement("strong", "", name)' in visible_lines[0] + assert "versionLabel" not in visible_lines[0] + assert 'makeElement("small"' not in visible_lines[0] + + styles = (STATIC / "styles.css").read_text(encoding="utf-8") + version_rules = re.findall(r"\.template-version-option\{([^}]*)\}", styles) + text_align = [ + match.group(1) + for rule in version_rules + for match in re.finditer(r"text-align:([^;}]*)", rule) + ] + assert text_align[-1] == "center" + + def test_admin_only_catalog_navigation_and_rename_control() -> None: script = (STATIC / "app.js").read_text(encoding="utf-8") session_code = script.split("function applySession(session) {", 1)[1].split(