From 9ec90f81d2ffcbd83fa9ea15252f29c2c7f72166 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 10 Jul 2005 06:56:54 +0000
Subject: [PATCH] r295: Added global page elements to main pages.

---
 templates/editattach.tpl     | 8 +++++++-
 templates/editcomment.tpl    | 6 ++++++
 templates/editreport.tpl     | 8 +++++++-
 templates/history.tpl        | 8 +++++++-
 templates/login.tpl          | 8 +++++++-
 templates/newattach.tpl      | 8 +++++++-
 templates/newcomment.tpl     | 8 +++++++-
 templates/newreport.tpl      | 8 +++++++-
 templates/register.tpl       | 8 +++++++-
 templates/search.tpl         | 8 +++++++-
 templates/search_results.tpl | 8 +++++++-
 templates/showreport.tpl     | 8 +++++++-
 templates/std_error.tpl      | 8 +++++++-
 templates/std_message.tpl    | 8 +++++++-
 templates/std_redirect.tpl   | 8 +++++++-
 templates/trackerhome.tpl    | 8 +++++++-
 16 files changed, 111 insertions(+), 15 deletions(-)

diff --git a/templates/editattach.tpl b/templates/editattach.tpl
index 1961a4f..d97c30c 100644
--- a/templates/editattach.tpl
+++ b/templates/editattach.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 <form action="attachment.php" method="post" name="editattach">
 	<input name="do" type="hidden" value="update" />
 	<input name="attachmentid" type="hidden" value="$attachment[attachmentid]" />
