From 03d8e766e93cc3866501b2b857b90efc2400b247 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 27 Dec 2018 18:15:31 +0800
Subject: [PATCH] update

---
 class/core/firewall_api.py         |  2 +-
 route/templates/default/login.html | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/class/core/firewall_api.py b/class/core/firewall_api.py
index 44387595d..0bc27101c 100755
--- a/class/core/firewall_api.py
+++ b/class/core/firewall_api.py
@@ -33,7 +33,7 @@ class firewall_api:
         search = request.form.get('search', '').strip()
         return self.getLogList(int(p), int(limit), search)
 
-    def getSshInfo(self):
+    def getSshInfoApi(self):
         file = '/etc/ssh/sshd_config'
         conf = public.readFile(file)
         rep = "#*Port\s+([0-9]+)\s*\n"
diff --git a/route/templates/default/login.html b/route/templates/default/login.html
index 3332437a3..2d311b15f 100755
--- a/route/templates/default/login.html
+++ b/route/templates/default/login.html
@@ -138,10 +138,12 @@
 		<div class="account">
 			<form class="loginform" method="post" action="/login" onsubmit="return false;">
 			<div class="rlogo">mdserver-web</div>
-			<div class="line"><input class="inputtxt" value="" name="username" datatype="*" nullmsg="请填写账户" errormsg="$tData['lan']['N2']" placeholder="账户" type="text"><div class="Validform_checktip"></div></div>
-			<div class="line"><input class="inputtxt" name="password" value="" datatype="*" nullmsg="请填写密码" errormsg="$tData['lan']['N5']" placeholder="密码" type="password"><div class="Validform_checktip"></div></div>
+			<div class="line"><input class="inputtxt" value="" name="username" datatype="*" nullmsg="请填写账户" errormsg="请填写账户" placeholder="账户" type="text"><div class="Validform_checktip"></div></div>
+			<div class="line"><input class="inputtxt" name="password" value="" datatype="*" nullmsg="请填写密码" errormsg="请填写密码" placeholder="密码" type="password">
+				<div class="Validform_checktip"></div>
+			</div>
 			<div style="color: red;position: relative;top: -14px;" id="errorStr"></div>
-			<div class="line yzm" style="top: -5px;display:none;">
+			<div class="line yzm" style="top: -5px;{% if not session['code'] %}display:none;{% endif %}">
 				<input type="text" class="inputtxt" name="code" nullmsg="请填写4位验证码" errormsg="验证码" datatype="*" placeholder="验证码">
 				<div class="Validform_checktip"></div>
 				<img width="100" height="40" class="passcode" onClick="this.src=this.src.split('?')[0] + '?'+new Date().getTime()" src="/code" style="border: 1px solid #ccc; float: right;" title="" >
@@ -160,6 +162,13 @@
 <script type="text/javascript" src="/static/layer/layer.js?v={{config.version}}"></script>
 <script type="text/javascript" src="/static/js/Validform_v5.3.2_min.js?v={{config.version}}"></script>
 <script type="text/javascript">
+$(function(){
+	Wreset();
+})
+window.onresize=function(){
+	Wreset();
+}
+
 function Wreset(){
 	var w = $(window).width();
 	var yzmw = $(".login .line").width() - 140;
@@ -171,12 +180,7 @@ function Wreset(){
 	}
 	$(".login .yzm .inputtxt").width(yzmw);
 }
-$(function(){
-	Wreset();
-})
-window.onresize=function(){
-	Wreset();
-}
+
 
 $(function(){
 	$(".loginform").Validform({