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

Merge remote-tracking branch 'origin/szzh' into szzh

This commit is contained in:
lizanle 2015-07-16 17:57:45 +08:00
parent 759e68621f 7f31093869
commit 44a2e23d14
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/helpers/issues_helper.rb
View File

@ -72,14 +72,19 @@ module IssuesHelper
issuetype = [] issuetype = []
if value == "缺陷" || value == 1 if value == "缺陷" || value == 1
issuetype << "issues fl" issuetype << "issues fl"
elsif value == "功能" || value == 2 issuetype << "缺陷"
elsif value == "任务" || value == 4
issuetype << "duty fl" issuetype << "duty fl"
issuetype << "任务"
elsif value == "支持" || value == 3 elsif value == "支持" || value == 3
issuetype << "support fl" issuetype << "support fl"
elsif value == "任务" || value == 4 issuetype << "支持"
elsif value == "功能" || value == 2
issuetype << "function fl" issuetype << "function fl"
issuetype << "功能"
else else
issuetype << "weekly fl" issuetype << "weekly fl"
issuetype << "周报"
end end
end end

2
app/views/issues/_list.html.erb
View File

@ -7,7 +7,7 @@
<div class="problem_main"> <div class="problem_main">
<% column_content = ( query.inline_columns.map {|column| "#{column_content_new(column, issue)}"}) %> <% column_content = ( query.inline_columns.map {|column| "#{column_content_new(column, issue)}"}) %>
<% unless issue.author.nil? || issue.author.name == "Anonymous" %> <% unless issue.author.nil? || issue.author.name == "Anonymous" %>
<span class ="<%= get_issue_type(column_content[1])[0] %>"></span> <span class ="<%= get_issue_type(column_content[1])[0] %>" title="<%= get_issue_type(column_content[1])[1] %>"></span>
<div class="problem_txt fl"> <div class="problem_txt fl">
<%= link_to issue.author.name, user_path(issue.author), :class => "problem_name c_orange fl" %> <%= link_to issue.author.name, user_path(issue.author), :class => "problem_name c_orange fl" %>
<span class="fl"><%= l(:label_post_on_issue) %>(<%= "#{raw column_content[2]}" %>)：</span> <span class="fl"><%= l(:label_post_on_issue) %>(<%= "#{raw column_content[2]}" %>)：</span>

2
app/views/issues/show.html.erb
View File

@ -14,7 +14,7 @@
</div> </div>
<div class="talk_txt fl"> <div class="talk_txt fl">
<p class="pro_page_tit" style="word-break:break-all;"> <p class="pro_page_tit" style="word-break:break-all;">
<span class='<%= "#{get_issue_type(@issue.tracker_id)[0]} fl" %>'><%= get_issue_type(@issue.tracker_id)[1] %></span> <span class='<%= "#{get_issue_type(@issue.tracker_id)[0]} fl" %>' title="<%= get_issue_type(@issue.tracker_id)[1] %>"></span>
<span style="padding-left: 5px;"><%= @issue.subject %></span> <span style="padding-left: 5px;"><%= @issue.subject %></span>
<span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span> <span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span>
</p><br/> </p><br/>

11
app/views/repositories/stats.html.erb
View File

@ -1,12 +1,11 @@
<h3 style="padding-top: 40px;"><%= l(:label_statistics) %></h3> <div class="project_r_h">
<h2 class="project_h2"><%= l(:label_statistics) %></h2>
</div>
<p> <p>
<%= tag("embed", :width => 670, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_month")) %> <%= tag("embed", :width => 670, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_month")) %>
</p> </p>
<p> <p>
<%= tag("embed", :width => 670, :height => 400, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_author")) %> <%= tag("embed", :width => 670, :height => 400, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_author")) %>
</p> </p>
<p><%= link_to l(:button_back), :action => 'show', :id => @project %></p> <p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
<% html_title(l(:label_repository), l(:label_statistics)) -%> <% html_title(l(:label_repository), l(:label_statistics)) -%>