@@ -55,7 +59,8 @@
- <%= label_tag l(:field_subject) %>: <%=h @memo.subject %>
+ <%= label_tag l(:field_subject) %>:
+ <%=h @memo.subject %>
<%= textAreailizable(@memo,:content) %>
@@ -67,7 +72,9 @@
-
<%= authoring @memo.created_at, @memo.author %>
+
+ <%= authoring @memo.created_at, @memo.author %>
+
From a1b4b2ddae24548708c31dc53537c9954412ede6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 21 Nov 2014 15:48:08 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=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/_homework.html.erb | 2 +-
public/stylesheets/css.css | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/views/homework_attach/_homework.html.erb b/app/views/homework_attach/_homework.html.erb
index c4be4777c..b821e2495 100644
--- a/app/views/homework_attach/_homework.html.erb
+++ b/app/views/homework_attach/_homework.html.erb
@@ -51,7 +51,7 @@
<% if is_my_homework %>
<% if @bid.comment_status == 0 %>
-
+
<%= link_to l(:button_edit), edit_homework_attach_path(homework) %>
<% if homework.user == User.current || User.current.admin? %>
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index 2eb401dfd..b10870201 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -1,5 +1,5 @@
/* CSS Document */
-body{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; line-height:1.9; background:#fff; font-style:normal;}
+body{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; background:#fff; font-style:normal;}
div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,textarea{ margin:0; padding:0;}
div,img,tr,td,textarea{ border:0;}
table,tr,td{border:0; cellspacing:0; cellpadding:0;}
@@ -38,9 +38,9 @@ a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
.pic_head a{ text-align:center; width:42px; overflow:hidden;text-overflow:ellipsis; white-space:nowrap;}
.pic_head img{ border:1px solid #fff;}
.pic_head img:hover{border:1px solid #15bccf;}
-.dis ul li.wname a{ width:260px; font-size:14px; color:#595959; padding:20px 0 0 15px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;}
-.dis ul li.wdown a{padding-top:22px; color:#3d7ec2; margin-right:35px;}
-.wscore{ padding-top:22px; color:#888888; width:96px;}
+.dis ul li.wname a{ width:260px; font-size:14px; color:#595959; padding:25px 0 0 15px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;}
+.dis ul li.wdown a{padding-top:25px; color:#3d7ec2; margin-right:35px;}
+.wscore{ padding-top:25px; color:#888888; width:96px;}
.dis ul li.wping{margin-left:12px; }
.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:3px;}
.dis ul li.wping a:hover{ background-color:#03a1b3;}
From 2c28ed0fa13ae931e46322a72ce58c770b6bd472 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 21 Nov 2014 16:07:29 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BD=9C=E4=B8=9A?=
=?UTF-8?q?=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E7=95=99=E8=A8=80=E7=9A=84?=
=?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/bids/_homework_list.html.erb | 2 +-
public/stylesheets/css.css | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index 036289b0a..23f7070b2 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -22,7 +22,7 @@
<%= link_to "留言", get_homework_jours_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
(<%= @jours_count %>)
-
+
<%= link_to "作品打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), class: "tb_all" unless @bid.homeworks.empty? %>
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index b10870201..e756213ab 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -15,7 +15,7 @@ a:hover{ text-decoration:underline;}
/* TAB 切换效果 */
.tb_{ background-color: #eaeaea; height:40px; }
.tb_ ul{height:40px; }
-.tb_ li{float:left;height:35px;width: 90px;cursor:pointer; font-size:14px; padding-top:5px; text-align:center; }
+.tb_ li{float:left;height:30px;width: 90px;cursor:pointer; font-size:14px; padding-top:10px; text-align:center; }
a.tb_all{ margin-left:235px; font-size:12px; display:block; height:23px; padding-top:4px; width:90px; color:#7a7a7a; border:1px solid #cbcbcb; background:#fff; text-align: center;}
a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
@@ -44,7 +44,7 @@ a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
.dis ul li.wping{margin-left:12px; }
.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:3px;}
.dis ul li.wping a:hover{ background-color:#03a1b3;}
-ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
+ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px;line-height: 1.9; }
.wlist span{ border:1px solid #15bccf; padding:0 5px; margin-left:3px;}
.wlist a{ border:1px solid #15bccf; padding:0 5px; margin-left:3px;}
.wlist a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
@@ -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;max-width: 530px;width: 90%; margin-left:10px; }
+.recall_con{ float:left;color:#777777;max-width: 530px;width: 80%; margin-left:10px; }
.recall_con a{ color:#15bccf; }
.ping_list{ margin-top:15px;}
From 06f1ff026ab5d8318999333df1cd425064564660 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 21 Nov 2014 16:28:01 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE--?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B7=A5=E5=85=B7=E9=9B=86logo=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/stylesheets/nyan.css | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 50a1de7c4..1ef7c8dd7 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -649,14 +649,14 @@ input[class='nyan-clean-gray']:active, .nyan-clean-gray:active {
}
.tools a:visited {
- color: #fffbff;
+ color: #116699;
text-decoration: none;
padding: 3px 5px 0px 5px;
width: 100px;
}
.tools a:hover {
- color: #fffbff;
+ color: white;
padding: 3px 3px 0px 20px;
width: 88px;
text-decoration: none;
From db87f8f5db8259bc9c55757f0aa498656bf2eca8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 21 Nov 2014 16:38:14 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B7=A5=E5=85=B7=E9=9B=86=E6=A0=8F=E6=97=B6?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AEtab=E6=A0=8F=E4=B8=8B=E7=9A=84=E6=A8=AA?=
=?UTF-8?q?=E7=BA=BF=E6=B2=A1=E4=BA=86=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/stylesheets/application.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1b1580d8c..8d60c06a2 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2202,7 +2202,7 @@ button.tab-right {
padding-bottom: 2px;
text-align: center;
border: 1px solid #15BCCF;
- border-bottom: 0px solid #15BCCF;
+ border-bottom: 1px solid #15BCCF;
color:#606060;
font-weight:bold;
From ea19c1aeefed788f49491cfd22a20a9f66570b98 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 22 Nov 2014 09:33:37 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=95=99=E5=B8=88?=
=?UTF-8?q?=E8=AF=84=E5=88=86=E6=89=80=E5=8D=A0=E6=AF=94=E4=BE=8B=E9=80=89?=
=?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/bids/_homework_form.html.erb | 2 +-
app/views/courses/_homework_form.html.erb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/views/bids/_homework_form.html.erb b/app/views/bids/_homework_form.html.erb
index cd682deb0..12393c558 100644
--- a/app/views/bids/_homework_form.html.erb
+++ b/app/views/bids/_homework_form.html.erb
@@ -40,7 +40,7 @@
<%= f.select :is_evaluation, is_evaluation_option %>
-
+
<%= f.select :proportion, proportion_option %>
diff --git a/app/views/courses/_homework_form.html.erb b/app/views/courses/_homework_form.html.erb
index 8ce6be3fe..2d20ecf07 100644
--- a/app/views/courses/_homework_form.html.erb
+++ b/app/views/courses/_homework_form.html.erb
@@ -45,7 +45,7 @@
<%= f.select :is_evaluation, is_evaluation_option %>
-
+
<%= f.select :proportion, proportion_option %>
From 56150e44cee595b3daf13192f9e66116e4f0367f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 22 Nov 2014 09:49:51 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=82=AE=E4=BB=B6?=
=?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=9C=A8=E6=96=B0=E7=AA=97?=
=?UTF-8?q?=E5=8F=A3=E6=89=93=E5=BC=80=E7=BD=91=E9=A1=B5=E6=8A=A5500?=
=?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/homework_attach_controller.rb | 22 +--
app/views/homework_attach/show.html.erb | 177 +-----------------
2 files changed, 3 insertions(+), 196 deletions(-)
diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index 61760f462..0286fcad6 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -382,42 +382,22 @@ class HomeworkAttachController < ApplicationController
if User.current.admin? || User.current.member_of_course?(@homework.bid.courses.first)
# 打分统计
stars_reates = @homework. rates(:quality)
- #stars_reates_count = stars_reates.count == 0 ? 1 : stars_reates.count
- #stars_status = stars_reates.select("stars, count(*) as scount").group("stars")
- #@stars_status_map = Hash.new(0.0)
- #stars_status.each do |star_status|
- # percent = (star_status.scount * 1.0/ stars_reates_count) * 100.to_f
- # percent_m = format("%.2f", percent)
- # @stars_status_map["star#{star_status.stars.to_i}".to_sym] =
- # percent_m.to_s + "%"
- #end
#是否已经进行过评价
temp = HomeworkAttach.find_by_sql("SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = #{@homework.id} AND rater_id = #{User.current.id}").first
@m_score = temp.nil? ? 0:temp.stars
@has_evaluation = stars_reates.where("rater_id = ?",User.current).count > 0
- #是否开启互评功能
- #@is_evaluation = @homework.bid.is_evaluation == 1 || @homework.bid.is_evaluation == nil
- #@limit = 10
#@jours留言 is null条件用以兼容历史数据
@jours = @homework.journals_for_messages.where("is_comprehensive_evaluation = 3 or is_comprehensive_evaluation is null").order("created_on DESC")
@cur_page = params[:cur_page] || 1
@cur_type = params[:cur_type] || 5
@jour = paginateHelper @jours,5
- #@feedback_count = @jours.count
- #@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
- #@offset ||= @feedback_pages.offset
- #@jour = @jours[@offset, @limit]
- #@comprehensive_evaluation教师评论
- #@comprehensive_evaluation = @homework.journals_for_messages.where("is_comprehensive_evaluation = 1").order("created_on DESC")
+
teachers = searchTeacherAndAssistant @course
@comprehensive_evaluation = []
teachers.each do|teacher|
temp = @homework.journals_for_messages.where("is_comprehensive_evaluation = 1 and user_id = #{teacher.user_id}").order("created_on DESC").first
@comprehensive_evaluation << temp if temp
end
- #@comprehensive_evaluation = @homework.journals_for_messages.where("is_comprehensive_evaluation = 1 and user_id in #{convert_array(teachers)}").order("created_on DESC")
- #@anonymous_comments 匿评
- #@anonymous_comments = @homework.journals_for_messages.where("is_comprehensive_evaluation = 2").order("created_on DESC")
annymous_users = @homework.homework_evaluations.map(&:user)
unless annymous_users.nil? || annymous_users.count == 0
@anonymous_comments = @homework.journals_for_messages.where("is_comprehensive_evaluation = 2 and user_id in #{convert_array(annymous_users)}").order("created_on DESC")
diff --git a/app/views/homework_attach/show.html.erb b/app/views/homework_attach/show.html.erb
index 5f631c26a..d2f096bae 100644
--- a/app/views/homework_attach/show.html.erb
+++ b/app/views/homework_attach/show.html.erb
@@ -1,175 +1,2 @@
-<%= render :partial => 'layouts/base_homework_attach', :locals => {:homework_attach => @homework} %>
-
-<% is_student = is_cur_course_student @homework.bid.courses.first %>
-<% is_teacher = is_course_teacher User.current,@homework.bid.courses.first %>
-
<%= notice %>
-
-
- |
- |
-
-
-
- | 作业基础信息<%=@count %> |
-
-
- |
- 发布人员：<%= link_to @homework.user, user_path(@homework.user)%>
- |
-
- 所属任务：<%= link_to(@homework.bid.name, course_for_bid_path(@homework.bid))%>
- |
-
-
- |
- 作业下载：
- <% if @is_evaluation || is_teacher%>
- <% options = {:author => true } %>
- <%= render :partial => 'app_link', :locals => {:attachments => @homework.attachments, :options => options} %>
- <% else %>
- <%= l(:label_cant_download) %>
- <% end %>
- |
-
- 参与人员：
- <% @homework.users.each do |homework_user| %>
- <%= link_to homework_user, user_path(homework_user)%>
- <% if @homework.users.count > 1 && homework_user != @homework.users.last %>
-
- <% end %>
- <% end %>
- |
-
-
- | 平均评分：
- <%= render :partial => 'show_score', :locals => {:stars => @totle_score} %>
- |
- 发布时间：<%=format_time @homework.created_at %> |
-
-
- |
-
-
-
-
-
-
- |
- |
-
-
-
- 作业描述： |
-
-
-
-
- <% if @homework.description != nil && @homework.description != "" %>
- <%= @homework.description %>
- <% else %>
-
- 该作业无任何描述！
-
- <% end %>
- |
-
-
- |
-
-
-
-
-
-
- 作业得分：
-
-
-
-
得分比例
-
- <% 100.step(20,-20) do |star| %>
-
- <%= @stars_status_map["star#{(star/20).to_s}".to_sym] %>
-
- <% end %>
-
-
-
-
最终得分
-
- <%= @totle_score %>分
-
-
- <%= render :partial => 'show_score', :locals => {:stars => @totle_score} %>
-
-
-
-
打分总人数
-
-
- <%= @homework.raters(:quality).count%>
-
-
-
-
-
-
-
-
-
- <%= render :partial => 'comprehensive_evaluation', :locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework, :teaher_score => @teaher_score} %>
-
-
-
-
-
-<% if !users_for_homework(@homework).include?(User.current) %>
-
-
作业评论：
- <% if is_student %>
- <% if @is_evaluation %>
- <% if @has_evaluation %>
-
- <%= l(:lable_has_evaluation)%>
-
- <% else %>
- <%= render :partial => 'evaluation', :locals => {:homework => @homework} %>
- <% end %>
- <% else %>
-
- <%= l(:lable_close_evaluation)%>
-
- <% end %>
- <% end %>
-
-<% end %>
-
-<% if !is_teacher %>
-
-
- <%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => nil} %>
-
-<% end %>
-
-
-
-
- <%= render :partial => 'showjour', :locals => {:jour => @jour,:homework => @homework} %>
-
-
-
-
+<%= stylesheet_link_tag 'css', :media => 'all' %>
+<%= render :partial => "show"%>
\ No newline at end of file
From 74f9bc64044cf0a17c9467430175adb3b1944258 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 22 Nov 2014 10:07:28 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=B3=E9=94=AE?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E6=95=B0=E9=A1=B5=E9=9D=A2=E6=8A=A5?=
=?UTF-8?q?500=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/projects_controller.rb | 5 ++++-
app/views/projects/show_projects_score.html.erb | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 47c8107ce..b3efdcf97 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -842,7 +842,10 @@ class ProjectsController < ApplicationController
end
def show_projects_score
- render :layout => false
+ respond_to do |format|
+ format.html { render :layout => "project_base"}
+ format.js
+ end
end
def issue_score_index
diff --git a/app/views/projects/show_projects_score.html.erb b/app/views/projects/show_projects_score.html.erb
index 7f3f05cce..836e0a05c 100644
--- a/app/views/projects/show_projects_score.html.erb
+++ b/app/views/projects/show_projects_score.html.erb
@@ -66,6 +66,6 @@
- <%= render :partial => 'projects/project_score_index', :locals => {:index => 0 } %>
+ <%= render :partial => 'projects/project_score_index', :locals => {:index => 0,:project => @project } %>
<% end %>
\ No newline at end of file
From 8d3a2ad7a20da18ac3b8526d528a9f52c6623086 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 22 Nov 2014 10:36:14 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF?=
=?UTF-8?q?=E5=8C=BF=E8=AF=84=E6=94=B9=E4=B8=BA=E6=98=AF=E5=90=A6=E4=BD=BF?=
=?UTF-8?q?=E7=94=A8=E5=8C=BF=E8=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/locales/zh.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f01a6e6d8..9e3a13fff 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2202,4 +2202,4 @@ zh:
label_submit_comments: 提交评论
field_evaluation_num: 匿评分配数量
label_my_score: 我的评分
- field_open_anonymous_evaluation: 是否开启匿评
+ field_open_anonymous_evaluation: 是否使用匿评
From a95a68caec7d2aeb337f022caadc7e451bed1291 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 22 Nov 2014 10:46:15 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B?=
=?UTF-8?q?=E5=8F=B3=E4=BE=A7js=E6=82=AC=E6=B5=AE=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/layouts/base_courses.html.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index bc665ea41..6cdc19471 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -24,7 +24,7 @@
-
+<%= render :partial => 'courses/course_ad' %>