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

app/views/projects/_act_issues.html.erb

@@ -6,7 +6,7 @@
           <%#= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
         </div>
         <div class="content-big">
-          <div class="homepagePostTo break_word" style="width:880px">
+          <div class="homepagePostTo break_word">
             <% if activity.try(:author).try(:realname) == ' ' %>
                 <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
             <% else %>

app/views/projects/_act_messages.html.erb

@@ -1,11 +1,11 @@
-<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
-  <div class="homepagePostBrief">
+<div class="container-big mt10" id="user_activity_<%= user_activity_id%>">
+  <div class="pr">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
-    <div class="homepagePostDes">
-      <div class="homepagePostTo break_word"  style="width:620px">
+    <div class="ontent-big">
+      <div class="homepagePostTo break_word">
         <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
         TO
         <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%>

app/views/projects/_project_activities.html.erb

@@ -54,7 +54,7 @@
 
 <% if forge_acts.count == 10 %>
     <!--<div id="show_more_forge_activities" class="loadMore mt10 f_grey">点击展开更多<%#= link_to "", project_path(@project.id, :type => type, :page => page), :id => "more_forge_activities_link", :remote => "true", :class => "none" %></div>-->
-    <%= link_to "点击展开更多",project_path(@project.id, :type => type, :page => page),:id => "show_more_forge_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+    <%= link_to "点击展开更多",project_path(@project.id, :type => type, :page => page),:id => "show_more_forge_activities",:remote => "true",:class => "banner-big dis tac mt10 f_grey"%>
 <% end %>
 
 <!--

app/views/projects/_project_commit.html.erb

@@ -1,28 +1,28 @@
-<% project = Project.find(activity.project_id) %>
-<% user = get_user_by_mail(activity.committer) %>
-<div class="resources mt10">
-  <div class="homepagePostBrief">
-    <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %>
-      <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
-    </div>
-    <div class="homepagePostDes">
-      <div class="homepagePostTo break_word">
-        <% if user.try(:realname) == ' ' %>
-            <%= link_to user, user_path(user), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %>
-        <% end %>
-        TO
-        <%= link_to project.to_s+" | 项目代码提交", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
-      </div>
-      <div class="homepagePostTitle break_word" >
-        <%= link_to activity.comments, {:controller => 'repositories', :action => 'commit_diff', :id => project.id, :repository_id => identifier, :changeset => activity.version}, :class => "postGrey" %>
-      </div>
-      <div class="homepagePostDate">
-        提交时间：<%= format_time(activity.committed_on) %>
-      </div>
-    </div>
-    <div class="cl"></div>
-  </div>
-</div>
+<% project = Project.find(activity.project_id) %>
+<% user = get_user_by_mail(activity.committer) %>
+<div class="container-big mt10">
+  <div class="pr">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
+    </div>
+    <div class="content-big">
+      <div class="homepagePostTo break_word">
+        <% if user.try(:realname) == ' ' %>
+            <%= link_to user, user_path(user), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %>
+        <% end %>
+        TO
+        <%= link_to project.to_s+" | 项目代码提交", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word" >
+        <%= link_to activity.comments, {:controller => 'repositories', :action => 'commit_diff', :id => project.id, :repository_id => identifier, :changeset => activity.version}, :class => "postGrey" %>
+      </div>
+      <div class="homepagePostDate">
+        提交时间：<%= format_time(activity.committed_on) %>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/users/_project_attachment.html.erb

@@ -1,11 +1,11 @@
-<div class="resources mt10">
-  <div class="homepagePostBrief">
+<div class="container-big mt10">
+  <div class="pr">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
-    <div class="homepagePostDes">
-      <div class="homepagePostTo break_word" style="width:620px">
+    <div class="content-big">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>

app/views/users/_project_create.html.erb

@@ -1,12 +1,12 @@
 <% project = Project.find(activity.act_id) %>
 <% user = User.find(project.user_id)%>
-<div class="resources mt10">
-  <div class="homepagePostBrief">
+<div class="container-big mt10">
+  <div class="pr">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
     </div>
-    <div class="homepagePostDes">
+    <div class="content-big">
       <div class="homepagePostTo break_word">
         <% if user.try(:realname) == ' ' %>
             <%= link_to user, user_path(user), :class => "newsBlue mr15" %>
@@ -41,4 +41,4 @@
     $(function(){
         user_card_show_hide();
     });
-</script>
+</script>