修改系统文件配置

.gitignore

@@ -5,4 +5,4 @@
 runtime
 composer.lock
 public/upload
-/nbproject/private/
+/nbproject/private/

app/admin/view/config/index.html

@@ -1,20 +1,23 @@
 {extend name="main"}
 
-{block name="content"}
+{block name="button"}
 
-{if auth('config')}
-<div class="think-box-shadow margin-bottom-15">
-    <span class="color-green font-w7 text-middle">系统参数配置：</span>
-    <a class="layui-btn layui-btn-sm" data-modal="{:url('system')}">修改系统配置</a>
-</div>
+{if auth('system')}
+<a class="layui-btn layui-btn-sm layui-btn-primary" data-modal="{:url('system')}">修改系统配置</a>
 {/if}
 
+{/block}
+
+{block name="content"}
+
 <div class="think-box-shadow margin-bottom-15">
-    <span class="color-green font-w7 text-middle">文件存储引擎：</span>
-    {foreach ['local'=>'本地服务器存储','qiniu'=>'七牛云对象存储'] as $k=>$v}
+    <span class="color-green font-w7 text-middle">文件存储方式：</span>
+    {foreach ['local'=>'本地服务器存储','qiniu'=>'七牛云对象存储'] as $k => $v}
     {if sysconf('storage.type') eq $k}
-    {if auth('file')}<a data-modal="{:url('storage')}?type={$k}" class="layui-btn layui-btn-sm">{$v}</a>{else}<a class="layui-btn layui-btn-sm">{$v}</a>{/if}
-    {elseif auth('file')}<a data-modal="{:url('storage')}?type={$k}" class="layui-btn layui-btn-sm layui-btn-primary">{$v}</a>{/if}
+    {if auth('storage')}<a data-title="配置{$v}" data-modal="{:url('storage')}?type={$k}" class="layui-btn layui-btn-sm">{$v}</a>{else}<a class="layui-btn layui-btn-sm">{$v}</a>{/if}
+    {else}
+    {if auth('storage')}<a data-title="配置{$v}" data-modal="{:url('storage')}?type={$k}" class="layui-btn layui-btn-sm layui-btn-primary">{$v}</a>{else}<a class="layui-btn layui-btn-sm">{$v}</a>{/if}
+    {/if}
     {/foreach}
 </div>
 

app/admin/view/config/storage-local.html

@@ -4,7 +4,7 @@
             <p>文件将存储在本地服务器，需确保服务器的 public/upload 目录有写入权限，有足够的存储空间！</p>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">AllowExts<br><span class="nowrap color-desc">允许类型</span></label>
+            <label class="layui-form-label"><span class="color-green font-w7">AllowExts</span><br><span class="nowrap color-desc">允许类型</span></label>
             <div class="layui-input-block">
                 <input type="text" name="storage.allow_exts" required value="{:sysconf('storage.allow_exts')}" placeholder="请输入系统文件上传后缀" class="layui-input">
                 <p class="help-block">设置系统允许上传文件的后缀，多个以英文逗号隔开。如：png,jpg,rar,doc</p>

app/admin/view/config/storage-qiniu.html

@@ -5,14 +5,14 @@
             完成实名认证后可获得10G免费存储空间哦！<a target="_blank" href="https://portal.qiniu.com/signup?code=3lhz6nmnwbple">我要免费申请</a>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">AllowExts<br><span class="nowrap color-desc">允许类型</span></label>
+            <label class="layui-form-label"><span class="color-green font-w7">AllowExts</span><br><span class="nowrap color-desc">允许类型</span></label>
             <div class="layui-input-block">
                 <input type="text" name="storage.allow_exts" required value="{:sysconf('storage.allow_exts')}" placeholder="请输入系统文件上传后缀" class="layui-input">
                 <p class="help-block">设置系统允许上传文件的后缀，多个以英文逗号隔开。如：png,jpg,rar,doc</p>
             </div>
         </div>
         <div class="layui-form-item" data-storage-type="qiniu">
