From 52eaaa932aba08bc8e6105f55083caad7410f837 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Sat, 26 Mar 2016 23:09:59 +0800
Subject: [PATCH] use spinner instead of showing alert while
 logging&registering

---
 assets/js/index.utils.js | 10 +++++-----
 index.php                |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/js/index.utils.js b/assets/js/index.utils.js
index 5de6b67b..b89892d4 100644
--- a/assets/js/index.utils.js
+++ b/assets/js/index.utils.js
@@ -2,7 +2,7 @@
 * @Author: printempw
 * @Date:   2016-01-21 13:55:44
 * @Last Modified by:   printempw
-* @Last Modified time: 2016-03-19 10:08:46
+* @Last Modified time: 2016-03-26 23:07:15
 */
 
 'use strict';
@@ -17,7 +17,7 @@ var login = function() {
             dataType: "json",
             data: { "uname": uname, "passwd": passwd },
             beforeSend: function() {
-                showMsg('alert-info', '登录中。。');
+                $('#login-button').html('<i class="fa fa-spinner fa-spin"></i> 登录中').prop('disabled', 'disabled');
             },
             success: function(json) {
                 console.log(json);
@@ -33,7 +33,7 @@ var login = function() {
                     window.setTimeout('window.location = "./user/index.php"', 1000);
                 } else {
                     showAlert(json.msg);
-                    showMsg('hide', '');
+                    $('#login-button').html('登录').prop('disabled', '');
                 }
             },
             error: function(json) {
@@ -53,7 +53,7 @@ var register = function() {
             dataType: "json",
             data: {'uname':uname, 'passwd':passwd},
             beforeSend: function() {
-                showMsg('alert-info', '注册中...');
+                $('#register-button').html('<i class="fa fa-spinner fa-spin"></i> 注册中').prop('disabled', 'disabled');
             },
             success: function(json) {
                 if (json.errno == 0) {
@@ -67,7 +67,7 @@ var register = function() {
                     });
                 } else {
                     showAlert(json.msg);
-                    showMsg('hide', "");
+                    $('#register-button').html('注册').prop('disabled', '');
                 }
             },
             error: function(json) {
diff --git a/index.php b/index.php
index d091e130..0240e167 100755
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * @Author: printempw
  * @Date:   2016-01-17 13:55:20
  * @Last Modified by:   printempw
- * @Last Modified time: 2016-03-26 22:28:22
+ * @Last Modified time: 2016-03-26 23:09:06
  */
 session_start();
 $dir = dirname(__FILE__);
@@ -28,6 +28,7 @@ if (isset($_COOKIE['uname']) && isset($_COOKIE['token'])) {
     <link rel="shortcut icon" href="./assets/images/favicon.ico">
     <link rel="stylesheet" href="./assets/libs/pure/pure-min.css">
     <link rel="stylesheet" href="./assets/libs/pure/grids-responsive-min.css">
+    <link rel="stylesheet" href="../assets/libs/font-awesome/css/font-awesome.min.css">
     <link rel="stylesheet" href="./assets/css/style.css">
     <link rel="stylesheet" href="./assets/css/index.style.css">
     <link rel="stylesheet" href="./assets/libs/remodal/remodal.css">
@@ -102,7 +103,6 @@ if (isset($_COOKIE['uname']) && isset($_COOKIE['token'])) {
         </label>
         <button id="login-button" class="pure-button pure-button-primary">登录</button>
     </div>
-    <div id="msg" class="alert"></div>
 </div>
 <?php if (Option::get('user_can_register') == 1): ?>
 <div class="remodal" data-remodal-id="register-modal">