Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/layouts/new_base_user.html.erb

@@ -229,7 +229,7 @@
               <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :style => "margin-right:10px;", :title => "新建项目"%>
           <% end%>
         </div>
-        <% if @user.projects.visible.count == 0
+        <% if @user.projects.visible.count > 0
            project_order_ids = "(" +
             ForgeActivity.find_by_sql("SELECT  p.project_id, p.created_at FROM
 	(SELECT fa.project_id, MAX(fa.created_at) AS created_at FROM forge_activities fa WHERE fa.project_id IN (" + @user.projects.visible.select('projects.id').map{|p| p.id}.join(',') + ")

app/views/users/_user_activities.html.erb

@@ -79,6 +79,8 @@
                         <% cache (act) do %>
                             <%= render :partial => 'users/course_create', :locals => {:activity => act, :user_activity_id => act.id} %>
                         <%end%>
+                        <% when 'JournalsForMessage'%>
+                        <%= render :partial => 'users/course_journalsformessage', :locals => {:activity => act, :user_activity_id => user_activity.id} %>
                         <% end %>
                     <% when 'Project' %>
                         <% case user_activity.act_type.to_s %>