From 3ca8d8d3b5614a9a5bec4d6b9fd0c009a67279eb Mon Sep 17 00:00:00 2001
From: Junv <wahyd4@gmail.com>
Date: Wed, 23 Jan 2013 15:16:34 +0800
Subject: [PATCH] update view

---
 app/controllers/user_controller.rb         | 10 +++++++---
 app/views/layouts/application.html.slim    |  2 +-
 app/views/shared/_borrowed-books.html.slim |  5 +++--
 app/views/user/view.html.slim              |  0
 config/routes.rb                           |  1 +
 5 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 app/views/user/view.html.slim

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 3b2b476..f99bd67 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -20,14 +20,14 @@ class UserController < ApplicationController
 
   def books
     query = params[:query]
-    user = User.find_by_id params[:id]
+    @user = User.find_by_id params[:id]
     case  query
       when 'borrowed'
-        @books = user.borrowed_and_not_returned_books
+        @books = @user.borrowed_and_not_returned_books
       when 'wanted'
         @books = nil
       else
-        @books =  user.books.order 'id DESC'
+        @books =  @user.books.order 'id DESC'
     end
     @query = query
     render :books
@@ -44,4 +44,8 @@ class UserController < ApplicationController
     redirect_to :back,:notice => @message
   end
 
+  def view
+
+  end
+
 end
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index f6e8bc7..c103225 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -27,7 +27,7 @@ html
           ul.nav.pull-right
             -if @current_user != nil
               li
-                a href="#"
+                a href="/users/#{@current_user.id}"
                   img.img-circle style="max-width:82%;margin:-5px" src="#{@current_user.avatar}" title="#{@current_user.name}"
               li
                 a href="/logout" 注销
diff --git a/app/views/shared/_borrowed-books.html.slim b/app/views/shared/_borrowed-books.html.slim
index 4b5b768..a5bbf05 100644
--- a/app/views/shared/_borrowed-books.html.slim
+++ b/app/views/shared/_borrowed-books.html.slim
@@ -5,5 +5,6 @@ div.row  style="margin-top:2em;"
         a href="/books/#{book.id}"
            img.cover src="#{book.image}"
         p.title style="font-size:0.9em;"  =book.name
-        = form_tag("borrowedbooks/#{book.id}", method:'put') do
-          input.btn.btn-warning.btn-mini.my-borrow-btn type="submit" value="归还"
\ No newline at end of file
+        -if @user == @current_user
+          = form_tag("borrowedbooks/#{book.id}", method:'put') do
+            input.btn.btn-warning.btn-mini.my-borrow-btn type="submit" value="归还"
\ No newline at end of file
diff --git a/app/views/user/view.html.slim b/app/views/user/view.html.slim
new file mode 100644
index 0000000..e69de29
diff --git a/config/routes.rb b/config/routes.rb
index e7efd99..5658e33 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -12,6 +12,7 @@ Libr::Application.routes.draw do
 	get '/logout' => 'user#logout'
 	get '/login/douban' => 'user#auth_douban'
 	get '/douban_callback' =>'home#douban_callback'
+  get '/users/:id' => 'user#view'
 
   # The priority is based upon order of creation:
   # first created -> highest priority.