From 2ee2440c6865893855261a9d085acd1b2656dc21 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 25 Oct 2018 17:33:34 +0800
Subject: [PATCH] u

---
 route/dashboard.py            |   5 +
 templates/default/config.html | 237 +++++++++++++++++-----------------
 templates/default/soft.html   |   1 -
 3 files changed, 122 insertions(+), 121 deletions(-)

diff --git a/route/dashboard.py b/route/dashboard.py
index 1d92623e7..461aff941 100644
--- a/route/dashboard.py
+++ b/route/dashboard.py
@@ -13,3 +13,8 @@ dashboard = Blueprint('dashboard', __name__, template_folder='templates')
 @dashboard.route("/")
 def index():
     return render_template('default/index.html')
+
+
+@dashboard.route("/login")
+def login():
+    return render_template('default/login.html')
diff --git a/templates/default/config.html b/templates/default/config.html
index ac58ab785..d3c76d194 100755
--- a/templates/default/config.html
+++ b/templates/default/config.html
@@ -57,24 +57,22 @@
 							<input name="domain" 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']['CT4']">$data['lan']['CT4']</span><input name="limitip" class="inputtxt bt-input-text" type="text" value="$data['panel']['limitip']"><span class="set-info c7">$:data['lan']['CY4']</span></p>
-						<p class="mtb15"><span class="set-tit text-right" title="$data['lan']['CT5']">$data['lan']['CT5']</span><input name="sites_path" class="inputtxt bt-input-text" type="text" value="$data['sites_path']"><span class="set-info c7">$data['lan']['CY5']</span></p>
+						<p class="mtb15"><span class="set-tit text-right" title="授权IP">授权IP</span><input name="limitip" class="inputtxt bt-input-text" type="text" value=""><span class="set-info c7">设置访问授权IP,多个请使用逗号(,)隔开;注意：一旦设置授权IP,只有指定IP的电脑能访问面板!</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" style="display: none;"><span class="set-tit text-right" title="$data['lan']['CT12']">$data['lan']['CT12']</span>
-							<select class="inputtxt bt-input-text disable" style="margin-left: -4px;width: 211px;" name="template">
-							$for template in data['panel']['templates']:
-								$if template == data['panel']['template']:
-									<option value="$template" selected>$template</option>
-								$else:
-									<option value="$template">$template</option>
-							</select>
-						<span class="modify btn btn-xs btn-success mr5" style="margin-left: 5px;" onclick="setTemplate()">$data['lan']['CY12']</span></p>
-						<p class="mtb15"><span class="set-tit text-right">微信小程序</span><input class="inputtxt bt-input-text disable" type="text" value="$data['wx']" disabled><span class="modify btn btn-xs btn-success mr5" onclick="open_wxapp()">绑定</span></p>
+						
+
+						
 					</form>
 					<div class="bt-submit set-submit">$data['lan']['C4']</div>
 				</div>
@@ -83,118 +81,117 @@
 	</div>
 </div>
 <style>
-	.boxConter{
-		height: 458px;
-		position: relative;
-		overflow:auto;
-	}
-	.iconCode{
-		padding: 50px 60px;
-	}
-	.box-conter{
-		width: 100%;
-	}
-	#QRcode{
-		margin-bottom: 25px;
-		text-align: center;
-	}
+.boxConter{
+	height: 458px;
+	position: relative;
+	overflow:auto;
+}
+.iconCode{
+	padding: 50px 60px;
+}
+.box-conter{
+	width: 100%;
+}
+#QRcode{
+	margin-bottom: 25px;
+	text-align: center;
+}
 
