6 files changed, 11 insertions, 25 deletions
diff --git a/theme/admin/editDraft.tpl b/theme/admin/editDraft.tpl
index b3197c4..29c1fea 100755
--- a/theme/admin/editDraft.tpl
+++ b/theme/admin/editDraft.tpl

@@ -3,9 +3,7 @@
 <FORM ACTION="/admin/editDraft.php?id=<!--ID-->&submit=" METHOD="POST">
        Draft Title: <INPUT TYPE="text" NAME="title" VALUE="<!--TITLE-->"><BR>
        <TEXTAREA NAME="text" COLS="80" ROWS="20"><!--TEXT--></TEXTAREA><P>
-        Tag 1: <INPUT TYPE="text" NAME="tag1" VALUE="<!--TAG1-->"><BR>
+        Tags (comma-seperated): <INPUT TYPE="text" NAME="tags" VALUE="<!--TAGS-->"><BR>
-        Tag 2: <INPUT TYPE="text" NAME="tag2" VALUE="<!--TAG2-->"> (Optional)<BR>
-        Tag 3: <INPUT TYPE="text" NAME="tag3" VALUE="<!--TAG3-->"> (Optional)<BR>
        Post Type: <SELECT NAME="type" SIZE="4">
                <OPTION VALUE="draft" SELECTED>Draft</OPTION>
                <OPTION VALUE="normal">Normal (Article-style) Post</OPTION>
diff --git a/theme/admin/editPending.tpl b/theme/admin/editPending.tpl
index ccded76..355e156 100755
--- a/theme/admin/editPending.tpl
+++ b/theme/admin/editPending.tpl

@@ -3,8 +3,6 @@
 <FORM ACTION="/admin/editPending.php?id=<!--ID-->&submit=" METHOD="POST">
        Post Title: <INPUT TYPE="text" NAME="title" VALUE="<!--TITLE-->"><BR>
        <TEXTAREA NAME="text" COLS="80" ROWS="20"><!--TEXT--></TEXTAREA><P>
-        Tag 1: <INPUT TYPE="text" NAME="tag1" VALUE="<!--TAG1-->"><BR>
+        Tags (comma-seperated): <INPUT TYPE="text" NAME="tags" VALUE="<!--TAGS-->"><BR>
-        Tag 2: <INPUT TYPE="text" NAME="tag2" VALUE="<!--TAG2-->"> (Optional)<BR>
-        Tag 3: <INPUT TYPE="text" NAME="tag3" VALUE="<!--TAG3-->"> (Optional)<BR>
        <INPUT TYPE="submit" VALUE="Edit post">
 </FORM>
diff --git a/theme/admin/editPost.tpl b/theme/admin/editPost.tpl
index 544fe5f..f7e44e3 100755
--- a/theme/admin/editPost.tpl
+++ b/theme/admin/editPost.tpl

@@ -3,8 +3,6 @@
 <FORM ACTION="/admin/editPost.php?id=<!--ID-->&submit=" METHOD="POST">
        Post Title: <INPUT TYPE="text" NAME="title" VALUE="<!--TITLE-->"><BR>
        <TEXTAREA NAME="text" COLS="80" ROWS="20"><!--TEXT--></TEXTAREA><P>
-        Tag 1: <INPUT TYPE="text" NAME="tag1" VALUE="<!--TAG1-->"><BR>
+        Tags (comma-seperated): <INPUT TYPE="text" NAME="tags" VALUE="<!--TAGS-->"><BR>
-        Tag 2: <INPUT TYPE="text" NAME="tag2" VALUE="<!--TAG2-->"> (Optional)<BR>
-        Tag 3: <INPUT TYPE="text" NAME="tag3" VALUE="<!--TAG3-->"> (Optional)<BR>
        <INPUT TYPE="submit" VALUE="Edit post">
 </FORM>
diff --git a/theme/admin/write.tpl b/theme/admin/write.tpl
index 30e870c..0d8fb24 100755
--- a/theme/admin/write.tpl
+++ b/theme/admin/write.tpl

@@ -3,9 +3,7 @@
 <FORM ACTION="/admin/writePost.php?submit=" METHOD="POST">
        Post Title: <INPUT TYPE="text" NAME="title"><BR>
        <TEXTAREA NAME="text" COLS="80" ROWS="20"></TEXTAREA><P>
