From 183f019c048737ef8c8757912ec4418d6b95ca3b Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 13 Nov 2015 15:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org.html.erb           |  2 +-
 app/views/organizations/_org_members.html.erb | 53 ++++++++++---------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 55fd13e7d..8e004d4cb 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -69,7 +69,7 @@
             <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;(
             <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
             )&nbsp;|&nbsp;
-            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;（<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id' %>）
+            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;（<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
           </div>
         </div>
         <div class="homepageLeftMenuContainer">
diff --git a/app/views/organizations/_org_members.html.erb b/app/views/organizations/_org_members.html.erb
index 8f80b2997..8719ad275 100644
--- a/app/views/organizations/_org_members.html.erb
+++ b/app/views/organizations/_org_members.html.erb
@@ -1,26 +1,29 @@
-<%= stylesheet_link_tag  'courses' %>
-<div class="project_r_h">
-  <h2 class="project_h2"> 组织成员</h2>
-</div>
-<div class="st_list">
-  <div class="st_box">
-    <div class="cl"></div><!--st_box_top end-->
-
-    <% members.each do |member| %>
-        <div class="st_boxlist">
-          <a href="javascript:" class="st_img">
-            <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32))  %>
-          </a>
-          <span class="fl ml10 c_grey"><%= l(:label_username)%></span>
-          <%= link_to(member.user.show_name, user_path(member.user),:class => "ml10 c_blue02") %>
-          <span class="fr c_grey mr30 w45"><%= member.user.admin_of_org?(organization)?"组织管理员":"组织成员" %></span>
-        </div>
-        <div class="cl"></div>
-    <% end%>
-
-    <ul class="wlist">
-      <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-    </ul>
-    <div class="cl"></div>
-  </div>
+<%= stylesheet_link_tag  'courses' %>
+<div class="resources">
+    <div class="project_r_h" style="width: 720px;">
+      <h2 class="project_h2"> 组织成员</h2>
+    </div>
+    <div class="st_list" style="width: 720px;">
+      <div class="st_box">
+        <span class="fr fb fontGrey3">加入时间</span>
+        <div class="cl"></div><!--st_box_top end-->
+
+        <% members.each do |member| %>
+            <div class="st_boxlist">
+              <a href="javascript:" class="st_img">
+                <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32))  %>
+              </a>
+              <span class="fl ml10 c_grey"><%= l(:label_username)%></span>
+              <%= link_to(member.user.show_name, user_path(member.user),:class => "ml5 c_blue02") %><br />
+              <span class="fl c_grey ml10">身份：<%= member.user.admin_of_org?(organization)?"组织管理员":"组织成员" %></span>
+            </div>
+            <div class="cl"></div>
+        <% end%>
+
+        <ul class="wlist">
+          <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
 </div>
\ No newline at end of file