hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

所有项目列表、创客列表中的分数都能被点击，然后弹出项目或个人的窗口；点击应该在分数上而不是文字上、

Browse Source 
完成：1、项目列表分数都能被点击，弹出项目窗口，点击应该在分数上而不是文字上
2、创客列表中的分数都能被点击，弹出个人的窗口，点击应该在分数上而不是文字上
exceptionHandle
baiyu 11 years ago
parent 9520cf3f7a
commit f03cc6c74c
23 changed files with 137 additions and 21 deletions
Show Stats Download Patch File Download Diff File

8
app/views/layouts/base_projects.html.erb
Unescape View File

@ -88,8 +88,12 @@
<% finall_project_score = finall_issue_score + finall_new_score + finall_file_score + finall_code_submit_score + topic_score %>
<% if @project.project_type == 0 %>
<%= link_to(l(:label_project_grade), {:controller => 'projects', :action => 'show_projects_score', :remote => true, :id => @project.id})%> :
<span style='color:#ec6300'><%= format("%.2f" , finall_project_score ).to_f %></span>
<%= 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;")%>
<% end %>
<!-- end -->
</div>

10
app/views/layouts/base_users.html.erb
Unescape View File

@ -93,9 +93,13 @@
<% finall_influence_score = news_score + wiki_contents_score + comments_score %>
<% finall_user_score = finall_messages_score + finall_user_project_score + finall_activity_score + finall_influence_score %>
<tr><td class="buttons_for_course" style="margin-top:30px;margin-left:144px">
<%= link_to(l(:label_user_grade), {:controller => 'users', :action => 'show_score', :remote => true, :id => @user.id})%>:
<span style="color:#ec6300"><%= format("%.2f" , finall_user_score).to_f %></span>
<tr><td class="score">
<%= l(:label_user_grade)%>:
<%= link_to(format("%.2f" , finall_user_score).to_f, {:controller => 'users',
:action => 'show_score',
:remote => true,
:id => @user.id
}, :style => 'color :#E8770D;') %>
</td>
</tr>

2
app/views/projects/_code_submit_score_index.html.erb
Unescape View File

@ -1,5 +1,7 @@
<!-- added by bai -->
<% changeset_count = @project.changesets.count %>
<% code_submit_score = changeset_count * 0.3 %>
<% finall_code_submit_score = code_submit_score %>
<div><%= l(:label_code_submit_number) %> * 0.3 = <%= changeset_count %> * 0.3 = <%= format("%.2f" , code_submit_score).to_f %></div>
<div><%= l(:label_code_submit_score) %> = <%= format("%.2f" , finall_code_submit_score).to_f %></div>
<!-- end -->

4
app/views/projects/_file_score_index.html.erb
Unescape View File

@ -1,5 +1,7 @@
<!-- added by bai -->
<% document_count = @project.documents.count %>
<% file_score = document_count * 0.1 %>
<% finall_file_score = file_score %>
<div><%= l(:label_file_number) %> * 0.1 = <%= document_count %> * 0.1 = <%= format("%.2f" , file_score).to_f %></div>
<div><%= l(:label_file_score) %> = <%= format("%.2f" , finall_file_score).to_f %></div>
<div><%= l(:label_file_score) %> = <%= format("%.2f" , finall_file_score).to_f %></div>
<!-- end -->

4
app/views/projects/_news_score_index.html.erb
Unescape View File

@ -1,5 +1,7 @@
<!-- added by bai -->
<% new_count = @project.news.count %>
<% new_score = new_count * 0.1 %>
<% finall_new_score = new_score %>
<div><%= l(:label_new_number) %> * 0.1 = <%= new_count %> * 0.1 = <%= format("%.2f" , new_score).to_f %></div>
<div><%= l(:label_news_score) %> = <%= format("%.2f" , finall_new_score).to_f %></div>
<div><%= l(:label_news_score) %> = <%= format("%.2f" , finall_new_score).to_f %></div>
<!-- end -->

42
app/views/projects/_project.html.erb
Unescape View File

