diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb index 4feddc675..5f507db3c 100644 --- a/app/views/projects/_project.html.erb +++ b/app/views/projects/_project.html.erb @@ -18,18 +18,40 @@

- <%= link_to @project.watcher_users.count, project_watcherlist_path(project)%> - <%= content_tag('span', l(:label_x_follow_people,:count =>@project.watcher_users.count)) %> -

-

- <%= link_to "#{@project.members.count}", project_member_path(@project)%> - <%= content_tag('span', l(:label_x_current_contributors, :count => @project.users.count)) %> -

-

- <%= content_tag('span', "#{(@project.repository.nil? || @project.repository.changesets[0].nil?) ? '0' : distance_of_time_in_words(Time.now, @project.repository.changesets[0].committed_on)}", :class => "info") %><%= content_tag('span', l(:label_since_last_commits)) %> -

-

- <%= content_tag('span', "#{@project.repository.nil? || @project.project_status.nil? ? '0' : @project.project_status.changesets_count }", :class => "info") %><%= content_tag('span', l(:label_commit_on)) %> + + + + + + + + + + + + + + + + + +
+ <%= link_to @project.watcher_users.count, project_watcherlist_path(project)%> + + <%= content_tag('span', l(:label_x_follow_people,:count =>@project.watcher_users.count)) %> +
+ <%= link_to "#{@project.members.count}", project_member_path(@project)%> + + <%= content_tag('span', l(:label_x_current_contributors, :count => @project.users.count)) %> +
+ <%= content_tag('span', "#{(@project.repository.nil? || @project.repository.changesets[0].nil?) ? '0' : distance_of_time_in_words(Time.now, @project.repository.changesets[0].committed_on)}", :class => "info") %> + + <%= content_tag('span', l(:label_since_last_commits)) %> +
+ <%= content_tag('span', "#{@project.repository.nil? || @project.project_status.nil? ? '0' : @project.project_status.changesets_count }", :class => "info") %> + + <%= content_tag('span', l(:label_commit_on)) %> +

<% end %> @@ -120,9 +142,9 @@ <%= l(:label_project_grade)%>: <%= link_to(format("%.2f" , finall_project_score ).to_f, - {:controller => 'projects', - :action => 'show_projects_score', - :remote => true, :id => @project.id}, :style=>"color: #EC6300;") %> + {:controller => 'projects', + :action => 'show_projects_score', + :remote => true, :id => @project.id}, :style=>"color: #EC6300;") %> <% end %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 890155915..67cbb3bd0 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -54,7 +54,7 @@ @@ -114,7 +114,7 @@
<%activities = find_all_activities%> <% activities.each do |event| %> - +
  • <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %> @@ -125,7 +125,7 @@

    <%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前     <%= show_event_reply event %>

  • - + <% end %>