-        Tag 1: <INPUT TYPE="text" NAME="tag1" VALUE="update"><BR>
+        Tags (comma-seperated): <INPUT TYPE="text" NAME="tags" VALUE="update"><BR>
-        Tag 2: <INPUT TYPE="text" NAME="tag2"> (Optional)<BR>
-        Tag 3: <INPUT TYPE="text" NAME="tag3"> (Optional)<BR>
        Post Type: <SELECT NAME="type" SIZE="4">
                <OPTION VALUE="draft">Draft</OPTION>
                <OPTION VALUE="normal" SELECTED>Normal (Article-style) Post</OPTION>
diff --git a/theme/archive.tpl b/theme/archive.tpl
index 7d85565..b06aad9 100755
--- a/theme/archive.tpl
+++ b/theme/archive.tpl

@@ -20,12 +20,6 @@
                                <A HREF="/blog/author/<!--MONTH.BIG.AUTHOR-->.php"><!--MONTH.BIG.AUTHOR--></A>
                        </SPAN>
-                        <SPAN CLASS="post-tag-3 category">
-                                <A CLASS="noVisit" HREF="/blog/tag/<!--MONTH.BIG.TAG1-->.php" REL="tag" TITLE="<!--MONTH.BIG.TAG1-->"><!--MONTH.BIG.TAG1--></A>
-                                <A CLASS="noVisit" HREF="/blog/tag/<!--MONTH.BIG.TAG2-->.php" REL="tag" TITLE="<!--MONTH.BIG.TAG2-->"><!--MONTH.BIG.TAG2--></A>
-                                <A CLASS="noVisit" HREF="/blog/tag/<!--MONTH.BIG.TAG3-->.php" REL="tag" TITLE="<!--MONTH.BIG.TAG3-->"><!--MONTH.BIG.TAG3--></A>
-                        </SPAN>
                        <SPAN CLASS="post-comment<!--MONTH.BIG.PLURALCOMMENT-->">
                                <A CLASS="noVisit" HREF="/blog/<!--MONTH.BIG.CODED-->/#comments"><!--MONTH.BIG.COMMENTS-->&nbsp;&#187;</A>
                        </SPAN>
diff --git a/theme/post.tpl b/theme/post.tpl
index 91bf4e9..3314d4e 100755
--- a/theme/post.tpl
+++ b/theme/post.tpl

@@ -6,16 +6,16 @@
 <!--BEGIN POST-->
 <DIV CLASS="post vevent" ID="post-<!--POST.ID-->">
        <DIV CLASS="post-date-<!--POST.YEARID-->">
-                <ABBR CLASS="dtstart" TITLE="<!--POST.DATE-->">
+                <ABBR CLASS="dtstart" TITLE="<!--POST.DATE-->">
                        <SPAN CLASS="post-month"><!--POST.MONTH--></SPAN>
-                        <SPAN CLASS="post-day"><!--POST.DAY--></SPAN>
+                        <SPAN CLASS="post-day"><!--POST.DAY--></SPAN>
                </ABBR>
-        </DIV>
+        </DIV>
        <DIV CLASS="post-title">
                <H2>
                        <!--BEGIN EXTERNAL--><A CLASS="url" HREF="/blog/<!--POST.CODED-->/" REL="bookmark" TITLE="Permalink for <!--POST.TITLE-->"><!--END EXTERNAL-->
-                        <SPAN CLASS="summary"><!--POST.TITLE--></SPAN>
+                        <SPAN CLASS="summary"><!--POST.TITLE--></SPAN>
                        <!--BEGIN EXTERNAL--></A><!--END EXTERNAL-->
                </H2>
@@ -24,9 +24,9 @@
                </SPAN>
                <SPAN CLASS="post-tag-3 category">
-                        <A CLASS="noVisit" HREF="/blog/tag/<!--POST.TAG1-->.php" REL="tag" TITLE="<!--POST.TAG1-->"><!--POST.TAG1--></A>
+                        <!--BEGIN POST.TAGS-->
-                        <A CLASS="noVisit" HREF="/blog/tag/<!--POST.TAG2-->.php" REL="tag" TITLE="<!--POST.TAG2-->"><!--POST.TAG2--></A>
+                        <A CLASS="noVisit" HREF="/blog/tag/<!--POST.TAGS.TAG-->.php" REL="tag" TITLE="<!--POST.TAGS.TAG-->"><!--POST.TAGS.TAG--></A>
-                        <A CLASS="noVisit" HREF="/blog/tag/<!--POST.TAG3-->.php" REL="tag" TITLE="<!--POST.TAG3-->"><!--POST.TAG3--></A>
+                        <!--END POST.TAGS-->
                </SPAN>
                <!--BEGIN EXTERNAL-->