-
<%= yield %>
From 7ec738dd874b2bb7e8d8fc64c8067059691dfe7e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 30 Oct 2014 10:43:19 +0800
Subject: [PATCH 003/146] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=85=B3css?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/layouts/base_homework.html.erb | 17 +++-
public/stylesheets/css.css | 106 +++++++++++++++++++++++
2 files changed, 122 insertions(+), 1 deletion(-)
create mode 100644 public/stylesheets/css.css
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index d3a5f5b07..4fb97bf24 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -254,7 +254,22 @@
-
-
- - <%= link_to l(:label_question_student), {:controller => 'bids', :action => 'show'}, :class => link_class(:respond) %> - - <% if User.current.member_of_course? course %> -
- - <% if User.current.logged? && course && (!Member.where('user_id = ? and course_id = ?', User.current.id, course.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, course.id).first.roles&Role.where('id = ? or id = ? or id =?', 5, 10, 7)).size >0) %> - <%= link_to l(:label_homework_commit), course_for_bid_path, :class => link_class(:course) %> - <% else %> - <%= link_to l(:label_homework_info), course_for_bid_path, :class => link_class(:course) %> - <% end %> - - <% end %> - - -
-
+
<%= yield %>
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
new file mode 100644
index 000000000..ecab893ec
--- /dev/null
+++ b/public/stylesheets/css.css
@@ -0,0 +1,106 @@
+/* CSS Document */
+body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
+div,img,tr,td{ border:0;}
+table,tr,td{border:0; cellspacing:0; cellpadding:0;}
+ul,li{ list-style-type:none}
+.cl{ clear:both; overflow:hidden; }
+a{ text-decoration:none; }
+a:hover{ text-decoration:underline;}
+
+
+.container{ width:940px; margin:0 auto; padding-top:125px;}
+
+
+/* 作业列表 */
+.ttl{ }
+.ctt{height:820px;clear:both; }
+#content{float:right;clear:both;width:693px;/*滑动门的宽度*/}
+/* 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; }
+
+/* 控制显示与隐藏css类 */
+.normaltab { color:#64bdd9 ; }
+.hovertab { color:#fff; background-color:#64bdd9; }
+.normaltab a { color:#64bdd9 ; }
+.hovertab a{color:#fff; background-color:#64bdd9; text-decoration:none;}
+.dis{display:block; }
+.undis{display:none;}
+
+.c_red{ color:#de030d;}
+.f_12{ font-size:12px;}
+
+.dis ul{ height:75px; border-bottom:1px dashed #64bdd9;}
+.dis ul li{ float:left;}
+.dis ul li a{ display:block; color:#15bccf;}
+.pic_head{ width:40px; padding:8px 15px 0 8px; }
+.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:43px;}
+.wscore{ padding-top:22px; color:#888888;}
+.dis ul li.wping{margin-left:16px; }
+.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; }
+.wlist a{ border:1px solid #15bccf; padding:0 5px; margin-left:3px;}
+.wlist a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
+.code_list{ float:right; font-size:12px; color:#484848; padding:5px 3px; border-bottom:2px solid #15bccf; width:687px; }
+.code_list a{ color:#787878;}
+.fr{ float:right;}
+.c_grey{ color:#999; font-weight:normal;}
+
+.msg_box{ width:693px; height:170px; border-bottom:1px dashed #CCC; padding-top:20px;}
+.msg_box h4{ margin-left:15px;}
+.msg_box textarea{width:660px;height:90px;padding:2px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 15px; color:#666; font-size:12px;}
+.msg_box a{ float:right; display:block; width:50px; height:22px; background:#15bccf; color:#fff; margin-right:10px; text-align:center; margin-top:5px; }
+.msg_box a:hover{ background-color:#03a1b3; text-decoration:none;}
+
+
+/****评分弹框****/
+#popbox{width:488px;height:550px;position:absolute;z-index:100;left:50%;top:40%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; padding:5px; overflow:auto; }
+.alert .close{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-502px;background:url(images/close.png) no-repeat;cursor:pointer;}
+.alert .C{width:476px;height:296px;position:absolute;left:5px;top:5px; }
+
+.ping_con{ margin:5px; border-bottom:1px dashed #CCC; padding-bottom:5px;}
+.ping_con ul{ height:30px;}
+.ping_con ul li{ float:left; color:#656767; font-weight:bold;}
+.ping_con h2{ font-size:14px; color:#444443; margin-bottom:10px; }
+.ping_con p{ color:#777777; font-size:12px; border-bottom:1px dashed #CCC; padding-bottom:5px;}
+.ping_con p span a{ color:#777777;}
+.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;}
+a.ping_sub{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;}
+a:hover.ping_sub{ background:#14a8b9;}
+
+.ping_list{ margin-top:15px;}
+
+.ping_ttl{height:18px;}
+.ping_ctt{height:auto;padding:6px;clear:both;}
+.ping_tb_{ border-bottom:3px solid #e4e4e4; text-align:center;}
+.ping_tb_ ul{height:24px;}
+.ping_tb_ li{float:left;height: 24px;width: auto; padding:0 10px;cursor:pointer;}
+.ping_normaltab { color:#15bccf ; border-bottom:3px solid #e4e4e4;}
+.ping_hovertab { color:#656767; font-weight:bold; border-bottom:3px solid #15bccf; }
+.ping_dis{display:block; }
+.ping_undis{display:none;}
+
+.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_discon{ float:left; width:384px; margin-left:15px;}
+.ping_distop span{ float:left;}
+.ping_distop p{ color:#5f5f5f;}
+.ping_disfoot a{ float:right; color:#15bccf; margin-left:5px;}
+
+.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}
+
+
+
+
+
+
+
From ceb181e6699538fe4bb3c10986d7ee67e67d2765 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 30 Oct 2014 10:58:14 +0800
Subject: [PATCH 004/146] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=96=B0=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E9=9D=99=E6=80=81?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/bids/_homework.html.erb | 29 --
app/views/bids/_homework_list.html.erb | 373 ++++++++++++++----------
public/stylesheets/css.css | 3 +-
public/stylesheets/images/225905790.jpg | Bin 0 -> 12704 bytes
public/stylesheets/images/close.png | Bin 0 -> 1637 bytes
public/stylesheets/images/pic_down.png | Bin 0 -> 714 bytes
public/stylesheets/images/star.png | Bin 0 -> 1601 bytes
7 files changed, 215 insertions(+), 190 deletions(-)
create mode 100644 public/stylesheets/images/225905790.jpg
create mode 100644 public/stylesheets/images/close.png
create mode 100644 public/stylesheets/images/pic_down.png
create mode 100644 public/stylesheets/images/star.png
diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb
index f3578e713..5071444f4 100644
--- a/app/views/bids/_homework.html.erb
+++ b/app/views/bids/_homework.html.erb
@@ -35,35 +35,6 @@
-
+
- + <%= link_to l(:label_question_student), {:controller => 'bids', :action => 'show'}, :class => link_class(:respond) %> + + <% if User.current.member_of_course? course %> +
- + <% if User.current.logged? && course && (!Member.where('user_id = ? and course_id = ?', User.current.id, course.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, course.id).first.roles&Role.where('id = ? or id = ? or id =?', 5, 10, 7)).size >0) %> + <%= link_to l(:label_homework_commit), course_for_bid_path, :class => link_class(:course) %> + <% else %> + <%= link_to l(:label_homework_info), course_for_bid_path, :class => link_class(:course) %> + <% end %> + + <% end %> + + +
| - <% if @homework_list.empty? %> - - <% end %> - | -- - | -
| - - | -- - | -
<%= render :partial => 'homework_list', :locals => {:homework => @homework_list} %>
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index 0326f218c..a460a0d7a 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -1,163 +1,218 @@
-
-<% is_student = is_cur_course_student(@bid.courses.first) %>
-<% is_teacher = is_course_teacher(User.current,@bid.courses.first) %>
-
-<% is_evaluation = @bid.is_evaluation == 1 || @bid.is_evaluation == nil %>
-<%= form_tag(:controller => 'bids', :action => "show_courseEx", :method => :get) do %>
-
-
-
-
-<% end %>
-<% display_id = im_watching_student_id? @bid%>
-<% @homework_list.each do |homework|%>
- | <%= l(:label_task_plural)%>(<%= @homework_list.count%>) - <%= link_to "作业打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), class: "button_submit button_submit_font_white", style: "margin: 5px 10px;line-height: 20px;height: 20px;display: inline-block;" if(is_teacher && @bid.homeworks.count > 0) %> - | -
-
- <% if is_teacher %>
- <%= text_field_tag 'student_id', params[:student_id], :size => 30 %>
- <%= submit_tag l(:label_search_by_student_id), :class => "small", :name => nil %>
- <% end %>
-
- |
-
-
|
-
-
|
- ||||||||||
-
\ No newline at end of file
+-
- <%= pagination_links_full @feedback_pages %>
