From dbf29f6e951a95e5250900b189c7c2a8740035f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 18 Apr 2017 17:42:30 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E7=B3=BB=E7=BB=9F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=A8=A1=E5=9D=97=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=BD=99=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Index.php   |   2 +-
 application/admin/view/config.index.html | 172 ++++++++---------------
 application/extra/view/admin.main.html   |   2 +-
 3 files changed, 57 insertions(+), 119 deletions(-)

diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index ed572d4e6..e3e4907a6 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -38,7 +38,7 @@ class Index extends BasicAdmin {
         NodeModel::applyAuthNode();
         $list = Db::name('SystemMenu')->where('status', '1')->order('sort asc,id asc')->select();
         $menus = $this->_filterMenu(ToolsService::arr2tree($list));
-        $this->assign('title', '后台管理');
+        $this->assign('title', '平台管理');
         $this->assign('menus', $menus);
         return view();
     }
diff --git a/application/admin/view/config.index.html b/application/admin/view/config.index.html
index b7e81cc04..ab5787f19 100644
--- a/application/admin/view/config.index.html
+++ b/application/admin/view/config.index.html
@@ -1,127 +1,65 @@
 {extend name="extra@admin/content"}
 
 {block name="content"}
-<div class="row">
-    <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">
+<form onsubmit="return false;" action="{$_url_}" data-auto="true" method="post"
+      class='form-horizontal' style='padding-top:20px'>
 
-                    <div class="layui-form-item layui-box">
-                        <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">
-                        </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 class="form-group">
+        <label class="col-sm-2 control-label">SiteName <span class="nowrap">(网站名称)</span></label>
+        <div class='col-sm-8'>
+            <input type="text" name="site_name" required="required" title="请输入网站名称" placeholder="请输入网站名称"
+                   value="{:sysconf('site_name')}" class="layui-input">
+            <p class="help-block">网站名称，显示在浏览器标签上</p>
+        </div>
     </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>
-
-                    <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">系统版本</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="app_version" required="required" title="请输入网站域名" placeholder="请输入网站域名" value="{:sysconf('app_version')}" class="layui-input">
-                        </div>
-                    </div>
-
-                    <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">百度统计ID</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="site_tongji_baidu" title="请输入公司名称" placeholder="请输入百度统计ID" value="{:sysconf('site_tongji_baidu')}" class="layui-input">
-                        </div>
-                    </div>
-
-                    <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">CNZZ统计ID</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="site_tongji_cnzz" placeholder="请输入CNZZ统计ID" value="{:sysconf('site_tongji_cnzz')}" class="layui-input">
-                        </div>
-                    </div>
-
-                    <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">网站Logo</label>
-                        <div class="layui-input-block">
-                            <img data-tips-image="" style="height:auto;max-height:32px;min-width:32px" src="{:sysconf('site_logo')}"/>
-                            <input type="hidden" onchange="$(this).prev('img').attr('src', this.value)" name="site_logo" value="{:sysconf('site_logo')}"  class="layui-input">
-                            <a class="btn btn-link" data-file="one" data-uptype="qiniu" data-type="jpg,png,gif" data-field="site_logo">上传图片</a>
-                        </div>
-                        <div class="layui-form-mid layui-word-aux">
-                            建议LOGO图片的尺寸为160x56px，此LOGO图片用于后台登陆页面。
-                        </div>
-                    </div>
-                    <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">浏览器图标</label>
-                        <div class="layui-input-block">
-                            <img data-tips-image="" style="height:auto;max-height:32px;min-width:32px" src="{:sysconf('app_logo')}"/>
-                            <input type="hidden" name="app_logo" onchange="$(this).prev('img').attr('src', this.value)" value="{:sysconf('app_logo')}" class="layui-input">
-                            <a class="btn btn-link" data-file="one" data-type="ico,png" data-field="app_logo">上传图片</a>
-                        </div>
-                        <div class="layui-form-mid layui-word-aux">
-                            建议上传ICO图标的尺寸为128x128px，此图标用于网站标题前，ICON在线制作。
-                        </div>
-                    </div>
-                    <div class="layui-form-item layui-box text-center">
-                        <button class="layui-btn" type="submit">立即提交</button>
-                    </div>
-                </div>
-                </div>
-            </fieldset>
-        </form>
+    <div class="form-group">
+        <label class="col-sm-2 control-label">Copyright <span class="nowrap">(版权信息)</span></label>
+        <div class='col-sm-8'>
+            <input type="text" name="site_copy" required="required" title="请输入版权信息" placeholder="请输入版权信息"
+                   value="{:sysconf('site_copy')}" class="layui-input">
+            <p class="help-block">程序的版权信息设置，在后台登录页面显示</p>
+        </div>
     </div>
 
-</div>
+    <div class="form-group">
+        <label class="col-sm-2 control-label">AppName <span class="nowrap">(程序名称)</span></label>
+        <div class='col-sm-8'>
+            <input type="text" name="app_name" required="required" title="请输入程序名称" placeholder="请输入程序名称"
+                   value="{:sysconf('app_name')}" class="layui-input">
+            <p class="help-block">当前程序名称，在后台主标题上显示</p>
+        </div>
+    </div>
+
+
+    <div class="form-group">
+        <label class="col-sm-2 control-label">AppVersion <span class="nowrap">(程序版本)</span></label>
+        <div class='col-sm-8'>
+            <input type="text" name="app_version" required="required" title="请输入程序版本" placeholder="请输入程序版本"
+                   value="{:sysconf('app_version')}" class="layui-input">
+            <p class="help-block">当前程序版本号，在后台主标题上标显示</p>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="col-sm-2 control-label">BrowserIcon <span class="nowrap">(浏览器图标)</span></label>
+        <div class='col-sm-8'>
+            <img data-tips-image style="height:auto;max-height:32px;min-width:32px" src="{:sysconf('browser_icon')}"/>
+            <input type="hidden" name="browser_icon" onchange="$(this).prev('img').attr('src', this.value)"
+                   value="{:sysconf('browser_icon')}" class="layui-input">
+            <a class="btn btn-link" data-file="one" data-type="ico,png" data-field="browser_icon">上传图片</a>
+            <p>建议上传ICO图标的尺寸为128x128px，此图标用于网站标题前，ICON在线制作。</p>
+        </div>
+    </div>
+
+    <div class="hr-line-dashed"></div>
+
+    <div class="col-sm-4 col-sm-offset-2">
+        <div class="layui-form-item text-center">
+            <button class="layui-btn" type="submit">保存配置</button>
+        </div>
+    </div>
+
+</form>
 
 {/block}
\ No newline at end of file
diff --git a/application/extra/view/admin.main.html b/application/extra/view/admin.main.html
index b22d7f08f..038607830 100644
--- a/application/extra/view/admin.main.html
+++ b/application/extra/view/admin.main.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <meta name="renderer" content="webkit"/>
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <link rel="shortcut icon" href="{:sysconf('app_logo')}" />
+        <link rel="shortcut icon" href="{:sysconf('browser_icon')}" />
         <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__/plugs/layui/css/layui.css"/>