From 0a8f341de78c81d0b87e765737efa699b7df4990 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 21 Jan 2022 11:28:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86=E5=8F=8A=E5=90=8E=E5=8F=B0=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/config/system.html    | 84 +++++++++++++++++-----------
 app/admin/view/index/layout-top.html |  1 +
 app/admin/view/login/index.html      |  2 +-
 3 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/app/admin/view/config/system.html b/app/admin/view/config/system.html
index bfb435ee5..f09699aa4 100644
--- a/app/admin/view/config/system.html
+++ b/app/admin/view/config/system.html
@@ -1,23 +1,41 @@
 <form onsubmit="return false" data-auto="true" action="{:sysuri()}" method="post" class='layui-form layui-card' autocomplete="off">
     <div class="layui-card-body padding-left-40">
 
-        <div class="layui-form-item margin-bottom-5">
-            <div class="help-label"><b>登录界面背景</b>BackImage</div>
-            <input type="hidden" value="{:sysconf('login_image')}" name="login_image">
-            <script>$('[name="login_image"]').uploadMultipleImage()</script>
+        <div class="layui-form-item">
+            <div class="help-label"><b>登录背景图片</b>Back Image</div>
+            <table class="layui-table">
+                <thead>
+                <tr>
+                    <th class="padding-bottom-5">
+                        <input type="hidden" value="{:sysconf('login_image')}" name="login_image">
+                        <script>$('[name="login_image"]').uploadMultipleImage()</script>
+                    </th>
+                </tr>
+                </thead>
+            </table>
         </div>
 
-        <div class="layui-form-item">
-            <div class="help-label label-required-prev"><b>后台登录入口</b>LoginEntry</div>
-            <label class="layui-input relative block label-required-null">
-                <span>{:sysuri('@',[],false,true)}</span>
-                <input autofocus required pattern="[a-zA-Z_][a-zA-Z0-9_]*" placeholder="请输入后台登录入口" class="layui-input inline-block padding-0 border-0" style="width:auto;background:none" value="{:substr(sysuri('admin/index/index',[],false), strlen(sysuri('@')))}" name="xpath">
-            </label>
-            <span class="help-block">名称由英文字母开头且不能存在相同名称的应用，设置之后原地址不能继续访问！</span>
+        <div class="layui-row layui-col-space15 layui-form-item margin-bottom-5">
+            <div class="layui-col-xs6 padding-top-0 padding-bottom-0">
+                <div class="help-label label-required-prev"><b>后台登录入口</b>Login Entry</div>
+                <label class="layui-input relative block label-required-null">
+                    <span>{:sysuri('@',[],false,true)}</span>
+                    <input autofocus required pattern="[a-zA-Z_][a-zA-Z0-9_]*" placeholder="请输入后台登录入口" class="layui-input inline-block padding-0 border-0" style="width:auto;background:none" value="{:substr(sysuri('admin/index/index',[],false), strlen(sysuri('@')))}" name="xpath">
+                </label>
+            </div>
+            <div class="layui-col-xs6 padding-top-0 padding-bottom-0">
+                <label class="relative block">
+                    <span class="help-label"><b>登录表单标题</b>Login Name</span>
+                    <input name="login_name" required placeholder="请输入登录页面的表单标题" value="{:sysconf('login_name')?:'系统管理'}" class="layui-input">
+                </label>
+            </div>
+            <div class="layui-col-xs12 padding-top-0 padding-bottom-0">
+                <span class="help-block">后台登录入口由英文字母开头且不能有相同名称的模块，设置之后原地址不能继续访问 ~</span>
+            </div>
         </div>
 
-        <div class="layui-form-item">
-            <div class="help-label label-required-prev"><b>后台默认主题</b>Theme</div>
+        <div class="layui-form-item margin-bottom-5 label-required-prev">
+            <div class="help-label"><b>默认主题样式</b>Theme Style</div>
             <div class="layui-input">
                 {foreach ['default'=>'默认色','white'=>'简约白','black'=>'精典黑','red'=>'玫瑰红','blue'=>'天空蓝'] as $k=>$v}
                 <label class="think-radio">
@@ -29,60 +47,60 @@
                 </label>
                 {/foreach}
             </div>
-            <span class="help-block">用户登录管理后台默认会以此配置的主题显示管理界面，用户也可以单独修改配置主题！</span>
+            <span class="help-block">用户登录管理后台默认会以此配置的主题显示管理界面，用户也可以单独修改配置主题 ~</span>
         </div>
 
         <div class="layui-form-item">
-            <div class="help-label label-required-prev"><b>浏览器小图标</b>Icon</div>
+            <div class="help-label label-required-prev"><b>浏览器小图标</b>Browser Icon</div>
             <label class="relative block label-required-null">
                 <input class="layui-input" required pattern="^(http|/)" placeholder="请上传浏览器图标" value="{:sysconf('site_icon')}" name="site_icon">
-                <a class="input-right-icon layui-icon layui-icon-upload-drag" data-file="btn" data-type="ico,png" data-field="site_icon"></a>
+                <a class="input-right-icon layui-icon layui-icon-upload-drag" data-file="btn" data-type="ico,png,jpg" data-field="site_icon"></a>
             </label>
-            <span class="help-block">建议上传 <span class="color-blue">128x128</span> | <span class="color-blue">256x256</span> 的 ico 或 png 图片，可以通过 <a href="https://www.favicon-icon-generator.com" target="_blank">ICON </a>在线制作 ico 后缀文件！</span>
+            <span class="help-block">建议上传 <span class="color-blue">128x128</span> | <span class="color-blue">256x256</span> 的 ico 或 png 图片，可以通过 <a href="https://www.favicon-icon-generator.com" target="_blank">ICON </a>在线制作 ico 后缀文件 ~</span>
         </div>
 
         <div class="layui-row layui-col-space15">
