From ac59bc8623819312e29fb8d971729240e0d95109 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sun, 2 Nov 2014 10:34:22 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=82=B9=E8=B5=9E?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/homework_attach_controller.rb | 3 ---
app/views/homework_attach/_homework.html.erb | 21 +++----------------
.../homework_attach/_homework_praise.html.erb | 9 ++++++++
.../homework_attach/praise_homework.js.erb | 7 +++----
public/stylesheets/css.css | 2 +-
5 files changed, 16 insertions(+), 26 deletions(-)
create mode 100644 app/views/homework_attach/_homework_praise.html.erb
diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index 57c786f50..2237ccab6 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -128,9 +128,6 @@ class HomeworkAttachController < ApplicationController
pt.praise_tread_object_id = @homework.id
pt.praise_tread_object_type = "HomeworkAttach"
pt.praise_or_tread = 1
- @is_my_homework = params[:is_my_homework]
- @is_student_batch_homework = params[:is_student_batch_homework]
- @is_teacher = params[:is_teacher]
if pt.save
respond_to do |format|
format.js
diff --git a/app/views/homework_attach/_homework.html.erb b/app/views/homework_attach/_homework.html.erb
index 6bf4128eb..b84f36984 100644
--- a/app/views/homework_attach/_homework.html.erb
+++ b/app/views/homework_attach/_homework.html.erb
@@ -59,23 +59,8 @@
<% else %>
- <% if is_praise_homework User.current.id,homework.id %>
-
- <%= link_to "",praise_homework_homework_attach_path(homework,:is_my_homework => is_my_homework,
- :is_student_batch_homework => is_student_batch_homework,
- :is_teacher => is_teacher),
- :class => "wzan_img wzan_visited", :remote => true%>
-
- <%= praise_homework_count homework.id %>
-
-
- <% else %>
-
-
-
- <%= praise_homework_count homework.id %>
-
-
- <% end %>
+
+ <%= render :partial => "homework_attach/homework_praise", locals: {:homework => homework} %>
+
<% end %>
<% end %>
\ No newline at end of file
diff --git a/app/views/homework_attach/_homework_praise.html.erb b/app/views/homework_attach/_homework_praise.html.erb
new file mode 100644
index 000000000..7fc967644
--- /dev/null
+++ b/app/views/homework_attach/_homework_praise.html.erb
@@ -0,0 +1,9 @@
+<% if is_praise_homework User.current.id,homework.id %>
+ <%= link_to "",praise_homework_homework_attach_path(homework),
+ :class => "wzan_img", :remote => true, :title => "点赞"%>
+<% else %>
+
+<% end %>
+
+ <%= praise_homework_count homework.id %>
+
\ No newline at end of file
diff --git a/app/views/homework_attach/praise_homework.js.erb b/app/views/homework_attach/praise_homework.js.erb
index 77855cd3c..1f627a017 100644
--- a/app/views/homework_attach/praise_homework.js.erb
+++ b/app/views/homework_attach/praise_homework.js.erb
@@ -1,4 +1,3 @@
-$('#homework_li_<%= @homework.id%>').
- html('<%= escape_javascript(render :partial => 'homework_attach/homework',
- :locals => {:homework => @homework, :is_student_batch_homework => @is_student_batch_homework,
- :is_my_homework => @is_my_homework, :is_teacher => @is_teacher})%>');
\ No newline at end of file
+$('#homeworl_praise_li_<%= @homework.id%>').
+ html('<%= escape_javascript(render :partial => 'homework_attach/homework_praise',
+ :locals => {:homework => @homework})%>');
\ No newline at end of file
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index 2a1ae81a7..c91f9f83f 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -60,7 +60,7 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
.dis ul li.wmine{ margin:12px 0 0 10px;}
.dis ul li.wmine a{ color:#3d7ec2; text-align:center; width:50px; font-weight: bold;}
.wzan{ margin:15px 0 0 25px; width:32px; height:44px;}
-.wzan a{ display: block;}
+.wzan a{ display: block;text-align: center;}
a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;}
a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
From c2e9363d4450300640f73b486bca27f38246b580 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sun, 2 Nov 2014 11:35:37 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=BF=9B=E5=85=A5?=
=?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=EF=BC=8C=E5=A6=82=E6=9E=9C?=
=?UTF-8?q?=E5=B7=B2=E7=BB=8F=E8=A2=AB=E5=88=86=E9=85=8D=E5=8C=BF=E8=AF=84?=
=?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=B8=94=E8=AF=A5=E5=AD=A6=E7=94=9F=E6=9C=AA?=
=?UTF-8?q?=E5=AF=B9=E6=AD=A4=E4=BD=9C=E4=B8=9A=E8=BF=9B=E8=A1=8C=E6=89=93?=
=?UTF-8?q?=E5=88=86=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E5=BC=B9?=
=?UTF-8?q?=E5=87=BA=E5=8C=BF=E8=AF=84=E7=9B=B8=E5=85=B3=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/bids/_homework.html.erb | 9 ++++++
app/views/bids/_homework_list.html.erb | 11 +++++--
.../homework_attach/_praise_alert.html.erb | 27 ++++++++++++++++++
public/images/bid/pic_top.jpg | Bin 0 -> 8817 bytes
public/stylesheets/css.css | 1 -
5 files changed, 44 insertions(+), 4 deletions(-)
create mode 100644 app/views/homework_attach/_praise_alert.html.erb
create mode 100644 public/images/bid/pic_top.jpg
diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb
index 471ad73b9..d6f53aaf2 100644
--- a/app/views/bids/_homework.html.erb
+++ b/app/views/bids/_homework.html.erb
@@ -26,6 +26,15 @@
{
$("#what_is_project_div").slideToggle();
}
+
+ window.onready = function()
+ {
+ <% if !@is_teacher && @homework_list.count > 0%>
+ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_attach/praise_alert') %>');
+ showModal('ajax-modal', '480px');
+ $('#ajax-modal').css('height','250px');
+ <% end %>
+ }
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index 5979e64d8..828474acb 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -39,7 +39,9 @@
<%= link_to "留言", get_homework_jours_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
- (<%= @jours_count %>)
+ (
+ <%= @jours_count %>
+ )
<% end %>
@@ -47,11 +49,14 @@
- <%= render :partial => 'homework_attach/homeworks_list', :locals => {:homeworks => @homework_list, :homework_count => @obj_count, :remote => false, :is_student_batch_homework => @is_student_batch_homework}%>
+ <%= render :partial => 'homework_attach/homeworks_list',
+ :locals => {:homeworks => @homework_list,
+ :homework_count => @obj_count,
+ :remote => false,
+ :is_student_batch_homework => @is_student_batch_homework}%>
-