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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
z9hang 2015-03-05 09:26:33 +08:00
parent d01aa5f15c ef5b7c9fca
commit d1651f7252
2 changed files with 54 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/views/layouts/base_projects.html.erb
View File

@ -96,21 +96,20 @@
<%= image_tag(url_to_avatar(@project), :class => 'avatar2') %>
</td>
<td>
<div class="info-course">
<%= link_to @project.name, project_path(@project)%>
</div>
<div>
<% if @project.project_type == 0 %>
<%= l(:label_project_grade)%> :
<%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects',
:action => 'show_projects_score',
:remote => true,
:id => @project.id
}, :style => "color: #EC6300;")%>
<% end %>
<!-- end -->
</div>
<% project_score = format("%.2f" ,project_scores(@project)).to_i%>
<div class="info-course">
<%= link_to @project.name, project_path(@project)%>
</div>
<div>
<% if @project.project_type == 0 && project_score != 0 %>
<%= l(:label_project_grade)%> :
<%= link_to(project_score, {:controller => 'projects',
:action => 'show_projects_score',
:remote => true,
:id => @project.id}, :style => "color: #EC6300;")%>
<% end %>
<!-- end -->
</div>
<div id="join_exit_project_div">
<%= render 'layouts/join_exit_project' %>
</div>

63
app/views/projects/show.html.erb
View File

@ -1,7 +1,7 @@
<% if @events_by_day.size >0 %>
<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>
@ -12,7 +12,9 @@
<%= 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>
<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) %>
@ -30,10 +32,18 @@
</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>
：&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>
@ -48,21 +58,24 @@
<%= 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 %>
<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>
<span class="font_lighter">
<%= l :label_activity_time %>:
<%= format_time(@project.created_on) %>
</span>
</div>
</div>
</div>
@ -75,20 +88,24 @@
</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 %>
<% 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 %>
<%= @user.to_s %>
<%= 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>
<span class="font_lighter">
<%= l :label_activity_time %>:
<%= format_time(@project.created_on) %>
</span>
</div>
</div>
</div>