-            <div class="layui-col-xs4 padding-bottom-0">
-                <label class="layui-form-item relative block">
-                    <span class="help-label"><b>网站名称</b>SiteName</span>
+            <div class="layui-col-xs4 padding-top-0 padding-bottom-0">
+                <label class="layui-form-item margin-bottom-5 relative block">
+                    <span class="help-label"><b>网站名称</b>Site Name</span>
                     <input name="site_name" required placeholder="请输入网站名称" value="{:sysconf('site_name')}" class="layui-input">
-                    <span class="help-block">网站名称将显示在浏览器的标签上！</span>
+                    <span class="help-block">网站名称将显示在浏览器的标签上 ~</span>
                 </label>
             </div>
-            <div class="layui-col-xs4 padding-bottom-0">
-                <label class="layui-form-item relative block">
-                    <span class="help-label"><b>后台程序名称</b>AppName</span>
+            <div class="layui-col-xs4 padding-top-0 padding-bottom-0">
+                <label class="layui-form-item margin-bottom-5 relative block">
+                    <span class="help-label"><b>后台程序名称</b>App Name</span>
                     <input name="app_name" required placeholder="请输入程序名称" value="{:sysconf('app_name')}" class="layui-input">
-                    <span class="help-block">管理程序名称显示在后台左上标题处！</span>
+                    <span class="help-block">管理程序名称显示在后台左上标题处 ~</span>
                 </label>
             </div>
-            <div class="layui-col-xs4 padding-bottom-0">
-                <label class="layui-form-item relative block">
-                    <span class="help-label"><b>后台程序版本</b>AppVersion</span>
+            <div class="layui-col-xs4 padding-top-0 padding-bottom-0">
+                <label class="layui-form-item margin-bottom-5 relative block">
+                    <span class="help-label"><b>后台程序版本</b>App Version</span>
                     <input name="app_version" placeholder="请输入程序版本" value="{:sysconf('app_version')}" class="layui-input">
-                    <span class="help-block">管理程序版本显示在后台左上标题处！</span>
+                    <span class="help-block">管理程序版本显示在后台左上标题处 ~</span>
                 </label>
             </div>
-            <div class="layui-col-xs4 padding-bottom-0">
+            <div class="layui-col-xs4 padding-top-0 padding-bottom-0">
                 <label class="relative block">
                     <span class="help-label"><b>公网安备号</b>Baian</span>
                     <input name="beian" placeholder="请输入公网安备号" value="{:sysconf('beian')}" class="layui-input">
                 </label>
             </div>
-            <div class="layui-col-xs4 padding-bottom-0">
+            <div class="layui-col-xs4 padding-top-0 padding-bottom-0">
                 <label class="relative block">
                     <span class="help-label"><b>网站备案号</b>Miitbeian</span>
                     <input name="miitbeian" placeholder="请输入网站备案号" value="{:sysconf('miitbeian')}" class="layui-input">
                 </label>
             </div>
-            <div class="layui-col-xs4 padding-bottom-0">
+            <div class="layui-col-xs4 padding-top-0 padding-bottom-0">
                 <label class="relative block">
                     <span class="help-label"><b>网站版权信息</b>Copyright</span>
                     <input name="site_copy" required placeholder="请输入版权信息" value="{:sysconf('site_copy')}" class="layui-input">
                 </label>
             </div>
             <div class="layui-col-xs12 help-block padding-top-0">
-                网站备案号和公安备案号可以在<a target="_blank" href="https://beian.miit.gov.cn">备案管理中心</a>查询并获取，网站上线时必需配置备案号，备案号会链接到信息备案管理系统！
+                网站备案号和公安备案号可以在<a target="_blank" href="https://beian.miit.gov.cn">备案管理中心</a>查询并获取，网站上线时必需配置备案号，备案号会链接到信息备案管理系统 ~
             </div>
         </div>
     </div>
diff --git a/app/admin/view/index/layout-top.html b/app/admin/view/index/layout-top.html
index ce7de68bb..22bd108b0 100644
--- a/app/admin/view/index/layout-top.html
+++ b/app/admin/view/index/layout-top.html
@@ -22,6 +22,7 @@
         <li class="layui-nav-item">
             <dl class="layui-nav-child">
                 <dd lay-unselect><a data-modal="{:sysuri('admin/index/info',['id'=>session('user.id')])}"><i class="layui-icon layui-icon-set-fill"></i> 基本资料</a></dd>
+                <dd lay-unselect><a data-modal="{:sysuri('admin/index/theme')}"><i class="layui-icon layui-icon-theme"></i> 配色方案</a></dd>
                 <dd lay-unselect><a data-modal="{:sysuri('admin/index/pass',['id'=>session('user.id')])}"><i class="layui-icon layui-icon-component"></i> 安全设置</a></dd>
                 {if isset($isSuper) and $isSuper}
                 <dd lay-unselect><a data-load="{:sysuri('admin/api.runtime/push')}"><i class="layui-icon layui-icon-template-1"></i> 缓存加速</a></dd>
diff --git a/app/admin/view/login/index.html b/app/admin/view/login/index.html
index 648758af0..ec6ca147f 100644
--- a/app/admin/view/login/index.html
+++ b/app/admin/view/login/index.html
@@ -11,7 +11,7 @@
         {/notempty}
     </div>
     <form data-login-form onsubmit="return false" method="post" class="layui-anim layui-anim-upbit" autocomplete="off">
-        <h2 class="notselect">系统管理</h2>
+        <h2 class="notselect">{:sysconf('login_name')?:'系统管理'}</h2>
         <ul>
             <li class="username">
                 <label class="label-required-null">