kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced acronym with abbr tags (#15191). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12235 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-10-26 07:15:08 +00:00
parent ec5dbdb0bd
commit 3578cf4d9a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -384,7 +384,7 @@ module ApplicationHelper
if @project if @project
link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)}, :title => format_time(time)) link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)}, :title => format_time(time))
else else
content_tag('acronym', text, :title => format_time(time)) content_tag('abbr', text, :title => format_time(time))
end end
end end

4
lib/redcloth3.rb
View File

@ -129,7 +129,7 @@
# #
# Will become: # Will become:
# #
# <acronym title="American Civil Liberties Union">ACLU</acronym> # <abbr title="American Civil Liberties Union">ACLU</abbr>
# #
# == Adding Tables # == Adding Tables
# #
@ -457,7 +457,7 @@ class RedCloth3 < String
# text.gsub! re, resub # text.gsub! re, resub
#end #end
text.gsub!(/\b([A-Z][A-Z0-9]{1,})\b(?:[(]([^)]*)[)])/) do |m| text.gsub!(/\b([A-Z][A-Z0-9]{1,})\b(?:[(]([^)]*)[)])/) do |m|
"<acronym title=\"#{htmlesc $2}\">#{$1}</acronym>" "<abbr title=\"#{htmlesc $2}\">#{$1}</abbr>"
end end
end end

2
public/stylesheets/application.css
View File

@ -315,7 +315,7 @@ legend {color: #484848;}
hr { width: 100%; height: 1px; background: #ccc; border: 0;} hr { width: 100%; height: 1px; background: #ccc; border: 0;}
blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;} blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;}
blockquote blockquote { margin-left: 0;} blockquote blockquote { margin-left: 0;}
acronym { border-bottom: 1px dotted; cursor: help; } abbr { border-bottom: 1px dotted; cursor: help; }
textarea.wiki-edit {width:99%; resize:vertical;} textarea.wiki-edit {width:99%; resize:vertical;}
li p {margin-top: 0;} li p {margin-top: 0;}
div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;} div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}

8
test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
View File

@ -159,11 +159,11 @@ EXPECTED
) )
end end
def test_acronyms def test_abbreviations
assert_html_output( assert_html_output(
'this is an acronym: GPL(General Public License)' => 'this is an acronym: <acronym title="General Public License">GPL</acronym>', 'this is an abbreviation: GPL(General Public License)' => 'this is an abbreviation: <abbr title="General Public License">GPL</abbr>',
'2 letters JP(Jean-Philippe) acronym' => '2 letters <acronym title="Jean-Philippe">JP</acronym> acronym', '2 letters JP(Jean-Philippe) abbreviation' => '2 letters <abbr title="Jean-Philippe">JP</abbr> abbreviation',
'GPL(This is a double-quoted "title")' => '<acronym title="This is a double-quoted &quot;title&quot;">GPL</acronym>' 'GPL(This is a double-quoted "title")' => '<abbr title="This is a double-quoted &quot;title&quot;">GPL</abbr>'
) )
end end