From 7189d9a14aa10193ebbb9b69e898da07c48cc0cb Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Tue, 20 May 2014 14:52:30 +0800
Subject: [PATCH] course_form

---
 app/views/users/_course_form.html.erb | 113 +++++++++++++-------------
 1 file changed, 58 insertions(+), 55 deletions(-)

diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb
index cadebff41..058c92d4e 100644
--- a/app/views/users/_course_form.html.erb
+++ b/app/views/users/_course_form.html.erb
@@ -1,56 +1,59 @@
 <div class="content_frame">
-<ul class="user_project_sort">				
-		<% for membership in memberships %>		
-		<li>								
-			<table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
-				<tr>
-					<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(membership.project), :class => 'avatar') %></td>
-					<td>
-					<table width="580" border="0">
-						<tr>
-							<td colspan="2" valign="top">
-								<span><%= link_to_project(membership.project) %></span>
-								<!--added by huang for: filter by roles-->								
-								<span style="float: right">
-									<%=render :partial => 'courses/set_course_time', :locals => {:project => membership.project} %>
-									<% if User.current == @user %>
-									<% (membership.roles).each do |role| %>
-										<% unless (role == Role.find(9) || role == Role.find(3)) %>								
-										<%= join_in_course(membership.project, User.current)%>&nbsp;&nbsp;&nbsp;&nbsp;
-										<% end %>
-									<% end %>
-									<% else %>										
-									<% end %>
-									<!--end-->
-									<%= l(:label_x_base_courses_member, :count => membership.project.members.count) %>(<%= link_to "#{membership.project.members.count}", project_member_path(membership.project), :course =>'1' %>)&nbsp;&nbsp;
-									<%= l(:label_homework) %> (<span class=""><%= link_to (membership.project.homeworks.count), {:controller => 'projects', :action => 'homework', :id => membership.project.identifier} %></span>)
-								&nbsp;&nbsp;
-								<%= l(:label_course_news)%> (<span style="color: #ed8924"><%= link_to (membership.project.news.count), {:controller => 'news', :action => 'index', :project_id => membership.project.identifier} %></span>)
-								</span></td>
-						</tr>
-						<tr>
-							<td colspan="2" width="580" >
-							<p class="font_description">
-								<%= membership.project.description %>
-							</p></td>
-						</tr>
-						<tr><td>
-							
-						<!-- added by bai	 -->
-							<% @course = Course.find_by_extra(membership.project.identifier)%>
-							<% unless (@course.nil? || @course.teacher.nil? || @course.teacher.name.nil?) %>
-							<span class="font-lighter" style="float: left"><%= l(:label_main_teacher) %> : <%= link_to(@course.teacher.name, user_path(@course.teacher)) %></span>
-							<span  style="float: right; padding-left: 8px" ><%= l(:label_course_term) %> : <%= @course.time %><%= @course.term %></span>							
-							<!-- <span class="font_lighter" style="float: right"><%= l(:label_create_time) %> ：<%= format_time(membership.created_on) %></span>	 -->
-							<% end %>							
-						</td></tr>						
-					</table></td>
-				</tr>
-			</table>
-		</li>
-		
-		<% end %>
-		
-	</ul>
-</div>			
-	<%= call_hook :view_account_left_bottom, :user => @user %>
\ No newline at end of file
+  <ul class="user_project_sort">
+    <% for membership in memberships %>
+        <li>
+          <table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
+            <tr>
+              <td colspan="2" valign="top" width="50"><%= image_tag(url_to_avatar(membership.project), :class => 'avatar') %></td>
+              <td>
+                <table width="580" border="0">
+                  <tr>
+                    <td colspan="2" valign="top">
+                      <span><%= link_to_project(membership.project) %></span>
+                      <span style="float: right">
+                        <%= render :partial => 'courses/set_course_time', :locals => {:project => membership.project} %>
+                        <% if User.current == @user %>
+                            <% (membership.roles).each do |role| %>
+                                <% unless (role == Role.find(9) || role == Role.find(3)) %>
+                                    <%= join_in_course(membership.project, User.current) %>&nbsp;&nbsp;&nbsp;&nbsp;
+                                <% end %>
+                            <% end %>
+                        <% else %>
+                        <% end %>
+                        <%= l(:label_x_base_courses_member, :count => membership.project.members.count) %>
+                        (<%= "#{membership.project.members.count}" %>)&nbsp;&nbsp;
+                        <%= l(:label_homework) %>
+                        (<span class=""><%= link_to (membership.project.homeworks.count), {:controller => 'projects', :action => 'homework', :id => membership.project.identifier} %></span>)
+                        &nbsp;&nbsp;
+                        <%= l(:label_course_news) %>
+                        (<span style="color: #ed8924"><%= link_to (membership.project.news.count), {:controller => 'news', :action => 'index', :project_id => membership.project.identifier} %></span>)
+                      </span></td>
+                  </tr>
+                  <tr>
+                    <td colspan="2" width="580">
+                      <p class="font_description">
+                        <%= membership.project.description %>
+                      </p></td>
+                  </tr>
+                  <tr>
+                    <td>
+
+                      <% @course = Course.find_by_extra(membership.project.identifier) %>
+                      <% unless (@course.nil? || @course.teacher.nil? || @course.teacher.name.nil?) %>
+                          <span class="font-lighter" style="float: left"><%= l(:label_main_teacher) %>
+                            : <%= link_to(@course.teacher.name, user_path(@course.teacher)) %></span>
+                          <span style="float: right; padding-left: 8px"><%= l(:label_course_term) %>
+                            : <%= @course.time %><%= @course.term %></span>
+                      <% end %>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </li>
+
+    <% end %>
+  </ul>
+</div>
+<%= call_hook :view_account_left_bottom, :user => @user %>
\ No newline at end of file