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

添加全局 toggle modify with readonly; 发布1.4.1

Browse Source
This commit is contained in:
lealife
2015-12-02 20:56:03 +08:00
parent 90bd07cdcc
commit a5b006aae7
19 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/service/ConfigService.go
View File

@ -611,5 +611,5 @@ func (this *ConfigService) HomePageIsAdminsBlog() bool {
}
func (this *ConfigService) GetVersion() string {
return "1.4"
return "1.4.1"
}

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

@ -208,13 +208,13 @@ function log(o) {
</a>
</div>
<div class="pull-right toggle-editor-mode" style="line-height: 60px; margin-right:10px" id="toggleEditorMode">
<div class="pull-right toggle-editor-mode top-nav" id="toggleEditorMode">
<a href="#writing"><span>{{msg . "writingMode"}}</span></a>
</div>
{{if eq .userInfo.Email "demo@leanote.com"}}
{{if .openRegister}}
<div class="pull-right" style="line-height: 60px; margin-right:10px" id="demoRegister">
<div class="pull-right top-nav" id="demoRegister">
<span>
{{msg . "demoRegister"}}
</span>
@ -423,7 +423,7 @@ function log(o) {
<div class="noteSplit" id="noteSplitter"></div>
<div id="note">
<div id="note" class="read-only-editor">
<!-- 遮罩, 为了resize3Columns用 -->
<div id="noteMask" class="note-mask"></div>
@ -494,8 +494,12 @@ function log(o) {
</div>
<ul class="pull-right" id="editorTool">
<li><a class="ios7-a " id="editBtn"
data-toggle="dropdown" title="ctrl/cmd+e {{leaMsg . "Toggle Modify with Readonly"}}">
<span class="fa"></span></a></li>
<li><a class="ios7-a " id="saveBtn"
data-toggle="dropdown" title="ctrl+s {{msg . "save"}}">
data-toggle="dropdown" title="ctrl/cmd+s {{msg . "save"}}">
<span class="fa fa-save"></span></a></li>
<li class="dropdown" id="noteInfoDropdown">
@ -572,7 +576,7 @@ function log(o) {
</div>
<!-- 查看信息 -->
<div id="infoToolbar" class="info-toolbar invisible">
<a class="toolbar-update" title="{{msg . "modify"}} ctrl/cmd+e"><i class="fa fa-pencil"></i> <span class="lang">{{msg . "modify"}}</span></a>
<span class="lang">{{msg . "created"}}</span>: <span class="created-time"></span>
<span class="lang">{{msg . "updated"}}</span>: <span class="updated-time"></span>
</div>
@ -607,7 +611,6 @@ function log(o) {
<div class="navbar navbar-default">
<div class="navbar-inner" id="wmd-button-bar">
<div id="mdInfoToolbar" class="info-toolbar invisible">
<a class="toolbar-update" title="{{msg . "modify"}} ctrl/cmd+e"><i class="fa fa-pencil"></i> <span class="lang">{{msg . "modify"}}</span></a>
<span class="lang">{{msg . "created"}}</span>: <span class="created-time"></span>
<span class="lang">{{msg . "updated"}}</span>: <span class="updated-time"></span>
</div>

14
app/views/note/note.html
View File

@ -196,13 +196,13 @@ function log(o) {
{{msg . "myBlog"}}
</a>
</div>
<div class="pull-right toggle-editor-mode" style="line-height: 60px; margin-right:10px" id="toggleEditorMode">
<div class="pull-right toggle-editor-mode top-nav" id="toggleEditorMode">
<a href="#writing"><span>{{msg . "writingMode"}}</span></a>
</div>
{{if eq .userInfo.Email "demo@leanote.com"}}
{{if .openRegister}}
<div class="pull-right" style="line-height: 60px; margin-right:10px" id="demoRegister">
<div class="pull-right top-nav" id="demoRegister">
<span>
{{msg . "demoRegister"}}
</span>
@ -405,7 +405,7 @@ function log(o) {
<div class="noteSplit" id="noteSplitter"></div>
<div id="note">
<div id="note" class="read-only-editor">
<!-- 遮罩, 为了resize3Columns用 -->
<div id="noteMask" class="note-mask"></div>
@ -473,8 +473,11 @@ function log(o) {
</div>
<ul class="pull-right" id="editorTool">
<li><a class="ios7-a " id="editBtn"
data-toggle="dropdown" title="ctrl/cmd+e {{leaMsg . "Toggle Modify with Readonly"}}">
<span class="fa"></span></a></li>
<li><a class="ios7-a " id="saveBtn"
data-toggle="dropdown" title="ctrl+s {{msg . "save"}}">
data-toggle="dropdown" title="ctrl/cmd+s {{msg . "save"}}">
<span class="fa fa-save"></span></a></li>
<li class="dropdown" id="noteInfoDropdown">
<a class="ios7-a dropdown-toggle" data-toggle="dropdown" title="{{msg . "Information"}}">
@ -547,7 +550,7 @@ function log(o) {
</div>
<!-- 查看信息 -->
<div id="infoToolbar" class="info-toolbar invisible">
<a class="toolbar-update" title="{{msg . "modify"}} ctrl/cmd+e"><i class="fa fa-pencil"></i> <span class="lang">{{msg . "modify"}}</span></a>
<span class="lang">{{msg . "created"}}</span>: <span class="created-time"></span>
<span class="lang">{{msg . "updated"}}</span>: <span class="updated-time"></span>
</div>
@ -582,7 +585,6 @@ function log(o) {
<div class="navbar navbar-default">
<div class="navbar-inner" id="wmd-button-bar">
<div id="mdInfoToolbar" class="info-toolbar invisible">
<a class="toolbar-update" title="{{msg . "modify"}} ctrl/cmd+e"><i class="fa fa-pencil"></i> <span class="lang">{{msg . "modify"}}</span></a>
<span class="lang">{{msg . "created"}}</span>: <span class="created-time"></span>
<span class="lang">{{msg . "updated"}}</span>: <span class="updated-time"></span>
</div>