diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 7e6e3d04a..9b2e5990a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -280,11 +280,11 @@ class UsersController < ApplicationController 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 = @jours[@offset, @limit] + #@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 end # end diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index b4bc52eab..89fa0e1dc 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -27,11 +27,7 @@ class WordsController < ApplicationController end end @jours = @user.journals_for_messages.where('m_parent_id IS NULL').reverse - @limit = 10 - @feedback_count = @jours.count - @feedback_pages = Paginator.new @feedback_count, @limit, params['page'] - @offset ||= @feedback_pages.offset - @jour = @jours[@offset, @limit] + @jour = paginateHelper @jours,10 respond_to do |format| # format.html { redirect_to_referer_or {render :text => 'Watcher added.', :layout => true}} diff --git a/app/views/homework_attach/_show_star.html.erb b/app/views/homework_attach/_show_star.html.erb index 6dc82e238..08923a874 100644 --- a/app/views/homework_attach/_show_star.html.erb +++ b/app/views/homework_attach/_show_star.html.erb @@ -1,11 +1,11 @@ <% if is_comprehensive_evaluation == 3 || User.current == homework.user%> - <%= l(:label_work_rating) %>： - <%= render :partial => 'show_score', locals: {:stars => totle_score} %> + <% elsif is_comprehensive_evaluation == 2 %> - <%= l(:label_work_rating) %>： <% if has_evaluation %> - <%= render :partial => 'show_score', locals: {:stars => totle_score} %> + <% else %> + <%= l(:label_work_rating) %>： <%= rating_for homework, dimension: :quality, class: 'rateable div_inline' %> <% end %> diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb index 2462d57ef..be1550000 100644 --- a/app/views/projects/_project_jours.html.erb +++ b/app/views/projects/_project_jours.html.erb @@ -25,7 +25,7 @@
- <%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %> + <%= render :partial => 'history',:locals => { :journals => @jour, :state => false} %>
diff --git a/app/views/users/_history.html.erb b/app/views/users/_history.html.erb new file mode 100644 index 000000000..60289c420 --- /dev/null +++ b/app/views/users/_history.html.erb @@ -0,0 +1,55 @@ +<% reply_allow = JournalsForMessage.create_by_user? User.current %> + +
+
+ <% if journals.size > 0 %> + <% for journal in journals %> +
+
<%= image_tag(url_to_avatar(journal.user)) %>
+
+
+ + <%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%><%= format_time(journal.created_on) %> +
+

<%= textilizable journal.notes%>

+
+
+ <% ids = 'project_respond_form_'+ journal.id.to_s%> + + <% if journal.user == User.current|| User.current.admin? %> + <%= link_to(l(:label_bid_respond_delete), + {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user}, + :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', + :class => "delete", :title => l(:button_delete)) %> + <% end %> + <% if reply_allow %> + <%= link_to l(:label_bid_respond_quote),'', + {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"} %> + + <% end %> + + + <%= l(:label_bids_published) %>  + <%= time_tag(journal.created_on).html_safe %>  + <%= l(:label_bids_published_ago) %> + +
+
+ <% ids = 'project_respond_form_'+ journal.id.to_s%> + <% if reply_allow %> +
+ <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal,:show_name => true} %> +
+ <% end %> +
+
+ <%= render :partial => "words/journal_reply", :locals => {:journal => journal, :show_name => true} %> +
+
+
+
+ <% end %> + <% end %> +
+
+ diff --git a/app/views/users/_user_jours.html.erb b/app/views/users/_user_jours.html.erb new file mode 100644 index 000000000..e62505722 --- /dev/null +++ b/app/views/users/_user_jours.html.erb @@ -0,0 +1,14 @@ +
+
+ <% reply_allow = JournalsForMessage.create_by_user? User.current %> + +

<%= l(:label_user_response) %>（<%= @obj_count%>）

+ + <%= render :partial => 'words/new', :locals => {:user => @user, :sta => @state} %> + +
+
+ <%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %> +
+ +
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb index c20d9717d..deb360efd 100644 --- a/app/views/users/user_newfeedback.html.erb +++ b/app/views/users/user_newfeedback.html.erb @@ -1,18 +1,7 @@ -
-
- <%= render :partial => 'words/new', :locals => {:user => @user, :sta => @state} %> -
-
-<%= l(:label_newfeedback_message) %>（<%= @feedback_count%>） -
+<% reply_allow = JournalsForMessage.create_by_user? User.current %> +<%= stylesheet_link_tag 'css', :media => 'all' %> -
- <%= render :partial => 'words/message', :locals => {:jour => @jour, :state => @state, :user => @user, :feedback_pages => @feedback_pages} %> -
- -
+<%= render :partial => 'user_jours', + :locals => { :journals => @jour, :state => false} +%> <% html_title(l(:label_responses)) -%> \ No newline at end of file diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index 743f65231..ea14be1a6 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -64,12 +64,12 @@ function checkMaxLength() {
<% if reply_allow %> - <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal} %> + <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal,:show_name => show_name} %> <% end %>
- <%= render :partial => "words/journal_reply", :locals => {:journal => journal } %> + <%= render :partial => "words/journal_reply", :locals => {:journal => journal,:show_name => show_name } %>
<% end %> diff --git a/app/views/words/create.js.erb b/app/views/words/create.js.erb index 923d0a23c..4bf7fb244 100644 --- a/app/views/words/create.js.erb +++ b/app/views/words/create.js.erb @@ -1,4 +1,6 @@ -$('#message').html('<%= escape_javascript(render(:partial => 'words/message', :locals => {:jour => @jour, :state => false, :user => @user, :feedback_pages => @feedback_pages})) %>'); +//$('#message').html('<#%= escape_javascript(render(:partial => 'words/message', :locals => {:jour => @jour, :state => false, :user => @user, :feedback_pages => @feedback_pages,:show_name => true})) %>'); +$('#history').html('<%= escape_javascript(render(:partial => 'users/history',:locals => { :journals => @jour, :state => false})) %>') +$('#jour_count').html('<%= @obj_count%>') $('#pre_show').html('<%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>'); $('#new_form_user_message').val(""); $('#new_form_reference_user_id').val(""); \ No newline at end of file diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 767095c49..2d3a43ff3 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -82,7 +82,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;} .ping_star{ width:160px; color:#333; font-weight:bold; margin-bottom:5px;} .ping_star span a{ float:right; width:20px; height:20px; background:url(images/star.png) -2px 0 no-repeat; margin-right:3px;} .ping_star span a:hover{background:url(images/star.png) -24px 0 no-repeat;} -.ping_con textarea{ width:455px; height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;} +.ping_con textarea{ height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;} a.ping_sub{ float:right; height:22px; width:60px; margin-right:20px; background:#15bccf; color:#fff; text-align:center;} a.ping_sub1{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;} a:hover.ping_sub{ background:#14a8b9;} @@ -92,7 +92,7 @@ a:hover.ping_sub{ background:#14a8b9;} .recall_head img{ height:30px; width:30px;} .recall_head a:hover{border:1px solid #15bccf;} .recall_head img:hover{border:1px solid #15bccf;} -.recall_con{ float:left;color:#777777; width:90%; margin-left:10px; } +.recall_con{ float:left;color:#777777; margin-left:10px; } .recall_con a{ color:#15bccf; } .ping_list{ margin-top:15px;}