From 7d4d3f590cb1b7fbc2c0c0384d19e63ed7555d7c Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 5 Nov 2014 09:51:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E3=80=81=E7=AB=9E=E8=B5=9B=E7=95=99=E8=A8=80=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=88=86=E9=A1=B5=E6=8E=A7=E4=BB=B6=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 8 ++++---- app/controllers/projects_controller.rb | 8 ++++---- app/views/contests/_contest_jours.html.erb | 4 +++- app/views/courses/_courses_jours.html.erb | 4 +++- app/views/courses/feedback.html.erb | 6 ------ app/views/projects/_project_jours.html.erb | 4 +++- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 8a5bfd9fb..a048c3c9c 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -672,10 +672,10 @@ class CoursesController < ApplicationController page = 1 + offset / @limit end - @feedback_count = @jours.count - @feedback_pages = Paginator.new @feedback_count, @limit, page - @offset ||= @feedback_pages.offset - @jour = @jours[@offset, @limit] + #@feedback_count = @jours.count + #@feedback_pages = Paginator.new @feedback_count, @limit, page + #@offset ||= @feedback_pages.offset + @jour = paginateHelper @jours,10 @state = false respond_to do |format| format.html{render :layout => 'base_courses'} diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index bf0717aae..47c8107ce 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -424,10 +424,10 @@ class ProjectsController < ApplicationController end - @feedback_count = @jours.count - @feedback_pages = Paginator.new @feedback_count, @limit, @page - @offset ||= @feedback_pages.offset - @jour = @jours[@offset, @limit] + #@feedback_count = @jours.count + #@feedback_pages = Paginator.new @feedback_count, @limit, @page + #@offset ||= @feedback_pages.offset + @jour = paginateHelper @jours,10 @state = false @base_courses_tag = @project.project_type diff --git a/app/views/contests/_contest_jours.html.erb b/app/views/contests/_contest_jours.html.erb index 94814c492..54a7f14a7 100644 --- a/app/views/contests/_contest_jours.html.erb +++ b/app/views/contests/_contest_jours.html.erb @@ -1,3 +1,4 @@ +

留言内容

<%= render :partial => 'new', :locals => {:contest => @contest, :sta => @state} %> @@ -9,4 +10,5 @@ <%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %>
- \ No newline at end of file + +
\ No newline at end of file diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index 70f956d4e..57bde9e68 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -1,3 +1,4 @@ +
<% reply_allow = JournalsForMessage.create_by_user? User.current %> @@ -26,4 +27,5 @@
<%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %>
- +
    <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
\ No newline at end of file diff --git a/app/views/courses/feedback.html.erb b/app/views/courses/feedback.html.erb index 90fb9e0c2..ccd171679 100644 --- a/app/views/courses/feedback.html.erb +++ b/app/views/courses/feedback.html.erb @@ -43,10 +43,4 @@ function checkMaxLength() { } - - <% html_title(l(:label_course_feedback)) -%> \ No newline at end of file diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb index 6d6ae1362..2462d57ef 100644 --- a/app/views/projects/_project_jours.html.erb +++ b/app/views/projects/_project_jours.html.erb @@ -1,3 +1,4 @@ +
<% reply_allow = JournalsForMessage.create_by_user? User.current %> @@ -26,4 +27,5 @@
<%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %>
- +
    <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
From 3b073eec7421a5f16ba03b6a4ba59ea9d0dd478e Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 5 Nov 2014 10:05:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=95=99=E8=A8=80?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_attach/_jour.html.erb | 4 +++- public/stylesheets/css.css | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/homework_attach/_jour.html.erb b/app/views/homework_attach/_jour.html.erb index f18245f7e..0aa0165a6 100644 --- a/app/views/homework_attach/_jour.html.erb +++ b/app/views/homework_attach/_jour.html.erb @@ -19,7 +19,9 @@ <%= format_time(jour.created_on) %> <% if show_score %> - <%= l(:label_work_rating) %>： + + <%= l(:label_work_rating) %>： + <%= render :partial => 'show_score', locals: {:stars => get_homework_score(jour.user,@homework ) } %> <% end %> diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index a8fee8b67..767095c49 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -110,7 +110,7 @@ a:hover.ping_sub{ background:#14a8b9;} .ping_C{border-bottom:1px dashed #CCC; padding:5px;} .ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;} .ping_dispic img{ height:46px; width:46px;} -.ping_discon{ float:left; width:372px; margin-left:15px;} +.ping_discon{ float:left; width:350px; margin-left:15px;} .ping_distop span{ float:left;} .ping_distop p{ color:#5f5f5f;} .ping_disfoot a{ float:right; color:#15bccf; margin-left:5px;}