Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/views/layouts/_base_header_new.html.erb

@@ -56,9 +56,9 @@
             </li><!---level1 end--->
             <!--消息提醒-->
             <div class="navHomepageNews">
-              <%= link_to image_tag("/images/news_icon_small.png" , :width => "21", :height => "24"), {:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user} %>
+              <%= link_to image_tag("/images/news_icon_small.png" , :width => "21", :height => "24"), user_message_path(User.current) %>
               <% if User.current.count_new_message >0 %>
-                  <div class="newsActive"></div>
+                  <div class="newsActive"><%= link_to "" , user_message_path(User.current) %></div>
               <% end %>
             </div>
             <!--消息提醒end-->

config/routes.rb

@@ -360,7 +360,7 @@ RedmineApp::Application.routes.draw do
   end
   match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback',  :via => :get, :as => "feedback"
   match 'users/:id/user_projects', :to => 'users#user_projects',  :via => :get
-  match 'users/:id/user_messages', :to => 'users#user_messages', :via => :get
+  match 'users/:id/user_messages', :to => 'users#user_messages', :via => :get, :as => "user_message"