Removed separate header/footers and moved into each pages body

git-svn-id: file:///svn/phpbb/trunk@311 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Paul S. Owen <psotfx@users.sourceforge.net> 2001-05-17 14:48:39 +0000
committer: Paul S. Owen <psotfx@users.sourceforge.net> 2001-05-17 14:48:39 +0000
commit: b621f70cd14a4a912837021604e723cefac406b7 (patch)
tree: ff9ba32a10ce34179d10dabef9e980f538757e19 /phpBB/templates
parent: dcf65b486eeae372b5604a84bfbbfbabc7a22a8e (diff)
download: forums-b621f70cd14a4a912837021604e723cefac406b7.tar
forums-b621f70cd14a4a912837021604e723cefac406b7.tar.gz
forums-b621f70cd14a4a912837021604e723cefac406b7.tar.bz2
forums-b621f70cd14a4a912837021604e723cefac406b7.tar.xz
forums-b621f70cd14a4a912837021604e723cefac406b7.zip
6 files changed, 239 insertions, 5 deletions
diff --git a/phpBB/templates/Default/index_body.tpl b/phpBB/templates/Default/index_body.tpl
index 3d363bc65f..0a6fc9cda6 100644
--- a/phpBB/templates/Default/index_body.tpl
+++ b/phpBB/templates/Default/index_body.tpl
@@ -1,4 +1,23 @@
 <tr>
+<td>
+  <table border="0" align="right" width="30%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+  <tr>
+	  <td>
+	    <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
+        <tr>
+	        <td align="right" style="{font-size: 8pt;}">{L_POSTEDTOTAL} -<b>{TOTAL_POSTS}</b>- {L_MESSAGES}.<br>
+	          {L_WEHAVE} <b>{TOTAL_USERS}</b> {L_REGUSERS}.<br>
+	          {L_NEWESTUSER} <b><a href="{U_NEWEST_USER_PROFILE}">{NEWEST_USER}</a></b><br>
+	          {L_ARECURRENTLY} <a href="{U_VIEWONLINE}"><b>{USERS_BROWSING}</b> {L_BROWSING}</a> {L_THEFORUMS}<br>
+	        </td>
+	      </tr>
+	    </table>
+	  </td>
+	</tr>
+	</table>
+ </td>
+</tr>
+<tr>
 	<td bgcolor="#000000" align="center"><table width="100%" cellpadding="0" cellspacing="1"  border="0">
 		<tr>
 			<td><table width="100%" cellpadding="3" cellspacing="1" border="0">
@@ -31,4 +50,15 @@
 			</table></td>
 		</tr>
 	</table></td>
+</tr>
+<tr>
+	<td align="center"><table border="0" width="100%" cellpadding="0" cellspacing="1">
+		<tr>
+			<td style="{font-size: 8pt;}"><img src="images/folder.gif"> = {L_NEWPOSTS}</td>
+			<td style="{font-size: 8pt;}" align="right" valign="top"><b>{S_TIMEZONE}</b></td>
+		</tr>
+		<tr>
+			<td style="{font-size: 8pt;}"><img src="images/red_folder.gif"> = {L_NONEWPOSTS}</td>
+		</tr>
+	</table></td>
 </tr>
 \ No newline at end of file
diff --git a/phpBB/templates/Default/login_body.tpl b/phpBB/templates/Default/login_body.tpl
index 0aad58a463..8f4b4f51a2 100644
--- a/phpBB/templates/Default/login_body.tpl
+++ b/phpBB/templates/Default/login_body.tpl
@@ -1,4 +1,11 @@
 <tr>
+	<td><div align="center"><table width="60%" cellspacing="0" cellpadding="4" border="0">
+		<tr>
+			<td align="left" style="{font-size: 8pt; height: 55px;}" nowrap><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></font></td>
+		</tr>
+	</table></div></td>
+</tr>
+<tr>
 	<td><br clear="all" /><br />
 	
 <table border="0" align="center" width="60%" bgcolor="#000000" cellpadding="0" cellspacing="1">
