xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API, Tag

Browse Source
This commit is contained in:
life
2015-03-31 14:27:26 +08:00
parent 9515f1e58f
commit decf580ed3
585 changed files with 8128 additions and 9023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/admin/nav.html
View File

@ -229,7 +229,12 @@
<li>
<a href="/admin/t?t=upgrade/beta2">
<span>
v1.0-beta to v1.0-beta2
v1.0-beta to v1.0-beta.2
</span>
</a>
<a href="/admin/t?t=upgrade/beta3">
<span>
v1.0-beta.2/3 to v1.0-beta.4
</span>
</a>
</li>

22
app/views/admin/upgrade/beta2.html
View File

@ -1,5 +1,5 @@
{{template "admin/top.html" .}}
<div class="m-b-md"> <h3 class="m-b-none">Upgrade v1.0-beta to v1.0-beta2</h3></div>
<div class="m-b-md"> <h3 class="m-b-none">Upgrade v1.0-beta to v1.0-beta.2</h3></div>
<div class="row">
@ -17,7 +17,7 @@
</ul>
</div>
<footer class="panel-footer text-right bg-light lter">
<button type="submit" id="submit" class="btn btn-success btn-s-xs">Upgrade</button>
<button type="submit" id="submit" class="btn btn-success btn-s-xs">Upgrade to v1.0-beta.2</button>
</footer>
</section>
</form>
@ -31,14 +31,16 @@ $(function() {
$("#submit").click(function(e){
e.preventDefault();
var t = this;
$(t).button('loading');
ajaxPost("/adminUpgrade/UpgradeBetaToBeta2", {}, function(ret){
$(t).button('reset')
if(!ret.Ok) {
art.alert(ret.Msg)
} else {
art.tips("Success");
}
art.confirm("Are you sure to upgrade to v1.0-beta.2", function() {
$(t).button('loading');
ajaxPost("/adminUpgrade/UpgradeBetaToBeta2", {}, function(ret){
$(t).button('reset')
if(!ret.Ok) {
art.alert(ret.Msg)
} else {
art.tips("Success");
}
});
});
});
});

46
app/views/admin/upgrade/beta3.html Normal file
View File

@ -0,0 +1,46 @@
{{template "admin/top.html" .}}
<div class="m-b-md"> <h3 class="m-b-none">Upgrade v1.0-beta.2/3 to v1.0-beta.4</h3></div>
<div class="row">
<div class="col-sm-6">
<form id="add_user_form">
<section class="panel panel-default">
<div class="panel-body">
Current Version: <span class="label label-success">leanote v{{.version}}</span>
<ul>
<li>Api support (Enable Leanote Desktop App to connect server))</li>
<li>Update tags</li>
</ul>
</div>
<footer class="panel-footer text-right bg-light lter">
<button type="submit" id="submit" class="btn btn-success btn-s-xs">Upgrade to v1.0-beta.4</button>
</footer>
</section>
</form>
</div>
</div>
{{template "admin/footer.html" .}}
<script>
$(function() {
$("#submit").click(function(e) {
e.preventDefault();
var t = this;
art.confirm("Are you sure to upgrade to v1.0-beta.4 ? Please don't try to upgrade twice.", function() {
$(t).button('loading');
ajaxPost("/adminUpgrade/UpgradeBeta3ToBeta4", {}, function(ret){
$(t).button('reset')
if(!ret.Ok) {
art.alert(ret.Msg)
} else {
art.tips("Success");
}
});
});
});
});
</script>
{{template "admin/end.html" .}}

4
app/views/note/note-dev.html
View File

@ -711,7 +711,7 @@ function log(o) {
<!-- 插入图片 -->
<div class="modal fade modal-insert-image">
<div class="modal-dialog" style="width: 840px">
<div class="modal-dialog" style="width: 840px;max-width:100%;">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"
@ -926,4 +926,4 @@ window.require = {
<script src="/js/require.js"></script>
</script>
</body>
</html>
</html>