move blog templates into their own directory

diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index f22c61dceead4381d3c1439db406f807c769488e..2254b9c0526c01f49c7b6cbb04e25200c371ec41 100644 (file)
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -69,7 +69,7 @@ void blogpost_render(struct blogpost *bp, int with_comments)
                for (i=1; i<bp->num_msgs; ++i) {
                        read_message(WC->WBuf, HKEY("view_blog_comment"), bp->msgs[i], NULL, &Mime);
                }
-               do_template("blog_comment_box");
+               do_template("view_blog_comment_box");
        }
 
        else {

diff --git a/webcit/static/t/blog_comment_box.html b/webcit/static/t/blog_comment_box.html
deleted file mode 100644 (file)
index b5fd223..0000000
--- a/webcit/static/t/blog_comment_box.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<script type="text/javascript">
-function submit_comment() {
-       $('comment_form_references').value = $('comment_replyto').innerHTML ;
-       return false;
-}
-</script>
-<div class="blog_comment">
-<span class="post_a_comment_title"><?_("Post a comment")></span>
-<form id="blog_comment_form" accept-charset="UTF-8" enctype="multipart/form-data"
- method="POST" action="post" onSubmit="submit_comment();">
-<input type="hidden" name="postseq" value="<?DATE:NOW:NO>">
-<input type="hidden" name="nonce" value="<?NONCE>">
-<input type="hidden" name="force_room" value="<?ROOMNAME("X")>">
-<input type="hidden" name="references" id="comment_form_references" /><br>
-<textarea name="msgtext" id="comment_form_msgtext" cols=80 rows=10 style="width:98%"
-       <?!("COND:LOGGEDIN",1)>
-               onClick="javascript:GetLoggedInFirst(encodeURIComponent(window.location.href));"
-       <??("X",1)>
->
-</textarea>
-<input type="submit" name="submit_action" value="Submit Comment"
-       <?!("COND:LOGGEDIN",1)>
-               disabled="disabled"
-       <??("X",1)>
-/>
-</form>
-</div>

diff --git a/webcit/static/t/view_blog/comment.html b/webcit/static/t/view_blog/comment.html
new file mode 100644 (file)
index 0000000..8a24ee4
--- /dev/null
+++ b/webcit/static/t/view_blog/comment.html
@@ -0,0 +1,21 @@
+<div class="blog_comment">
+<div class="blog_comment_header">
+<span>
+ <??("COND:MAIL:ANON",1)>
+   <?!("COND:MAIL:SUMM:RFCA", 2)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>">"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
+   <??("COND:MAIL:SUMM:RFCA", 3)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> 
+      <??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
+ <??("X", 1)>
+</span>
+ <span><?MAIL:SUMM:DATEFULL></span>
+</div>
+<div class="blog_comment_content">
+<?MAIL:BODY>
+<?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)>
+<?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", ="view_message_inline_attach")>
+<?!("X", 10)>
+<?!("COND:MAIL:MIME:ATTACH:LINKS", 11)>
+<?ITERATE("MAIL:MIME:ATTACH:LINKS", ="view_message_list_attach")>
+<?!("X", 11)>
+</div>
+</div>

diff --git a/webcit/static/t/view_blog/comment_box.html b/webcit/static/t/view_blog/comment_box.html
new file mode 100644 (file)
index 0000000..b5fd223
--- /dev/null
+++ b/webcit/static/t/view_blog/comment_box.html
@@ -0,0 +1,27 @@
+<script type="text/javascript">
+function submit_comment() {
+       $('comment_form_references').value = $('comment_replyto').innerHTML ;
+       return false;
+}
+</script>
+<div class="blog_comment">
+<span class="post_a_comment_title"><?_("Post a comment")></span>
+<form id="blog_comment_form" accept-charset="UTF-8" enctype="multipart/form-data"
+ method="POST" action="post" onSubmit="submit_comment();">
+<input type="hidden" name="postseq" value="<?DATE:NOW:NO>">
+<input type="hidden" name="nonce" value="<?NONCE>">
+<input type="hidden" name="force_room" value="<?ROOMNAME("X")>">
+<input type="hidden" name="references" id="comment_form_references" /><br>
+<textarea name="msgtext" id="comment_form_msgtext" cols=80 rows=10 style="width:98%"
+       <?!("COND:LOGGEDIN",1)>
+               onClick="javascript:GetLoggedInFirst(encodeURIComponent(window.location.href));"
+       <??("X",1)>
+>
+</textarea>
+<input type="submit" name="submit_action" value="Submit Comment"
+       <?!("COND:LOGGEDIN",1)>
+               disabled="disabled"
+       <??("X",1)>
+/>
+</form>
+</div>

