diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 761dd96..54522f4 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -98,3 +98,23 @@ div.span2{ .my-borrow-btn{ margin-top:-20px; } + +.container-narrow{ + margin: 0 auto; + max-width: 700px; + min-height: 500px; + margin-bottom: 10px; + border: 1px solid #9EAA99; + border-radius: 3px; + box-shadow: 0 0 4px rgba(0,0,0,.25); + margin-top: 20px; +} +.cool-border{ + border: 1px solid #9EAA99; + box-shadow: 0 0 4px rgba(0,0,0,.25); +} +.record-info{ + color: #c67605; + font-size: 25px; + line-height: 35px; +} diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 189dfbe..f886b66 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -42,7 +42,6 @@ class UserController < ApplicationController def return_book instance = BookInstance.find_by_id params[:instance_id] - puts "---------------------" +instance.to_s + " -------"+params[:instance_id] if @current_user.borrowed_and_not_returned_books.include? instance @current_user.return_book instance @message = 'Return book success.' @@ -53,7 +52,10 @@ class UserController < ApplicationController end def view + @user = User.find_by_id params[:id] + @total_borrowed_books = @user.borrowed_books + @total_books = @user.book_instances end end diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index ffbda76..5bdc2bb 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -25,7 +25,7 @@ html li a href="/users/#{@current_user.id}/books" 我的书架 li - a href="/users" 我的记录 + a href="/users/#{@current_user.id}" 个人中心 ul.nav.pull-right -if @current_user != nil li diff --git a/app/views/user/view.html.slim b/app/views/user/view.html.slim index e69de29..341daf8 100644 --- a/app/views/user/view.html.slim +++ b/app/views/user/view.html.slim @@ -0,0 +1,13 @@ +div.container-narrow style="text-align:center;" + div style="margin-top:-25px;" + img.img-circle.cool-border src="#{@user.avatar}" + h3 =@user.name + div.record-info + p 近一个月借书#{0}本 + p + p 近一年借书#{0}本 + p + p 至今共借书#{@total_borrowed_books.count}本 + p + p 共拥有图书#{@total_books.count}本 +