@ -87,14 +87,50 @@
<div class="licences">
<%= content_tag('span', "#{l(:label_create_time)}: ") %><%= content_tag('span', format_time(@project.created_on)) %>
</div>
<!-- added by bai -->
<div class="grade">
<% 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 %>
<% 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 %>
<% 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 %>
<% if @project.project_type !=1 %>
<%= content_tag('span', "#{l(:label_project_grade)}: ")%><span style='color:#ec6300'><%=@project.project_status ? @project.project_status.grade : 0.0 %></span>
<%= 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;") %>
</span>
<% end %>
</div>
<!-- added by liuping -->
<!-- end -->
<!-- added by liuping -->
</span>
</div>

2
app/views/projects/_project_score_index.html.erb
Unescape View File

@ -1,3 +1,4 @@
<!-- added by bai -->
<% issue_count = @project.issues.count %>
<% issue_journal_count = @project.issue_changes.count %>
<% issue_score = issue_count * 0.2 %>
@ -32,3 +33,4 @@
<%= format("%.2f" , finall_file_score).to_f %> + <%= format("%.2f" , finall_code_submit_score).to_f %> +
<%= format("%.2f" , topic_score).to_f %></div>
<div> = <%= format("%.2f" , finall_project_score).to_f %></div>
<!-- end -->

2
app/views/projects/_projects_topic_score_index.html.erb
Unescape View File

@ -1,3 +1,4 @@
<!-- added by bai -->
<% board_message_count = 0 %>
<% @project.boards.each do |board| %>
<% board_message_count += board.messages_count %>
@ -6,3 +7,4 @@
<% finall_topic_score = topic_score %>
<div><%= l(:label_topic_number) %> * 0.1 = <%= board_message_count %> * 0.1 = <%= topic_score %></div>
<div><%= l(:label_topic_score) %> = <%= format("%.2f" , finall_topic_score).to_f %></div>
<!-- end -->

4
app/views/projects/code_submit_score_index.js.erb
Unescape View File

@ -1,3 +1,5 @@
<!-- added by bai -->
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/code_submit_score_index') %>');
showModal('ajax-modal', '400px');
$('#ajax-modal').addClass('new-watcher');
$('#ajax-modal').addClass('new-watcher');
<!-- end -->

4
app/views/projects/file_score_index.js.erb
Unescape View File

@ -1,3 +1,5 @@
<!-- added by bai -->
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/file_score_index') %>');
showModal('ajax-modal', '400px');
$('#ajax-modal').addClass('new-watcher');
$('#ajax-modal').addClass('new-watcher');
<!-- end -->

2
app/views/projects/issue_score_index.js.erb
Unescape View File

@ -1,3 +1,5 @@
<!-- added by bai -->
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/issue_score_index') %>');
showModal('ajax-modal', '400px');
$('#ajax-modal').addClass('new-watcher');
<!-- end -->

2
app/views/projects/news_score_index.js.erb
Unescape View File

@ -1,3 +1,5 @@
<!-- added by bai -->
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/news_score_index') %>');
showModal('ajax-modal', '400px');
$('#ajax-modal').addClass('new-watcher');
<!-- end -->

2
app/views/projects/project_score_index.js.erb
Unescape View File

@ -1,3 +1,5 @@
<!-- added by bai -->
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/project_score_index') %>');
showModal('ajax-modal', '400px');
$('#ajax-modal').addClass('new-watcher');
<!-- end -->

4
app/views/projects/projects_topic_score_index.js.erb
Unescape View File

@ -1,3 +1,5 @@
<!-- added by bai -->
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/projects_topic_score_index') %>');
showModal('ajax-modal', '400px');
$('#ajax-modal').addClass('new-watcher');
$('#ajax-modal').addClass('new-watcher');
<!-- end -->

4
app/views/projects/show_projects_score.js.erb
Unescape View File

@ -1,3 +1,5 @@
<!-- added by bai -->
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/show_projects_score') %>');
showModal('ajax-modal', '400px');
$('#ajax-modal').addClass('new-watcher');
$('#ajax-modal').addClass('new-watcher');
<!-- end -->

2
app/views/users/_show_score.html.erb
Unescape View File

@ -1,7 +1,9 @@
<!-- added by bai -->
<% unless @user.id == 1%>
<% messages_count = @user.messages.count %>
<% messages_score = messages_count * 0.05%>
<% finall_messages_score = messages_score %>
<% end %>
<% journals_count = @user.journals.count %>
<% journals_score = journals_count * 0.1 %>

