# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1429498729 25200
# Node ID be7275021f3ad31e8f1a5c7827dbb832561c37a8
# Parent  861b581749b0ab288ccadfd4893fbfd70f09d33d
Fix asset URL formatting.

diff -r 861b581749b0 -r be7275021f3a tests/test_page.py
--- a/tests/test_page.py	Wed Mar 11 15:35:17 2015 -0700
+++ b/tests/test_page.py	Sun Apr 19 19:58:49 2015 -0700
@@ -75,7 +75,6 @@
             '/sub_dir/Second.txt': "Go back to [[../First]], or to [[Second Sibling]].",
             '/sub_dir/Second Sibling.txt': "Go back to [[Second]]."
             })
-        print str(list(wiki.getPageUrls()))
         first = wiki.getPage('/First')
         self.assertEqual(['/First Sibling'], first.links)
         first2 = wiki.getPage('/First Sibling')
@@ -94,7 +93,7 @@
 
     def testImageUrl(self):
         wiki = self._getWikiFromStructure({
-            '/foo.txt': "URL: [[blah|url:/blah/boo/image.png]]"
+            '/foo.txt': "URL: [[blah|asset:/blah/boo/image.png]]"
             })
         foo = wiki.getPage('/foo')
         self.assertEqual("URL: <img src=\"/files/blah/boo/image.png\" alt=\"blah\"></img>", foo.getFormattedText())
diff -r 861b581749b0 -r be7275021f3a wikked/formatter.py
--- a/wikked/formatter.py	Wed Mar 11 15:35:17 2015 -0700
+++ b/wikked/formatter.py	Sun Apr 19 19:58:49 2015 -0700
@@ -194,11 +194,11 @@
 
     def _formatUrlLink(self, ctx, endpoint, value, display):
         if value.startswith('/'):
-            return '/files' + value
-
-        abs_url = os.path.join('/files', ctx.urldir, value)
-        abs_url = os.path.normpath(abs_url).replace('\\', '/')
-        return abs_url
+            abs_url = '/files' + value
+        else:
+            abs_url = os.path.join('/files', ctx.urldir, value)
+            abs_url = os.path.normpath(abs_url).replace('\\', '/')
+        return '<a class="wiki-asset" href="%s">%s</a>' % (abs_url, display)
 
     def _formatAssetLink(self, ctx, endpoint, value, display):
         img_exts = ['.jpg', '.jpeg', '.png', '.gif']