个人中心页面调整

jslc2008 · Sep 4, 2018 · 6d7276e · 6d7276e
1 parent d395593
commit 6d7276e
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 43 deletions.
diff --git a/controllers/HomeControllers/UserController.go b/controllers/HomeControllers/UserController.go
@@ -28,7 +28,7 @@ func (this *UserController) Prepare() {
 
 //会员中心
 func (this *UserController) Get() {
-
+	this.Data["Tab"] = "doc"
 	uid, _ := this.GetInt(":uid")
 	path := this.GetString(":splat")
 	params := conv.Path2Map(path)
@@ -149,7 +149,7 @@ func (this *UserController) Get() {
 
 //金币记录
 func (this *UserController) Coin() {
-
+	this.Data["Tab"] = "coin"
 	uid, _ := this.GetInt(":uid")
 	p, _ := this.GetInt("p", 1)
 	if p < 1 {
@@ -193,6 +193,7 @@ func (this *UserController) Coin() {
 
 //收藏夹
 func (this *UserController) Collect() {
+	this.Data["Tab"] = "collect"
 	action := this.GetString("action")
 	uid, _ := this.GetInt(":uid")
 	p, _ := this.GetInt("p", 1)
@@ -609,9 +610,10 @@ func (this *UserController) DocDel() {
 
 //文档编辑
 func (this *UserController) DocEdit() {
-	var (
-		docId int //文档id
-	)
+	var docId int //文档id
+
+	this.Data["Tab"] = "doc"
+
 	docId, _ = this.GetInt(":doc")
 	if this.IsLogin > 0 {
 		if docId > 0 {

diff --git a/static/Home/default/css/dochub.css b/static/Home/default/css/dochub.css
@@ -261,6 +261,8 @@ textarea{resize: none;}
 
 /*wenku page user [start]*/
 #wenku-user .wenku-left{padding: 0px;}
+#wenku-user .wenku-left .nav-tabs{font-size: 15px;}
+#wenku-user .wenku-left .nav-tabs li:first-of-type a{border-left: 0px !important;}
 #wenku-user .wenku-left .panel-heading .pull-right a{margin-left: 15px;color: #6b7a88;font-size: 15px;}
 #wenku-user .wenku-left .panel-heading .pull-right a.active{color: #00B38A;}
 #wenku-user .wenku-left .panel-heading .wenku-show{border-left: 1px solid #DDDDDD;margin-left: 15px;}
@@ -291,15 +293,16 @@ textarea{resize: none;}
 #wenku-user .wenku-list-table-body li .wenku-edit{display: none;}
 #wenku-user .wenku-list-table-body li:hover .wenku-time{display: none;}
 #wenku-user .wenku-list-table-body li:hover .wenku-edit{display: inline-block;}
-#wenku-user .wenku-circle-avatar{border-radius:50% !important;}
+#wenku-user .wenku-circle-avatar{border-radius:50% !important;width: 100px;height: 100px;margin: 0px auto;}
 #wenku-user .wenku-circle-avatar img{border-radius: 50% !important;}
 #wenku-user a.wenku-collect-edit{font-size: 12px !important;color:#ffffff !important;}
 #wenku-user .wenku-thumbnail-collect-edit .btn-group{text-align: right;clear: both;width: 100%;}
 #wenku-user .wenku-thumbnail-collect-edit .btn-group .btn{width: 50%;padding: 8px;}
-#wenku-user .column{border-top: 1px solid #EFEFEF;margin-top: 15px;padding-top: 15px;}
-#wenku-user .column ul{margin-bottom: 0px;}
-#wenku-user .column a{display: block;}
-#wenku-user .column li.active a{color: #1abc9c;}
+#wenku-user .username-info .strong{text-align: center;margin-top: 10px;}
+#wenku-user .username-info .help-block .col-xs-4{text-align: center;padding: 0px;border-left: 1px solid #EFEFEF;border-right: 1px solid #EFEFEF}
+#wenku-user .username-info .help-block .col-xs-middle{border: 0px;}
+#wenku-user .username-info .help-block{margin: 15px 0px;}
+
 
 /*wenku page user [end]*/
 

diff --git a/views/Home/default/User/coin.html b/views/Home/default/User/coin.html
@@ -6,6 +6,8 @@
 
 
         <div class="col-xs-9 wenku-left">
+        {{template "Tabs" .}}
+
             <div class="panel panel-default">
                 <div class="panel-heading clearfix">
                     <div class="strong pull-left">财富记录</div>

diff --git a/views/Home/default/User/collect.html b/views/Home/default/User/collect.html
@@ -6,6 +6,8 @@
 
 
         <div class="col-xs-9 wenku-left">
+        {{template "Tabs" .}}
+
             <div class="panel panel-default">
                 <div class="panel-heading clearfix">
                     <div class="strong pull-left">收藏列表</div>

diff --git a/views/Home/default/User/edit.html b/views/Home/default/User/edit.html
@@ -1,7 +1,16 @@
 
 <div class="container">
     <div class="row">
-        <div class="col-xs-8 wenku-left">
+
+
+    {{template "UserRight" .}}
+
+
+        <div class="col-xs-9 wenku-left">
+
+        {{template "Tabs" .}}
+
+
             <div class="panel panel-default">
                 <div class="panel-heading clearfix">
                     <div class="strong pull-left">文档编辑</div>
@@ -68,8 +77,6 @@
             </div>
         </div>
 
-        {{template "UserRight" .}}
-
     </div>
 </div>
 <script type="text/javascript" id="wenku-cates">

diff --git a/views/Home/default/User/index.html b/views/Home/default/User/index.html
@@ -5,6 +5,10 @@
         {{template "UserRight" .}}
 
         <div class="col-xs-9 wenku-left pull-left">
+
+            {{template "Tabs" .}}
+
+
             <div class="panel panel-default">
                 {{if gt .Cid 0}}
                 <div class="panel-heading clearfix">

diff --git a/views/Home/default/User/public.html b/views/Home/default/User/public.html
@@ -1,10 +1,19 @@
+{{define "Tabs"}}
+<ul class="nav nav-tabs">
+    <li {{if eq .Tab "doc"}}class="active"{{end}}><a href="/user/{{.User.Id}}/doc">分享文档</a></li>
+    <li {{if eq .Tab "collect"}}class="active"{{end}}><a href="/user/{{.User.Id}}/collect">收藏文档</a></li>
+    <li {{if eq .Tab "coin"}}class="active"{{end}}><a href="/user/{{.User.Id}}/coin">财富记录</a></li>
+</ul>
+{{end}}
+
+
 {{define "UserRight"}}
 <div class="col-xs-3 wenku-right pull-left">
     <div class="panel panel-default">
         <div class="panel-heading"><span class="strong">个人主页</span></div>
         <div class="panel-body">
             <div class="row">
-                <div class="col-xs-4 wenku-no-pdr">
+                <div class="col-xs-12">
                    {{if eq $.LoginUid (.User.Id|Interface2Int)}}
                     <a href="javascript:void(0);" title="点击选择图片更换头像" data-placement="bottom" class="thumbnail wenku-circle-avatar wenku-tooltip wenku-update-avatar">
                         <img onerror="this.src='/static/Common/img/avatar.png'" class="img-responsive" alt="{{.User.Username}}" src="{{DefPic .User.Avatar "avatar"}}"/>
@@ -21,7 +30,7 @@
                     </a>
                     {{end}}
                 </div>
-                <div class="col-xs-8">
+                <div class="col-xs-12 username-info">
                     <div class="strong">
                         <a href="/user/{{.User.Id}}" title="{{.User.Username}}">{{.User.Username}} </a>
                         {{if eq $.LoginUid (.User.Id|Interface2Int)}}
@@ -34,28 +43,29 @@
                         </small>
                         {{end}}
                     </div>
-                    <div class="help-block">
-                        <ul>
-                            <li>文档: <a href="/user/{{.User.Id}}/doc" class="text-primary">{{.User.Document}} </a></li>
-                            <li>财富: <a href="/user/{{.User.Id}}/coin" class="text-primary">{{.User.Coin}} </a></li>
-                            <li>收藏: <a href="/user/{{.User.Id}}/collect" class="text-primary">{{.User.Collect}}</a></li>
-                        </ul>
+                    <div class="help-block clearfix">
+                        <div class="col-xs-4">
+                            {{/*文档: <a href="/user/{{.User.Id}}/doc" class="text-primary">{{.User.Document}} </a>*/}}
+                            <div>文档</div>
+                            <div class="text-primary">{{.User.Document}}</div>
+                        </div>
+                        <div class="col-xs-4 col-xs-middle">
+                            {{/*财富: <a href="/user/{{.User.Id}}/coin" class="text-primary">{{.User.Coin}} </a>*/}}
+                            <div>财富</div>
+                            <div class="text-primary">{{.User.Coin}}</div>
+                        </div>
+                        <div class="col-xs-4">
+                            {{/*收藏: <a href="/user/{{.User.Id}}/collect" class="text-primary">{{.User.Collect}}</a>*/}}
+                            <div>收藏</div>
+                            <div class="text-primary">{{.User.Collect}}</div>
+                        </div>
                     </div>
                 </div>
             </div>
             <div class="help-block">
                 <div class="strong">个性签名 </div>
                 <div style="text-indent: 2em;">{{Default .User.Intro "当前用户暂无个性签名"}}</div>
             </div>
-
-            <div class="column">
-                <ul>
-                    <li class="active"><a href="#">我的文档</a></li>
-                    <li><a href="#">我的收藏</a></li>
-                    <li><a href="#">财富记录</a></li>
-                </ul>
-            </div>
-
         </div>
     </div>
 
@@ -65,20 +75,19 @@
             <ul>
 
                 {{range .Ranks}}
-                <li class="clearfix">
-                    <div class="col-xs-2 wenku-nopadding">
-                        <a href="/user/{{.Id}}" title="{{.Username}}" target="_blank" class="thumbnail">
-                            <img class="img-responsive" onerror="this.src='/static/Common/img/avatar.png'" alt="{{.Username}}" src="{{DefPic .Avatar "avatar"}}"/>
-                        </a>
-                    </div>
-                    <div class="col-xs-10">
-                        <div>
-                            <a href="/user/{{.Id}}" class="wenku-username">{{.Username}}</a>
-                            <div class="help-block pull-right"><span class="text-primary">{{.Document}}</span> 篇文档</div>
+                    <li class="clearfix">
+                        <div class="col-xs-3 wenku-nopadding">
+                            <a href="/user/{{.Id}}" title="{{.Username}}" target="_blank" class="thumbnail">
+                                <img class="img-responsive" onerror="this.src='/static/Common/img/avatar.png'" alt="{{.Username}}" src="{{DefPic .Avatar "avatar"}}"/>
+                            </a>
                         </div>
-                        <div class="help-block wenku-text-ellipsis">{{Default .Intro "暂无个性签名..."}}</div>
-                    </div>
-                </li>
+                        <div class="col-xs-9">
+                            <div>
+                                <a href="/user/{{.Id}}" class="wenku-username">{{.Username}}</a>
+                            </div>
+                            <div class="help-block"><span class="text-primary">{{.Document}}</span> 篇文档</div>
+                        </div>
+                    </li>
                 {{end}}
 
             </ul>