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

Merge branch 'develop' into szzh

This commit is contained in:
sw 2015-03-04 11:34:19 +08:00
parent 33e9a3e326 032e28067d
commit 2e70d0d167
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,14 +96,14 @@
<%= image_tag(url_to_avatar(@project), :class => 'avatar2') %> <%= image_tag(url_to_avatar(@project), :class => 'avatar2') %>
</td> </td>
<td> <td>
<% project_score = format("%.2f" ,project_scores(@project)).to_i%>
<div class="info-course"> <div class="info-course">
<%= link_to @project.name, project_path(@project)%> <%= link_to @project.name, project_path(@project)%>
</div> </div>
<div> <div>
<% if @project.project_type == 0 && project_score != 0 %>
<% if @project.project_type == 0 %>
<%= l(:label_project_grade)%> : <%= l(:label_project_grade)%> :
<%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects', <%= link_to(project_score, {:controller => 'projects',
:action => 'show_projects_score', :action => 'show_projects_score',
:remote => true, :remote => true,
:id => @project.id :id => @project.id