improved user experience, maybe...
This commit is contained in:
parent
559fd5baf3
commit
156d278b7a
|
|
@ -2,15 +2,11 @@
|
||||||
* @Author: prpr
|
* @Author: prpr
|
||||||
* @Date: 2016-01-21 13:55:44
|
* @Date: 2016-01-21 13:55:44
|
||||||
* @Last Modified by: prpr
|
* @Last Modified by: prpr
|
||||||
* @Last Modified time: 2016-01-22 10:34:42
|
* @Last Modified time: 2016-01-22 11:14:09
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
function showMsg(type, msg) {
|
|
||||||
$("[id=msg]").removeClass().addClass("alert").addClass(type).html(msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
$('#login').click(function(){
|
$('#login').click(function(){
|
||||||
$('[data-remodal-id=login-modal]').remodal().open();
|
$('[data-remodal-id=login-modal]').remodal().open();
|
||||||
})
|
})
|
||||||
|
|
@ -41,11 +37,10 @@ $("body").on("click", "#login-button", function(){
|
||||||
// 设置长效 token (7天)
|
// 设置长效 token (7天)
|
||||||
docCookies.setItem("token", json.token, 604800, '/');
|
docCookies.setItem("token", json.token, 604800, '/');
|
||||||
}
|
}
|
||||||
showMsg("alert-success", "Logging succeed!");
|
showAlert("Logging succeed!");
|
||||||
window.setTimeout("$('[data-remodal-id=login-modal]').remodal().close(); window.location = './user/index.php'", 1000);
|
window.setTimeout("window.location = './user/index.php'", 1000);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
showMsg("alert-danger", json.msg);
|
showAlert(json.msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -67,10 +62,9 @@ $("body").on("click", "#register-button", function(){
|
||||||
},
|
},
|
||||||
success: function(json) {
|
success: function(json) {
|
||||||
if (json.errno == 0) {
|
if (json.errno == 0) {
|
||||||
showMsg("alert-success", json.msg);
|
showAlert(json.msg + " Please log in.");
|
||||||
window.setTimeout("$('[data-remodal-id=register-modal]').remodal().close(); window.location = './index.php?action=login&msg=Successfully Registered, please log in.'", 1000);
|
|
||||||
} else {
|
} else {
|
||||||
showMsg("alert-danger", json.msg);
|
showAlert(json.msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
* @Author: prpr
|
* @Author: prpr
|
||||||
* @Date: 2016-01-21 13:56:40
|
* @Date: 2016-01-21 13:56:40
|
||||||
* @Last Modified by: prpr
|
* @Last Modified by: prpr
|
||||||
* @Last Modified time: 2016-01-21 22:58:32
|
* @Last Modified time: 2016-01-22 11:23:48
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
@ -17,10 +17,6 @@ $("body").on("change", "#capeinput", function(){
|
||||||
handleFiles(files, "cape");
|
handleFiles(files, "cape");
|
||||||
});
|
});
|
||||||
|
|
||||||
function showMsg(type, msg) {
|
|
||||||
$("#msg").removeClass().addClass("alert").addClass(type).html(msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
var handleFiles = function (files, type) {
|
var handleFiles = function (files, type) {
|
||||||
if(files.length > 0) {
|
if(files.length > 0) {
|
||||||
var file = files[0];
|
var file = files[0];
|
||||||
|
|
@ -36,13 +32,13 @@ var handleFiles = function (files, type) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
img.onerror = function () {
|
img.onerror = function () {
|
||||||
alert("Error: Not an image or unknown file format");
|
showMsg("alert-danger", "Error: Not an image or unknown file format");
|
||||||
};
|
};
|
||||||
img.src = this.result;
|
img.src = this.result;
|
||||||
};
|
};
|
||||||
fr.readAsDataURL(file);
|
fr.readAsDataURL(file);
|
||||||
} else {
|
} else {
|
||||||
alert("Error: This is not a PNG image!");
|
showMsg("alert-danger", "Error: This is not a PNG image!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -84,9 +80,9 @@ $("#logout").click(function(){
|
||||||
var path = "/" + document.URL.split("/").slice(-3)[0];
|
var path = "/" + document.URL.split("/").slice(-3)[0];
|
||||||
docCookies.removeItem("uname", path);
|
docCookies.removeItem("uname", path);
|
||||||
docCookies.removeItem("token", path);
|
docCookies.removeItem("token", path);
|
||||||
showMsg('alert-success', json.msg);
|
showAlert(json.msg + " Successfully logged out.");
|
||||||
window.setTimeout(function(){
|
window.setTimeout(function(){
|
||||||
window.location = "../index.php?msg=Successfully logged out.";
|
window.location = "../index.php";
|
||||||
}, 1000);
|
}, 1000);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
* @Author: printempw
|
* @Author: printempw
|
||||||
* @Date: 2016-01-17 13:55:20
|
* @Date: 2016-01-17 13:55:20
|
||||||
* @Last Modified by: prpr
|
* @Last Modified by: prpr
|
||||||
* @Last Modified time: 2016-01-22 10:33:36
|
* @Last Modified time: 2016-01-22 11:14:35
|
||||||
*/
|
*/
|
||||||
session_start();
|
session_start();
|
||||||
function __autoload($classname) {
|
function __autoload($classname) {
|
||||||
|
|
@ -120,7 +120,7 @@ function getValue($key, $array) {
|
||||||
<?php
|
<?php
|
||||||
if ($msg = getValue('msg', $_GET)) { ?>
|
if ($msg = getValue('msg', $_GET)) { ?>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
Ply.dialog("alert", "<?php echo $msg; ?>");
|
showAlert("<?php echo $msg; ?>");
|
||||||
</script>
|
</script>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
|
|
@ -41,3 +41,11 @@ var docCookies = {
|
||||||
return aKeys;
|
return aKeys;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
function showMsg(type, msg) {
|
||||||
|
$("[id=msg]").removeClass().addClass("alert").addClass(type).html(msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
function showAlert(msg) {
|
||||||
|
Ply.dialog("alert", msg);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ if (isset($_SESSION['uname'])) {
|
||||||
<link rel="stylesheet" href="../libs/glyphicon/glyphicon.css">
|
<link rel="stylesheet" href="../libs/glyphicon/glyphicon.css">
|
||||||
<link rel="stylesheet" href="../assets/css/style.css">
|
<link rel="stylesheet" href="../assets/css/style.css">
|
||||||
<link rel="stylesheet" href="../assets/css/user.style.css">
|
<link rel="stylesheet" href="../assets/css/user.style.css">
|
||||||
|
<link rel="stylesheet" href="../libs/ply/ply.css">
|
||||||
<link rel="stylesheet" href="../libs/remodal/remodal.css">
|
<link rel="stylesheet" href="../libs/remodal/remodal.css">
|
||||||
<link rel="stylesheet" href="../libs/remodal/remodal-default-theme.css">
|
<link rel="stylesheet" href="../libs/remodal/remodal-default-theme.css">
|
||||||
</head>
|
</head>
|
||||||
|
|
@ -156,9 +157,10 @@ if (isset($_SESSION['uname'])) {
|
||||||
</body>
|
</body>
|
||||||
<script type="text/javascript" src="../libs/jquery/jquery-2.1.1.min.js"></script>
|
<script type="text/javascript" src="../libs/jquery/jquery-2.1.1.min.js"></script>
|
||||||
<script type="text/javascript" src="../libs/cookie.js"></script>
|
<script type="text/javascript" src="../libs/cookie.js"></script>
|
||||||
<script src="../libs/three.js"></script>
|
<script type="text/javascript" src="../libs/three.js"></script>
|
||||||
<script src="../libs/three.msp.js"></script>
|
<script type="text/javascript" src="../libs/three.msp.js"></script>
|
||||||
<script src="../assets/js/user.utils.js"></script>
|
<script type="text/javascript" src="../libs/ply/ply.min.js"></script>
|
||||||
|
<script type="text/javascript" src="../assets/js/user.utils.js"></script>
|
||||||
<?php
|
<?php
|
||||||
// get and set texture for preview
|
// get and set texture for preview
|
||||||
$skin_file = $user->getTexture('skin');
|
$skin_file = $user->getTexture('skin');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user