38
app/views/users/_user_show.html.erb
Unescape View File

@ -1,6 +1,33 @@
<!-- added by bai -->
<div class="autoscroll">
<% for user in @users -%>
<% unless user.id == 1%>
<!-- added by bai -->
<% messages_count = user.messages.count %>
<% messages_score = messages_count * 0.05%>
<% finall_messages_score = messages_score %>
<% journals_count = user.journals.count %>
<% journals_score = journals_count * 0.1 %>
<% user_changesets_count = user.changesets.count %>
<% user_changesets_score = user_changesets_count * 0.3 %>
<% finall_user_project_score = journals_score + user_changesets_score %>
<% journals_for_messages_count = user.journals_for_messages.count %>
<% activities_count = user.activities.count %>
<% journals_for_messages_score = journals_for_messages_count * 0.05 %>
<% activities_score = activities_count * 0.2 %>
<% finall_activity_score = journals_for_messages_score + activities_score %>
<% news_count = user.news.count %>
<% news_score = news_count * 0.1 %>
<% wiki_contents_count = user.wiki_contents.count %>
<% wiki_contents_score = wiki_contents_count * 0.1 %>
<% comments_count = user.comments.count %>
<% comments_score = comments_count * 0.1 %>
<% finall_influence_score = news_score + wiki_contents_score + comments_score %>
<% finall_user_score = finall_messages_score + finall_user_project_score + finall_activity_score + finall_influence_score %>
<!-- end -->
<div class="well">
<%= content_tag "p", "#{format_date(user.created_on)} #{l(:label_member_since)}", :class => "float_right member_since" %>
@ -9,10 +36,17 @@
<div>
<%= image_tag(url_to_avatar(user), :class => 'avatar') %>
<%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
<!-- modified by bai -->
<div style="position:relative;float:left;margin-top:-2px;margin-left: 160px">
<%= l(:label_user_grade) %>: <span style="color:#ec6300"><%= user.user_status.grade %></span>
<%= l(:label_user_grade) %>: <span style="color:#ec6300">
<%= link_to( format("%.2f" , finall_user_score).to_f, {:controller => 'users',
:action => 'show_score',
:remote => true,
:id => user.id},
:style=>"color: #EC6300;") %></span>
</div>
<!-- end -->
</div>
<div style="margin-top: 20px;margin-left:66px">

4
app/views/users/activity_score_index.js.erb
Unescape View File

@ -1 +1,3 @@
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/activity_score_index', :locals => {:index =>0 }) %>');
<!-- added by bai -->
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/activity_score_index', :locals => {:index =>0 }) %>');
<!-- end -->

4
app/views/users/influence_score_index.js.erb
Unescape View File

@ -1 +1,3 @@
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/influence_score_index', :locals => {:index =>0 }) %>');
<!-- added by bai -->
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/influence_score_index', :locals => {:index =>0 }) %>');
<!-- end -->

4
app/views/users/project_score_index.js.erb
Unescape View File

@ -1 +1,3 @@
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/project_score_index', :locals => {:index =>1 }) %>');
<!-- added by bai -->
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/project_score_index', :locals => {:index =>1 }) %>');
<!-- end -->

4
app/views/users/score_index.js.erb
Unescape View File

@ -1 +1,3 @@
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/score_index', :locals => {:index =>0 }) %>');
<!-- added by bai -->
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/score_index', :locals => {:index =>0 }) %>');
<!-- end -->

2
app/views/users/show_score.js.erb
Unescape View File

@ -1,3 +1,5 @@
<!-- added by bai -->
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_score') %>');
showModal('ajax-modal', '400px');
$('#ajax-modal').addClass('new-watcher');
<!-- end -->

4
app/views/users/topic_score_index.js.erb
Unescape View File

@ -1 +1,3 @@
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/topic_score_index', :locals => {:index =>0 }) %>');
<!-- added by bai -->
$('#show_score_detail').html('<%= escape_javascript(render :partial => 'users/topic_score_index', :locals => {:index =>0 }) %>');
<!-- end -->
Write Preview
Loading…
Cancel
Save