jro_apps/redmine Commit - r781:47e7ceacd72d

Better handling of external link style assignment....

Jean-Philippe Lang -

r781:47e7ceacd72d

parent child

Context file:

r781:47e7ceacd72d

Collapse all files

lib/redcloth.rb +3 -1

                         atts << " title=\"#{ title }\"" if title
                         atts = shelve( atts ) if atts
-                        "#{ pre }<a#{ atts }>#{ text }</a>#{ post }"
+                        external = (url =~ /^http:\/\//) ? ' class="external"' : ''
+                        "#{ pre }<a#{ atts }#{ external }>#{ text }</a>#{ post }"
                     end
                 end

lib/redmine/wiki_formatting.rb +1 -1

                         # and URL's prefixed with ! !> !< != (textile images)
                         all
                       else
-                        %(#{leading}<a href="#{proto=="www."?"http://www.":proto}#{url}">#{proto + url}</a>#{post})
+                        %(#{leading}<a class="external" href="#{proto=="www."?"http://www.":proto}#{url}">#{proto + url}</a>#{post})
                       end
                     end
                   end

public/stylesheets/application.css +1 -6

                 padding: 4px;
             }
-            div.wiki a {
+            div.wiki .external {
                 background-position: 0% 60%;
                 background-repeat: no-repeat;
                 padding-left: 12px;
                 background-image: url(../images/external.png);
             }
-            div.wiki a.wiki-page, div.wiki a.issue, div.wiki a.changeset, div.wiki a.email, div.wiki div.toc a {
-                padding-left: 0;
-                background-image: none;
             div.wiki a.new {
                 color: #b73535;
             }

test/unit/helpers/application_helper_test.rb +9 -8

               def test_auto_links
                 to_test = {
-                  'http://foo.bar' => '<a href="http://foo.bar">http://foo.bar</a>',
+                  'http://foo.bar' => '<a class="external" href="http://foo.bar">http://foo.bar</a>',
-                  'http://foo.bar.' => '<a href="http://foo.bar">http://foo.bar</a>.',
+                  'http://foo.bar.' => '<a class="external" href="http://foo.bar">http://foo.bar</a>.',
-                  'http://foo.bar/foo.bar#foo.bar.' => '<a href="http://foo.bar/foo.bar#foo.bar">http://foo.bar/foo.bar#foo.bar</a>.',
+                  'http://foo.bar/foo.bar#foo.bar.' => '<a class="external" href="http://foo.bar/foo.bar#foo.bar">http://foo.bar/foo.bar#foo.bar</a>.',
-                  'www.foo.bar' => '<a href="http://www.foo.bar">www.foo.bar</a>',
+                  'www.foo.bar' => '<a class="external" href="http://www.foo.bar">www.foo.bar</a>',
-                  'http://foo.bar/page?p=1&t=z&s=' => '<a href="http://foo.bar/page?p=1&#38;t=z&#38;s=">http://foo.bar/page?p=1&#38;t=z&#38;s=</a>',
+                  'http://foo.bar/page?p=1&t=z&s=' => '<a class="external" href="http://foo.bar/page?p=1&#38;t=z&#38;s=">http://foo.bar/page?p=1&#38;t=z&#38;s=</a>',
-                  'http://foo.bar/page#125' => '<a href="http://foo.bar/page#125">http://foo.bar/page#125</a>'
+                  'http://foo.bar/page#125' => '<a class="external" href="http://foo.bar/page#125">http://foo.bar/page#125</a>'
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
                   '!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
                   'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>',
                   # textile links
-                  'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar">link</a>',
+                  'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
-                  '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title">link</a>'
+                  'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
+                  '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>'
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages