Skip to content

Commit 2677b1b

Browse files
TruthHunTruthHun
committed
调整阅读页面布局样式
1 parent d1eeb7f commit 2677b1b

File tree

4 files changed

+13
-31
lines changed

4 files changed

+13
-31
lines changed

‎static/css/main.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,8 @@ a{color: #333}
867867
.bookstack-info .recommend-book:before{
868868
top:22px;
869869
}
870-
.bookstack-info .btn{border: 0px;}
870+
.bookstack-info .btn{border: 0px;margin-right: 15px;margin-top: 15px;border-radius: 4px !important;}
871+
.bookstack-info .btn:last-of-type{margin-right: 0px;}
871872
.book-list .recommend-book:before,.ucenter .recommend-book:before{left: 7px;}
872873

873874
.manual-header .nav>li>a:focus, .manual-header .nav>li>a:hover{

‎static/js/main.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ $(function () {
180180
if(ret.errcode==0){//操作成功
181181
alertTips("success",ret.message,3000,"");
182182
if (ret.data.IsCancel){//取消收藏
183-
_this.find("span").text("收藏");
183+
_this.find("span").text("收藏书籍");
184184
_this.find(".fa-heart").addClass("fa-heart-o").removeClass("fa-heart");
185185
}else{//添加收藏
186-
_this.find("span").text("已收藏");
186+
_this.find("span").text("取消收藏");
187187
_this.find(".fa-heart-o").addClass("fa-heart").removeClass("fa-heart-o");
188188
}
189189
}else{

‎views/document/default_read.html‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
</div>
4343
<div class="navbar-header pull-right manual-menu">
4444
<div class="bookstack-item">
45-
{{/*<a title="分享" href="javascript:" data-toggle="modal" data-target="#ModalShare" class="btn btn-default"><i class="fa fa-share-alt"></i> 分享</a>*/}}
4645
<a title="首页" href="/" class="btn btn-link"><i class="fa fa-home"></i> 首页</a>
4746
{{range .Model.Navs}}
4847
<a title="{{.Name}}" href="{{.URL}}" class="btn btn-link" target="{{.Target}}" style="{{if .Color}}color:{{.Color}} !important;{{end}}">
@@ -107,7 +106,6 @@ <h1 id="article-title">{{.Title}}</h1>
107106
{{end}}
108107
<span><i class="fa fa-eye"></i> 浏览 <i class="read-count">{{.View}}</i></span>
109108
<span class="hidden-xs"><a href="#" data-target="#ModalQRcode" data-toggle="modal"><i class="fa fa-qrcode"></i> 扫码</a></span>
110-
<span><a href="#" data-target="#ModalShare" data-toggle="modal"><i class="fa fa-share-alt"></i> 分享</a></span>
111109
<span><a href="javascript:;"title="打印当前页面内容为PDF" class="tooltips printPDF"><i class="fa fa-print"></i> 打印</a></span>
112110
<span class="pull-right hidden-xs tooltips" title="更新时间"><i class="fa fa-clock-o"></i> <i class="updated-at">{{.UpdatedAt}}</i></span>
113111
</div>
@@ -201,9 +199,6 @@ <h1 id="article-title">{{.Title}}</h1>
201199
<li class="visible-xs visible-sm bars-menu bars-menu-hide">
202200
<a title="下载" href="javascript:" data-toggle="modal" data-target="#ModalDownload"><i class="fa fa-cloud-download"></i></a>
203201
</li>
204-
<li class="visible-xs visible-sm bars-menu bars-menu-hide">
205-
<a title="分享" href="javascript:" data-toggle="modal" data-target="#ModalShare"><i class="fa fa-share-alt"></i></a>
206-
</li>
207202
<li class="visible-xs visible-sm bars-menu bars-menu-hide">
208203
<a title="阅读记录" class="showModalHistory" href="{{urlfor "RecordController.List" ":book_id" .Model.BookId}}" rel="nofollow"><i class="fa fa-clock-o"></i></a>
209204
</li>
@@ -299,7 +294,6 @@ <h1 class="modal-title" id="ModalReplaceLabel" style="align:center;">思维导
299294
</div>
300295
</div>
301296

302-
{{template "widgets/share.html" .}}
303297
{{template "widgets/qrcode.html" .}}
304298

305299
{{template "widgets/download.html" .}}

‎views/document/intro.html‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -53,25 +53,19 @@ <h1>{{.Book.BookName}}
5353
{{end}}
5454
<li><span>整理分享：</span><a target="_blank" class="text-primary" href="{{urlfor "UserController.Index" ":username" (.Book.MemberId|getUsernameByUid)}}">{{.Book.MemberId|getNicknameByUid}}</a></li>
5555
<li class="hidden-xs">
56-
<div class="btn btn-group">
5756
{{range $index,$val:=.Menu}}
5857
{{if eq $index 0}}
59-
<a href="{{urlfor "DocumentController.Read" ":key" $.Book.Identify ":id" .Identify}}" target="_blank" title="马上阅读" class="btn btn-success"><i class="fa fa-book"></i> 阅读</a>
58+
<a href="{{urlfor "DocumentController.Read" ":key" $.Book.Identify ":id" .Identify}}" target="_blank" title="马上阅读" class="btn btn-success btn-lg"><i class="fa fa-book"></i> 马上阅读</a>
6059
{{end}}
6160
{{end}}
62-
<a href="{{urlfor "BookController.Star" ":id" .Book.BookId}}" rel="nofollow" class="btn btn-warning ajax-star">
61+
<a href="{{urlfor "BookController.Star" ":id" .Book.BookId}}" rel="nofollow" class="btn btn-warning ajax-star btn-lg">
6362
{{if eq (doesStar $.Member.MemberId $.Book.BookId) true}}
64-
<i class="fa fa-heart"></i> <span>已收藏</span>
63+
<i class="fa fa-heart"></i> <span>取消收藏</span>
6564
{{else}}
66-
<i class="fa fa-heart-o"></i> <span>收藏</span>
65+
<i class="fa fa-heart-o"></i> <span>加入收藏</span>
6766
{{end}}
6867
</a>
69-
<a data-target="#ModalDownload" data-toggle="modal" href="#" target="_blank" class="btn btn-danger"><i class="fa fa-cloud-download"></i> 下载</a>
70-
<!-- {{if $.Wxacode}}
71-
<a href="#" data-target="#ModalBookChat" data-toggle="modal" class="btn btn-primary"><img src="/static/images/wxacode-white.png"> 小程序</a>
72-
{{end}} -->
73-
<a href="#" data-target="#ModalShare" data-toggle="modal" class="btn btn-info"><i class="fa fa-share-alt"></i> &nbsp;分享</a>
74-
</div>
68+
<a data-target="#ModalDownload" data-toggle="modal" href="#" target="_blank" class="btn btn-danger btn-lg"><i class="fa fa-cloud-download"></i> 下载电子书</a>
7569
</li>
7670
</ul>
7771
</div>
@@ -82,25 +76,19 @@ <h1>{{.Book.BookName}}
8276
</div>
8377
{{end}}
8478
<div class="col-xs-12 text-center visible-xs">
85-
<div class="btn btn-group">
8679
{{range $index,$val:=.Menu}}
8780
{{if eq $index 0}}
88-
<a href="{{urlfor "DocumentController.Read" ":key" $.Book.Identify ":id" .Identify}}" target="_blank" title="马上阅读" class="btn btn-success"><i class="fa fa-book"></i>阅读</a>
81+
<a href="{{urlfor "DocumentController.Read" ":key" $.Book.Identify ":id" .Identify}}" target="_blank" title="马上阅读" class="btn btn-success"><i class="fa fa-book"></i> 马上阅读</a>
8982
{{end}}
9083
{{end}}
9184
<a href="{{urlfor "BookController.Star" ":id" .Book.BookId}}" rel="nofollow" class="btn btn-warning ajax-star">
9285
{{if eq (doesStar $.Member.MemberId $.Book.BookId) true}}
93-
<i class="fa fa-heart"></i> <span>已收藏</span>
86+
<i class="fa fa-heart"></i> <span>取消收藏</span>
9487
{{else}}
95-
<i class="fa fa-heart-o"></i> <span>收藏</span>
88+
<i class="fa fa-heart-o"></i> <span>收藏书籍</span>
9689
{{end}}
9790
</a>
98-
<a data-target="#ModalDownload" data-toggle="modal" href="#" target="_blank" class="btn btn-danger"><i class="fa fa-cloud-download"></i>下载</a>
99-
{{/* {{if $.Wxacode}}*/}}
100-
{{/* <a href="#" data-target="#ModalBookChat" data-toggle="modal" class="btn btn-primary"><img src="/static/images/wxacode-white.png">小程序</a>*/}}
101-
{{/* {{end}}*/}}
102-
<a href="#" data-target="#ModalShare" data-toggle="modal" class="btn btn-info"><i class="fa fa-share-alt"></i>分享</a>
103-
</div>
91+
<a data-target="#ModalDownload" data-toggle="modal" href="#" target="_blank" class="btn btn-danger"><i class="fa fa-cloud-download"></i> 下载书籍</a>
10492
</div>
10593
{{if (ads "intro-before-menu" $.IsMobile)}}
10694
<div class="ap ap-intro-before-menu mgt-15px col-xs-12">
@@ -236,7 +224,6 @@ <h4 class="help-block"><i class="fa fa-th color-gray"></i> 相关书籍</h4>
236224
</div>
237225
{{end}}
238226
</div>
239-
{{template "widgets/share.html" .}}
240227
{{template "widgets/download.html" .}}
241228
{{if $.Wxacode}}
242229
{{template "widgets/bookchat.html" .}}

0 commit comments

Comments
 (0)