diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5cb43f4e8..816a90ac3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -266,13 +266,10 @@ class UsersController < ApplicationController @jours.each do |journal| fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false) end - - #@limit = 10 - #@feedback_count = @jours.count - #@feedback_pages = Paginator.new @feedback_count, @limit, params['page'] - #@offset ||= @feedback_pages.offset @jour = paginateHelper @jours,10 @state = false + + render :layout=>'base_users_new' end # end diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 632a8f66c..ec2c18602 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -163,7 +163,9 @@ <% end %> -
留言
+
+ <%= link_to "留言",feedback_path(User.current),:class => "f14 c_blue02"%> +
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb index deb360efd..de0bfbd60 100644 --- a/app/views/users/user_newfeedback.html.erb +++ b/app/views/users/user_newfeedback.html.erb @@ -1,7 +1,82 @@ -<% reply_allow = JournalsForMessage.create_by_user? User.current %> -<%= stylesheet_link_tag 'css', :media => 'all' %> +
+
+

用户留言

+
+
+ + 表情 + 取消 + 发布 +
+
+
+ 头像 +
+ 黄井泉 :  +

上周交代的bug修改完成。上周交代的bug修改完成。上周交代的bug修改完成。上周交代的bug修改完成。上周交代的bug修改完成。回复删除

+
+ 50分钟前 +
+
+ + 表情 + 取消 + 发布 +
+
+
+ 头像 +
+ 尹刚尹刚尹刚 +  回复:  + 黄井泉 +

非常好！删除

+
+ 30分钟前 +
+
+
+
+ 头像 +
+ 白羽 :  +

什么时候放暑假啊？回复删除

+
+ 50分钟前 +
+
+
+ 头像 +
+ 黄井泉 :  +

上周交代的bug修改完成。上周交代的bug修改完成。上周交代的bug修改完成。上周交代的bug修改完成。上周交代的bug修改完成。回复删除

+
+ 50分钟前 +
+
+ 头像 +
+ 尹刚尹刚尹刚 +  回复:  + 黄井泉 +

非常好！删除

+
+ 30分钟前 +
+
+
+
+ 头像 +
+ 白羽 :  +

什么时候放暑假啊？回复删除

+
+ 50分钟前 +
+
-<%= render :partial => 'user_jours', - :locals => { :journals => @jour, :state => false} -%> -<% html_title(l(:label_responses)) -%> \ No newline at end of file + + +
+
+
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 280053f60..7c1096303 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -304,7 +304,7 @@ RedmineApp::Application.routes.draw do match 'user_projects_index', :to => 'users#user_projects_index', :via => :get match 'user_projects', :to => 'users#user_projects', :via => :get match 'user_activities', :to => 'users#user_activities', :via => :get, :as => "user_activities" - match 'user_newfeedback', :to => 'users#user_newfeedback', :via => :get, :as => "user_newfeedback" + # match 'user_newfeedback', :to => 'users#user_newfeedback', :via => :get, :as => "user_newfeedback" match 'info', :to => 'users#info', :via => [:get , :post], :as => 'user_info' match 'user_watchlist', :to => 'users#user_watchlist', :via => :get, :as => "user_watchlist" #add by huang match 'user_fanslist', :to => 'users#user_fanslist', :via => :get, :as => "user_fanslist" #add by huang diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css index 7c3dad383..3e17f1f7b 100644 --- a/public/stylesheets/users.css +++ b/public/stylesheets/users.css @@ -123,6 +123,13 @@ a:hover.c_lgrey{ color:#3ca5c6;} .newhwork_div input,.newhwork_div select{ height:26px;border:1px solid #CCC; } .newhwork_div textarea{border:1px solid #CCC;} .w460{ width:460px;} +/* 留言新增*/ +.mes_box{ width:600px;} +.mes_box02{ margin-left:80px; border-top:1px dashed #c9c9c9; padding-top:10px;} +.mes_box02_info{ width:500px; margin-left:5px;} +.users_r_top{ width:730px; height:40px; background:#eaeaea; margin-bottom:10px;} +.users_r_h2{background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} + a.hidepic>img{display:none;}