-            <label class="layui-form-label label-required">Protocol<br><span class="nowrap color-desc">访问协议</span></label>
+            <label class="layui-form-label label-required"><span class="color-green font-w7">Protocol</span><br><span class="nowrap color-desc">访问协议</span></label>
             <div class="layui-input-block">
                 {foreach ['http','https','auto'] as $pro}
                 <label class="think-radio">
@@ -27,7 +27,7 @@
             </div>
         </div>
         <div class="layui-form-item" data-storage-type="qiniu">
-            <label class="layui-form-label">Region<br><span class="nowrap color-desc label-required">存储区域</span></label>
+            <label class="layui-form-label"><span class="color-green font-w7">Region</span><br><span class="nowrap color-desc label-required">存储区域</span></label>
             <div class="layui-input-block">
                 {foreach ['华东','华北','华南','北美'] as $area}
                 <label class="think-radio">
@@ -43,28 +43,28 @@
             </div>
         </div>
         <div class="layui-form-item" data-storage-type="qiniu">
-            <label class="layui-form-label">Bucket<br><span class="nowrap color-desc">空间名称</span></label>
+            <label class="layui-form-label"><span class="color-green font-w7">Bucket</span><br><span class="nowrap color-desc">空间名称</span></label>
             <div class="layui-input-block">
                 <input type="text" name="storage.qiniu_bucket" required value="{:sysconf('storage.qiniu_bucket')}" placeholder="请输入七牛云存储 Bucket (空间名称)" class="layui-input">
                 <p class="help-block">填写七牛云存储空间名称，如：static</p>
             </div>
         </div>
         <div class="layui-form-item" data-storage-type="qiniu">
-            <label class="layui-form-label">Domain<br><span class="nowrap color-desc">访问域名</span></label>
+            <label class="layui-form-label"><span class="color-green font-w7">Domain</span><br><span class="nowrap color-desc">访问域名</span></label>
             <div class="layui-input-block">
                 <input type="text" name="storage.qiniu_http_domain" required value="{:sysconf('storage.qiniu_http_domain')}" placeholder="请输入七牛云存储 Domain (访问域名)" class="layui-input">
                 <p class="help-block">填写七牛云存储访问域名，如：static.ctolog.com</p>
             </div>
         </div>
         <div class="layui-form-item" data-storage-type="qiniu">
-            <label class="layui-form-label">AccessKey<br><span class="nowrap color-desc">访问密钥</span></label>
+            <label class="layui-form-label"><span class="color-green font-w7">AccessKey</span><br><span class="nowrap color-desc">访问密钥</span></label>
             <div class="layui-input-block">
                 <input type="text" name="storage.qiniu_access_key" required value="{:sysconf('storage.qiniu_access_key')}" placeholder="请输入七牛云 AccessKey (访问密钥)" class="layui-input">
                 <p class="help-block">可以在 [ 七牛云 > 个人中心 ] 设置并获取到访问密钥。</p>
             </div>
         </div>
         <div class="layui-form-item" data-storage-type="qiniu">
-            <label class="layui-form-label">SecretKey<br><span class="nowrap color-desc">安全密钥</span></label>
+            <label class="layui-form-label"><span class="color-green font-w7">SecretKey</span><br><span class="nowrap color-desc">安全密钥</span></label>
             <div class="layui-input-block">
                 <input type="text" name="storage.qiniu_secret_key" required value="{:sysconf('storage.qiniu_secret_key')}" maxlength="43" placeholder="请输入七牛云 SecretKey (安全密钥)" class="layui-input">
                 <p class="help-block">可以在 [ 七牛云 > 个人中心 ] 设置并获取到安全密钥。</p>

public/static/theme/css/console.custom.css

@@ -431,6 +431,16 @@
   margin-bottom: 40px;
   background-color: #E90D24;
 }
+.input-right-icon {
+  top: 0;
+  right: 0;
+  width: 38px;
+  height: 38px;
+  display: inline-block;
+  position: absolute;
+  text-align: center;
+  line-height: 38px;
+}
 /** 加载进度 */
 .pace-inactive {
   display: none;