1.优化课程动态信息

2.优化项目动态信息

app/views/courses/show.html.erb

@@ -58,12 +58,8 @@
           </div>
 
       <% end -%>
-
+      <% if (@events_pages.page == @events_pages.last_page) %>
-
+          <div class="font_description">
-
-    </div>
-<% end %>
-<div class="font_description">
             <table width="660">
               <tr>
                 <td><%= image_tag(url_to_avatar(@user), :class => "avatar") %></td>
@@ -71,15 +67,13 @@
                   <table width="580">
                     <tr>
                       <td>
-              <%
+                        <% if @canShowRealName %>
-                 #判断是否显示真名
+                            (<%= link_to_user(@user, @canShowRealName) %>
-                 if @canShowRealName
+                            )
-              %>
-                  <%= link_to (h @user.try(:name)), user_path(@user) if @user %>
-                  (<%= link_to (h @user.try(:realname)), user_path(@user) if @user %>)
                         <% else %>
-                  <%= link_to (h @user.try(:name)), user_path(@user) if @user %>
+                            <%= link_to_user(@user)%>
                         <% end %>
+
                         <%= l(:label_user_create_project) %> <%= link_to @course.name %>
                         <strong> !</strong></td>
                     </tr>
@@ -90,7 +84,39 @@
                 </td>
               </tr>
             </table>
-</div>
+          </div>
+      <% end %>
+
+
+    </div>
+ <%else%>
+    <div class="font_description">
+      <table width="660">
+        <tr>
+          <td><%= image_tag(url_to_avatar(@user), :class => "avatar") %></td>
+          <td colspan="2">
+            <table width="580">
+              <tr>
+                <td>
+                  <% if @canShowRealName %>
+                      (<%= link_to_user(@user, @canShowRealName) %>
+                      )
+                  <% else %>
+                      <%= link_to_user(@user)%>
+                  <% end %>
+
+                  <%= l(:label_user_create_project) %> <%= link_to @course.name %>
+                  <strong> !</strong></td>
+              </tr>
+              <tr>
+                <td class="font_lighter" style="float: right"><%= l :label_create_time %>
+                  : <%= format_time(@course.created_at) %>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div>
+<% end %>
 
 
 <div class="pagination">

app/views/projects/show.html.erb

@@ -1,5 +1,5 @@
 <% if @events_by_day.size >0 %>
-<div class="content-title-top-avtive">
+    <div class="content-title-top-avtive">
       <p class="subtitle">
         <%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
       </p>
@@ -8,13 +8,14 @@
           <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
               <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
                 <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
-        <%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%>
+                  <%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
                 </div>
                 <div class="activity-content" style="padding:5px 5px 5px 70px;">
                   <strong> <%= h(e.project) if @project.nil? || @project.id != e.project.id %></strong>
         <span class="activity-title font_lighter">
           <% if @canShowRealName %>
-          <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>(<%= link_to_user(e.event_author,@canShowRealName) if e.respond_to?(:event_author) %>)
+          <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
+              (<%= link_to_user(e.event_author, @canShowRealName) if e.respond_to?(:event_author) %>)
           <% else %>
           <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
           <% end %>
@@ -24,13 +25,14 @@
                   <%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>
 
                   <div class="activity_description info-break" style="font-size: 13px;">
-          <%= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/,' '), length: 30, omission:'...')) %>
+                    <%= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/, ' '), length: 30, omission: '...')) %>
                   </div>
                   <div class="activity_status" style="position:relative; padding-top: 3px;">
-          <span class="font_lighter"> <%= l :label_activity_time %>：&nbsp; <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span>
+                    <span class="font_lighter"> <%= l :label_activity_time %>
+                      ：&nbsp; <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span>
                     <% if e.event_type == "issue" %>
                         <div class="" style="display:inline-block;position:absolute; right:2%;">
-          <span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count)%></span>
+                          <span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count) %></span>
                         </div>
                     <% end %>
                   </div>
@@ -39,7 +41,7 @@
 
           <% end %>
       <% end -%>
-  <% if(@events_pages.page == @events_pages.last_page) %>
+      <% if (@events_pages.page == @events_pages.last_page) %>
           <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
             <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
               <%= image_tag(url_to_avatar(@user), :class => "avatar") %>
@@ -47,13 +49,15 @@
             <div class="activity-content" style="padding:5px 5px 5px 70px;">
       <span class="activity-title font_lighter">
               <% if @canShowRealName %>
-        <%= link_to (h @user.try(:name)), user_path(@user) if @user %>(<%= link_to (h @user.try(:realname)), user_path(@user) if @user %>)
+                  (<%= link_to_user(@user, @canShowRealName) %>
+            )
               <% else %>
-        <%= link_to (h @user.try(:name)), user_path(@user) if @user %>
+                  <%= link_to_user(@user) %>
               <% end %>
         <%#= l(:label_new_activity) %>
       </span>
-      <%= l(:label_user_create_project) %> <%= link_to @project.name %><strong> !</strong>
+              <%= l(:label_user_create_project) %> <%= link_to @project.name %>
+              <strong> !</strong>
               <div class="activity_description info-break" style="font-size: 13px;">
               </div>
               <div class="activity_status" style="position:relative; padding-top: 3px;">
@@ -62,15 +66,37 @@
             </div>
           </div>
       <% end %>
-</div>
+    </div>
-<%end%>
+<% else %>
-
+    <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
-
+      <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
+        <%= image_tag(url_to_avatar(@user), :class => "avatar") %>
+      </div>
+      <div class="activity-content" style="padding:5px 5px 5px 70px;">
+      <span class="activity-title font_lighter">
+              <% if @canShowRealName %>
+                  (<%= link_to_user(@user, @canShowRealName) %>
+            )
+              <% else %>
+                  <%= link_to_user(@user) %>
+              <% end %>
+        <%#= l(:label_new_activity) %>
+      </span>
+        <%= l(:label_user_create_project) %> <%= link_to @project.name %>
+        <strong> !</strong>
+        <div class="activity_description info-break" style="font-size: 13px;">
+        </div>
+        <div class="activity_status" style="position:relative; padding-top: 3px;">
+          <span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span>
+        </div>
+      </div>
+    </div>
+<% end %>
 
 
 <div class="pagination">
   <ul>
-    <%= pagination_links_full @events_pages%>
+    <%= pagination_links_full @events_pages %>
     <% #binding.pry  %>
   </ul>
 </div>