jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
huang 2016-10-19 14:43:25 +08:00
parent 590e639112 5844af922e
commit bf3506002b
6 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/projects/_act_issues.html.erb
View File

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

8
app/views/projects/_act_messages.html.erb
View File

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

2
app/views/projects/_project_activities.html.erb
View File

@ -54,7 +54,7 @@
<% if forge_acts.count == 10 %> <% 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>--> <!--<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 %> <% end %>
<!-- <!--

6
app/views/projects/_project_commit.html.erb
View File

@ -1,12 +1,12 @@
<% project = Project.find(activity.project_id) %> <% project = Project.find(activity.project_id) %>
<% user = get_user_by_mail(activity.committer) %> <% user = get_user_by_mail(activity.committer) %>
<div class="resources mt10"> <div class="container-big mt10">
<div class="homepagePostBrief"> <div class="pr">
<div class="homepagePostPortrait"> <div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %> <%= 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} %> <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
</div> </div>
<div class="homepagePostDes"> <div class="content-big">
<div class="homepagePostTo break_word"> <div class="homepagePostTo break_word">
<% if user.try(:realname) == ' ' %> <% if user.try(:realname) == ' ' %>
<%= link_to user, user_path(user), :class => "newsBlue mr15" %> <%= link_to user, user_path(user), :class => "newsBlue mr15" %>

8
app/views/users/_project_attachment.html.erb
View File

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

6
app/views/users/_project_create.html.erb
View File

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