From 37702037402c122f50db82f4ef63bd17945fafcb Mon Sep 17 00:00:00 2001
From: Angel Ortega <angel@triptico.com>
Date: Fri, 14 Nov 2008 13:40:38 +0100
Subject: [PATCH] Use 'aurl' wherever suitable.

---
 templates/artemus/ALL/SITEMAP         | 4 ++--
 templates/artemus/ALL/_story_for_rss  | 2 +-
 templates/artemus/en/_story_complete  | 2 +-
 templates/artemus/en/_story_printable | 2 +-
 templates/artemus/es/_story_complete  | 2 +-
 templates/artemus/es/_story_printable | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/artemus/ALL/SITEMAP b/templates/artemus/ALL/SITEMAP
index 8df544f..c4b62d3 100644
--- a/templates/artemus/ALL/SITEMAP
+++ b/templates/artemus/ALL/SITEMAP
@@ -1,7 +1,7 @@
 {-content_type|text/xml}<?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 {-foreach|{-stories_by_date||0|0}|
-	<url><loc>http://{-cfg_host_name}/?t=STORY;topic=\$1;id=\$0</loc></url>}
+	<url><loc>\{-aurl\|STORY\|topic\|\$1\|id\|\$0\}</loc></url>}
 {-foreach|{-topics}|
-	<url><loc>http://{-cfg_host_name}/?t=TOPIC;topic=\$0</loc></url>}
+	<url><loc>\{-aurl\|TOPIC\|topic\|\$0\}</loc></url>}
 </urlset>
diff --git a/templates/artemus/ALL/_story_for_rss b/templates/artemus/ALL/_story_for_rss
index 7b03e0d..f064247 100644
--- a/templates/artemus/ALL/_story_for_rss
+++ b/templates/artemus/ALL/_story_for_rss
@@ -6,7 +6,7 @@ Generates a story link in RSS format.
 =cut
 <item>
 	<title>{-story_title|$0|$1}</title>
-	<link>http://{-cfg_host_name}/?t=STORY;topic=$0;id=$1</link>
+	<link>{-aurl|STORY|topic|$0|id|$1}</link>
 	<author>{-story_userid|$0|$1}</author>
 	<description>
 <![CDATA[
diff --git a/templates/artemus/en/_story_complete b/templates/artemus/en/_story_complete
index e66c998..623eeaf 100644
--- a/templates/artemus/en/_story_complete
+++ b/templates/artemus/en/_story_complete
@@ -6,5 +6,5 @@
 
 <div class = 'self_links'>
 	<a href = '{-url|STORY_PRINTABLE|topic|$0|id|$1}'>Print version</a> -
-	<a href = 'http://{-cfg_host_name}/?t=STORY;topic=$0;id=$1'>Permanent link to this page</a>
+	<a href = '{-aurl|STORY|topic|$0|id|$1}'>Permanent link to this page</a>
 </div>
diff --git a/templates/artemus/en/_story_printable b/templates/artemus/en/_story_printable
index bfac2d2..c6095b4 100644
--- a/templates/artemus/en/_story_printable
+++ b/templates/artemus/en/_story_printable
@@ -17,7 +17,7 @@ Shows a complete story, in 'printer-friendly' format.
 
 	<div class = 'self_links'>
 		Permanent link to this page:
-		<a href='http://{-cfg_host_name}/?t=STORY;topic=$0;id=$1'>http://{-cfg_host_name}/?t=STORY;topic=$0;id=$1</a>
+		<a href='{-aurl|STORY|topic|$0|id|$1}'>{-aurl|STORY|topic|$0|id|$1}</a>
 	</div>
 
 </div>
diff --git a/templates/artemus/es/_story_complete b/templates/artemus/es/_story_complete
index 661522f..638b2a7 100644
--- a/templates/artemus/es/_story_complete
+++ b/templates/artemus/es/_story_complete
@@ -6,5 +6,5 @@
 
 <div class = 'self_links'>
 	<a href = '{-url|STORY_PRINTABLE|topic|$0|id|$1}'>Versi&oacute;n para Imprimir</a> -
-	<a href = 'http://{-cfg_host_name}/?t=STORY;topic=$0;id=$1'>Enlace permanente a esta p&aacute;gina</a>
+	<a href = '{-aurl|STORY|topic|$0|id|$1}'>Enlace permanente a esta p&aacute;gina</a>
 </div>
diff --git a/templates/artemus/es/_story_printable b/templates/artemus/es/_story_printable
index 72ad803..11b0d84 100644
--- a/templates/artemus/es/_story_printable
+++ b/templates/artemus/es/_story_printable
@@ -17,7 +17,7 @@ Shows a complete story, in 'printer-friendly' format.
 
 	<div class = 'self_links'>
 		Enlace permanente a esta p&aacute;gina:
-		<a href='http://{-cfg_host_name}/?t=STORY;topic=$0;id=$1'>http://{-cfg_host_name}/?t=STORY;topic=$0;id=$1</a>
+		<a href='{-aurl|STORY|topic|$0|id|$1}'>{-aurl|STORY|topic|$0|id|$1}</a>
 	</div>
 
 </div>
-- 
2.11.4.GIT