From 9da70f9a20f718e6b0b6d328d606a956653f5915 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Jul 2014 14:51:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B9=E7=9B=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_project.html.erb | 52 ++++++++++++++++++++--------
 app/views/welcome/index.html.erb     | 52 ++++++++++++++--------------
 2 files changed, 63 insertions(+), 41 deletions(-)

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 @@
 
 	<div class="information">
 		<p class="stats">
-			<strong><span style="font-size: 17px;margin-left: 145px"><%= link_to @project.watcher_users.count, project_watcherlist_path(project)%></span></strong>
-			<%= content_tag('span',  l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>
-		</p>
-		<p class="stats">
-			<strong><span style="font-size: 17px;margin-left: 145px"><%= link_to "#{@project.members.count}", project_member_path(@project)%></span></strong>
-			<%= content_tag('span',  l(:label_x_current_contributors, :count => @project.users.count)) %>
-		</p>
-		<p class="stats">
-			<%= 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)) %>
-		</p>
-		<p class="stats">
-			<%= 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)) %>
+            <table style="padding-left: 100px">
+              <tr>
+                <td style="width: 40%;text-align: right;font-size: 17px;">
+                  <strong><%= link_to @project.watcher_users.count, project_watcherlist_path(project)%></strong>
+                </td>
+                <td style="width: 60%;text-align: left">
+                  <%= content_tag('span',  l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>
+                </td>
+              </tr>
+              <tr>
+                <td style="width: 40%;text-align: right;font-size: 17px;">
+                  <strong><%= link_to "#{@project.members.count}", project_member_path(@project)%></strong>
+                </td>
+                <td style="width: 60%;text-align: left">
+                  <%= content_tag('span',  l(:label_x_current_contributors, :count => @project.users.count)) %>
+                </td>
+              </tr>
+              <tr>
+                <td style="width: 40%;text-align: right;font-size: 17px;color: rgb(17, 102, 153)">
+                  <strong><%= 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") %></strong>
+                </td>
+                <td style="width: 60%;text-align: left">
+                  <%= content_tag('span',  l(:label_since_last_commits)) %>
+                </td>
+              </tr>
+              <tr>
+                <td style="width: 40%;text-align: right;font-size: 17px;color: rgb(17, 102, 153)">
+                  <strong><%= content_tag('span',  "#{@project.repository.nil? || @project.project_status.nil?  ? '0' : @project.project_status.changesets_count }", :class => "info") %></strong>
+                </td>
+                <td style="width: 60%;text-align: left">
+                  <%= content_tag('span',  l(:label_commit_on)) %>
+                </td>
+              </tr>
+            </table>
 		</p>
 	</div>
 	<% end %>
@@ -120,9 +142,9 @@
 			<%= l(:label_project_grade)%>: 
 			<span >
 				<%= 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;") %>
 			</span>
 	    <% end %>
 	</div>
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 @@
 		<ul class="d-p-projectlist">
 			<% projects = find_miracle_project(10, 3) %>
 			<% projects.map do |project| %>
-			<!--<% cache cache_key_for_project(project) do %> -->
+			<!--<%# cache cache_key_for_project(project) do %> -->
 			<li style="position:relative;height:6em;" class='<%= cycle("odd", "even") %>'>
 				<div style="float: left;">
 					<%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
@@ -68,40 +68,40 @@
 					<span class='font_lighter' title =<%=project.short_description.to_s%>><%=project.short_description.truncate(50, omission: '...')%></span>
 				</div>
 				<div style="position:absolute; bottom:0;right:0;margin:5px 10px 5px 5px ;">
-                  <% issue_count = project.issues.count %>
-                  <% issue_journal_count = project.issue_changes.count %>
-                  <% issue_score = issue_count * 0.2 %>
-                  <% issue_journal_score = issue_journal_count * 0.1 %>
-                  <% finall_issue_score = issue_score + issue_journal_score %>
+                  <%# issue_count = project.issues.count %>
+                  <%# issue_journal_count = project.issue_changes.count %>
+                  <%# issue_score = issue_count * 0.2 %>
+                  <%# issue_journal_score = issue_journal_count * 0.1 %>
+                  <%# finall_issue_score = issue_score + issue_journal_score %>
 
-                  <% new_count = project.news.count %>
-                  <% new_score = new_count * 0.1 %>
-                  <% finall_new_score = new_score %>
+                  <%# new_count = project.news.count %>
+                  <%# new_score = new_count * 0.1 %>
+                  <%# finall_new_score = new_score %>
 
-                  <% document_count = project.documents.count %>
-                  <% file_score = document_count * 0.1 %>
-                  <% finall_file_score = file_score %>
+                  <%# document_count = project.documents.count %>
+                  <%# file_score = document_count * 0.1 %>
+                  <%# finall_file_score = file_score %>
 
-                  <% changeset_count = project.changesets.count %>
-                  <% code_submit_score = changeset_count * 0.3 %>
-                  <% finall_code_submit_score = code_submit_score %>
+                  <%# changeset_count = project.changesets.count %>
+                  <%# code_submit_score = changeset_count * 0.3 %>
+                  <%# finall_code_submit_score = code_submit_score %>
 
-                  <% board_message_count = 0 %>
-                  <% project.boards.each do |board| %>
-                      <% board_message_count += board.messages_count %>
-                  <% end %>
-                  <% topic_score = board_message_count * 0.1 %>
-                  <% finall_topic_score = topic_score %>
+                  <%# board_message_count = 0 %>
+                  <%# project.boards.each do |board| %>
+                      <%# board_message_count += board.messages_count %>
+                  <%# end %>
+                  <%# topic_score = board_message_count * 0.1 %>
+                  <%# finall_topic_score = topic_score %>
 
-                  <% finall_project_score = finall_issue_score + finall_new_score + finall_file_score + finall_code_submit_score + topic_score %>
-                  <%= content_tag "span", l(:label_project_score)+ ":" + format("%.2f" , finall_project_score ),
+                  <%# finall_project_score = finall_issue_score + finall_new_score + finall_file_score + finall_code_submit_score + topic_score %>
+                  <%= content_tag "span", l(:label_project_score)+ ":" + project_score(project),
          	        :style => "cursor: pointer; display: inline-block; float: right; color: #ec6300; ",
 			        :title => "项目得分，综合考虑了项目的各项活动，反映了该项目的活跃程度",
 			        :class => "tooltip",
 			        :id => "tooltip-#{project.id}" %>
 				</div>
 			</li>
-           <!--<%end %> -->
+           <!--<%#end %> -->
 			<% end; reset_cycle  %>
 		</ul>
 	</div>
@@ -114,7 +114,7 @@
 			<div class="user-message-box-list" style="margin-top: 10px;">
 				<%activities = find_all_activities%>
 			<% activities.each do |event| %>
-                  <!--<% cache cache_key_for_event(event) do %> -->
+                  <!--<%# cache cache_key_for_event(event) do %> -->
 			<li style="display: block;height:60px; padding-bottom: 4px;">
 				<div class="inner-right" style="float: left; height: 100%; ">
 					<%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
@@ -125,7 +125,7 @@
 				<p style="margin-top: 4px;"><span style="color: rgb(172, 174, 177)"><%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="float: right; color: rgb(172, 174, 177);"><%= show_event_reply event %></span></p>
 				</div>
 			</li>
-                      <!--<%end %> --><!-- cache -->
+                      <!--<%#end %> --><!-- cache -->
 			    <% end  %>	
 			</div>
 		</ul>