AE86 2 年之前
父節點
當前提交
894c423c3f

+ 1 - 1
dbsyncer-web/src/main/resources/public/index.html

@@ -12,7 +12,7 @@
     <meta name="description" content="search">
     <meta name="author" content="AE86">
     <title>dbsyncer</title>
-    <link type="image/x-icon" rel="icon" th:href="@{/img/sync.ico}"/>
+    <link type="image/x-icon" rel="icon" th:href="@{/img/logo.ico}"/>
     <link type="text/css" rel="stylesheet" th:href="@{/plugins/css/font-awesome.min.css}"/>
     <link type="text/css" rel="stylesheet" th:href="@{/plugins/css/bootstrap/bootstrap.min.css}"/>
     <link type="text/css" rel="stylesheet" th:href="@{/plugins/css/bootstrap-dialog/bootstrap-dialog.min.css}"/>

+ 10 - 2
dbsyncer-web/src/main/resources/public/login.html

@@ -4,11 +4,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>dbsyncer</title>
-<link type="image/x-icon" rel="icon" th:href="@{/img/sync.ico}"/>
+<link type="image/x-icon" rel="icon" th:href="@{/img/logo.ico}"/>
 <link type="text/css" rel="stylesheet" th:href="@{/css/login/login.css}"/>
 </head>
 <body>
-<form id="loginForm" name="loginForm" method="post"></form>
+<form id="loginForm" name="loginForm" method="post">
+	<dl class="admin_login">
+		<dt><strong id="appName" /></dt>
+		<div id="loginTip" class="loginVerifcateTextError"></div>
+		<dd class="user_icon"><input type="text" name="username" placeholder="请输入帐号" class="login_txtbx required" /></dd>
+		<dd class="pwd_icon"><input type="password" name="password" placeholder="请输入密码" class="login_txtbx required" /></dd>
+		<dd class="pwd_icon"><input type="button" value="登录" class="submit_btn" id="loginSubmitBtn" /></dd>
+	</dl>
+</form>
 <div class="footerContainer">
 	<p id="appCopyRight" style="text-align:center;"></p>
 	<p>&nbsp;</p>

+ 1 - 1
dbsyncer-web/src/main/resources/public/nav.html

@@ -5,7 +5,7 @@
 <nav th:fragment="nav" class="navbar navbar-inverse" role="navigation" >
     <div class="container-fluid">
         <div class="navbar-header">
-            <span id="appName" class="navbar-brand" href="javascript:;"></span>
+            <img draggable="false" th:src="@{'/img/logo.png'}" style="width: 50px; height: 50px;">&nbsp;
         </div>
         <div>
             <ul id="menu" class="nav navbar-nav">

二進制
dbsyncer-web/src/main/resources/static/img/logo.ico


二進制
dbsyncer-web/src/main/resources/static/img/logo.jpg


二進制
dbsyncer-web/src/main/resources/static/img/logo.png


二進制
dbsyncer-web/src/main/resources/static/img/sync.ico


+ 0 - 2
dbsyncer-web/src/main/resources/static/js/index.js

@@ -5,8 +5,6 @@ $(function () {
     // 初始化版权信息
     doGetter("/index/version.json",{}, function (data) {
         if (data.success == true) {
-            // 获取头部版权信息
-            $("#appName").html(data.resultValue.appName);
             // 获取底部版权信息
             $("#appCopyRight").html(data.resultValue.appCopyRight);
         }

+ 1 - 26
dbsyncer-web/src/main/resources/static/js/login/login.js

@@ -3,30 +3,7 @@ var $location = (window.location + '').split('/');
 var $path = document.location.pathname;
 var $basePath = $location[0] + '//' + $location[2] + $path.substr(0, $path.substr(1).indexOf("/")+1);
 
-var $formHtml = "<dl class=\"admin_login\">\n" +
-    "\t<dt>\n" +
-    "\t\t<strong id=\"appName\"></strong>\n" +
-    "\t</dt>\n" +
-    "\t<div id=\"loginTip\" class=\"loginVerifcateTextError\"></div>\n" +
-    "\t<dd class=\"user_icon\">\n" +
-    "\t\t<input type=\"text\" name=\"username\" placeholder=\"请输入帐号\" class=\"login_txtbx required\" />\n" +
-    "\t</dd>\n" +
-    "\t<dd class=\"pwd_icon\">\n" +
-    "\t\t<input type=\"password\" name=\"password\" placeholder=\"请输入密码\" class=\"login_txtbx required\" />\n" +
-    "\t</dd>\n" +
-    "\t<dd>\n" +
-    "\t\t<input type=\"button\" value=\"登录\" class=\"submit_btn\" id=\"loginSubmitBtn\" />\n" +
-    "\t</dd>\n" +
-    "</dl>";
-
 $(document).ready(function () {
-    // 会话过期
-    var html = $("#appName").html();
-    if (html != undefined && html != null) {
-        location.href = $basePath;
-        return;
-    }
-
     // 兼容IE PlaceHolder
     $('input[type="text"],input[type="password"]').PlaceHolder({
         zIndex: '0',
@@ -36,12 +13,10 @@ $(document).ready(function () {
         color: '#999'
     });
 
-    var $form = $("#loginForm");
-    $form.html($formHtml);
     // 提交表单
     var $loginSubBtn = $("#loginSubmitBtn");
     $loginSubBtn.click(function () {
-        login($form);
+        login($("#loginForm"));
     });
     $("input").keydown(function (e) {
         if (e.which == 13) {