From 6e10f16c685736e14a44fcb591a67325ae171def Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Mon, 14 Oct 2013 22:40:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BD=9C=E4=B8=9A=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=88=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=88=90=E9=9C=80=E6=B1=82=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_list_projects.html.erb | 20 +++++++++++++++++--- app/views/bids/_project_list.html.erb | 19 ++++++++++++------- app/views/bids/show_project.html.erb | 2 +- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb index 38e2ece3..d7611e8b 100644 --- a/app/views/bids/_list_projects.html.erb +++ b/app/views/bids/_list_projects.html.erb @@ -124,14 +124,28 @@
+ <% if @bid.reward_type == 3 %> - + + + + + + + + + <% else %> + + - + + <% end %>
<%= l(:label_bidding_user) %> + <%= l(:label_bidding_user_studentcode) %> : <%= @user.user_extensions.student_id %>
<%= l(:label_bidding_user_homework) %> <%= link_to(b_project.user.lastname+b_project.user.firstname, user_path(b_project.user)) %> -
<%= l(:label_bidding_reason_homewrok) %><%= b_project.description %>
<%= l(:label_bidding_user) %> + <%= link_to(b_project.user.lastname+b_project.user.firstname, user_path(b_project.user)) %> +
<%= l(:label_bidding_reason) %><%= b_project.description %>
diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index 50f34d3d..9afa3ea9 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -1,19 +1,24 @@ <%= render_flash_messages %> -<% if @bid.reward_type == 3 %> +<% if @bid.reward_type == 3 %> + <% if User.current.user_extensions.identity == 1 %> +
+

贴心小提示：

+

亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以再 + 回到这里来提交作业哦~ 这样在作业提交后，老师就可以随时关注你的作业进展啦~祝使用愉快^^

+
+ <% end %> - - <% if User.current.logged? %> + - <% end %> +
<%= l(:label_homework_project) %>(<%= @bidding_project.count%>)<%= l(:label_homework_project) %>(<%= @bidding_project.count%>) - <% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %> + <% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %> +
<%= toggle_link l(:label_commit_homework), 'put-bid-form' %>
<% end %> -
- +