summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorBruno Binet <bruno.binet@gmail.com>2012-11-30 10:46:32 +0100
committerBruno Binet <bruno.binet@gmail.com>2012-12-01 21:30:50 +0100
commitc74abe579bc2b855b6487254bc7a79fab0718c84 (patch)
tree5e580dbf7fc463b2a7c72bfc5c83bde8cc4c9734 /samples
parentf6531186589aa6187319914a03d2ac9b950c05d8 (diff)
downloadpelican-c74abe579bc2b855b6487254bc7a79fab0718c84.tar.gz
Don't rewrite URLs
Remove the code that was appending ../static in front of some URLs, and add a way to do cross-content linking.
Diffstat (limited to 'samples')
-rw-r--r--samples/content/another_super_article.rst2
-rw-r--r--samples/content/cat1/markdown-article.md3
-rw-r--r--samples/content/pages/test_page.rst2
-rw-r--r--samples/content/super_article.rst4
-rw-r--r--samples/content/unbelievable.rst3
5 files changed, 10 insertions, 4 deletions
diff --git a/samples/content/another_super_article.rst b/samples/content/another_super_article.rst
index 5ec1e2b8..e6e0a92c 100644
--- a/samples/content/another_super_article.rst
+++ b/samples/content/another_super_article.rst
@@ -14,7 +14,7 @@ Why not ?
After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
YEAH !
-.. image:: pictures/Sushi.jpg
+.. image:: |filename|/pictures/Sushi.jpg
:height: 450 px
:width: 600 px
:alt: alternate text
diff --git a/samples/content/cat1/markdown-article.md b/samples/content/cat1/markdown-article.md
index 3bf56dc0..5307b47a 100644
--- a/samples/content/cat1/markdown-article.md
+++ b/samples/content/cat1/markdown-article.md
@@ -2,3 +2,6 @@ Title: A markdown powered article
Date: 2011-04-20
You're mutually oblivious.
+
+[a root-relative link to unbelievable](|filename|/unbelievable.rst)
+[a file-relative link to unbelievable](|filename|../unbelievable.rst)
diff --git a/samples/content/pages/test_page.rst b/samples/content/pages/test_page.rst
index 06f91c10..2285f17b 100644
--- a/samples/content/pages/test_page.rst
+++ b/samples/content/pages/test_page.rst
@@ -5,7 +5,7 @@ This is a test page
Just an image.
-.. image:: pictures/Fat_Cat.jpg
+.. image:: |filename|/pictures/Fat_Cat.jpg
:height: 450 px
:width: 600 px
:alt: alternate text
diff --git a/samples/content/super_article.rst b/samples/content/super_article.rst
index 1dfd8e34..76e57683 100644
--- a/samples/content/super_article.rst
+++ b/samples/content/super_article.rst
@@ -16,12 +16,12 @@ This is a simple title
And here comes the cool stuff_.
-.. image:: pictures/Sushi.jpg
+.. image:: |filename|/pictures/Sushi.jpg
:height: 450 px
:width: 600 px
:alt: alternate text
-.. image:: pictures/Sushi_Macro.jpg
+.. image:: |filename|/pictures/Sushi_Macro.jpg
:height: 450 px
:width: 600 px
:alt: alternate text
diff --git a/samples/content/unbelievable.rst b/samples/content/unbelievable.rst
index 11443e9a..20cb9dc7 100644
--- a/samples/content/unbelievable.rst
+++ b/samples/content/unbelievable.rst
@@ -4,3 +4,6 @@ Unbelievable !
:date: 2010-10-15 20:30
Or completely awesome. Depends the needs.
+
+`a root-relative link to markdown-article <|filename|/cat1/markdown-article.md>`_
+`a file-relative link to markdown-article <|filename|cat1/markdown-article.md>`_