From 8b42018d40b20c391b1eaa4b5f55c1c76a58c396 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 24 May 2019 16:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=AF=BE=E7=A8=8B=E5=8F=B3?=
=?UTF-8?q?=E4=BE=A7=E6=95=99=E5=AD=A6=E5=9B=A2=E9=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/subjects/_subject_members.html.erb | 59 ++++++++++----------
1 file changed, 29 insertions(+), 30 deletions(-)
diff --git a/app/views/subjects/_subject_members.html.erb b/app/views/subjects/_subject_members.html.erb
index 87c518c7..b2665099 100644
--- a/app/views/subjects/_subject_members.html.erb
+++ b/app/views/subjects/_subject_members.html.erb
@@ -4,48 +4,47 @@
<div class="teacherTeamItem clearfix">
- <p class="clearfix title-line">
+ <div class="clearfix df title-line">
<a href="<%= user_path(member.user) %>" target="_blank" class="fl">
<%= image_tag(url_to_avatar(member.user), :width =>"80", :height => "80", :class => "radius", :alt=>"头像") %>
</a>
+ <div class="flex1 ml15">
+ <p class="mb10 mt5 task-hide" style="max-width: 120px;"><%= member.user.try(:show_name) %></p>
+ <div class="clearfix ml3">
+ <p class="color-grey-9 font-12">
+ <!-- <span class="mr10"><%#= member.user.school_name %></span>-->
+ <span><%= member.user.identity == "学生" ? "" : member.user.identity %></span>
+ </p>
+ <!--<a href="JavaScript:void(0)" class="edu-default-btn edu-focus-btn fr color-grey-6">关注</a>-->
+ </div>
+ </div>
- <span class="font-18 font-bd"></span>
+ <span class="fr">
- <span class="fr">
+ <% if User.current.admin? && member.role != 1 %>
+ <a class="fl mr20 mt4" data-tip-down="删除" onclick="delete_confirm_box_2('<%= delete_member_subject_path(@subject, :mem_id => member.id) %>', '确定要删除该成员吗？');">
+ <img src="/images/educoder/icon/del.svg" class="fl mt4 ml4">
+ </a>
+ <% end %>
- <% if User.current.admin? && member.role != 1 %>
- <a class="fl mr20 mt4" data-tip-down="删除" onclick="delete_confirm_box_2('<%= delete_member_subject_path(@subject, :mem_id => member.id) %>', '确定要删除该成员吗？');">
- <img src="/images/educoder/icon/del.svg" class="fl mt4 ml4">
- </a>
- <% end %>
+ <% if User.current.member_of_subject?(@subject) && member.position > 1 %>
+ <a data-method="POST" class="fl ring-op-green mr20 mt7" data-remote="true" href="<%= up_member_position_subject_path(@subject, :mem_id => member.id) %>">
+ <img src="/images/educoder/icon/moveup.svg" data-tip-down="向上移动" class="fl mt2 ml4">
+ </a>
+ <% end %>
- <% if User.current.member_of_subject?(@subject) && member.position > 1 %>
- <a data-method="POST" class="fl ring-op-green mr25 mt7" data-remote="true" href="<%= up_member_position_subject_path(@subject, :mem_id => member.id) %>">
- <img src="/images/educoder/icon/moveup.svg" data-tip-down="向上移动" class="fl mt2 ml4">
- </a>
- <% end %>
+ <% if User.current.member_of_subject?(@subject) && member.position < @subject.subject_members.size %>
+ <a data-method="POST" class="fl ring-op-green mt7" data-remote="true" href="<%= down_member_position_subject_path(@subject, :mem_id => member.id) %>">
+ <img src="/images/educoder/icon/movedown.svg" data-tip-down="向下移动" class="fl mt2 ml4">
+ </a>
+ <% end %>
- <% if User.current.member_of_subject?(@subject) && member.position < @subject.subject_members.size %>
- <a data-method="POST" class="fl ring-op-green mr25 mt7" data-remote="true" href="<%= down_member_position_subject_path(@subject, :mem_id => member.id) %>">
- <img src="/images/educoder/icon/movedown.svg" data-tip-down="向下移动" class="fl mt2 ml4">
- </a>
- <% end %>
+ </span>
- </span>
+ </div>
- </p>
- <div class=" ml15">
- <p class="mb10 mt5"><%= member.user.try(:show_name) %></p>
- <div class="clearfix ml3">
- <p class="color-grey-9 font-12">
-<!-- <span class="mr10"><%#= member.user.school_name %></span>-->
- <span><%= member.user.identity == "学生" ? "" : member.user.identity %></span>
- </p>
- <!--<a href="JavaScript:void(0)" class="edu-default-btn edu-focus-btn fr color-grey-6">关注</a>-->
- </div>
- </div>
</div>
<% end %>
<% end %>
\ No newline at end of file