From d832514a556686f3cbd56d500346cbc325e61204 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 8 Apr 2015 11:24:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E6=88=90?= =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 2 +- app/views/projects/_member_list.html.erb | 6 ++-- .../projects/_project_member_list.html.erb | 23 ++++++++++++ app/views/projects/member.html.erb | 2 +- public/stylesheets/project.css | 35 ++++++++++++++++++- 5 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 app/views/projects/_project_member_list.html.erb diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 8ed9fcfef..4c46b6586 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -379,7 +379,7 @@ class ProjectsController < ApplicationController # include CoursesHelper def member ## 有角色参数的才是课程，没有的就是项目 - @render_file = 'member_list' + @render_file = 'project_member_list' # 判断是否课程 if @project.project_type == Project::ProjectType_course @teachers= searchTeacherAndAssistant(@project) diff --git a/app/views/projects/_member_list.html.erb b/app/views/projects/_member_list.html.erb index ca42e1c86..785292c80 100644 --- a/app/views/projects/_member_list.html.erb +++ b/app/views/projects/_member_list.html.erb @@ -8,10 +8,10 @@ <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :class => 'avatar')) %> <%= content_tag "div", link_to(member.user.name, user_path(member.user)), :class => "nomargin avatar_name" %> - + <% if @project.project_type == 1 %> <% unless member.user.user_extensions.identity ==0 %> - + <%if @canShowCode# if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil?) %> <%= content_tag "p", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :class => "nomargin avatar_name" %> <% end %> @@ -28,7 +28,7 @@

<% end %> - + <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %> <% end; reset_cycle %> diff --git a/app/views/projects/_project_member_list.html.erb b/app/views/projects/_project_member_list.html.erb new file mode 100644 index 000000000..72dd4ded2 --- /dev/null +++ b/app/views/projects/_project_member_list.html.erb @@ -0,0 +1,23 @@ +
+
+ 加入时间 +
+ + <% members.each do |member| %> +
+ + <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %> + + <%= l(:label_username)%> + <%= link_to(member.user.name, user_path(member.user),:class => "ml10 c_blue02") %> + <%= format_date(member.created_on)%> +
+
+ <% end%> + +
    + <%= 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/projects/member.html.erb b/app/views/projects/member.html.erb index c47ba7ebc..e6760d3b3 100644 --- a/app/views/projects/member.html.erb +++ b/app/views/projects/member.html.erb @@ -3,6 +3,6 @@
<%= error_messages_for 'member' %> - <%= render :partial => @render_file, :locals => {:members => @members} %> + <%= render :partial => @render_file, :locals => {:members => @members} %>
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 62c370b43..c6445971d 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -247,4 +247,37 @@ a.link_file_board{ background:url(../images/pic_file.png) 0 3px no-repeat !impor /*新闻*/ .hwork_new{ color:#4c4c4c;} .hwork_text{ border:1px solid #64bdd9; height:100px;width:555px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;} -.hwork_input{ border:1px solid #64bdd9; height:22px; width:555px; background:#fff; margin-bottom:10px; padding:5px;} \ No newline at end of file +.hwork_input{ border:1px solid #64bdd9; height:22px; width:555px; background:#fff; margin-bottom:10px; padding:5px;} +/* 学生列表*/ +.st_list{ width:670px;} +.st_search{ } +.st_search span{ font-size:14px; font-weight:bold; color:#606060; margin-right:35px;} +.st_search_input{ border:1px solid #1c9ec7; background:#fff; height:20px; color:#c4c4c4; width:200px; padding-left:5px; margin-bottom:5px;} +.st_search a{ background:#1c9ec7; color:#fff;border:1px solid #1c9ec7; text-align:center; display:block; width:60px; height:20px; float:left; font-size:12px; } +.st_search a:hover{ background:#048fbb; text-decoration:none;} +.classbox{ border:1px solid #f8df8c; background:#fffce6; color:#0d90c3; padding:0 3px; float:left; margin-left:15px;} +.st_addclass{ margin-top:5px;} +.st_addclass ul li,.st_addclass a,.st_addclass img{ float:left;} +.st_addclass img{ margin-top:3px;} +.st_addclass a{ color:#0d90c3;} +.st_box{ margin-top:10px; border-top:1px solid #CCC; padding-top:10px;} +.st_box ul li{ float:left;} +.st_box_top a{ font-weight:bold; color:#7a7a7a; float:left; margin-bottom:5px;} +.st_box_top a:hover{ color:#1c9ec7;} +a.st_up{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 0 no-repeat; margin-top:5px; margin-left:3px;} +a.st_down{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 -22px no-repeat; margin-top:5px; margin-left:3px;} +a.st_img { display:block;width:32px; height:32px; border:1px solid #CCC; padding:1px;} +a:hover.st_img { border:1px solid #1c9ec7; } +.st_boxlist{ border-bottom:1px dashed #CCC; height:43px; margin-bottom:10px; } +.st_boxlist a{ float:left;} +.st_boxlist ul{ float:left; width:200px; margin-left:10px;} +.st_boxlist ul li a{ color:#5d5d5d;} +.st_boxlist ul li a span{ color:#1c9ec7;} +.st_boxlist ul li a:hover span{ color:#ff8e15;} +.ml50{ margin-left:50px;} +.ml358{ margin-left:358px;} +.ml258{ margin-left:254px;} +.ml65{ margin-left:65px;} +a:hover.st_add{ color:#ff8e15;} +.classbox_on{ border:1px solid #f8df8c; background:#f6f098; padding:0 3px; float:left; margin-left:15px;} +.classbox_on a{ color:#716cad;} \ No newline at end of file