@@ -14,4 +18,6 @@
 <input name="reset" type="reset" value="  Reset  " accesskey="r" />
 [<a href="attachment.php?do=delete&amp;attachmentid=$attachment[attachmentid]\">Delete</a>]
 
-</form>
\ No newline at end of file
+</form>
+
+$footer
\ No newline at end of file
diff --git a/templates/editcomment.tpl b/templates/editcomment.tpl
index 11e7e5c..61e2c40 100644
--- a/templates/editcomment.tpl
+++ b/templates/editcomment.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 <div><strong>Bug:</strong> $bug[summary]</div>
 <div><strong>Comment posted on:</strong> $comment[posttime]</div>
 <div><strong>Comment posted by:</strong> $comment[postby]</div>
@@ -9,3 +13,5 @@
 <div><strong>Comment:</strong></div><textarea name="comment" cols="100" rows="35">$comment[comment]</textarea>
 <div><input type="submit" name="submit" value="Save Changes" /></div>
 </form>
+
+$footer
\ No newline at end of file
diff --git a/templates/editreport.tpl b/templates/editreport.tpl
index e2b472e..8c418a5 100644
--- a/templates/editreport.tpl
+++ b/templates/editreport.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 <form name="bugreport" action="editreport.php" method="post">
 <input type="hidden" name="do" value="update" />
 <input type="hidden" name="bugid" value="$bug[bugid]" />
@@ -34,4 +38,6 @@
 $customfields
 
 <div><input type="submit" name="submit" value="Save Changes" />
-</form>
\ No newline at end of file
+</form>
+
+$footer
\ No newline at end of file
diff --git a/templates/history.tpl b/templates/history.tpl
index eff4bb2..bf26689 100644
--- a/templates/history.tpl
+++ b/templates/history.tpl
@@ -1,3 +1,9 @@
+$doctype
+$headinclude
+$header
+
 <h2>History for <em>$bug[summary]</em> (bugid: $bug[bugid])</h2>
 
-$history
\ No newline at end of file
+$history
+
+$footer
\ No newline at end of file
diff --git a/templates/login.tpl b/templates/login.tpl
index 680b0a2..013a6de 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 <form action="login.php" name="register" method="post">
 <input type="hidden" name="do" value="login" />
 <input type="hidden" name="goindex" value="1" />
@@ -5,4 +9,6 @@ Email: <input type="text" name="email" size="30" /><br />
 Password: <input type="password" name="password" size="30" /><br />
 Remember Me: <input type="checkbox" name="rememberme" value="1" checked="checked" /> Yes<br />
 <input type="submit" name="submit" value="Login" accesskey="s" /> <input type="reset" name="reset" value="Reset" accesskey="r" />
-</form>
\ No newline at end of file
+</form>
+
+$footer
\ No newline at end of file
diff --git a/templates/newattach.tpl b/templates/newattach.tpl
index 0bff692..51a2331 100644
--- a/templates/newattach.tpl
+++ b/templates/newattach.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 <form action="attachment.php" method="post" enctype="multipart/form-data" name="newattach">
 	<input name="do" type="hidden" value="insert" />
 	<input name="bugid" type="hidden" value="$bug[bugid]" />
@@ -23,4 +27,6 @@
 <input name="submit" type="submit" value="  Submit  " accesskey="s" />
 <input name="reset" type="reset" value="  Reset  " accesskey="r" />
 
-</form>
\ No newline at end of file
+</form>
+
+$footer
\ No newline at end of file
diff --git a/templates/newcomment.tpl b/templates/newcomment.tpl
index 8df971c..619461b 100644
--- a/templates/newcomment.tpl
+++ b/templates/newcomment.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 <div><strong>New comment for:</strong> <em>$bug[summary]</em></div>
 
 <form name="newcomment" method="post" action="newcomment.php">
@@ -18,4 +22,6 @@
 <tr>
 	<td>$bug[comment]</td>
 </tr>
-</table>
\ No newline at end of file
+</table>
+
+$footer
\ No newline at end of file
diff --git a/templates/newreport.tpl b/templates/newreport.tpl
index 2121c15..ac9596f 100644
--- a/templates/newreport.tpl
+++ b/templates/newreport.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 <form name="bugreport" action="newreport.php" method="post">
 <input type="hidden" name="do" value="insert" />
 
@@ -21,4 +25,6 @@
 </div>
 
 <input type="submit" name="submit" value="  Proceed  " />
-</form>
\ No newline at end of file
+</form>
+
+$footer
\ No newline at end of file
diff --git a/templates/register.tpl b/templates/register.tpl
index 0107679..81ebc83 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 <form action="register.php" name="register" method="post">
 <input type="hidden" name="do" value="insert" />
 Email: <input type="text" name="email" size="30" /><br />
@@ -8,4 +12,6 @@ Confirm Password: <input type="password" name="confirmpassword" size="30" /><br
 Show My Email Publicly: <input type="checkbox" value="1" name="showemail" /> Yes<br />
 Language: <select name="languageid">$opts</select><br />
 <input type="submit" name="submit" value="Save" accesskey="s" /> <input type="reset" name="reset" value="Reset" accesskey="r" />
-</form>
\ No newline at end of file
+</form>
+
+$footer
\ No newline at end of file
diff --git a/templates/search.tpl b/templates/search.tpl
index 49ce6f7..9f650b3 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 <div>Any fields left blank or unselected will be excluded from the search query</div>
 
 <form action="search.php" method="post" name="search">
@@ -60,4 +64,6 @@ $pcv_select
 	<input type="reset" name="reset" value="  Reset  " />
 </div>
 
-</form>
\ No newline at end of file
+</form>
+
+$footer
\ No newline at end of file
diff --git a/templates/search_results.tpl b/templates/search_results.tpl
index 2c63918..f2a1a64 100644
--- a/templates/search_results.tpl
+++ b/templates/search_results.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 Here are the search results:
 
 <table border="1" cellspacing="2" cellpadding="4" width="100%">
@@ -10,4 +14,6 @@ Here are the search results:
 	<td>Last Post</td>
 </tr>
 $bugs
-</table>
\ No newline at end of file
+</table>
+
+$footer
\ No newline at end of file
diff --git a/templates/showreport.tpl b/templates/showreport.tpl
index a548202..05ba521 100644
--- a/templates/showreport.tpl
+++ b/templates/showreport.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 <if condition="$bug['hidden']"><div><strong style="color: red">This bug is hidden!</strong></div></if>
 
 <div><strong>Bug ID:</strong> $bug[bugid]</div>
@@ -75,4 +79,6 @@ $attachments
 
 $comments
 
-<if condition="$show['newreply']"><div>[<a href="newcomment.php?bugid=$bug[bugid]">New Comment</a>]</div></if>
\ No newline at end of file
+<if condition="$show['newreply']"><div>[<a href="newcomment.php?bugid=$bug[bugid]">New Comment</a>]</div></if>
+
+$footer
\ No newline at end of file
diff --git a/templates/std_error.tpl b/templates/std_error.tpl
index 62dfa92..6016d42 100644
--- a/templates/std_error.tpl
+++ b/templates/std_error.tpl
@@ -1,3 +1,9 @@
+$doctype
+$headinclude
+$header
+
 <span style="color: red">
 $errormessage
-</span>
\ No newline at end of file
+</span>
+
+$footer
\ No newline at end of file
diff --git a/templates/std_message.tpl b/templates/std_message.tpl
index dd7f69d..f7067ba 100644
--- a/templates/std_message.tpl
+++ b/templates/std_message.tpl
@@ -1,3 +1,9 @@
+$doctype
+$headinclude
+$header
+
 <span style="color: green">
 $message
-</span>
\ No newline at end of file
+</span>
+
+$footer
\ No newline at end of file
diff --git a/templates/std_redirect.tpl b/templates/std_redirect.tpl
index 1cacc9d..5356983 100644
--- a/templates/std_redirect.tpl
+++ b/templates/std_redirect.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 <span style="color: blue">
 $redirectmessage
 
@@ -5,4 +9,6 @@ $redirectmessage
 <br />
 
 <a href="$redirecturl">If you are not redirected in a few seconds, click here.</a>
-</span>
\ No newline at end of file
+</span>
+
+$footer
\ No newline at end of file
diff --git a/templates/trackerhome.tpl b/templates/trackerhome.tpl
index a389484..f6836da 100644
--- a/templates/trackerhome.tpl
+++ b/templates/trackerhome.tpl
@@ -1,3 +1,7 @@
+$doctype
+$headinclude
+$header
+
 <table border="1" cellspacing="2" cellpadding="4" width="100%">
 <tr style="background-color:#EEEEEE">
 	<td>Bug ID</td>
@@ -10,4 +14,6 @@
 $bugs
 </table>
 
-<if condition="$show['newreport']">[<a href="newreport.php?">New Report</a>]</if>
\ No newline at end of file
+<if condition="$show['newreport']">[<a href="newreport.php?">New Report</a>]</if>
+
+$footer
\ No newline at end of file
-- 
2.22.5