feat: 图标策略升级 + 引擎显隐就地切换 + 前后台一致性;界面美化
按反馈逐条处理: ① 界面美化 - 前台重做:品牌区(logo + 站名 + 副标题)、胶囊式引擎切换、圆角卡片与 悬停浮起、聚焦光晕、合集标签页淡入动画;版心改为 shell 变量 (--pad-x = max(gutter, (100% - wrap)/2)),与顶栏左右边缘严格对齐。 - 后台:表格窄屏可横向滚动、状态胶囊、自定义徽章、图标预览框。 ② 自动更新图标质量差 + 允许自定义图标 - 抓取改为阶梯择优:manifest 512/192 → apple-touch-icon → <link rel=icon> (按 sizes 降序,SVG 视为最高清)→ 第三方聚合服务(favicon.yandex.net 实测 100% 可用;icon.horse 可达时最高 256px)→ 站点自身 /favicon.ico。 - 逐个候选实测像素,达到 120px 即停;候选上限 8 个 + 10s 总预算,避免超时。 - 用 GD 只缩不放,统一存成 128×128 PNG;识别并丢弃第三方服务的 「灰底字母」占位块。 - 新增 sites.icon_custom 列(带幂等迁移):可上传图标或填图标地址; 一旦自定义,「全部更新」只刷新名称、跳过图标。 ③ 后台引擎「可见/不可见」不好用 - 小图标换成内联 SVG(原来用 emoji,跨字体显示成方块)。 - 切换改为 AJAX 原地生效 + 状态胶囊同步,不再点一下就跳页; 所有切换/移动表单都带 p 参数,无 JS 时也能正确回到当前页。 - 修掉一个隐蔽的成因:本站此前完全不发 Cache-Control/Expires/ETag, 浏览器只能自行猜测缓存策略,导致「改完刷新还是旧的」。现在所有动态页 统一发 no-store/no-cache。 ④ deploy/ 与 data/ 误入版本库 - 两目录整目录忽略,部署脚本移出仓库(存 _tooling/),已 git rm --cached。 (历史提交里仍含这些文件,如需彻底抹除需 git filter-repo,待确认。) 附带修复(线上实测驱动) - 服务器侧页面缓存:宝塔「网站加速」Apache(mod_lua) 版是一层基于 memcached 的 30 秒整页缓存,且**读不到 FastCGI 返回的 Cache-Control**,所以 no-store 挡不住它;唯一信号是请求 cookie X_CACHE=1。已在根 .htaccess 用 RequestHeader 在请求侧注入该标记(实测任何访客均 X-Cache: MISS), PHP 侧另发一颗 cookie 作为 Nginx 环境的兜底(BYPASS_PAGE_CACHE 开关)。 - 静态资源改为「长缓存 + 版本号」:asset()/icon_src() 拼 mtime+size, assets/.htaccess 与根 .htaccess 给出 max-age=31536000 immutable。 - 修 absolutize() 未还原 JSON 转义 \/ 导致部分图标 URL 抓不下来的问题。 - 修部署脚本 md5sum 在 Git Bash 下输出 "hash *path" 导致 38 项假「缺失文件」。
This commit is contained in:
+83
-21
@@ -5,6 +5,7 @@
|
||||
declare(strict_types=1);
|
||||
require_once __DIR__ . '/_auth.php';
|
||||
require_login();
|
||||
send_no_cache();
|
||||
|
||||
$pdo = db();
|
||||
$p = isset($_GET['p']) ? (string)$_GET['p'] : 'sites';
|
||||
@@ -26,12 +27,35 @@ function flash_html(?array $f): string
|
||||
return '<div class="' . $cls . '">' . e($f['m']) . '</div>';
|
||||
}
|
||||
|
||||
function toggle_form(string $action, int $id): string
|
||||
/** 眼睛(显示)/ 斜杠眼(隐藏)图标 —— 用内联 SVG,避免 emoji 字体差异导致显示成方块 */
|
||||
function eye_svg(bool $on): string
|
||||
{
|
||||
return '<form method="post" action="' . e(url('admin/actions.php')) . '" class="inline">'
|
||||
. csrf_field() . '<input type="hidden" name="action" value="' . e($action) . '">'
|
||||
$slash = $on ? '' : '<path d="M3 3l18 18" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>';
|
||||
return '<svg viewBox="0 0 24 24" width="16" height="16" aria-hidden="true" fill="currentColor">'
|
||||
. '<path d="M12 5c-5.5 0-9.6 4.3-11 7 1.4 2.7 5.5 7 11 7s9.6-4.3 11-7c-1.4-2.7-5.5-7-11-7zm0 12a5 5 0 110-10 5 5 0 010 10z"/>'
|
||||
. '<circle cx="12" cy="12" r="2.6"/>'
|
||||
. $slash
|
||||
. '</svg>';
|
||||
}
|
||||
|
||||
/**
|
||||
* 显隐切换按钮:表单自带 ajax=1,前端原地切换、不跳页;
|
||||
* 即使浏览器禁用 JS,表单也会正常提交并回到当前列表页(p 已带上)。
|
||||
*/
|
||||
function toggle_form(string $action, int $id, int $state, string $p = ''): string
|
||||
{
|
||||
$on = $state === 1;
|
||||
return '<form method="post" action="' . e(url('admin/actions.php')) . '" class="inline js-toggle" data-id="' . $id . '">'
|
||||
. csrf_field()
|
||||
. '<input type="hidden" name="action" value="' . e($action) . '">'
|
||||
. '<input type="hidden" name="id" value="' . $id . '">'
|
||||
. '<button class="ico-btn" title="切换显示">' . "\u{1F441}" . '</button></form>';
|
||||
. '<input type="hidden" name="p" value="' . e($p) . '">'
|
||||
. '<input type="hidden" name="ajax" value="1">'
|
||||
. '<button type="submit" class="ico-btn toggle' . ($on ? ' on' : '') . '"'
|
||||
. ' data-on="' . ($on ? '1' : '0') . '"'
|
||||
. ' title="' . ($on ? '当前:显示中(点击隐藏)' : '当前:已隐藏(点击显示)') . '">'
|
||||
. eye_svg($on)
|
||||
. '</button></form>';
|
||||
}
|
||||
|
||||
function move_form(string $action, int $id, string $dir, string $label, string $p): string
|
||||
@@ -48,15 +72,17 @@ ob_start();
|
||||
|
||||
if ($p === 'sites'):
|
||||
$rows = $pdo->query('SELECT s.*, g.name AS gname FROM sites s JOIN groups g ON g.id=s.group_id ORDER BY g.sort_order, g.id, s.sort_order, s.id')->fetchAll();
|
||||
$customCount = 0;
|
||||
foreach ($rows as $rr) { if ((int)($rr['icon_custom'] ?? 0) === 1) { $customCount++; } }
|
||||
?>
|
||||
<?= flash_html($flash) ?>
|
||||
|
||||
<section class="card">
|
||||
<div class="card-head">
|
||||
<h2>新增 / 编辑网站</h2>
|
||||
<button type="button" class="btn ghost" id="btn-update-all" data-url="<?= e(url('admin/update_all.php')) ?>">⟳ 全部更新(图标+名称)</button>
|
||||
<button type="button" class="btn ghost" id="btn-update-all" data-url="<?= e(url('admin/update_all.php')) ?>">⟳ 全部更新(名称 + 自动图标)</button>
|
||||
</div>
|
||||
<form method="post" action="<?= e(url('admin/actions.php')) ?>" class="grid-form" id="site-form">
|
||||
<form method="post" action="<?= e(url('admin/actions.php')) ?>" class="grid-form" id="site-form" enctype="multipart/form-data">
|
||||
<?= csrf_field() ?>
|
||||
<input type="hidden" name="action" value="site_save">
|
||||
<input type="hidden" name="id" id="f-id" value="0">
|
||||
@@ -74,12 +100,32 @@ if ($p === 'sites'):
|
||||
<button type="button" class="btn ghost" id="btn-fetch" data-url="<?= e(url('admin/fetch_meta.php')) ?>">自动获取</button>
|
||||
</span>
|
||||
</label>
|
||||
<label>网站名称(自动)
|
||||
<label>网站名称(自动抓取)
|
||||
<input type="text" name="name" id="f-name" placeholder="自动抓取">
|
||||
</label>
|
||||
<label>简称(页面显示,手动)
|
||||
<input type="text" name="short_name" id="f-short" placeholder="如:知乎">
|
||||
</label>
|
||||
|
||||
<div class="span2 icon-field">
|
||||
<div class="icon-field-preview">
|
||||
<span class="icon-preview" id="f-icon-preview"><span class="ph">无</span></span>
|
||||
</div>
|
||||
<div class="icon-field-body">
|
||||
<div class="icon-field-title">图标</div>
|
||||
<input type="text" name="icon_url" id="f-icon-url" placeholder="自定义图标图片地址(http/https),留空则用自动获取的">
|
||||
<div class="row icon-row2">
|
||||
<input type="file" name="icon_file" id="f-icon-file" accept="image/png,image/jpeg,image/gif,image/webp,image/svg+xml,image/x-icon,.svg,.ico">
|
||||
<label class="chk"><input type="checkbox" name="icon_auto" id="f-icon-auto" checked> 允许自动更新图标</label>
|
||||
</div>
|
||||
<p class="hint">
|
||||
优先级:<b>上传文件</b> > <b>自定义地址</b> > 「自动获取」抓到的图。<br>
|
||||
选择上传或填写地址后会自动取消勾选「允许自动更新图标」,该网站图标此后不再被「全部更新」覆盖;
|
||||
勾回去即可恢复自动。
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<label class="chk"><input type="checkbox" name="is_visible" id="f-visible" checked> 显示</label>
|
||||
<div class="span2 form-actions">
|
||||
<button type="submit" class="btn primary">保存</button>
|
||||
@@ -90,24 +136,31 @@ if ($p === 'sites'):
|
||||
</section>
|
||||
|
||||
<section class="card">
|
||||
<div class="card-head"><h2>网站列表(<?= count($rows) ?>)</h2></div>
|
||||
<table class="tbl">
|
||||
<div class="card-head">
|
||||
<h2>网站列表(<?= count($rows) ?>)</h2>
|
||||
<span class="hint">其中 <?= $customCount ?> 个使用自定义图标(不会自动更新)</span>
|
||||
</div>
|
||||
<div class="tbl-wrap"><table class="tbl">
|
||||
<thead><tr><th>图标</th><th>简称(展示)</th><th>名称</th><th>网址</th><th>板块</th><th>显示</th><th>排序</th><th>操作</th></tr></thead>
|
||||
<tbody>
|
||||
<?php foreach ($rows as $r): $label = $r['short_name'] !== '' ? $r['short_name'] : ($r['name'] !== '' ? $r['name'] : domain_of($r['url'])); $src = icon_src($r['icon']); ?>
|
||||
<tr>
|
||||
<td><?php if ($src): ?><img class="mini" src="<?= e($src) ?>" alt=""><?php else: ?><span class="mini letter" style="background:<?= e(letter_color($label)) ?>"><?= e(mb_substr($label, 0, 1)) ?></span><?php endif; ?></td>
|
||||
<td>
|
||||
<?php if ($src): ?><img class="mini" src="<?= e($src) ?>" alt=""><?php else: ?><span class="mini letter" style="background:<?= e(letter_color($label)) ?>"><?= e(mb_substr($label, 0, 1)) ?></span><?php endif; ?>
|
||||
<?php if ((int)($r['icon_custom'] ?? 0) === 1): ?><span class="badge" title="用户自定义图标,不会被自动更新覆盖">自定义</span><?php endif; ?>
|
||||
</td>
|
||||
<td><?= e($label) ?></td>
|
||||
<td class="muted"><?= e($r['name']) ?></td>
|
||||
<td class="muted ell"><a href="<?= e($r['url']) ?>" target="_blank" rel="noopener"><?= e($r['url']) ?></a></td>
|
||||
<td><?= e($r['gname']) ?></td>
|
||||
<td><?= toggle_form('site_toggle', (int)$r['id']) ?></td>
|
||||
<td><?= toggle_form('site_toggle', (int)$r['id'], (int)$r['is_visible']) ?></td>
|
||||
<td class="nowrap"><?= move_form('site_move', (int)$r['id'], 'up', '上移', '') . move_form('site_move', (int)$r['id'], 'down', '下移', '') ?></td>
|
||||
<td class="nowrap">
|
||||
<button type="button" class="ico-btn edit-site"
|
||||
data-id="<?= (int)$r['id'] ?>" data-group="<?= (int)$r['group_id'] ?>"
|
||||
data-url="<?= e($r['url']) ?>" data-name="<?= e($r['name']) ?>"
|
||||
data-short="<?= e($r['short_name']) ?>" data-icon="<?= e($r['icon']) ?>"
|
||||
data-icon-url="<?= e($src) ?>" data-custom="<?= (int)($r['icon_custom'] ?? 0) ?>"
|
||||
data-visible="<?= (int)$r['is_visible'] ?>" title="编辑">✎</button>
|
||||
<form method="post" action="<?= e(url('admin/actions.php')) ?>" class="inline" onsubmit="return confirm('确定删除该网站?');">
|
||||
<?= csrf_field() ?><input type="hidden" name="action" value="site_delete">
|
||||
@@ -118,7 +171,7 @@ if ($p === 'sites'):
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</table></div>
|
||||
</section>
|
||||
<?php
|
||||
|
||||
@@ -143,7 +196,7 @@ elseif ($p === 'groups'): ?>
|
||||
</form>
|
||||
</section>
|
||||
<section class="card">
|
||||
<table class="tbl">
|
||||
<div class="tbl-wrap"><table class="tbl">
|
||||
<thead><tr><th>名称</th><th>展示方式</th><th>网站数</th><th>显示</th><th>排序</th><th>操作</th></tr></thead>
|
||||
<tbody>
|
||||
<?php foreach ($groups as $g): $cnt = (int)$pdo->query('SELECT COUNT(*) FROM sites WHERE group_id=' . (int)$g['id'])->fetchColumn(); ?>
|
||||
@@ -151,7 +204,7 @@ elseif ($p === 'groups'): ?>
|
||||
<td><?= e($g['name']) ?></td>
|
||||
<td><?= $g['display'] === 'tabs' ? '合集标签页' : '普通网格' ?></td>
|
||||
<td><?= $cnt ?></td>
|
||||
<td><?= toggle_form('group_toggle', (int)$g['id']) ?></td>
|
||||
<td><?= toggle_form('group_toggle', (int)$g['id'], (int)$g['is_visible'], 'groups') ?></td>
|
||||
<td class="nowrap"><?= move_form('group_move', (int)$g['id'], 'up', '上移', 'groups') . move_form('group_move', (int)$g['id'], 'down', '下移', 'groups') ?></td>
|
||||
<td class="nowrap">
|
||||
<button type="button" class="ico-btn edit-group" data-id="<?= (int)$g['id'] ?>" data-name="<?= e($g['name']) ?>" data-display="<?= e($g['display']) ?>" data-visible="<?= (int)$g['is_visible'] ?>">✎</button>
|
||||
@@ -163,7 +216,7 @@ elseif ($p === 'groups'): ?>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</table></div>
|
||||
</section>
|
||||
<?php
|
||||
|
||||
@@ -187,20 +240,27 @@ elseif ($p === 'engines'): ?>
|
||||
<?php foreach ($SUGGEST_TYPES as $t): ?><option value="<?= e($t) ?>"><?= e($t) ?></option><?php endforeach; ?>
|
||||
</select>
|
||||
</label>
|
||||
<label class="chk"><input type="checkbox" name="is_active" id="e-active"> 启用(显示在首页)</label>
|
||||
<label class="chk"><input type="checkbox" name="is_active" id="e-active"> 启用(显示在首页顶部)</label>
|
||||
<div class="span2 form-actions"><button class="btn primary">保存</button><button type="button" class="btn ghost" id="e-reset">清空</button></div>
|
||||
</form>
|
||||
</section>
|
||||
<section class="card">
|
||||
<table class="tbl">
|
||||
<thead><tr><th>名称</th><th>搜索地址</th><th>联想类型</th><th>启用</th><th>排序</th><th>操作</th></tr></thead>
|
||||
<div class="card-head">
|
||||
<h2>搜索引擎列表</h2>
|
||||
<span class="hint">点最右侧「眼睛」图标即在该行原地切换,不会跳页</span>
|
||||
</div>
|
||||
<div class="tbl-wrap"><table class="tbl">
|
||||
<thead><tr><th>名称</th><th>搜索地址</th><th>联想类型</th><th>前台显示</th><th>排序</th><th>操作</th></tr></thead>
|
||||
<tbody>
|
||||
<?php foreach ($engines as $en): ?>
|
||||
<tr>
|
||||
<td><span style="color:<?= e($en['color']) ?>">■</span> <?= e($en['name']) ?> <span class="muted">(<?= e($en['slug']) ?>)</span></td>
|
||||
<td class="muted ell"><?= e($en['search_url']) ?></td>
|
||||
<td class="muted"><?= e($en['suggest_type']) ?></td>
|
||||
<td><?= $en['is_active'] ? '<span class="ok-dot">已启用</span>' : '<span class="muted">未启用</span>' ?> <?= toggle_form('engine_toggle', (int)$en['id']) ?></td>
|
||||
<td class="nowrap">
|
||||
<span class="state <?= $en['is_active'] ? 'on' : 'off' ?> js-state" data-on-text="已显示" data-off-text="已隐藏"><?= $en['is_active'] ? '已显示' : '已隐藏' ?></span>
|
||||
<?= toggle_form('engine_toggle', (int)$en['id'], (int)$en['is_active'], 'engines') ?>
|
||||
</td>
|
||||
<td class="nowrap"><?= move_form('engine_move', (int)$en['id'], 'up', '上移', 'engines') . move_form('engine_move', (int)$en['id'], 'down', '下移', 'engines') ?></td>
|
||||
<td class="nowrap">
|
||||
<button type="button" class="ico-btn edit-engine"
|
||||
@@ -215,8 +275,8 @@ elseif ($p === 'engines'): ?>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
<p class="hint">提示:联想接口需填写对应平台的地址,解析类型可选 bing_osjson / baidu_sugrec / google_firefox / sogou_ajaj / so360 / ddg。</p>
|
||||
</table></div>
|
||||
<p class="hint">提示:联想接口需填写对应平台的地址,解析类型可选 bing_osjson / baidu_sugrec / google_firefox / sogou_ajaj / so360 / ddg。「前台显示」为该引擎是否出现在首页顶部搜索框上方的切换条里。</p>
|
||||
</section>
|
||||
<?php
|
||||
|
||||
@@ -238,6 +298,8 @@ else: // settings ?>
|
||||
</label>
|
||||
<label>主题色<input type="text" name="primary_color" value="<?= e(setting('primary_color', '#2F6BF7')) ?>"></label>
|
||||
<label class="chk"><input type="checkbox" name="open_blank" <?= setting('open_blank', '1') === '1' ? 'checked' : '' ?>> 搜索结果新窗口打开</label>
|
||||
<label class="chk"><input type="checkbox" name="icon_services" <?= setting('icon_services', '1') === '1' ? 'checked' : '' ?>> 联网搜索高清图标(第三方聚合服务)</label>
|
||||
<p class="hint span2">勾上后,当站点自身没有提供高清图标时,会依次尝试 icon.horse、Yandex 图标服务;关掉则只用站点自己声明的图标。</p>
|
||||
<div class="span2 form-actions"><button class="btn primary">保存设置</button></div>
|
||||
</form>
|
||||
</section>
|
||||
|
||||
Reference in New Issue
Block a user