@@ -33,4 +40,9 @@
 </table></td>
 
 	</td>
+</tr>
+<tr>
+	<td><div align="center"><table align="center" border="0" width="60%">
+		<td style="{font-size: 8pt;}" align="right" valign="top"><b>{S_TIMEZONE}</b></td>
+	</table></div></td>
 </tr>
 \ No newline at end of file
diff --git a/phpBB/templates/Default/posting_body.tpl b/phpBB/templates/Default/posting_body.tpl
index c49b6292c3..9256a4841c 100644
--- a/phpBB/templates/Default/posting_body.tpl
+++ b/phpBB/templates/Default/posting_body.tpl
@@ -1,4 +1,19 @@
 <tr>
+	<td>
+	  <table border="0" align="right" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+	  <tr>
+	    <td>
+	      <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
+	        <tr>
+                  <td align="center" style="{font-size: 8pt;}">{L_POSTNEWIN}<br><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></td>
+	        </tr>
+	      </table>
+	    </td>
+	  </tr>
+	  </table>
+	 </td>
+	</tr>
+	<tr>
   <td><form action="{S_POST_ACTION}" method="post">
    <table border="0" align="center" width="100%" bgcolor="#000000" cellpadding="0" cellspacing="1">
     <tr>
diff --git a/phpBB/templates/Default/viewforum_body.tpl b/phpBB/templates/Default/viewforum_body.tpl
index 5be8f6f258..75a9e829cc 100644
--- a/phpBB/templates/Default/viewforum_body.tpl
+++ b/phpBB/templates/Default/viewforum_body.tpl
@@ -1,4 +1,44 @@
 <tr>
+	<td>
+	<table border="0" width="100%" cellpadding="0" cellspacing="0">
+	  <tr>
+	  <td>
+	   <table border="0" align="left" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+	    <tr>                           
+	      <td>                         
+	        <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
+	          <tr>                                
+	            <td align="left" style="{font-size: 8pt; height: 55px;}" nowrap>
+							<div style="{font-size: 10pt; font-weight: bold}">{FORUM_NAME}</div>
+							Moderated by - {MODERATORS}<br>
+	            <a href="{U_INDEX}">{SITENAME} - Forum Index</a> >> {FORUM_NAME}
+	            </td>                             
+	          </tr>                               
+	        </table>                              
+	      </td>                                   
+	    </tr>                                      
+	    </table>
+	  <table border="0" align="right" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+	  <tr>
+	    <td>
+	      <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
+	        <tr>
+	          <td align="right" style="{font-size: 8pt;}">
+	            <a href="{U_POST_NEW_TOPIC}">
+	            <img src="images/newpost.jpg" height="50" width="250" alt="Post New Topic" border="0">
+	            </a>
+	          </td>
+	        </tr>
+	      </table>
+	    </td>
+	  </tr>
+	  </table>
+		</td>
+		</tr>
+		</table>
+	 </td>
+	</tr>
+	<tr>
   <td>
    <table border="0" align="center" width="100%" bgcolor="#000000" cellpadding="0" cellspacing="1">
     <tr>
@@ -41,3 +81,37 @@
 			</tr>
 		</table></td>
 	</tr>
+<tr>
+	<td>
+	<table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
+	<tr>
+	<td>
+	  <table border="0" align="left" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+	  <tr>
+	    <td>
+	      <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
+	        <tr>
+	          <td align="left" style="{font-size: 8pt;}"><a href="{U_POST_NEW_TOPIC}"><img src="images/newpost.jpg" height="50" width="250" alt="Post New Topic" border="0"></a></td>
+	        </tr>
+	      </table>
+	    </td>
+	  </tr>
+	  </table>
+	 
+	   <table border="0" align="right" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+	    <tr>                           
+	      <td>                          
+	        <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
+	          <tr>
+	            <td align="right" style="{font-size: 8pt; height: 55px;}">{JUMPBOX}</td>    
+	          </tr>                               
+	        </table>                              
+	      </td>                                    
+	    </tr>
+	    </table>
+	  
+	 </td>
+	</tr>
+  </table>
+ </td>
+</tr>
+\ No newline at end of file
diff --git a/phpBB/templates/Default/viewonline_body.tpl b/phpBB/templates/Default/viewonline_body.tpl
index c9e2ca6f9f..5c93812dd3 100644
--- a/phpBB/templates/Default/viewonline_body.tpl
+++ b/phpBB/templates/Default/viewonline_body.tpl
@@ -1,4 +1,15 @@
 <tr>
