用户登录(未完成)

88659108 · Oct 27, 2018 · b2113c3 · b2113c3
1 parent 0611957
commit b2113c3
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 7 deletions.
diff --git a/TODO.md b/TODO.md
@@ -112,5 +112,4 @@ sudo chmod 0777 -R /www/elasticsearch/dochub/data
 - [x] mobi、epub、chm、txt等格式文档在线浏览的实现支持。
 - [x] 解决邮件发送问题，统一使用SMTP发送邮件，并实现对TLS/SSL邮件的发送支持。使用了https://github.com/go-gomail/gomail库。
 - [x] 文档阅读页面性能优化
-- [x] 文档预览页数限制(可在`管理后台`->`系统设置`->`文档最大预览页数`做限制。这样的好处就是，如果一个300页的文档，只提供100页给用户阅读，可以减少服务器后端PDF转svg的资源开销，也可以促进用户使用积分下载文档...新浪爱问共享资料就是这么干的...)
-
+- [x] 文档预览页数限制(可在`管理后台`->`系统设置`->`文档最大预览页数`做限制。这样的好处就是，如果一个300页的文档，只提供100页给用户阅读，可以减少服务器后端PDF转svg的资源开销，也可以促进用户使用积分下载文档...新浪爱问共享资料就是这么干的...)
diff --git a/static/Home/default/css/dochub-mobile.css b/static/Home/default/css/dochub-mobile.css
@@ -54,6 +54,8 @@
     .wenku-footer{padding: 15px 0px;}
     .wenku-footer-dark{padding: 30px 15px;}
 
+    #wenku-carousel .carousel-inner img{height: auto;}
+
     /* 列表页 */
 
     #wenku-list .wenku-main .wenku-right{width: 100%;padding-left: 0px;}
@@ -119,6 +121,9 @@
     #wenku-reg .form-horizontal .form-group .col-sm-6{width: 50%;display: inline-block;padding-right: 0px;}
     #wenku-reg .form-horizontal .form-group .col-sm-4{width: 50%;float: right;}
     #wenku-reg .col-xs-4{width: 100%;padding: 0px;}
+    #wenku-reg .form-header{padding: 10px 15px;}
+    #wenku-reg .login-form .form-box{padding: 25px 15px;}
+    #wenku-reg .form-footer{padding: 5px 15px;}
 
     /* 搜索 */
     #wenku-search .wenku-top{display: none;}

diff --git a/static/Home/default/css/dochub.css b/static/Home/default/css/dochub.css
@@ -182,7 +182,7 @@ textarea{resize: none;}
 #wenku-index .wenku-avatar{height: 80px;width: 80px;margin: 15px;border-radius:50%;}
 #wenku-index .wenku-avatar img{border-radius: 50%;}
 #wenku-index .wenku-username{margin-top: 10px;}
-#wenku-index .wenku-userinfo{border-top: 1px solid #EEEEEE;margin-top: 15px;padding-top: 1px;padding-bottom:7px;width: 230px;margin-left: 15px;}
+#wenku-index .wenku-userinfo{border-top: 1px solid #EEEEEE;margin-top: 15px;padding-top: 5px;padding-bottom:10px;width: 230px;margin-left: 15px;}
 
 #wenku-index .wenku-cate{background-color: #FFFFFF;margin-bottom: 15px;padding: 15px;}
 #wenku-index .wenku-cate a{display: inline-block;font-size: 16px;margin-right: 5px;}
@@ -196,7 +196,16 @@ textarea{resize: none;}
 #wenku-index .wenku-item img{width:195px;border: 1px solid #EFEFEF;}
 #wenku-index .wenku-item a.wenku-text-ellipsis img{display: none;}
 #wenku-index .wenku-loginbox .panel-body{padding-bottom: 0px;}
