Merge branch 'pulls/663/add-alt-tags' into feature/2.3.0/accessibility-master

pull/41/head
jwollert 13 years ago
commit 83f5c914c7
  1. 10
      app/helpers/application_helper.rb
  2. 3
      app/helpers/projects_helper.rb
  3. 4
      app/views/common/_calendar.rhtml
  4. 2
      public/stylesheets/application.css

@ -73,17 +73,17 @@ module ApplicationHelper
def link_to_issue(issue, options={}) def link_to_issue(issue, options={})
title = nil title = nil
subject = nil subject = nil
if options[:subject] == false title = "#{h(issue.tracker)} #{issue.id}: #{(truncate(issue.subject, :length => 60))}"
title = truncate(issue.subject, :length => 60) unless options[:subject] == false
else
subject = issue.subject subject = issue.subject
if options[:truncate] if options[:truncate]
subject = truncate(subject, :length => options[:truncate]) subject = truncate(subject, :length => options[:truncate])
end end
end end
s = link_to "#{h(issue.tracker)} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, s = image_tag "bullet_go.png", :alt => l(:label_issue), :title => l(:label_issue)
s << link_to("#{h(issue.tracker)} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue},
:class => issue.css_classes, :class => issue.css_classes,
:title => title :title => title)
s << ": #{h subject}" if subject s << ": #{h subject}" if subject
s = "#{h issue.project} - " + s if options[:project] s = "#{h issue.project} - " + s if options[:project]
s s

@ -14,7 +14,8 @@
module ProjectsHelper module ProjectsHelper
def link_to_version(version, options = {}) def link_to_version(version, options = {})
return '' unless version && version.is_a?(Version) return '' unless version && version.is_a?(Version)
link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, options s = image_tag "package.png", :title => l(:label_version)
s << link_to_if(version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, options)
end end
def project_settings_tabs def project_settings_tabs

@ -17,9 +17,9 @@ while day <= calendar.enddt %>
<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>
<%= h("#{i.project} -") unless @project && @project == i.project %> <%= h("#{i.project} -") unless @project && @project == i.project %>
<%= link_to_version i%> <%= link_to_version i, :title => l(:label_version) %>
</span> </span>
<% end %> <% end %>
<% end %> <% end %>

@ -563,9 +563,9 @@ table.cal td p.day-num {font-size: 1.1em; text-align:right;}
table.cal td.odd p.day-num {color: #bbb;} table.cal td.odd p.day-num {color: #bbb;}
table.cal td.today {background:#ffffdd;} table.cal td.today {background:#ffffdd;}
table.cal td.today p.day-num {font-weight: bold;} table.cal td.today p.day-num {font-weight: bold;}
table.cal .starting a, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
table.cal .ending a, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;} table.cal .ending a, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
table.cal .starting.ending a, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;} table.cal .starting.ending a, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}
table.cal td img {padding:0px 2px 3px 0px; vertical-align:middle;}
p.cal.legend span {display:block;} p.cal.legend span {display:block;}
/***** Tooltips ******/ /***** Tooltips ******/

Loading…
Cancel
Save