-	.iconCode #QRcode,
-	.iconCode .codeTip{
-		width: 100%;
-		text-align: center;
-		font-size: 17px;
-	}
-	.iconCode .weChatSamll img{
-		width: 100%;
-	}
-	.iconCode .weChatSamll{
-		display: none;
-		width: 200px;
-		height: 200px;
-		position: absolute;
-		border: 1px solid #ececec;
-		border-radius: 5px;
-		bottom: 150px;
-		right: 50px;
-		padding: 20px;
-		background-color: #fff;
-	}
-	.iconCode .weChatSamll:after{
-		content: '';
-		width: 15px;
-		height: 15px;
-		background: #ffffff;
-		border-bottom: 1px solid #ececec;
-		border-right: 1px solid #ececec;
-		transform: rotate(45deg);
-		position: absolute;
-		border-radius: 4px;
-		left: 90px;
-		bottom: -8px;
-	}
-	.iconCode .weChat{
-		margin-left: 15px;
-	}
-	.iconCode .weChat:hover .weChatSamll{
-		display: block;
-	}
-	.iconCode .QRcode{
-		margin-bottom: 15px;
-		text-align: center;
-	}
+.iconCode #QRcode,
+.iconCode .codeTip{
+	width: 100%;
+	text-align: center;
+	font-size: 17px;
+}
+.iconCode .weChatSamll img{
+	width: 100%;
+}
+.iconCode .weChatSamll{
+	display: none;
+	width: 200px;
+	height: 200px;
+	position: absolute;
+	border: 1px solid #ececec;
+	border-radius: 5px;
+	bottom: 150px;
+	right: 50px;
+	padding: 20px;
+	background-color: #fff;
+}
+.iconCode .weChatSamll:after{
+	content: '';
+	width: 15px;
+	height: 15px;
+	background: #ffffff;
+	border-bottom: 1px solid #ececec;
+	border-right: 1px solid #ececec;
+	transform: rotate(45deg);
+	position: absolute;
+	border-radius: 4px;
+	left: 90px;
+	bottom: -8px;
+}
+.iconCode .weChat{
+	margin-left: 15px;
+}
+.iconCode .weChat:hover .weChatSamll{
+	display: block;
+}
+.iconCode .QRcode{
+	margin-bottom: 15px;
+	text-align: center;
+}
 
-	.codeTip ul li{
-		margin-bottom: 10px;
-	}
+.codeTip ul li{
+	margin-bottom: 10px;
+}
 
-	.personalDetails .head_img{
-		width: 50px;
-		height: 50px;
-		float: left;
-		margin-right: 30px;
-	}
-	.personalDetails .head_img img{
-		height: 100%;
-		border-radius:50%;
-	}
-	.personalDetails .nick_name{
-		height: 50px;
-		line-height: 50px;
-		width: 148px;
-		float: left;
-		font-size: 15px;
-		color: #808080;
-	}
-	.personalDetails .userList{
-		height: 100%;
-	}
-	.personalDetails .userList .addweChat{
-		height: 50px;
-		text-align: center;
-		padding-top: 20px;
-		color: #20a53a;
-		font-size: 16px;
-	}
-	.personalDetails .userList .addweChat:hover{
-		
-	}
-	.personalDetails .userList .item{
-		height: 70px;
-		padding: 10px 15px;
-		border: 1px solid #ececec;
-		margin: 15px 65px;
-		border-radius: 5px;
-	}
-	.personalDetails .userList .cancelBind{
-		height: 50px;
-		width: 60px;
-		float: right;
-		line-height: 50px;
-		text-align: center;
-	}
+.personalDetails .head_img{
+	width: 50px;
+	height: 50px;
+	float: left;
+	margin-right: 30px;
+}
+.personalDetails .head_img img{
+	height: 100%;
+	border-radius:50%;
+}
+.personalDetails .nick_name{
+	height: 50px;
+	line-height: 50px;
+	width: 148px;
+	float: left;
+	font-size: 15px;
+	color: #808080;
+}
+.personalDetails .userList{
+	height: 100%;
+}
+.personalDetails .userList .addweChat{
+	height: 50px;
+	text-align: center;
+	padding-top: 20px;
+	color: #20a53a;
+	font-size: 16px;
+}
+.personalDetails .userList .addweChat:hover{
+	
+}
+.personalDetails .userList .item{
+	height: 70px;
+	padding: 10px 15px;
+	border: 1px solid #ececec;
+	margin: 15px 65px;
+	border-radius: 5px;
+}
+.personalDetails .userList .cancelBind{
+	height: 50px;
+	width: 60px;
+	float: right;
+	line-height: 50px;
+	text-align: center;
+}
 </style>
-<script type="text/javascript" src="/static/js/jquery.qrcode.min.js"></script>
 <script src="/static/js/config.js?date=20180530"></script>
 <script type="text/javascript">
 	// setCookie('serverType','$web.ctx.session.webserver');
diff --git a/templates/default/soft.html b/templates/default/soft.html
index f101d52f8..a0e28d660 100755
--- a/templates/default/soft.html
+++ b/templates/default/soft.html
@@ -13,7 +13,6 @@
 						<input type="text" id="SearchValue" class="ser-text pull-left" placeholder="search" />
 						<button type="button" class="ser-sub pull-left" onclick='GetSList()'></button>
 					</form>
-					<iframe name='hid' id="hid" style="display:none"></iframe>
 				</div>
 			</div>
 			<div class="softbox bgw mtb15">