-#wenku-index .wenku-loginbox{padding: 11px 0px;}
+#wenku-index .wenku-loginbox{padding: 11px 0px 0px;}
+#wenku-index .quick-login{height: 40px;line-height: 40px;margin-bottom: 0px;}
+#wenku-index .quick-login .iconfont{font-size: 25px;margin-left: 5px;}
+#wenku-index .quick-login .icon-weixin{font-size: 23px;color: #00bf75;}
+#wenku-index .quick-login .icon-weibo{font-size: 23px;color: #fa4151;}
+#wenku-index .quick-login .icon-QQ{font-size: 26px;color: #5fa3e4;}
+#wenku-index .quick-login .iconfont:hover{color: #1abc9c;}
+
+#wenku-carousel .carousel-inner img{height: 350px;}
+
 /*#wenku-index .wenku-item .panel-body{padding-bottom: 6px;}*/
 /*wenku page index [end]*/
 

diff --git a/views/Home/default/Index/index.html b/views/Home/default/Index/index.html
@@ -14,7 +14,6 @@
 			</div>
 
 			{{if gt .LoginUid 0}}
-
 			<div class="panel panel-default text-center wenku-noradius clearfix wenku-noborder">
 				{{with .User}}
 					<div class="text-center row">
@@ -49,7 +48,6 @@
 					</div>
 				{{end}}
 			</div>
-
 			{{else}}
 
 			<div class="panel panel-default wenku-loginbox">
@@ -67,6 +65,15 @@
 							<a href="/user/findpwd">忘记密码？</a>
 							<a href="/user/reg" class="pull-right">注册会员</a>
 						</div>
+						<div class="help-block quick-login">
+							<span>快捷登录</span>
+							<div class="pull-right">
+                                <a href="#"><i class="iconfont icon-github"></i></a>
+                                <a href="#"><i class="iconfont icon-weixin"></i></a>
+                                <a href="#"><i class="iconfont icon-weibo"></i></a>
+                                <a href="#"><i class="iconfont icon-QQ"></i></a>
+							</div>
+						</div>
 					</form>
 				</div>
 			</div>

diff --git a/views/Home/default/User/login.html b/views/Home/default/User/login.html
@@ -6,7 +6,17 @@
             <form action="/user/login" method="post" class="wenku-ajax-form" data-redirect="/user">
                 <div class="login-screen">
                     <div class="login-form">
-                        <div class="form-header">会员登录</div>
+                        <div class="form-header">
+                            会员登录
+                            <div class="help-block quick-login pull-right">
+                                <div class="pull-right">
+                                    <a href="#"><i class="iconfont icon-github"></i></a>
+                                    <a href="#"><i class="iconfont icon-weixin"></i></a>
+                                    <a href="#"><i class="iconfont icon-weibo"></i></a>
+                                    <a href="#"><i class="iconfont icon-QQ"></i></a>
+                                </div>
+                            </div>
+                        </div>
                         <div class="form-box">
                             <div class="form-group form-group-lg">
                                 <input type="email" autocomplete="no" name="Email" class="form-control login-field" required="required" value="" placeholder="请输入登录邮箱" id="login-name">
@@ -25,6 +35,7 @@
                                 <a href="/user/findpwd">找回密码</a>
                                 <a class="pull-right" href="/user/reg">立即注册</a>
                             </div>
+
                         </div>
                     </div>
                 </div>

diff --git a/views/Home/default/head.html b/views/Home/default/head.html
@@ -23,6 +23,7 @@
     <link rel="stylesheet" href="//cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css">
     <link rel="stylesheet" type="text/css" href="/static/Common/css/jquery.toast.min.css"/>
     <link rel="stylesheet" type="text/css" href="{{.TplStatic}}/css/dochub.css?version={{$.Version}}"/>
+    <link rel="stylesheet" href="//at.alicdn.com/t/font_794762_dpncr3eyueh.css">
     {{if .Sys.MobileOn}}
     <link rel="stylesheet" type="text/css" href="{{.TplStatic}}/css/dochub-mobile.css?version={{$.Version}}"/>
     {{end}}