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

日历中issue号与完成度超出边框问题修复

This commit is contained in:
Tim 2016-09-27 14:03:26 +08:00
parent cb21fb8d3d
commit edd03d05d0
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/issues_helper.rb
View File

@ -60,9 +60,9 @@ module IssuesHelper
def states_done_ratio(issue) def states_done_ratio(issue)
done_ratio = issue.done_ratio done_ratio = issue.done_ratio
if done_ratio == 100 if done_ratio == 100
"<span class='c_green'>#{l(:label_done_ratio_endding)}</span>".html_safe "<span class='c_green' style='display:inline-block;'>#{l(:label_done_ratio_endding)}</span>".html_safe
else else
"<span class='c_orange'>#{l(:label_done_ratio_doing)}</span>".html_safe "<span class='c_orange' style='display:inline-block;'>#{l(:label_done_ratio_doing)}</span>".html_safe
end end
end end

6
app/views/calendars/show.html.erb
View File

@ -5,12 +5,6 @@
<%= form_tag({:controller => 'calendars', :action => 'show', :project_id => @project}, <%= form_tag({:controller => 'calendars', :action => 'show', :project_id => @project},
:method => :get, :id => 'query_form') do %> :method => :get, :id => 'query_form') do %>
<%= hidden_field_tag 'set_filter', '1' %> <%= hidden_field_tag 'set_filter', '1' %>
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
<legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
<div style="<%= @query.new_record? ? "" : "display: none;" %>">
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
</div>
</fieldset>
<p style="float:right;"> <p style="float:right;">
<%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %> <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
</p> </p>

7
app/views/common/_calendar.html.erb
View File

@ -24,10 +24,9 @@
<span class="tip"><%= render_issue_tooltip i %></span> <span class="tip"><%= render_issue_tooltip i %></span>
</div> </div>
<% else %> <% else %>
<span class="icon icon-package"> <span class="icon icon-package"></span>
<%= h("#{i.project} -") unless @project && @project == i.project %> <%= h("#{i.project} -") unless @project && @project == i.project %>
<%= link_to_version i%> <%= link_to_version i%>
</span>
<% end %> <% end %>
<% end %> <% end %>
</td> </td>

2
public/stylesheets/css/project.css
View File

@ -167,7 +167,7 @@ div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;}
/* 里程碑 */ /* 里程碑 */
.roadmap_box{ background:#f8f8f8; width:648px; padding:10px; margin-top:5px; border:1px solid #ddd; color:#555;} .roadmap_box{ background:#f8f8f8; width:648px; padding:10px; margin-top:5px; border:1px solid #ddd; color:#555;}
.progress{ width:648px; height:20px; margin-bottom:5px; background:#e9e9e9;} .progress{ width:648px; height:20px; margin-bottom:5px; background:#e9e9e9;}
.closed{ background:#bae0ba; height:20px;} .closed{ background:#bae0ba;}
.done{ background:#d3edd3; display:block;height:20px;float:left;} .done{ background:#d3edd3; display:block;height:20px;float:left;}
.roadmap_box{ margin-bottom:10px;} .roadmap_box{ margin-bottom:10px;}
.roadmap_list_ul{border:1px solid #ddd; border-bottom:none; margin-bottom:10px;} .roadmap_list_ul{border:1px solid #ddd; border-bottom:none; margin-bottom:10px;}