| @@ -1,32 +1,30 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Desktop Mode admin-bar toggle. | |
| 3 | + * OpenStation admin-bar toggle. | |
| 4 | 4 | * |
| 5 | - * Adds the "Switch to Desktop Mode" button to the admin bar's top-right | |
| 6 | - * area and wires its click handler to the save-desktop-mode AJAX endpoint. | |
| 5 | + * Adds the "Switch to OpenStation" button to the admin bar's top-right | |
| 6 | + * area and wires its click handler to the save-openstation AJAX endpoint. | |
| 7 | 7 | * |
| 8 | - * @package WPDesktopMode | |
| 8 | + * @package OpenStation | |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | defined( 'ABSPATH' ) || exit; |
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | - * Adds the desktop mode toggle to the admin bar. | |
| 14 | + * Adds the OpenStation toggle to the admin bar. | |
| 15 | 15 | * |
| 16 | - * Allows users to switch between classic admin and desktop mode, | |
| 16 | + * Allows users to switch between classic admin and OpenStation, | |
| 17 | 17 | * which renders admin screens in draggable, resizable windows. |
| 18 | 18 | * |
| 19 | - * @since 0.1.0 | |
| 20 | - * | |
| 21 | 19 | * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance. |
| 22 | 20 | */ |
| 23 | -function desktop_mode_admin_bar_toggle( $wp_admin_bar ) { | |
| 21 | +function openstation_admin_bar_toggle( $wp_admin_bar ) { | |
| 24 | 22 | if ( ! is_admin() || ! is_user_logged_in() ) { |
| 25 | 23 | return; |
| 26 | 24 | } |
| 27 | 25 | |
| 28 | - // "Active" means "the user is *currently viewing* desktop mode", | |
| 26 | + // "Active" means "the user is *currently viewing* OpenStation", | |
| 29 | 27 | // not "the preference is enabled in user meta." These diverge on |
| 30 | 28 | // requests carrying the per-request classic override |
| 31 | 29 | // (`?desktop_mode_classic=1`) — the user's meta may be '1' but the |
| 32 | 30 | // page they're looking at right now is classic admin. If we went |
| @@ -31,25 +29,25 @@ | ||
| 31 | 29 | // (`?desktop_mode_classic=1`) — the user's meta may be '1' but the |
| 32 | 30 | // page they're looking at right now is classic admin. If we went |
| 33 | 31 | // by meta alone, the toggle here would read "Switch to Classic |
| 34 | 32 | // Admin" on a page that's already classic, and the user's first |
| 35 | - // click would disable desktop mode entirely (redirecting to | |
| 33 | + // click would disable OpenStation entirely (redirecting to | |
| 36 | 34 | // classic admin) instead of taking them back into the shell. |
| 37 | 35 | // The second click would then re-enable it — a two-click trap. |
| 38 | - $is_active = desktop_mode_is_enabled() && ! desktop_mode_is_classic_request(); | |
| 36 | + $is_active = openstation_is_enabled() && ! openstation_is_classic_request(); | |
| 39 | 37 | $label = $is_active |
| 40 | 38 | ? __( 'Switch to Classic Admin', 'desktop-mode' ) |
| 41 | - : __( 'Switch to Desktop Mode', 'desktop-mode' ); | |
| 39 | + : __( 'Switch to OpenStation', 'desktop-mode' ); | |
| 42 | 40 | |
| 43 | 41 | $wp_admin_bar->add_node( |
| 44 | 42 | array( |
| 45 | 43 | 'parent' => 'top-secondary', |
| 46 | - 'id' => 'desktop-mode-toggle', | |
| 44 | + 'id' => 'os-toggle', | |
| 47 | 45 | 'title' => '<span class="ab-icon dashicons dashicons-desktop" aria-hidden="true"></span>' |
| 48 | 46 | . '<span class="ab-label">' . $label . '</span>', |
| 49 | 47 | 'href' => '#', |
| 50 | 48 | 'meta' => array( |
| 51 | - 'class' => $is_active ? 'desktop-mode-active' : '', | |
| 49 | + 'class' => $is_active ? 'os-active' : '', | |
| 52 | 50 | 'tabindex' => 0, |
| 53 | 51 | 'title' => $label, |
| 54 | 52 | ), |
| 55 | 53 | ) |
| @@ -56,9 +54,9 @@ | ||
| 56 | 54 | ); |
| 57 | 55 | |
| 58 | 56 | // Fullscreen toggle — sits next to "Switch to Classic Admin" so the |
| 59 | 57 | // shell can occupy the whole screen without browser chrome. Only |
| 60 | - // makes sense in desktop mode; kept out of classic where it would | |
| 58 | + // makes sense in OpenStation; kept out of classic where it would | |
| 61 | 59 | // just be a redundant browser-fullscreen shortcut. |
| 62 | 60 | if ( $is_active ) { |
| 63 | 61 | $wp_admin_bar->add_node( |
| 64 | 62 | array( |
| @@ -78,9 +76,9 @@ | ||
| 78 | 76 | // Layout menu — only surfaced when the user is actually viewing |
| 79 | 77 | // the desktop shell (the actions don't make sense in classic |
| 80 | 78 | // admin, which has no windows to arrange). Parent renders as a |
| 81 | 79 | // dashicon with a hover-opened submenu; each child is routed to |
| 82 | - // `wp.desktop.windowManager.*` by the inline JS. | |
| 80 | + // `wp.os.windowManager.*` by the inline JS. | |
| 83 | 81 | // |
| 84 | 82 | // Sits next to Fullscreen so the two shell-state actions group |
| 85 | 83 | // visually. Ask AI, then the help/meta cluster (Keyboard shortcuts |
| 86 | 84 | // + Report a bug) follow, with the help/meta pair anchored to the |
| @@ -104,9 +102,9 @@ | ||
| 104 | 102 | 'id' => 'desktop-layout-cascade', |
| 105 | 103 | 'title' => esc_html__( 'Cascade', 'desktop-mode' ), |
| 106 | 104 | 'href' => '#', |
| 107 | 105 | 'meta' => array( |
| 108 | - 'class' => 'desktop-mode-layout-action', | |
| 106 | + 'class' => 'os-layout-action', | |
| 109 | 107 | 'title' => __( 'Lay all windows out from top-left, offset so every title bar stays visible.', 'desktop-mode' ), |
| 110 | 108 | ), |
| 111 | 109 | ) |
| 112 | 110 | ); |
| @@ -116,9 +114,9 @@ | ||
| 116 | 114 | 'id' => 'desktop-layout-overview', |
| 117 | 115 | 'title' => esc_html__( 'Overview', 'desktop-mode' ), |
| 118 | 116 | 'href' => '#', |
| 119 | 117 | 'meta' => array( |
| 120 | - 'class' => 'desktop-mode-layout-action', | |
| 118 | + 'class' => 'os-layout-action', | |
| 121 | 119 | 'title' => __( 'Zoom out to see every window at once. Click one to focus it.', 'desktop-mode' ), |
| 122 | 120 | ), |
| 123 | 121 | ) |
| 124 | 122 | ); |
| @@ -130,13 +128,13 @@ | ||
| 130 | 128 | $wp_admin_bar->add_node( |
| 131 | 129 | array( |
| 132 | 130 | 'parent' => 'desktop-layout-menu', |
| 133 | 131 | 'id' => 'desktop-layout-snap', |
| 134 | - 'title' => '<span class="desktop-mode-layout-checkbox" aria-hidden="true">☐</span> ' | |
| 132 | + 'title' => '<span class="os-layout-checkbox" aria-hidden="true">☐</span> ' | |
| 135 | 133 | . esc_html__( 'Snap to grid', 'desktop-mode' ), |
| 136 | 134 | 'href' => '#', |
| 137 | 135 | 'meta' => array( |
| 138 | - 'class' => 'desktop-mode-layout-snap', | |
| 136 | + 'class' => 'os-layout-snap', | |
| 139 | 137 | 'title' => __( 'Snap windows to a grid while dragging or resizing.', 'desktop-mode' ), |
| 140 | 138 | ), |
| 141 | 139 | ) |
| 142 | 140 | ); |
| @@ -146,9 +144,9 @@ | ||
| 146 | 144 | 'id' => 'desktop-layout-tile', |
| 147 | 145 | 'title' => esc_html__( 'Tile all windows', 'desktop-mode' ), |
| 148 | 146 | 'href' => '#', |
| 149 | 147 | 'meta' => array( |
| 150 | - 'class' => 'desktop-mode-layout-action', | |
| 148 | + 'class' => 'os-layout-action', | |
| 151 | 149 | 'title' => __( 'Pack every window into an evenly tiled grid that fills the desktop.', 'desktop-mode' ), |
| 152 | 150 | ), |
| 153 | 151 | ) |
| 154 | 152 | ); |
| @@ -157,9 +155,9 @@ | ||
| 157 | 155 | * Filter the list of custom arrange-menu items contributed by |
| 158 | 156 | * plugins. Each entry becomes an additional node under the |
| 159 | 157 | * "Arrange" submenu, rendered with the same styling as the |
| 160 | 158 | * built-in Cascade / Overview / Tile items. Clicking a custom |
| 161 | - * item dispatches the JS action `desktop-mode.arrange.custom-action` | |
| 159 | + * item dispatches the JS action `os.arrange.custom-action` | |
| 162 | 160 | * with payload `{ id }` — plugins subscribe via |
| 163 | 161 | * `wp.hooks.addAction()` and run their own arrangement logic. |
| 164 | 162 | * |
| 165 | 163 | * Each item is an associative array: |
| @@ -172,13 +170,11 @@ | ||
| 172 | 170 | * 10+ to append. |
| 173 | 171 | * |
| 174 | 172 | * Entries with missing/invalid `id` or `title` are dropped. |
| 175 | 173 | * |
| 176 | - * @since 0.6.2 | |
| 177 | - * | |
| 178 | 174 | * @param array $items Existing custom items (default empty). |
| 179 | 175 | */ |
| 180 | - $custom = apply_filters( 'desktop_mode_arrange_menu_items', array() ); | |
| 176 | + $custom = apply_filters( 'openstation_arrange_menu_items', array() ); | |
| 181 | 177 | if ( is_array( $custom ) ) { |
| 182 | 178 | // Stable sort by `position` (default 10 — after built-ins), |
| 183 | 179 | // preserving registration order within a tie. |
| 184 | 180 | $sortable = array(); |
| @@ -222,9 +218,9 @@ | ||
| 222 | 218 | 'id' => 'desktop-layout-custom-' . $item['id'], |
| 223 | 219 | 'title' => esc_html( $item['title'] ), |
| 224 | 220 | 'href' => '#', |
| 225 | 221 | 'meta' => array( |
| 226 | - 'class' => 'desktop-mode-layout-action desktop-mode-layout-custom', | |
| 222 | + 'class' => 'os-layout-action os-layout-custom', | |
| 227 | 223 | 'title' => $item['description'], |
| 228 | 224 | ), |
| 229 | 225 | ) |
| 230 | 226 | ); |
| @@ -231,20 +227,19 @@ | ||
| 231 | 227 | } |
| 232 | 228 | } |
| 233 | 229 | } |
| 234 | 230 | |
| 235 | - | |
| 236 | - // "Keyboard shortcuts" trigger — shown only when desktop mode is | |
| 231 | + // "Keyboard shortcuts" trigger — shown only when OpenStation is | |
| 237 | 232 | // active. Clicking toggles the keyboard-shortcuts popover wired by |
| 238 | 233 | // assets/js/admin-bar.js (wireShortcutsPopover); the popover content |
| 239 | 234 | // is translated server-side and shipped via the `shortcuts` key of |
| 240 | - // the desktopModeAdminBar config blob below. | |
| 235 | + // the openStationAdminBar config blob below. | |
| 241 | 236 | if ( $is_active ) { |
| 242 | 237 | $wp_admin_bar->add_node( |
| 243 | 238 | array( |
| 244 | 239 | 'parent' => 'top-secondary', |
| 245 | 240 | 'id' => 'desktop-help', |
| 246 | - 'title' => '<span class="ab-icon desktop-mode-keyboard-icon" aria-hidden="true"></span>', | |
| 241 | + 'title' => '<span class="ab-icon os-keyboard-icon" aria-hidden="true"></span>', | |
| 247 | 242 | 'href' => '#', |
| 248 | 243 | 'meta' => array( |
| 249 | 244 | 'class' => 'desktop-help-btn', |
| 250 | 245 | 'title' => __( 'Keyboard shortcuts', 'desktop-mode' ), |
| @@ -253,10 +248,10 @@ | ||
| 253 | 248 | ) |
| 254 | 249 | ); |
| 255 | 250 | } |
| 256 | 251 | |
| 257 | - // "Report a bug" trigger — shown only when desktop mode is active. | |
| 258 | - // Clicking dispatches a `desktop-mode-open-bug-report` document | |
| 252 | + // "Report a bug" trigger — shown only when OpenStation is active. | |
| 253 | + // Clicking dispatches a `os-open-bug-report` document | |
| 259 | 254 | // CustomEvent that the shell listens for and answers by opening the |
| 260 | 255 | // Bug Report native window. PHP doesn't know the JS side exists; the |
| 261 | 256 | // event lets us add the button without coupling to any specific |
| 262 | 257 | // shell module. Anchored to the far right of the secondary bar so |
| @@ -278,37 +273,61 @@ | ||
| 278 | 273 | ) |
| 279 | 274 | ); |
| 280 | 275 | } |
| 281 | 276 | } |
| 282 | -add_action( 'admin_bar_menu', 'desktop_mode_admin_bar_toggle', 190 ); | |
| 277 | +add_action( 'admin_bar_menu', 'openstation_admin_bar_toggle', 190 ); | |
| 283 | 278 | |
| 284 | 279 | /** |
| 285 | - * Enqueues the CSS and JS for the desktop mode toggle. | |
| 280 | + * Enqueues the CSS and JS for the OpenStation toggle. | |
| 286 | 281 | * |
| 287 | 282 | * The CSS is inline, attached to the `admin-bar` style handle so it always |
| 288 | 283 | * ships with the admin bar itself — no matter which admin screen is showing. |
| 289 | 284 | * The JS is the external assets/js/admin-bar.js bundle, registered as |
| 290 | - * `desktop-mode-admin-bar` with `admin-bar` as a dependency; its config is | |
| 285 | + * `os-admin-bar` with `admin-bar` as a dependency; its config is | |
| 291 | 286 | * emitted as an inline JSON literal `before` the script. |
| 292 | - * | |
| 293 | - * @since 0.1.0 | |
| 294 | 287 | */ |
| 295 | -function desktop_mode_enqueue_toggle_assets() { | |
| 288 | +function openstation_enqueue_toggle_assets() { | |
| 296 | 289 | if ( ! is_admin() || ! is_user_logged_in() ) { |
| 297 | 290 | return; |
| 298 | 291 | } |
| 299 | 292 | |
| 293 | + // Inside a chromeless window the admin bar is suppressed outright | |
| 294 | + // (`show_admin_bar` + the `wp_admin_bar_render` removal in | |
| 295 | + // helpers.php), so `#wpadminbar` never reaches the DOM. Every byte | |
| 296 | + // below — the toggle bundle, its inline config, the node styling — | |
| 297 | + // would load and run against markup that does not exist. Measured | |
| 298 | + // on a live install: the toggle bundle alone was 17.7 KB, the | |
| 299 | + // largest single asset in the admin-bar family a window loaded for | |
| 300 | + // nothing. See `includes/render/chromeless-trim.php`, which drops | |
| 301 | + // the rest of that family (core's `admin-bar`, host masterbar | |
| 302 | + // extras) for the same reason. | |
| 303 | + if ( openstation_is_chromeless_request() ) { | |
| 304 | + return; | |
| 305 | + } | |
| 306 | + | |
| 307 | + // The items are `display: flex`, never `inline-flex`. An | |
| 308 | + // inline-level box sits on a line box the <li> lays out at its | |
| 309 | + // 32px line-height and aligns on the baseline, so the line grows | |
| 310 | + // by the descender: the item became 37px inside a 32px bar. Under | |
| 311 | + // Core's float layout that overflow was invisible. On a host that | |
| 312 | + // lays the secondary group out as a flex row (WordPress.com's Debug | |
| 313 | + // Bar does, to order its own item first) every sibling stretched | |
| 314 | + // to the tallest one and the group's background painted 5px into | |
| 315 | + // the shell, under the windows' title bars. Block-level, the item | |
| 316 | + // is exactly the bar. `Tests_OpenStation_AdminBarDesktopToggle` | |
| 317 | + // pins it; `desktop.css` caps the group as well, for items we do | |
| 318 | + // not own. | |
| 300 | 319 | $css = ' |
| 301 | - #wpadminbar #wp-admin-bar-desktop-mode-toggle > .ab-item, | |
| 320 | + #wpadminbar #wp-admin-bar-os-toggle > .ab-item, | |
| 302 | 321 | #wpadminbar #wp-admin-bar-desktop-layout-menu > .ab-item, |
| 303 | 322 | #wpadminbar #wp-admin-bar-desktop-fullscreen > .ab-item, |
| 304 | 323 | #wpadminbar #wp-admin-bar-desktop-bug-report > .ab-item, |
| 305 | 324 | #wpadminbar #wp-admin-bar-desktop-help > .ab-item { |
| 306 | - display: inline-flex; | |
| 325 | + display: flex; | |
| 307 | 326 | align-items: center; |
| 308 | 327 | gap: 6px; |
| 309 | 328 | } |
| 310 | - #wpadminbar #wp-admin-bar-desktop-mode-toggle .ab-icon, | |
| 329 | + #wpadminbar #wp-admin-bar-os-toggle .ab-icon, | |
| 311 | 330 | #wpadminbar #wp-admin-bar-desktop-layout-menu .ab-icon, |
| 312 | 331 | #wpadminbar #wp-admin-bar-desktop-fullscreen .ab-icon, |
| 313 | 332 | #wpadminbar #wp-admin-bar-desktop-bug-report .ab-icon, |
| 314 | 333 | #wpadminbar #wp-admin-bar-desktop-help .ab-icon { |
| @@ -321,15 +340,15 @@ | ||
| 321 | 340 | width: 20px; |
| 322 | 341 | height: 20px; |
| 323 | 342 | } |
| 324 | 343 | |
| 325 | - #wp-admin-bar-desktop-mode-toggle .ab-icon.dashicons, | |
| 344 | + #wp-admin-bar-os-toggle .ab-icon.dashicons, | |
| 326 | 345 | #wp-admin-bar-desktop-layout-menu .ab-icon.dashicons { |
| 327 | 346 | font: normal 20px/1 dashicons; |
| 328 | 347 | -webkit-font-smoothing: antialiased; |
| 329 | 348 | -moz-osx-font-smoothing: grayscale; |
| 330 | 349 | } |
| 331 | - #wp-admin-bar-desktop-mode-toggle .ab-icon.dashicons::before { | |
| 350 | + #wp-admin-bar-os-toggle .ab-icon.dashicons::before { | |
| 332 | 351 | content: "\f472"; |
| 333 | 352 | top: 0; |
| 334 | 353 | position: static; |
| 335 | 354 | } |
| @@ -338,9 +357,9 @@ | ||
| 338 | 357 | content: "\f509"; |
| 339 | 358 | top: 0; |
| 340 | 359 | position: static; |
| 341 | 360 | } |
| 342 | - #wp-admin-bar-desktop-mode-toggle.desktop-mode-active .ab-icon.dashicons::before { | |
| 361 | + #wp-admin-bar-os-toggle.os-active .ab-icon.dashicons::before { | |
| 343 | 362 | /* Inherit the admin-bar text color so the active state |
| 344 | 363 | matches the +New, Home, Comments dashicons. Previously |
| 345 | 364 | hardcoded #72aee6, which forced blue regardless of the |
| 346 | 365 | profile color scheme. */ |
| @@ -346,9 +365,9 @@ | ||
| 346 | 365 | profile color scheme. */ |
| 347 | 366 | color: inherit; |
| 348 | 367 | } |
| 349 | 368 | @media screen and (max-width: 782px) { |
| 350 | - #wp-admin-bar-desktop-mode-toggle .ab-label { | |
| 369 | + #wp-admin-bar-os-toggle .ab-label { | |
| 351 | 370 | display: none; |
| 352 | 371 | } |
| 353 | 372 | } |
| 354 | 373 | |
| @@ -392,10 +411,10 @@ | ||
| 392 | 411 | where pointer events get intercepted before reaching the |
| 393 | 412 | page. Hiding these two shifts the Fullscreen toggle further |
| 394 | 413 | from the corner so its own click lands. Toggled by a body |
| 395 | 414 | class admin-bar.js sets on `fullscreenchange`. */ |
| 396 | - body.desktop-mode-browser-fs #wp-admin-bar-desktop-mode-toggle, | |
| 397 | - body.desktop-mode-browser-fs #wp-admin-bar-desktop-bug-report { | |
| 415 | + body.os-browser-fs #wp-admin-bar-os-toggle, | |
| 416 | + body.os-browser-fs #wp-admin-bar-desktop-bug-report { | |
| 398 | 417 | display: none; |
| 399 | 418 | } |
| 400 | 419 | |
| 401 | 420 | /* Bug Report admin-bar button — same dashicons rendering pattern |
| @@ -419,9 +438,9 @@ | ||
| 419 | 438 | glyph, so we paint a small inline SVG via CSS `mask` with |
| 420 | 439 | `background-color: currentColor` — that way the icon inherits |
| 421 | 440 | the admin-bar text color across every WP profile scheme |
| 422 | 441 | without us hardcoding a fill. */ |
| 423 | - #wp-admin-bar-desktop-help .ab-icon.desktop-mode-keyboard-icon { | |
| 442 | + #wp-admin-bar-desktop-help .ab-icon.os-keyboard-icon { | |
| 424 | 443 | background-color: currentColor; |
| 425 | 444 | -webkit-mask: url( "data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 24 24\' fill=\'none\' stroke=\'black\' stroke-width=\'1.6\' stroke-linecap=\'round\' stroke-linejoin=\'round\'><rect x=\'2.5\' y=\'6\' width=\'19\' height=\'12\' rx=\'2.2\'/><path d=\'M6 10h0M10 10h0M14 10h0M18 10h0M6 14h0M10 14h4M18 14h0\'/></svg>" ) no-repeat center / 20px 20px; |
| 426 | 445 | mask: url( "data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 24 24\' fill=\'none\' stroke=\'black\' stroke-width=\'1.6\' stroke-linecap=\'round\' stroke-linejoin=\'round\'><rect x=\'2.5\' y=\'6\' width=\'19\' height=\'12\' rx=\'2.2\'/><path d=\'M6 10h0M10 10h0M14 10h0M18 10h0M6 14h0M10 14h4M18 14h0\'/></svg>" ) no-repeat center / 20px 20px; |
| 427 | 446 | } |
| @@ -429,13 +448,13 @@ | ||
| 429 | 448 | /* Keyboard-shortcuts floating popover — anchored under the |
| 430 | 449 | keyboard button. Styled to match the Arrange submenu (light |
| 431 | 450 | bg on the otherwise-dark admin bar, soft shadow, rounded |
| 432 | 451 | corners). Built dynamically in admin-bar.js from translated |
| 433 | - content shipped via `desktopModeAdminBar.shortcuts`. */ | |
| 452 | + content shipped via `openStationAdminBar.shortcuts`. */ | |
| 434 | 453 | #wpadminbar #wp-admin-bar-desktop-help { |
| 435 | 454 | position: relative; |
| 436 | 455 | } |
| 437 | - #wpadminbar .desktop-mode-shortcuts-popover { | |
| 456 | + #wpadminbar .os-shortcuts-popover { | |
| 438 | 457 | display: none; |
| 439 | 458 | position: absolute; |
| 440 | 459 | top: 100%; |
| 441 | 460 | right: 0; |
| @@ -442,11 +461,11 @@ | ||
| 442 | 461 | margin-top: 0; |
| 443 | 462 | padding: 12px 14px; |
| 444 | 463 | min-width: 460px; |
| 445 | 464 | max-width: min( 90vw, 720px ); |
| 446 | - background: var( --desktop-mode-window-bg, #fff ); | |
| 447 | - color: var( --desktop-mode-text, #1d2327 ); | |
| 448 | - border: 1px solid var( --desktop-mode-window-border, #c3c4c7 ); | |
| 465 | + background: var( --os-ui-surface, var( --os-window-bg, #fff ) ); | |
| 466 | + color: var( --os-ui-fg, #1d2327 ); | |
| 467 | + border: 1px solid var( --os-ui-border, var( --os-window-border, #c3c4c7 ) ); | |
| 449 | 468 | border-radius: 8px; |
| 450 | 469 | box-shadow: 0 8px 24px rgba( 0, 0, 0, 0.18 ), |
| 451 | 470 | 0 2px 6px rgba( 0, 0, 0, 0.08 ); |
| 452 | 471 | z-index: 99999; |
| @@ -453,15 +472,15 @@ | ||
| 453 | 472 | font-size: 12px; |
| 454 | 473 | line-height: 1.4; |
| 455 | 474 | text-align: left; |
| 456 | 475 | } |
| 457 | - #wpadminbar .desktop-mode-shortcuts-popover.is-open { | |
| 476 | + #wpadminbar .os-shortcuts-popover.is-open { | |
| 458 | 477 | display: block; |
| 459 | 478 | } |
| 460 | - #wpadminbar .desktop-mode-shortcuts-popover__section + .desktop-mode-shortcuts-popover__section { | |
| 479 | + #wpadminbar .os-shortcuts-popover__section + .os-shortcuts-popover__section { | |
| 461 | 480 | margin-top: 12px; |
| 462 | 481 | } |
| 463 | - #wpadminbar .desktop-mode-shortcuts-popover__heading { | |
| 482 | + #wpadminbar .os-shortcuts-popover__heading { | |
| 464 | 483 | margin: 0 0 6px; |
| 465 | 484 | padding: 0; |
| 466 | 485 | font-size: 11px; |
| 467 | 486 | font-weight: 600; |
| @@ -466,44 +485,44 @@ | ||
| 466 | 485 | font-size: 11px; |
| 467 | 486 | font-weight: 600; |
| 468 | 487 | letter-spacing: 0.04em; |
| 469 | 488 | text-transform: uppercase; |
| 470 | - color: var( --desktop-mode-muted-fg, #50575e ); | |
| 489 | + color: var( --os-ui-fg-muted, #50575e ); | |
| 471 | 490 | line-height: 1.2; |
| 472 | 491 | } |
| 473 | - #wpadminbar .desktop-mode-shortcuts-popover__table { | |
| 492 | + #wpadminbar .os-shortcuts-popover__table { | |
| 474 | 493 | width: 100%; |
| 475 | 494 | border-collapse: collapse; |
| 476 | 495 | color: inherit; |
| 477 | 496 | } |
| 478 | - #wpadminbar .desktop-mode-shortcuts-popover__table th, | |
| 479 | - #wpadminbar .desktop-mode-shortcuts-popover__table td { | |
| 497 | + #wpadminbar .os-shortcuts-popover__table th, | |
| 498 | + #wpadminbar .os-shortcuts-popover__table td { | |
| 480 | 499 | padding: 6px 8px; |
| 481 | 500 | vertical-align: middle; |
| 482 | 501 | text-align: left; |
| 483 | - border-bottom: 1px solid rgba( 0, 0, 0, 0.06 ); | |
| 502 | + border-bottom: 1px solid var( --os-ui-border, rgba( 0, 0, 0, 0.06 ) ); | |
| 484 | 503 | color: inherit; |
| 485 | 504 | font-weight: 400; |
| 486 | 505 | font-size: 12px; |
| 487 | 506 | line-height: 1.4; |
| 488 | 507 | } |
| 489 | - #wpadminbar .desktop-mode-shortcuts-popover__table th { | |
| 508 | + #wpadminbar .os-shortcuts-popover__table th { | |
| 490 | 509 | font-weight: 600; |
| 491 | 510 | font-size: 11px; |
| 492 | - color: var( --desktop-mode-muted-fg, #50575e ); | |
| 511 | + color: var( --os-ui-fg-muted, #50575e ); | |
| 493 | 512 | letter-spacing: 0.02em; |
| 494 | 513 | } |
| 495 | - #wpadminbar .desktop-mode-shortcuts-popover__table tbody tr:last-child td { | |
| 514 | + #wpadminbar .os-shortcuts-popover__table tbody tr:last-child td { | |
| 496 | 515 | border-bottom: none; |
| 497 | 516 | } |
| 498 | - #wpadminbar .desktop-mode-shortcuts-popover__key-cell { | |
| 517 | + #wpadminbar .os-shortcuts-popover__key-cell { | |
| 499 | 518 | white-space: nowrap; |
| 500 | 519 | } |
| 501 | - #wpadminbar .desktop-mode-shortcuts-popover__note { | |
| 502 | - color: var( --desktop-mode-muted-fg, #50575e ); | |
| 520 | + #wpadminbar .os-shortcuts-popover__note { | |
| 521 | + color: var( --os-ui-fg-muted, #50575e ); | |
| 503 | 522 | font-size: 11px; |
| 504 | 523 | } |
| 505 | - #wpadminbar .desktop-mode-shortcuts-popover__list { | |
| 524 | + #wpadminbar .os-shortcuts-popover__list { | |
| 506 | 525 | margin: 0; |
| 507 | 526 | padding: 0; |
| 508 | 527 | list-style: none; |
| 509 | 528 | display: flex; |
| @@ -509,9 +528,9 @@ | ||
| 509 | 528 | display: flex; |
| 510 | 529 | flex-direction: column; |
| 511 | 530 | gap: 4px; |
| 512 | 531 | } |
| 513 | - #wpadminbar .desktop-mode-shortcuts-popover__item { | |
| 532 | + #wpadminbar .os-shortcuts-popover__item { | |
| 514 | 533 | display: grid; |
| 515 | 534 | grid-template-columns: 120px 1fr; |
| 516 | 535 | align-items: center; |
| 517 | 536 | gap: 12px; |
| @@ -516,17 +535,17 @@ | ||
| 516 | 535 | align-items: center; |
| 517 | 536 | gap: 12px; |
| 518 | 537 | padding: 4px 8px; |
| 519 | 538 | border-radius: 4px; |
| 520 | - background: rgba( 0, 0, 0, 0.03 ); | |
| 539 | + background: var( --os-ui-surface-sunken, rgba( 0, 0, 0, 0.03 ) ); | |
| 521 | 540 | } |
| 522 | - #wpadminbar .desktop-mode-shortcuts-popover__keys { | |
| 541 | + #wpadminbar .os-shortcuts-popover__keys { | |
| 523 | 542 | display: inline-flex; |
| 524 | 543 | align-items: center; |
| 525 | 544 | gap: 4px; |
| 526 | 545 | flex-wrap: wrap; |
| 527 | 546 | } |
| 528 | - #wpadminbar .desktop-mode-shortcuts-popover__kbd { | |
| 547 | + #wpadminbar .os-shortcuts-popover__kbd { | |
| 529 | 548 | display: inline-flex; |
| 530 | 549 | align-items: center; |
| 531 | 550 | justify-content: center; |
| 532 | 551 | min-width: 22px; |
| @@ -531,13 +550,13 @@ | ||
| 531 | 550 | justify-content: center; |
| 532 | 551 | min-width: 22px; |
| 533 | 552 | height: 20px; |
| 534 | 553 | padding: 0 5px; |
| 535 | - border: 1px solid rgba( 0, 0, 0, 0.18 ); | |
| 554 | + border: 1px solid var( --os-ui-border-strong, rgba( 0, 0, 0, 0.18 ) ); | |
| 536 | 555 | border-bottom-width: 2px; |
| 537 | 556 | border-radius: 4px; |
| 538 | - background: #fff; | |
| 539 | - color: var( --desktop-mode-text, #1d2327 ); | |
| 557 | + background: var( --os-ui-surface-elevated, #fff ); | |
| 558 | + color: var( --os-ui-fg, #1d2327 ); | |
| 540 | 559 | font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, monospace; |
| 541 | 560 | font-size: 11px; |
| 542 | 561 | font-weight: 600; |
| 543 | 562 | line-height: 1; |
| @@ -542,13 +561,13 @@ | ||
| 542 | 561 | font-weight: 600; |
| 543 | 562 | line-height: 1; |
| 544 | 563 | white-space: nowrap; |
| 545 | 564 | } |
| 546 | - #wpadminbar .desktop-mode-shortcuts-popover__plus { | |
| 565 | + #wpadminbar .os-shortcuts-popover__plus { | |
| 547 | 566 | font-size: 10px; |
| 548 | - color: var( --desktop-mode-muted-fg, #50575e ); | |
| 567 | + color: var( --os-ui-fg-muted, #50575e ); | |
| 549 | 568 | } |
| 550 | - #wpadminbar .desktop-mode-shortcuts-popover__description { | |
| 569 | + #wpadminbar .os-shortcuts-popover__description { | |
| 551 | 570 | color: inherit; |
| 552 | 571 | } |
| 553 | 572 | |
| 554 | 573 | /* Dock-style custom tooltip for icon-only admin-bar buttons. |
| @@ -590,21 +609,29 @@ | ||
| 590 | 609 | #wpadminbar #wp-admin-bar-desktop-help.is-open .ab-item[ data-desktop-tooltip ]::after { |
| 591 | 610 | opacity: 0; |
| 592 | 611 | } |
| 593 | 612 | |
| 594 | - /* Arrange submenu — aligned visually with the <wpd-menu> component | |
| 595 | - (src/ui/components/wpd-menu/wpd-menu.styles.ts). The submenu | |
| 596 | - flips from the native dark-on-dark admin bar to a light theme | |
| 597 | - (white bg, dark text) so it matches the rest of our UI AND so | |
| 598 | - the hover state stays legible (a light tint on a dark bg | |
| 599 | - would render as invisible overlap with native admin-bar hover | |
| 600 | - colors). Selectors prefixed with #wpadminbar to win the | |
| 601 | - admin-bar specificity without !important. */ | |
| 613 | + /* Arrange submenu — aligned visually with the <os-menu> component | |
| 614 | + (src/ui/components/os-menu/os-menu.styles.ts). The submenu | |
| 615 | + breaks out of the native dark-on-dark admin bar and paints | |
| 616 | + itself from the `--os-ui-*` panel palette instead, so it matches | |
| 617 | + the rest of our UI and stays legible under any desktop theme. | |
| 618 | + | |
| 619 | + Surface and text MUST come from the same palette. They used to | |
| 620 | + not: the background read `--os-window-bg` (which a | |
| 621 | + theme sets) while the text read `--os-text` (which | |
| 622 | + nothing has ever defined, so it always fell back to near-black). | |
| 623 | + Any dark theme therefore rendered near-black text on its own | |
| 624 | + near-black panel. Keep both sides on `--os-ui-surface` / | |
| 625 | + `--os-ui-fg` and that class of bug cannot come back. | |
| 626 | + | |
| 627 | + Selectors prefixed with #wpadminbar to win the admin-bar | |
| 628 | + specificity without !important. */ | |
| 602 | 629 | #wpadminbar #wp-admin-bar-desktop-layout-menu .ab-sub-wrapper { |
| 603 | - background: var( --desktop-mode-window-bg, #fff ); | |
| 630 | + background: var( --os-ui-surface, var( --os-window-bg, #fff ) ); | |
| 604 | 631 | padding: 4px; |
| 605 | 632 | min-width: 220px; |
| 606 | - border: 1px solid var( --desktop-mode-window-border, #c3c4c7 ); | |
| 633 | + border: 1px solid var( --os-ui-border, var( --os-window-border, #c3c4c7 ) ); | |
| 607 | 634 | border-radius: 8px; |
| 608 | 635 | box-shadow: 0 8px 24px rgba( 0, 0, 0, 0.18 ), |
| 609 | 636 | 0 2px 6px rgba( 0, 0, 0, 0.08 ); |
| 610 | 637 | } |
| @@ -623,9 +650,9 @@ | ||
| 623 | 650 | min-height: 32px; |
| 624 | 651 | padding: 6px 10px; |
| 625 | 652 | font-size: 13px; |
| 626 | 653 | line-height: 1.3; |
| 627 | - color: var( --desktop-mode-text, #1d2327 ); | |
| 654 | + color: var( --os-ui-fg, #1d2327 ); | |
| 628 | 655 | background: transparent; |
| 629 | 656 | border-radius: 6px; |
| 630 | 657 | transition: background-color 0.12s ease, color 0.12s ease; |
| 631 | 658 | } |
| @@ -635,12 +662,12 @@ | ||
| 635 | 662 | thanks to the extra id in our selector chain. */ |
| 636 | 663 | #wpadminbar #wp-admin-bar-desktop-layout-menu .ab-sub-wrapper .ab-submenu > li > .ab-item:hover, |
| 637 | 664 | #wpadminbar #wp-admin-bar-desktop-layout-menu .ab-sub-wrapper .ab-submenu > li > .ab-item:focus, |
| 638 | 665 | #wpadminbar.nojq #wp-admin-bar-desktop-layout-menu .ab-sub-wrapper .ab-submenu > li:hover > .ab-item { |
| 639 | - background: rgba( 0, 0, 0, 0.06 ); | |
| 640 | - color: #000; | |
| 666 | + background: var( --os-ui-hover, rgba( 0, 0, 0, 0.06 ) ); | |
| 667 | + color: var( --os-ui-fg, #000 ); | |
| 641 | 668 | } |
| 642 | - #wp-admin-bar-desktop-layout-snap .desktop-mode-layout-checkbox { | |
| 669 | + #wp-admin-bar-desktop-layout-snap .os-layout-checkbox { | |
| 643 | 670 | flex-shrink: 0; |
| 644 | 671 | display: inline-flex; |
| 645 | 672 | align-items: center; |
| 646 | 673 | justify-content: center; |
| @@ -648,9 +675,9 @@ | ||
| 648 | 675 | height: 16px; |
| 649 | 676 | font-size: 14px; |
| 650 | 677 | line-height: 1; |
| 651 | 678 | } |
| 652 | - #wp-admin-bar-desktop-layout-snap[aria-checked="true"] .desktop-mode-layout-checkbox { | |
| 679 | + #wp-admin-bar-desktop-layout-snap[aria-checked="true"] .os-layout-checkbox { | |
| 653 | 680 | color: var( --wp-admin-theme-color, #2271b1 ); |
| 654 | 681 | } |
| 655 | 682 | '; |
| 656 | 683 | wp_add_inline_style( 'admin-bar', $css ); |
| @@ -658,18 +685,18 @@ | ||
| 658 | 685 | // All PHP→JS values are emitted as JSON literals (never interpolated |
| 659 | 686 | // raw into the script body) so special characters, quotes, and |
| 660 | 687 | // unexpected shapes can't break the parser or be exploited. |
| 661 | 688 | // `active` must match the visual state shown on the toggle above — |
| 662 | - // i.e. "currently viewing desktop mode." Using `desktop_mode_is_enabled()` | |
| 689 | + // i.e. "currently viewing OpenStation." Using `openstation_is_enabled()` | |
| 663 | 690 | // alone would misclassify a classic-override request (meta = '1', |
| 664 | 691 | // URL carrying `desktop_mode_classic=1`) as active, causing the |
| 665 | 692 | // click handler to send `enabled=0` when the user actually wants |
| 666 | 693 | // to return to the shell. |
| 667 | 694 | wp_register_script( |
| 668 | - 'desktop-mode-admin-bar', | |
| 669 | - DESKTOP_MODE_URL . 'assets/js/admin-bar.js', | |
| 695 | + 'os-admin-bar', | |
| 696 | + OPENSTATION_URL . 'assets/js/admin-bar.js', | |
| 670 | 697 | array( 'admin-bar' ), |
| 671 | - DESKTOP_MODE_VERSION, | |
| 698 | + OPENSTATION_VERSION, | |
| 672 | 699 | true |
| 673 | 700 | ); |
| 674 | 701 | // Emit the config as a JSON literal via wp_add_inline_script (not |
| 675 | 702 | // wp_localize_script — the latter casts booleans to '' / '1', which |
| @@ -675,15 +702,21 @@ | ||
| 675 | 702 | // wp_localize_script — the latter casts booleans to '' / '1', which |
| 676 | 703 | // breaks the click handler's `!! cfg.active` check). 'before' runs |
| 677 | 704 | // before admin-bar.js so the global is ready when the IIFE fires. |
| 678 | 705 | wp_add_inline_script( |
| 679 | - 'desktop-mode-admin-bar', | |
| 680 | - 'var desktopModeAdminBar = ' . wp_json_encode( | |
| 706 | + 'os-admin-bar', | |
| 707 | + 'var openStationAdminBar = ' . wp_json_encode( | |
| 681 | 708 | array( |
| 682 | - 'nonce' => wp_create_nonce( 'save-desktop-mode' ), | |
| 683 | - 'active' => desktop_mode_is_enabled() && ! desktop_mode_is_classic_request(), | |
| 684 | - 'classicUrl' => esc_url_raw( admin_url() ), | |
| 685 | - 'portalUrl' => esc_url_raw( desktop_mode_portal_url() ), | |
| 709 | + 'nonce' => wp_create_nonce( 'save-openstation' ), | |
| 710 | + 'active' => openstation_is_enabled() && ! openstation_is_classic_request(), | |
| 711 | + // `self_admin_url()`: switching off from the network | |
| 712 | + // admin returns there, not to the main site. | |
| 713 | + 'classicUrl' => esc_url_raw( self_admin_url() ), | |
| 714 | + 'portalUrl' => esc_url_raw( openstation_portal_url() ), | |
| 715 | + // Passed back on the toggle's AJAX call: the handler | |
| 716 | + // runs on `admin-ajax.php`, where `is_network_admin()` | |
| 717 | + // is always false. | |
| 718 | + 'network' => is_network_admin(), | |
| 686 | 719 | 'ajaxUrl' => esc_url_raw( admin_url( 'admin-ajax.php' ) ), |
| 687 | 720 | 'i18n' => array( |
| 688 | 721 | 'enterFullscreen' => __( 'Fullscreen', 'desktop-mode' ), |
| 689 | 722 | 'exitFullscreen' => __( 'Exit fullscreen', 'desktop-mode' ), |
| @@ -689,8 +722,9 @@ | ||
| 689 | 722 | 'exitFullscreen' => __( 'Exit fullscreen', 'desktop-mode' ), |
| 690 | 723 | 'enterTitle' => __( 'Enter fullscreen', 'desktop-mode' ), |
| 691 | 724 | 'exitTitle' => __( 'Exit fullscreen', 'desktop-mode' ), |
| 692 | 725 | ), |
| 726 | + | |
| 693 | 727 | /* |
| 694 | 728 | * Keyboard-shortcuts popover content. Translated once on |
| 695 | 729 | * the server and shipped to admin-bar.js, which renders |
| 696 | 730 | * the popover anchored under the keyboard button. |
| @@ -760,8 +794,12 @@ | ||
| 760 | 794 | 'keys' => array( '⌘/Ctrl', 'K' ), |
| 761 | 795 | 'description' => __( 'Open the command palette / Ask AI overlay.', 'desktop-mode' ), |
| 762 | 796 | ), |
| 763 | 797 | array( |
| 798 | + 'keys' => array( '⌥/Alt', '⌘/Ctrl', 'W' ), | |
| 799 | + 'description' => __( 'Close every open window on the current desktop (asks first).', 'desktop-mode' ), | |
| 800 | + ), | |
| 801 | + array( | |
| 764 | 802 | 'keys' => array( 'Esc' ), |
| 765 | 803 | 'description' => __( 'Exit Overview (or Snap Overview) without changing window state.', 'desktop-mode' ), |
| 766 | 804 | ), |
| 767 | 805 | ), |
| @@ -770,8 +808,7 @@ | ||
| 770 | 808 | ) |
| 771 | 809 | ) . ';', |
| 772 | 810 | 'before' |
| 773 | 811 | ); |
| 774 | - wp_enqueue_script( 'desktop-mode-admin-bar' ); | |
| 812 | + wp_enqueue_script( 'os-admin-bar' ); | |
| 775 | 813 | } |
| 776 | -add_action( 'admin_enqueue_scripts', 'desktop_mode_enqueue_toggle_assets' ); | |
| 777 | - | |
| 814 | +add_action( 'admin_enqueue_scripts', 'openstation_enqueue_toggle_assets' ); | |
