diff options
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | lib/redcloth3.rb | 4 | ||||
| -rw-r--r-- | public/stylesheets/application.css | 2 | ||||
| -rw-r--r-- | test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2c093a26f..e5b75c4cf 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -384,7 +384,7 @@ module ApplicationHelper if @project link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)}, :title => format_time(time)) else - content_tag('acronym', text, :title => format_time(time)) + content_tag('abbr', text, :title => format_time(time)) end end diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb index cb2293443..7e9097ee3 100644 --- a/lib/redcloth3.rb +++ b/lib/redcloth3.rb @@ -129,7 +129,7 @@ # # Will become: # -# <acronym title="American Civil Liberties Union">ACLU</acronym> +# <abbr title="American Civil Liberties Union">ACLU</abbr> # # == Adding Tables # @@ -457,7 +457,7 @@ class RedCloth3 < String # text.gsub! re, resub #end 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 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c145abd5c..2823229f2 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -315,7 +315,7 @@ legend {color: #484848;} 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 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;} li p {margin-top: 0;} div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;} diff --git a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb index 324cea1e6..33b5f0985 100644 --- a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb @@ -159,11 +159,11 @@ EXPECTED ) end - def test_acronyms + def test_abbreviations assert_html_output( - 'this is an acronym: GPL(General Public License)' => 'this is an acronym: <acronym title="General Public License">GPL</acronym>', - '2 letters JP(Jean-Philippe) acronym' => '2 letters <acronym title="Jean-Philippe">JP</acronym> acronym', - 'GPL(This is a double-quoted "title")' => '<acronym title="This is a double-quoted "title"">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) abbreviation' => '2 letters <abbr title="Jean-Philippe">JP</abbr> abbreviation', + 'GPL(This is a double-quoted "title")' => '<abbr title="This is a double-quoted "title"">GPL</abbr>' ) end |