From 40c4f3bd6a705bd72908ff512d4f692e85051806 Mon Sep 17 00:00:00 2001
From: Angel Ortega <angel@triptico.com>
Date: Thu, 1 Oct 2009 13:22:02 +0200
Subject: [PATCH] More template fixes.

---
 templates/art5/CSS                       |  2 +-
 templates/art5/LIST                      |  8 ++++----
 templates/art5/LOGOUT                    |  2 +-
 templates/art5/SAVE_STORY                |  6 ++++--
 templates/art5/block_top_ten             | 10 ++--------
 templates/art5/block_topic_list_of_links |  3 +--
 templates/art5/link_to_new_story         |  2 +-
 templates/art5/meta_menu                 | 12 ++++++------
 templates/art5/navigator                 |  8 ++------
 9 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/templates/art5/CSS b/templates/art5/CSS
index 9116bc5..d0fb3bc 100644
--- a/templates/art5/CSS
+++ b/templates/art5/CSS
@@ -1 +1 @@
-<{content_type 'text/css'} css}>
\ No newline at end of file
+<{{content_type 'text/css'} css}>
\ No newline at end of file
diff --git a/templates/art5/LIST b/templates/art5/LIST
index 68f4b83..22a67e6 100644
--- a/templates/art5/LIST
+++ b/templates/art5/LIST
@@ -11,12 +11,12 @@
 	<{if is_admin {
 		'<em><ul>'
 
-		{foreach {stories_by_date %topic 0 0 date '' 1} {
+		{foreach {stories_by_date %topic 0 0 date '' 1}
 			{li {
 				{date cfg_date_format $2}
 				' '
 				{link_to_story_with_edit $0 $1}
-			}
+				}
 			}
 		}
 
@@ -25,12 +25,12 @@
 	}>
 
 	<ul>
-	<{foreach {stories_by_date %topic} {
+	<{foreach {stories_by_date %topic}
 		{li {
 			{date cfg_date_format $2}
 			' '
 			{link_to_story_with_edit $0 $1}
-		}
+			}
 		}
 	}>
 	</ul>
diff --git a/templates/art5/LOGOUT b/templates/art5/LOGOUT
index d70a88e..3494959 100644
--- a/templates/art5/LOGOUT
+++ b/templates/art5/LOGOUT
@@ -1 +1 @@
-<{logout INDEX>}
\ No newline at end of file
+<{logout INDEX}>
\ No newline at end of file
diff --git a/templates/art5/SAVE_STORY b/templates/art5/SAVE_STORY
index 9387acf..eca0b00 100644
--- a/templates/art5/SAVE_STORY
+++ b/templates/art5/SAVE_STORY
@@ -6,11 +6,13 @@
 	<h1><@{"Save story"}></h1>
 
 	<{_story_preview %topic
-		{save_story %topic %id %content
+		{save_story
+			%topic %id %content
 			%year %month %day '' '' ''
 			%format %tags
 			%year2 %month2 %day2
-			%description}
+			%description
+		}
 	}>
 
 </div>
diff --git a/templates/art5/block_top_ten b/templates/art5/block_top_ten
index 8dcc0d9..9c801e1 100644
--- a/templates/art5/block_top_ten
+++ b/templates/art5/block_top_ten
@@ -1,14 +1,8 @@
 <{
 	'<h1>' @"Top stories" '</h1>'
 	'<ul>'
-	{foreach {stories_top_ten {or %num cfg_top_ten_num}} {
-		li {
-			{link_to_story $1 $2}
-			' ('
-			$0
-			') '
-		}
-		}
+	{foreach {stories_top_ten {or %num cfg_top_ten_num}}
+		{li {{link_to_story $1 $2} ' (' $0 ') '}}
 	}
 	'</ul>'
 }>
\ No newline at end of file
diff --git a/templates/art5/block_topic_list_of_links b/templates/art5/block_topic_list_of_links
index 688a50f..5a97b52 100644
--- a/templates/art5/block_topic_list_of_links
+++ b/templates/art5/block_topic_list_of_links
@@ -1,9 +1,8 @@
 <{
 	'<h1>' {topic_name $0} '</h1>'
 	'<ul>'
-	{foreach {stories_by_date $0 $1} {
+	{foreach {stories_by_date $0 $1}
 		{li {link_to_story $0 $1}}
-		}
 	}
 	'</ul>'
 }>
\ No newline at end of file
diff --git a/templates/art5/link_to_new_story b/templates/art5/link_to_new_story
index 0680814..5613a5f 100644
--- a/templates/art5/link_to_new_story
+++ b/templates/art5/link_to_new_story
@@ -1 +1 @@
-<{link {url 'EDIT_STORY' 'topic' $0 'id' '[]'} @"New"}>
\ No newline at end of file
+<{link {url 'EDIT_STORY' 'topic' $0 'id' '[]'} @"[New]"}>
\ No newline at end of file
diff --git a/templates/art5/meta_menu b/templates/art5/meta_menu
index cdb8eff..4b8d5ac 100644
--- a/templates/art5/meta_menu
+++ b/templates/art5/meta_menu
@@ -2,8 +2,8 @@
 	{if {story_title 'info' 'about'}
 		{li
 			{link
-			{url 'STORY' 'topic' 'info' 'id' 'about'}
-			{story_title 'info' 'about'}
+				{url 'STORY' 'topic' 'info' 'id' 'about'}
+				{story_title 'info' 'about'}
 			}
 		}
 	}
@@ -11,8 +11,8 @@
 	{if {story_title 'info' 'legal'}
 		{li
 			{link
-			{url 'STORY' 'topic' 'info' 'id' 'legal'}
-			{story_title 'info' 'legal'}
+				{url 'STORY' 'topic' 'info' 'id' 'legal'}
+				{story_title 'info' 'legal'}
 			}
 		}
 	}
@@ -23,8 +23,8 @@
 		{if is_admin
 			{li {link {url 'ADMIN'} @"Admin"}}
 			{li {link
-				{url 'EDIT_USER' 'userid' userid}
-				@"Preferences"
+					{url 'EDIT_USER' 'userid' userid}
+					@"Preferences"
 				}
 			}
 		}
diff --git a/templates/art5/navigator b/templates/art5/navigator
index ffe106e..c4a9f94 100644
--- a/templates/art5/navigator
+++ b/templates/art5/navigator
@@ -3,9 +3,7 @@
 	{if $2 {
 			"<span class = 'prev'>"
 			{link
-				{url {or %t 'INDEX'}
-					'topic' $0 'offset' {sub $2 $1}
-				}
+				{url {or %t 'INDEX'} 'topic' $0 'offset' {sub $2 $1}}
 				"&lt;&lt;"
 			}
 			"</span>"
@@ -17,9 +15,7 @@
 		{
 			"<span class = 'next'>"
 			{link
-				{url {or %t 'INDEX'}
-					'topic' $0 'offset' {add $2 $1}
-				}
+				{url {or %t 'INDEX'} 'topic' $0 'offset' {add $2 $1}}
 				"&gt;&gt"
 			}
 			"</span>"
-- 
2.11.4.GIT