From 1f916d188c7cccb8e510e8ea2222664064be1762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 17 Feb 2017 16:04:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E5=8F=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/config.index.html | 97 ++++++++++++++++--------
 application/admin/view/login.index.html  |  4 +-
 application/extra/view/admin.main.html   |  2 +-
 3 files changed, 69 insertions(+), 34 deletions(-)

diff --git a/application/admin/view/config.index.html b/application/admin/view/config.index.html
index 2c62cd7f4..c621b7ce0 100644
--- a/application/admin/view/config.index.html
+++ b/application/admin/view/config.index.html
@@ -7,17 +7,78 @@
             <fieldset class="layui-elem-field layui-box">
                 <legend>网站信息</legend>
                 <div class="layui-field-box" style="padding-right:35px">
+
                     <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">网站名称</label>
+                        <label class="layui-form-label">公司名称</label>
                         <div class="layui-input-block">
-                            <input type="text" name="site_name" required="required" title="请输入网站名称" placeholder="请输入网站名称" value="{:sysconf('site_name')}" class="layui-input">
+                            <input type="text" name="site_company" required="required" title="请输入公司名称" placeholder="请输入公司名称" value="{:sysconf('site_company')}" class="layui-input">
                         </div>
                     </div>
 
                     <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">后台标题</label>
+                        <label class="layui-form-label">网站标题</label>
                         <div class="layui-input-block">
-                            <input type="text" name="site_name" required="required" title="请输入网站名称" placeholder="请输入网站名称" value="{:sysconf('site_name')}" class="layui-input">
+                            <input type="text" name="site_name" required="required" title="请输入网站标题" placeholder="请输入网站标题" value="{:sysconf('site_name')}" class="layui-input">
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-box">
+                        <label class="layui-form-label">网站域名</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="site_domain" required="required" title="请输入网站域名" placeholder="请输入网站域名" value="{:sysconf('site_domain')}" class="layui-input">
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-box">
+                        <label class="layui-form-label">网站版权</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="site_copy" required="required" title="请输入网站版权" placeholder="请输入网站版权" value="{:sysconf('site_copy')}" class="layui-input">
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-box">
+                        <label class="layui-form-label">网站备案号</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="site_beian" title="请输入网站备案号" placeholder="请输入网站备案号" value="{:sysconf('site_beian')}" class="layui-input">
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-box">
+                        <label class="layui-form-label">网站关键字</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="site_keys" title="请输入SEO关键字" placeholder="请输入关键字，多个以英文逗号隔开" value="{:sysconf('site_keys')}" class="layui-input">
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-box">
+                        <label class="layui-form-label">网站描述</label>
+                        <div class="layui-input-block">
+                            <textarea name="site_desc" placeholder="请输入网站描述" class="layui-textarea">{:sysconf('site_desc')}</textarea>
+                        </div>
+                    </div>
+
+
+
+
+
+                </div>
+                <div class="layui-form-item layui-box text-center">
+                    <button class="layui-btn" type="submit">立即提交</button>
+                </div>
+            </fieldset>
+        </form>
+    </div>
+
+    <div class="col-lg-6">
+        <form class=" layui-form" data-auto="" method="post">
+            <fieldset class="layui-elem-field layui-box">
+                <legend>其它参数</legend>
+                <div class="layui-field-box" style="padding-right:35px">
+
+                    <div class="layui-form-item layui-box">
+                        <label class="layui-form-label">系统名称</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="app_name" required="required" title="请输入系统名称" placeholder="请输入系统名称" value="{:sysconf('app_name')}" class="layui-input">
                         </div>
                     </div>
 
@@ -28,13 +89,6 @@
                         </div>
                     </div>
 
-                    <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">备案域名</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="site_domain" required="required" title="请输入网站域名" placeholder="请输入网站域名" value="{:sysconf('site_domain')}" class="layui-input">
-                        </div>
-                    </div>
-
                     <div class="layui-form-item layui-box">
                         <label class="layui-form-label">百度统计ID</label>
                         <div class="layui-input-block">
@@ -48,27 +102,6 @@
                             <input type="text" name="site_tongji_cnzz" placeholder="请输入CNZZ统计ID" value="{:sysconf('site_tongji_cnzz')}" class="layui-input">
                         </div>
                     </div>
-                </div>
-                <div class="layui-form-item layui-box text-center">
-                    <button class="layui-btn" type="submit">立即提交</button>
-                </div>
-            </fieldset>
-        </form>
-    </div>
-
-    <div class="col-lg-6">
-        <form class=" layui-form" data-auto="" method="post">
-            <fieldset class="layui-elem-field layui-box">
-                <legend>公司信息</legend>
-                <div class="layui-field-box" style="padding-right:35px">
-
-                    <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">公司名称</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="site_company" required="required" title="请输入公司名称" placeholder="请输入公司名称" value="{:sysconf('site_company')}" class="layui-input">
-                        </div>
-                    </div>
-
 
                     <div class="layui-form-item layui-box">
                         <label class="layui-form-label">网站Logo</label>
diff --git a/application/admin/view/login.index.html b/application/admin/view/login.index.html
index 5b31e6f5a..55755ba93 100644
--- a/application/admin/view/login.index.html
+++ b/application/admin/view/login.index.html
@@ -69,7 +69,9 @@
             </ul>
         </form>
     </div>
-    <div class="footer">{:sysconf('site_company')} &copy; {:date('Y')}</div>
+    {if sysconf('site_copy')}
+    <div class="footer">{:sysconf('site_copy')}</div>
+    {/if}
 </div>
 {/block}
 
diff --git a/application/extra/view/admin.main.html b/application/extra/view/admin.main.html
index 16d373300..5277f27a7 100644
--- a/application/extra/view/admin.main.html
+++ b/application/extra/view/admin.main.html
@@ -5,7 +5,7 @@
         <meta name="renderer" content="webkit"/>
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <link rel="shortcut icon" href="{:sysconf('app_logo')}" />
-        <title>{block name="title"}{$title|default=''}&nbsp;{if !empty($title)}-{/if}&nbsp;{:sysconf('app_name')}{/block}</title>
+        <title>{block name="title"}{$title|default=''}&nbsp;{if !empty($title)}-{/if}&nbsp;{:sysconf('app_name')}&nbsp;|&nbsp;{:sysconf('app_version')}{/block}</title>
         <link rel="stylesheet" href="__STATIC__/plugs/bootstrap/css/bootstrap.min.css"/>
         <link rel="stylesheet" href="__STATIC__/theme/default/css/console.css">
         <link rel="stylesheet" href="__STATIC__/theme/default/css/animate.css">