diff --git a/webcit/static/t/view_blog/post.html b/webcit/static/t/view_blog/post.html
new file mode 100644 (file)
index 0000000..ffffa58
--- /dev/null
+++ b/webcit/static/t/view_blog/post.html
@@ -0,0 +1,25 @@
+<div class="blog_post">
+<div class="blog_post_title">
+<?!("COND:MAIL:SUBJ", 7)><a href="<?BLOG:PERMALINK>"><?MAIL:SUMM:SUBJECT("X")></a><??("X", 7)>
+</div>
+<div class="blog_post_header">
+<span>
+ <??("COND:MAIL:ANON",1)>
+   <?!("COND:MAIL:SUMM:RFCA", 2)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>">"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
+   <??("COND:MAIL:SUMM:RFCA", 3)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> 
+      <??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
+ <??("X", 1)>
+</span>
+ <span><?MAIL:SUMM:DATEFULL></span>
+</div>
+<div class="blog_post_content"><div>
+<?MAIL:BODY>
+<?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)>
+<?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", ="view_message_inline_attach")>
+<?!("X", 10)>
+<?!("COND:MAIL:MIME:ATTACH:LINKS", 11)>
+<?ITERATE("MAIL:MIME:ATTACH:LINKS", ="view_message_list_attach")>
+<?!("X", 11)>
+</div>
+</div>
+<div id="comment_replyto" style="display:none"><?MAIL:SUMM:INREPLYTO("X")></div>

diff --git a/webcit/static/t/view_blog_comment.html b/webcit/static/t/view_blog_comment.html
deleted file mode 100644 (file)
index 8a24ee4..0000000
--- a/webcit/static/t/view_blog_comment.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="blog_comment">
-<div class="blog_comment_header">
-<span>
- <??("COND:MAIL:ANON",1)>
-   <?!("COND:MAIL:SUMM:RFCA", 2)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>">"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
-   <??("COND:MAIL:SUMM:RFCA", 3)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> 
-      <??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
- <??("X", 1)>
-</span>
- <span><?MAIL:SUMM:DATEFULL></span>
-</div>
-<div class="blog_comment_content">
-<?MAIL:BODY>
-<?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)>
-<?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", ="view_message_inline_attach")>
-<?!("X", 10)>
-<?!("COND:MAIL:MIME:ATTACH:LINKS", 11)>
-<?ITERATE("MAIL:MIME:ATTACH:LINKS", ="view_message_list_attach")>
-<?!("X", 11)>
-</div>
-</div>

diff --git a/webcit/static/t/view_blog_post.html b/webcit/static/t/view_blog_post.html
deleted file mode 100644 (file)
index ffffa58..0000000
--- a/webcit/static/t/view_blog_post.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="blog_post">
-<div class="blog_post_title">
-<?!("COND:MAIL:SUBJ", 7)><a href="<?BLOG:PERMALINK>"><?MAIL:SUMM:SUBJECT("X")></a><??("X", 7)>
-</div>
-<div class="blog_post_header">
-<span>
- <??("COND:MAIL:ANON",1)>
-   <?!("COND:MAIL:SUMM:RFCA", 2)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>">"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
-   <??("COND:MAIL:SUMM:RFCA", 3)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> 
-      <??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
- <??("X", 1)>
-</span>
- <span><?MAIL:SUMM:DATEFULL></span>
-</div>
-<div class="blog_post_content"><div>
-<?MAIL:BODY>
-<?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)>
-<?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", ="view_message_inline_attach")>
-<?!("X", 10)>
-<?!("COND:MAIL:MIME:ATTACH:LINKS", 11)>
-<?ITERATE("MAIL:MIME:ATTACH:LINKS", ="view_message_list_attach")>
-<?!("X", 11)>
-</div>
-</div>
-<div id="comment_replyto" style="display:none"><?MAIL:SUMM:INREPLYTO("X")></div>