v1.0 beta init

This commit is contained in:
life
2014-10-22 16:20:45 +08:00
parent 8ae438272b
commit 593d2c2965
225 changed files with 27217 additions and 3675 deletions

View File

@@ -22,6 +22,51 @@ function log(o) {
</head>
<body>
<nav id="headerContainer" style="background-color:#fff" class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/index">
<img src="/images/logo/leanote_black.png" id="" title="leanote, {{msg $ "moto"}}"/>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-left">
<li><a href="/index#" target="body" class="smooth-scroll">{{msg . "home"}}</a></li>
<!--
<li><a href="/index#aboutLeanote" target="#aboutLeanote" class="smooth-scroll">{{msg . "aboutLeanote"}}</a> </li>
-->
<li><a href="/index#download" target="#download" class="smooth-scroll">{{msg . "download"}}</a> </li>
<li><a href="/index#donate" target="#donate" class="smooth-scroll">{{msg . "donate"}}</a> </li>
<li><a id="leanoteBlog" href="{{.leaUrl}}/index" target="_blank" title="lea++, leanote博客平台" class="">lea++</a></li>
<li style="position: relative; margin-right: 3px;">
<a href="http://bbs.leanote.com" target="_blank" class="">{{msg . "discussion"}}</a>
<div class="red-circle" style=""></div>
</li>
<li id="loginBtns">
{{if .userInfo.Email}}
{{msg . "hi"}}, {{.userInfo.Username}}
<a href="{{$.noteUrl}}">{{msg . "myNote"}}</a>
<a href="/logout">{{msg . "logout"}}</a>
{{else}}
<a href="/login">{{msg . "login"}}</a>
{{if .openRegister}}
<a href="/register" class="btn-register">{{msg . "register"}}</a>
{{end}}
{{end}}
</li>
</ul>
</div>
</div>
</nav>
<!--
<div id="headerContainer" style="background-color:#fff" class="navbar-fixed-top">
<div class="container" style="clearfix" id="header">
<div class="pull-left">
@@ -35,7 +80,7 @@ function log(o) {
<div class="pull-right" id="loginBtns">
{{if .userInfo.Email}}
{{msg . "hi"}}, {{.userInfo.Username}}
<a href="/note">{{msg . "myNote"}}</a>
<a href="{{$.noteUrl}}">{{msg . "myNote"}}</a>
<a href="/logout">{{msg . "logout"}}</a>
{{else}}
<a href="/login">{{msg . "login"}}</a>
@@ -47,12 +92,9 @@ function log(o) {
<ul id="blogNav" class="pull-right">
<li><a href="/index#" target="body" class="smooth-scroll">{{msg . "home"}}</a></li>
<!--
<li><a href="/index#aboutLeanote" target="#aboutLeanote" class="smooth-scroll">{{msg . "aboutLeanote"}}</a> </li>
-->
<li><a href="/index#download" target="#download" class="smooth-scroll">{{msg . "download"}}</a> </li>
<li><a href="/index#donate" target="#donate" class="smooth-scroll">{{msg . "donate"}}</a> </li>
<li><a id="leanoteBlog" href="http://leanote.com/lea/index" target="_blank" title="lea++, leanote博客平台" class="">lea++</a></li>
<li><a id="leanoteBlog" href="{{.leaUrl}}/index" target="_blank" title="lea++, leanote博客平台" class="">lea++</a></li>
<li style="position: relative; margin-right: 3px;">
<a href="http://bbs.leanote.com" target="_blank" class="">{{msg . "discussion"}}</a>
<div style="position: absolute;
@@ -64,6 +106,6 @@ function log(o) {
border-radius: 9px;"></div>
</li>
</ul>
</div>
</div>
</div>
-->

View File

@@ -1,4 +1,13 @@
{{template "home/header_box.html" .}}
<!-- 验证码 -->
<script type="text/x-jsrender" id="tCaptcha">
<div class="form-group">
<label class="control-label">{{rawMsg . "captcha"}}</label>
<input type="text" class="form-control" id="captcha" name="captcha">
<a id="reloadCaptcha" title="{{msg . "reloadCaptcha"}}" onclick="$('#captchaImage').attr('src', '/captcha/get?' + ((new Date()).getTime()))"><img src="/captcha/get" id="captchaImage"/></a>
</div>
</script>
<section id="box" class="animated fadeInUp">
<!--
<div>
@@ -11,7 +20,8 @@
<div id="boxHeader">{{msg . "login"}}</div>
<form>
<div class="alert alert-danger" id="loginMsg"></div>
<div class="form-group">
<input id="from" type="hidden" value="{{.from}}" />
<div class="form-group">
<label class="control-label">{{msg . "usernameOrEmail"}}</label>
<input type="text" class="form-control" id="email" name="email" value="{{.email}}">
</div>
@@ -19,6 +29,11 @@
<label class="control-label">{{msg . "password"}}</label>
<input type="password" class="form-control" id="pwd" name="pwd">
</div>
<div id="captchaContainer">
</div>
<div class="clearfix">
<a href="/findPassword" class="pull-right m-t-xs"><small>{{msg . "forgetPassword"}}</small></a>
<button id="loginBtn" class="btn btn-success">{{msg . "login"}}</button>
@@ -57,6 +72,12 @@
<script>
$(function() {
var needCaptcha = {{.needCaptcha}};
if(needCaptcha){
$("#captchaContainer").html($("#tCaptcha").html());
}
$("#email").focus();
if($("#email").val()) {
$("#pwd").focus();
@@ -74,6 +95,7 @@ $(function() {
e.preventDefault();
var email = $("#email").val();
var pwd = $("#pwd").val();
var captcha = $("#captcha").val()
if(!email) {
showMsg("{{msg . "inputUsername"}}", "email");
return;
@@ -87,17 +109,27 @@ $(function() {
return;
}
}
if(needCaptcha && !captcha) {
showMsg("{{msg . "inputCaptcha"}}", "captcha");
return;
}
$("#loginBtn").html("{{msg . "logining"}}...").addClass("disabled");
// hideMsg();
$.post("/doLogin", {email: email, pwd: pwd}, function(e) {
$.post("/doLogin", {email: email, pwd: pwd, captcha: $("#captcha").val()}, function(e) {
$("#loginBtn").html("{{msg . "login"}}").removeClass("disabled");
if(e.Ok) {
$("#loginBtn").html("{{msg . "loginSuccess"}}...");
location.href = '/note';
var from = $("#from").val() || "{{.noteUrl}}" || "/note";
location.href = from;
} else {
showMsg(e.Msg, "pwd");
if(e.Item && $.trim($("#captchaContainer").text()) == "") {
$("#captchaContainer").html($("#tCaptcha").html());
needCaptcha = true
}
showMsg(e.Msg);
}
});
});

View File

@@ -10,7 +10,8 @@
<div id="boxForm">
<div id="boxHeader">{{msg . "register"}}</div>
<form>
<div class="alert alert-danger" id="loginMsg"></div>
<div class="alert alert-danger" id="loginMsg"></div>
<input id="from" type="hidden" value="{{.from}}" />
<div class="form-group">
<label class="control-label" for="email">{{msg . "email"}}</label>
<input type="text" class="form-control" id="email" name="email">
@@ -103,7 +104,8 @@ $(function() {
$("#registerBtn").html("{{msg . "register"}}").removeClass("disabled");
if(e.Ok) {
$("#registerBtn").html("{{msg . "registerSuccessAndRdirectToNote"}}");
location.href = '/note';
var from = $("#from").val() || "{{.noteUrl}}" || "/note";
location.href = from;
} else {
showMsg(e.Msg, "email");
}