+	<td><table border="0" align="right" width="30%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+		<tr>
+			<td><table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
+				<tr>
+					<td align="right" style="{font-size: 8pt;}">{L_POSTEDTOTAL} -<b>{TOTAL_POSTS}</b>- {L_MESSAGES}.<br> {L_WEHAVE} <b>{TOTAL_USERS}</b> {L_REGUSERS}.<br>{L_NEWESTUSER} <b><a href="{U_NEWEST_USER_PROFILE}">{NEWEST_USER}</a></b></td>
+				</tr>
+			</table></td>
+		</tr>
+	</table></td>
+</tr>
+<tr>
 	<td><table border="0" align="center" width="100%" bgcolor="#000000" cellpadding="0" cellspacing="1">
 		<tr>
 			<td><table border="0" width="100%" cellpadding="3" cellspacing="1">
@@ -6,18 +17,34 @@
 					<td colspan="4" align="center"><b>There are {ACTIVE_USERS} logged in users and {GUEST_USERS} guest users browsing this board.</b><br />This data is based on users active over the past five minutes.</td>
 				</tr>
 				<tr class="catheader">
-					<td width="35%" align="center">&nbsp;{L_USERNAME}&nbsp;</td>
-					<td width="25%" align="center">&nbsp;{L_LAST_UPDATE}&nbsp;</td>
+					<td width="30%" align="center">&nbsp;{L_USERNAME}&nbsp;</td>
+					<td width="30%" align="center">&nbsp;{L_LASTUPDATE}&nbsp;</td>
 					<td width="40%" align="center">&nbsp;{L_LOCATION}&nbsp;</td>
 				</tr>
 				<!-- BEGIN userrow -->
 				<tr bgcolor="{userrow.ROW_COLOR}" class="tablebody">
-					<td width="35%">&nbsp;<a href="{userrow.U_USER_PROFILE}">{userrow.USERNAME}</a>&nbsp;</td>
-					<td width="25%" align="center">&nbsp;{userrow.LASTUPDATE}&nbsp;</td>
-					<td width="40%">&nbsp;<a href="{userrow.U_FORUM_LOCATION}">&nbsp;{userrow.LOCATION}</a>&nbsp;</td>
+					<td width="30%">&nbsp;{userrow.USERNAME}&nbsp;</td>
+					<td width="30%" align="center">&nbsp;{userrow.LASTUPDATE}&nbsp;</td>
+					<td width="40%"><a href="{userguestrow.LOCATION_URL}">&nbsp;{userrow.LOCATION}&nbsp;</a></td>
 				</tr>
 				<!-- END userrow -->
 			</table></td>
 		</tr>
 	</table></td>
+</tr>
+<tr>
+	<td align="center"><table border="0" width="100%" cellpadding="0" cellspacing="1">
+		<tr>
+			<td style="{font-size: 8pt;}" align="left" valign="top"><b>{S_TIMEZONE}</b></td>
+			<td style="{font-size: 8pt;}" align="right" ><table cellpadding="0" cellspacing="1" border="0" bgcolor="#000000">
+				<tr>
+					<td bgcolor="#CCCCCC"><table width="100%" cellpadding="1" cellspacing="1" border="0">
+						<tr>
+							<td style="{font-size:8pt; height:55px;}" align="right">{JUMPBOX}</td>
+						</tr>
+					</table></td>
+				</tr>
+			</table></td>
+		</tr>
+	</table></td>
 </tr>
 \ No newline at end of file
