From d0b4d04315984c09c9733f6c1939d8a5d4605166 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Thu, 25 Oct 2018 23:23:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/default/config.html  | 36 +++++++++++++++++++++++++++++-------
 templates/default/control.html | 11 ++++++++---
 templates/default/layout.html  |  2 +-
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/templates/default/config.html b/templates/default/config.html
index d3c76d194..62dbfdee2 100755
--- a/templates/default/config.html
+++ b/templates/default/config.html
@@ -62,19 +62,41 @@
 						<p class="mtb15">
 							<span class="set-tit text-right" title="默认建站目录">默认建站目录</span>
 							<input name="sites_path" class="inputtxt bt-input-text" type="text" value="">
+							<span class="set-info c7">新创建的站点,默认将保存到该目录的下级目录!</span>
+						</p>
+
+						<p class="mtb15">
+							<span class="set-tit text-right" title="默认建站目录">默认备份目录</span>
+							<input name="sites_path" class="inputtxt bt-input-text" type="text" value="">
 							<span class="set-info c7">网站和数据库的备份目录!</span>
 						</p>
-						<p class="mtb15"><span class="set-tit text-right" title="$data['lan']['CT6']">$data['lan']['CT6']</span><input name="backup_path" class="inputtxt bt-input-text" type="text" value="$data['backup_path']"><span class="set-info c7">$data['lan']['CY6']</span></p>
-						<p class="mtb15"><span class="set-tit text-right" title="$data['lan']['CT7']">$data['lan']['CT7']</span><input name="address" class="inputtxt bt-input-text" type="text" value="$data['panel']['address']"><span class="set-info c7">$data['lan']['CY7']</span></p>
-						<p class="mtb15"><span class="set-tit text-right" title="$data['lan']['CT8']">$data['lan']['CT8']</span><input id="systemdate" name="systemdate" class="inputtxt bt-input-text disable" type="text" value="$data['systemdate']"><span class="modify btn btn-xs btn-success" onclick="syncDate()">$data['lan']['CY8']</span></p>
-						<p class="mtb15"><span class="set-tit text-right" title="$data['lan']['CT9']">$data['lan']['CT9']</span><input name="username_" class="inputtxt bt-input-text disable" type="text" value="$web.ctx.session.username" disabled><span class="modify btn btn-xs btn-success" onclick="setUserName()">$data['lan']['CY9']</span></p>
-						<p class="mtb15"><span class="set-tit text-right" title="$data['lan']['CT10']">$data['lan']['CT10']</span><input name="password_" class="inputtxt bt-input-text disable" type="text" value="******" disabled><span class="modify btn btn-xs btn-success" onclick="setPassword()">$data['lan']['CY10']</span></p>
-						<p class="mtb15"><span class="set-tit text-right" title="$data['lan']['CT11']">$data['lan']['CT11']</span><input name="btusername" class="inputtxt bt-input-text disable" type="text" value="" disabled><span class="modify btn btn-xs btn-success mr5" onclick="bindBTName(2,'b')">$data['lan']['CY11']</span></p>
+
+						<p class="mtb15">
+							<span class="set-tit text-right" title="服务器IP">服务器IP</span>
+							<input name="backup_path" class="inputtxt bt-input-text" type="text" value="">
+							<span class="set-info c7">
+								默认为外网IP,若您在本地虚拟机测试,请填写虚拟机内网IP!
+							</span>
+						</p>
+						
+						<p class="mtb15">
+							<span class="set-tit text-right" title="服务器时间">服务器时间</span>
+							<input id="systemdate" name="systemdate" class="inputtxt bt-input-text disable" type="text" value=""><span class="modify btn btn-xs btn-success" onclick="syncDate()">同步</span>
+						</p>
+						<p class="mtb15">
+							<span class="set-tit text-right" title="面板用户">面板用户</span>
+							<input name="username_" class="inputtxt bt-input-text disable" type="text" value="" disabled><span class="modify btn btn-xs btn-success" onclick="setUserName()">修改</span>
+						</p>
+						<p class="mtb15">
+							<span class="set-tit text-right" title="面板密码">面板密码</span>
+							<input name="password_" class="inputtxt bt-input-text disable" type="text" value="******" disabled><span class="modify btn btn-xs btn-success" onclick="setPassword()">修改</span>
+						</p>
+				
 						
 
 						
 					</form>
-					<div class="bt-submit set-submit">$data['lan']['C4']</div>
+					<div class="bt-submit set-submit">保存</div>
 				</div>
 			</div>
 		</div>
diff --git a/templates/default/control.html b/templates/default/control.html
index 9ac6cc5d6..55f1071dc 100755
--- a/templates/default/control.html
+++ b/templates/default/control.html
@@ -1,4 +1,7 @@
-$def with (data)
+{% extends "default/layout.html" %}
+
+{% block content %}
+
 <div class="main-content">
 		<div class="container-fluid" style="padding-bottom: 50px;">
 			<div class="pos-box bgw mtb15">
@@ -132,5 +135,7 @@ $def with (data)
 		</div>
 	</div>
 </div>
-<script src="/static/js/echarts.min.js"></script>
-<script src="/static/js/control.js?date=20180321"></script>
\ No newline at end of file
+<script src="/static/js/echarts.min.js?v={{config.version}}"></script>
+<script src="/static/js/control.js?v={{config.version}}"></script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/default/layout.html b/templates/default/layout.html
index 4f877b544..9014c00e7 100755
--- a/templates/default/layout.html
+++ b/templates/default/layout.html
@@ -26,7 +26,7 @@
                     <ul class="menu">
                         <li id="memuA"> <a class="menu_home" href="/">首页</a></li>
                         <li id="memuAsite"><a class="menu_web" href="/site">网站</a></li>
-                        <li id="memuAftp"><a class="menu_ftp" href="/ftp">FTP</a></li>
+                        <!-- <li id="memuAftp"><a class="menu_ftp" href="/ftp">FTP</a></li> -->
                         <li id="memuAdatabase"><a class="menu_data" href="/database">数据库</a></li>
                         <li id="memuAcontrol"><a class="menu_control" href="/control">监控</a></li>
                         <li id="memuAfirewall"><a class="menu_firewall" href="/firewall">安全</a></li>