From f623a3fdbb656a3ddecce81fd577ba6b39356e59 Mon Sep 17 00:00:00 2001 From: codex Date: Sat, 7 Nov 2026 19:56:33 +0800 Subject: [PATCH] feat(user): add standalone language switcher --- web/public/cloud/client.css | 20 ++++++++++------- web/resources/user-copy/manifest.php | 2 +- web/resources/views/venix/layout_assets.tpl | 2 +- .../views/venix/user/panel_topbar.tpl | 13 +++++++---- web/tests/CloudAssetVersionContractTest.php | 2 +- web/tests/UserAnnouncementDrawerViewTest.php | 22 +++++++++++++++++-- 6 files changed, 44 insertions(+), 17 deletions(-) diff --git a/web/public/cloud/client.css b/web/public/cloud/client.css index 3da58b3c..741773db 100644 --- a/web/public/cloud/client.css +++ b/web/public/cloud/client.css @@ -70,17 +70,21 @@ html.panel-user-dialog-open { overflow: hidden; overscroll-behavior: none; } /* Announcements share the user shell without loading administrator styles. */ .panel-announcements-close.button { flex: 0 0 44px; width: 44px; height: 44px; min-height: 44px; padding: 0; font-size: 22px; } .panel-announcements-trigger.button, -.panel-task-trigger.button { position: relative; flex: 0 0 30px; width: 30px; height: 30px; min-height: 30px; padding: 0; border: 0; border-radius: 50%; background: transparent; box-shadow: none; color: #597386; font-size: 18px; line-height: 1; } +.panel-task-trigger.button, +.panel-language-trigger.button { position: relative; flex: 0 0 30px; width: 30px; height: 30px; min-height: 30px; padding: 0; border: 0; border-radius: 50%; background: transparent; box-shadow: none; color: #597386; font-size: 18px; line-height: 1; } .panel-announcements-trigger.button:not(:disabled):hover, -.panel-task-trigger.button:not(:disabled):hover { background: #e9f8f7; color: #118e9a; transform: none; } +.panel-task-trigger.button:not(:disabled):hover, +.panel-language-trigger.button:hover { background: #e9f8f7; color: #118e9a; transform: none; } .panel-announcements-trigger.button:focus-visible, -.panel-task-trigger.button:focus-visible { outline: 2px solid #16a6ad; outline-offset: 2px; } +.panel-task-trigger.button:focus-visible, +.panel-language-trigger.button:focus-visible { outline: 2px solid #16a6ad; outline-offset: 2px; } .panel-task-badge { position: absolute; top: -5px; right: -7px; min-width: 17px; height: 17px; padding: 0 4px; border: 2px solid #fff; border-radius: 9px; background: #d14a59; color: #fff; font-size: 9px; font-weight: 800; line-height: 13px; text-align: center; } .panel-task-badge[hidden] { display: none; } @media (pointer: coarse) { /* Keep the icon as compact as the avatar; only the invisible hit area grows. */ .panel-announcements-trigger.button::after { content: ""; position: absolute; inset: -7px; border-radius: 50%; } .panel-task-trigger.button::after { content: ""; position: absolute; inset: -7px; border-radius: 50%; } + .panel-language-trigger.button::after { content: ""; position: absolute; inset: -7px; border-radius: 50%; } /* Touch opens the drawer programmatically and should not leave a focus ring around the close icon. Keyboard focus on desktop keeps its normal cue. */ .panel-announcements-close.button:focus, @@ -197,11 +201,11 @@ html.panel-task-open .panel-sidebar { transform: translate3d(0, calc(0px - var(- .panel-user-menu-options button:hover, .panel-user-menu-options button:focus-visible { background: #edf6f6; color: #117f88; outline: none; } .panel-user-menu-options button i { width: 18px; color: #2b9da5; font-size: 17px; text-align: center; } -.panel-user-menu-language { display: grid; grid-template-columns: repeat(2,minmax(0,1fr)); gap: 4px; margin-top: 3px; padding-top: 7px; border-top: 1px solid #e6edf1; } -.panel-user-menu-language a { display: grid; min-height: 32px; place-items: center; border-radius: 7px; color: #6f8190; font-size: 11px; font-weight: 800; text-decoration: none; } -.panel-user-menu-language a:hover, -.panel-user-menu-language a:focus-visible { background: #edf6f6; color: #117f88; outline: none; } -.panel-user-menu-language a[aria-current="true"] { background: #def4f2; color: #0d858e; } +.panel-language-menu-options { position: absolute; top: calc(100% + 7px); right: 0; display: grid; gap: 3px; min-width: 148px; padding: 7px; border: 1px solid #dce7ed; border-radius: 10px; background: #fff; box-shadow: 0 14px 34px rgba(17,42,59,.15); } +.panel-language-menu-options a { display: flex; align-items: center; min-height: 38px; padding: 8px 11px; border-radius: 7px; color: #536b7e; font-size: 12px; font-weight: 700; text-decoration: none; } +.panel-language-menu-options a:hover, +.panel-language-menu-options a:focus-visible { background: #edf6f6; color: #117f88; outline: none; } +.panel-language-menu-options a[aria-current="true"] { background: #def4f2; color: #0d858e; } html.panel-account-open { overflow: hidden; overscroll-behavior: none; scroll-behavior: auto !important; } html.panel-account-open body { position: fixed; top: var(--panel-account-scroll-top, 0px); left: 0; right: 0; width: 100%; overflow: hidden; } .panel-account-drawer { position: fixed; inset: 0 0 0 auto; display: none; width: min(540px, 100%); max-width: 100%; height: 100vh; height: 100dvh; max-height: none; margin: 0; padding: 0; border: 0; border-radius: 0; background: #f4f7fb; color: #25384e; box-shadow: -14px 0 52px rgba(19,42,65,.18); overflow: hidden; } diff --git a/web/resources/user-copy/manifest.php b/web/resources/user-copy/manifest.php index ce12fa2f..2d72880d 100644 --- a/web/resources/user-copy/manifest.php +++ b/web/resources/user-copy/manifest.php @@ -118,7 +118,7 @@ return [ $common('common.shell.account.promotion.description', '分享邀请链接并查看推广返利', 'description'), $common('common.shell.language.aria', '选择语言', 'aria_label'), $common('common.shell.language.chinese', '简体中文', 'label'), - $common('common.shell.language.english', '英语', 'label'), + $common('common.shell.language.english', 'English', 'label'), $common('common.shell.powered_by', '由 libvirt 提供虚拟化支持', 'description'), $common('common.theme.light', '亮色', 'label'), $common('common.theme.dark', '暗色', 'label'), diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index a834fef5..6af36300 100644 --- a/web/resources/views/venix/layout_assets.tpl +++ b/web/resources/views/venix/layout_assets.tpl @@ -1,2 +1,2 @@ {* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *} -{assign var=venix_asset_version value='2026110711' scope='global'} +{assign var=venix_asset_version value='2026110712' scope='global'} diff --git a/web/resources/views/venix/user/panel_topbar.tpl b/web/resources/views/venix/user/panel_topbar.tpl index e34d834e..f6a909a1 100644 --- a/web/resources/views/venix/user/panel_topbar.tpl +++ b/web/resources/views/venix/user/panel_topbar.tpl @@ -7,6 +7,15 @@ {/if} +
+ + +
{if $panel_cloud_mode} diff --git a/web/tests/CloudAssetVersionContractTest.php b/web/tests/CloudAssetVersionContractTest.php index eb1cafa3..20e814a5 100644 --- a/web/tests/CloudAssetVersionContractTest.php +++ b/web/tests/CloudAssetVersionContractTest.php @@ -15,7 +15,7 @@ $assert = static function (bool $condition, string $message): void { }; $assert(is_string($assets) - && str_contains($assets, "venix_asset_version value='2026110711'") + && str_contains($assets, "venix_asset_version value='2026110712'") && is_string($cloudShell) && str_contains($cloudShell, '/cloud/app.js?v={$venix_asset_version}'), 'The cloud application entry must use the shared Venix asset version.'); diff --git a/web/tests/UserAnnouncementDrawerViewTest.php b/web/tests/UserAnnouncementDrawerViewTest.php index e4dbbd0d..68505f7d 100644 --- a/web/tests/UserAnnouncementDrawerViewTest.php +++ b/web/tests/UserAnnouncementDrawerViewTest.php @@ -81,6 +81,24 @@ foreach (['account' => $accountHtml, 'cloud' => $cloudHtml] as $mode => $html) { $assert($xpath->query('//script[contains(@src,"/cloud/announcements.js?")]')->length === 1, $mode . ': shared module must load once.'); $assert($xpath->query('//header[contains(@class,"panel-topbar")]//button[@data-announcements-open]')->length === 1, $mode . ': global topbar announcement trigger missing.'); + $announcementTrigger = $xpath->query('//header[contains(@class,"panel-topbar")]//button[@data-announcements-open]')->item(0); + $languageMenu = $xpath->query('//header[contains(@class,"panel-topbar")]//details[contains(concat(" ",normalize-space(@class)," ")," panel-language-menu ")]'); + $accountMenu = $xpath->query('//header[contains(@class,"panel-topbar")]//details[contains(concat(" ",normalize-space(@class)," ")," panel-user-menu ") and not(contains(concat(" ",normalize-space(@class)," ")," panel-language-menu "))]'); + $assert($languageMenu->length === 1 && $accountMenu->length === 1, + $mode . ': language and account menus must be separate topbar controls.'); + $assert($announcementTrigger !== null + && $announcementTrigger->compareDocumentPosition($languageMenu->item(0)) === DOMNode::DOCUMENT_POSITION_FOLLOWING + && $languageMenu->item(0)->compareDocumentPosition($accountMenu->item(0)) === DOMNode::DOCUMENT_POSITION_FOLLOWING, + $mode . ': language menu must sit between announcements and account controls.'); + $assert($xpath->query('.//summary[contains(concat(" ",normalize-space(@class)," ")," panel-language-trigger ") and @aria-haspopup="menu"]', $languageMenu->item(0))->length === 1, + $mode . ': language icon trigger accessibility contract missing.'); + $assert($xpath->query('.//*[@role="menu"]/*[@role="menuitem" and @lang="zh-CN" and @hreflang="zh-CN"]', $languageMenu->item(0))->length === 1 + && $xpath->query('.//*[@role="menu"]/*[@role="menuitem" and @lang="en" and @hreflang="en"]', $languageMenu->item(0))->length === 1, + $mode . ': language dropdown must retain Chinese and English links.'); + $assert($xpath->query('.//*[@role="menu"]/*[@lang="en" and normalize-space(.)="English"]', $languageMenu->item(0))->length === 1, + $mode . ': English language option must be written in English.'); + $assert($xpath->query('.//*[contains(concat(" ",normalize-space(@class)," ")," panel-user-menu-language ")]', $accountMenu->item(0))->length === 0, + $mode . ': account menu still contains the retired language selector.'); $assert($xpath->query('//button[@data-announcements-open and @aria-controls="panel-announcements-drawer" and @aria-haspopup="dialog"]')->length === 1, $mode . ': trigger accessibility contract missing.'); $assert($xpath->query('//a[@href="/user/announcement"]')->length === 0, $mode . ': retired announcement navigation remains.'); @@ -130,8 +148,8 @@ foreach (['旧内容', '正在刷新', '正在读取最新公告', '正在加载 $assert(!str_contains($script, $retiredMessage), 'Retired announcement status message remains: ' . $retiredMessage); } $css = file_get_contents(dirname(__DIR__) . '/public/cloud/client.css'); -$assert(preg_match('/\.panel-announcements-trigger\.button,\s*\.panel-task-trigger\.button \{[^}]*width: 30px;[^}]*height: 30px;[^}]*background: transparent;/', $css) === 1, - 'The topbar announcement trigger must match the 30px avatar without a large button background.'); +$assert(preg_match('/\.panel-announcements-trigger\.button,\s*\.panel-task-trigger\.button,\s*\.panel-language-trigger\.button \{[^}]*width: 30px;[^}]*height: 30px;[^}]*background: transparent;/', $css) === 1, + 'Topbar icon triggers must match the 30px avatar without a large button background.'); $assert(preg_match('/\.panel-announcements-close\.button \{[^}]*width: 44px;[^}]*height: 44px;/', $css) === 1, 'The drawer close control must retain its 44px touch size.'); $assert(str_contains($css, '.panel-announcements-close.button:focus')