diff --git a/phpBB/templates/Default/viewtopic_body.tpl b/phpBB/templates/Default/viewtopic_body.tpl
index 0eeb777095..ffa5326054 100644
--- a/phpBB/templates/Default/viewtopic_body.tpl
+++ b/phpBB/templates/Default/viewtopic_body.tpl
@@ -1,4 +1,40 @@
 <tr>
+	<td>
+	<table border="0" width="100%" cellpadding="0" cellspacing="0">
+	  <tr>
+	  <td>
+	   <table border="0" align="left" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+	    <tr>                           
+	      <td>                         
+	        <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
+	          <tr>                                
+	            <td align="left" valign="bottom" style="{font-size: 8pt; height: 55px;}" nowrap>
+	            <a href="{U_INDEX}">{SITENAME} - Forum Index</a> >> <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a> >> {TOPIC_TITLE}
+	            </td>                             
+	          </tr>                               
+	        </table>                              
+	      </td>                                   
+	    </tr>                                      
+	    </table>
+	  <table border="0" align="right" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+	  <tr>
+	    <td>
+	      <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
+	        <tr>
+	          <td align="right" style="{font-size: 8pt;}">
+	            <a href="{U_POST_NEW_TOPIC}"><img src="images/newpost.jpg" height="50" width="125" alt="Post New Topic" border="0"></a>&nbsp;<a href="{U_POST_REPLY_TOPIC}"><img src="images/reply.jpg" height="50" width="125" alt="Reply to this topic" border="0"></a>
+	          </td>
+	        </tr>
+	      </table>
+	    </td>
+	  </tr>
+	  </table>
+		</td>
+		</tr>
+		</table>
+	 </td>
+	</tr>
+	<tr>
   <td>
   <table border="0" align="center" width="100%" bgcolor="#000000" cellpadding="0" cellspacing="1">
   <tr>
@@ -68,3 +104,43 @@
     </tr>
   </table></td>
 </tr>
+<tr>
+	<td>
+	<table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
+	<tr>
+	<td>
+	  <table border="0" align="left" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+	  <tr>
+	    <td>
+	      <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
+	        <tr>
+	          <td align="left" style="{font-size: 8pt;}">
+	            <a href="{U_POST_NEW_TOPIC}">
+	            <img src="images/newpost.jpg" height="50" width="125" alt="Post New Topic" border="0"></a>&nbsp;
+                    <a href="{U_POST_REPLY_TOPIC}">
+                    <img src="images/reply.jpg" height="50" width="125" alt="Reply to this topic" border="0">
+	            </a>
+	          </td>
+	        </tr>
+	      </table>
+	    </td>
+	  </tr>
+	  </table>
+	 
+	   <table border="0" align="right" width="20%" bgcolor="#000000" cellpadding="0" cellspacing="1">
+	    <tr>                           
+	      <td>                          
+	        <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
+	          <tr>
+	            <td align="right" style="{font-size: 8pt; height: 55px;}">{JUMPBOX}</td>                             
+	          </tr>                               
+	        </table>                              
+	      </td>                                    
+	    </tr>
+	    </table>
+	  
+	 </td>
+	</tr>
+  </table>
+ </td>
+</tr>
+\ No newline at end of file
author	Paul S. Owen <psotfx@users.sourceforge.net>	2001-05-17 14:48:39 +0000
committer	Paul S. Owen <psotfx@users.sourceforge.net>	2001-05-17 14:48:39 +0000
commit	b621f70cd14a4a912837021604e723cefac406b7 (patch)
tree	ff9ba32a10ce34179d10dabef9e980f538757e19 /phpBB/templates
parent	dcf65b486eeae372b5604a84bfbbfbabc7a22a8e (diff)
download	forums-b621f70cd14a4a912837021604e723cefac406b7.tar forums-b621f70cd14a4a912837021604e723cefac406b7.tar.gz forums-b621f70cd14a4a912837021604e723cefac406b7.tar.bz2 forums-b621f70cd14a4a912837021604e723cefac406b7.tar.xz forums-b621f70cd14a4a912837021604e723cefac406b7.zip