Merge pull request #9 from paintballrefjosh/4.0.4

4.0.4
paintballrefjosh · Jan 30, 2017 · 3f29a21 · 3f29a21
2 parents 1f0d17a + 883a2e9
commit 3f29a21
Show file tree

Hide file tree

Showing 11 changed files with 140 additions and 220 deletions.
diff --git a/rss.php b/rss.php
@@ -37,9 +37,11 @@
 
 	$write_file = array();
 	$write_file[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>";
-	$write_file[] = "<rss version=\"2.0\">";
+	$write_file[] = "<rss version=\"2.0\" xmlns:atom=\"http://www.w3.org/2005/Atom\">";
 	$write_file[] = "    <channel>";
 	$write_file[] = "        <title>".$Config->get('site_title')." RSS News Feed</title>";
+	$write_file[] = "        <description>".$Config->get('site_title')." RSS News Feed</description>";
+	$write_file[] = "        <atom:link href=\"http://".(str_replace('rss.php','index.php',($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'])))."\" rel=\"self\" type=\"application/rss+xml\" />";
 	$write_file[] = "        <link>http://".(str_replace('rss.php','index.php',($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'])))."</link>";
 	$write_file[] = "        <lastBuildDate>".date(DATE_RFC822_FIXED)."</lastBuildDate>";
 	$write_file[] = "        <language>en-us</language>";
@@ -48,6 +50,7 @@
 	{
 
 		$write_file[] = "        <item>";
+		$write_file[] = "            <guid isPermaLink=\"false\">".$_SERVER['HTTP_HOST']."-".$topic['id']."</guid>";
 		$write_file[] = "            <title>".htmlspecialchars($topic['title'])."</title>";
 		$write_file[] = "            <pubDate>".(date(DATE_RFC822_FIXED, $topic['post_time']))."</pubDate>";
 		$write_file[] = "            <description>Posted by ".htmlspecialchars($topic['posted_by']).": \n".htmlspecialchars($topic['message'])."</description>";

diff --git a/templates/Cataclysm_1/css/additional_fp.css b/templates/Cataclysm_1/css/additional_fp.css
@@ -1,9 +1,9 @@
 div.fpdrop {positon:relative; left:57px; }
 #right-bg { background: url('../images/page_rightbg.png') no-repeat; position: absolute; top: -103px; right: -1120px; height: 621px; width: 296px; z-index: -20; }
-#droppf {position: absolute; right: -24px; top: 39px; z-index:99; width: 145px;}
-#dropps {position: absolute; right: 124px; top: 39px; z-index:99; width: 145px;}
-#droppt {position: absolute; right: 272px; top: 39px; z-index:99; width: 145px;}
-#droppfo {position: absolute; right: 420px; top: 39px; z-index:99; width: 145px;}
+#droppf {position: absolute; right: -24px; top: 62px; z-index:99; width: 145px;}
+#dropps {position: absolute; right: 124px; top: 62px; z-index:99; width: 145px;}
+#droppt {position: absolute; right: 272px; top: 62px; z-index:99; width: 145px;}
+#droppfo {position: absolute; right: 420px; top: 62px; z-index:99; width: 145px;}
 #loginbox {position:absolute; z-index:99; left: 561px; top: 3px; width:430px; height:34px;text-align:right;color: #FFAC04; font-size: 12px; font-weight: bold; }
 #main { width:827px; background: url('../images/frontpage_bg_rpt.jpg') repeat-y; }
 #main-top { height: 46px; width: 100%; background: none; position: relative; top:1px; }

diff --git a/templates/Cataclysm_1/css/newhp.css b/templates/Cataclysm_1/css/newhp.css
@@ -42,10 +42,10 @@ ul.bullet-list li { list-style: none; background: url('../images/bullet.gif') no
 
 
 /* === Drop Down Menu's === */
-#droppf {position: absolute; right: 32px; top: 39px; z-index:99; width: 145px;}
-#dropps {position: absolute; right: 180px; top: 39px; z-index:99; width: 145px;}
-#droppt {position: absolute; right: 328px; top: 39px; z-index:99; width: 145px;}
-#droppfo {position: absolute; right: 476px; top: 39px; z-index:99; width: 145px;}
+#droppf {position: absolute; right: 32px; top: 62px; z-index:99; width: 145px;}
+#dropps {position: absolute; right: 180px; top: 62px; z-index:99; width: 145px;}
+#droppt {position: absolute; right: 328px; top: 62px; z-index:99; width: 145px;}
+#droppfo {position: absolute; right: 476px; top: 62px; z-index:99; width: 145px;}
 /* === END Drop Down Menu's === */
 
 #rightbox { background: url(../images/plainbox/plainbox-bg.jpg) repeat-y 0 0; width: 305px; border-top: 1px solid #49402c; border-bottom: 1px solid #49402c; padding-bottom: 5px; padding-top: 5px; position: relative; z-index: 2; margin-top: 15px; margin-left: 6px;}

diff --git a/templates/WotLK/css/additional_fp.css b/templates/WotLK/css/additional_fp.css
@@ -1,9 +1,9 @@
 div.fpdrop {positon:relative; left:57px; }
 #right-bg { background: url('../images/page_rightbg.png') no-repeat; position: absolute; top: -85px; right: -1120px; height: 621px; width: 296px; z-index: -20; }
-#droppf {position: absolute; right: -24px; top: 39px; z-index:99; width: 145px;}
-#dropps {position: absolute; right: 124px; top: 39px; z-index:99; width: 145px;}
-#droppt {position: absolute; right: 272px; top: 39px; z-index:99; width: 145px;}
-#droppfo {position: absolute; right: 420px; top: 39px; z-index:99; width: 145px;}
+#droppf {position: absolute; right: -24px; top: 62px; z-index:99; width: 145px;}
+#dropps {position: absolute; right: 124px; top: 62px; z-index:99; width: 145px;}
+#droppt {position: absolute; right: 272px; top: 62px; z-index:99; width: 145px;}
+#droppfo {position: absolute; right: 420px; top: 62px; z-index:99; width: 145px;}
 #loginbox {position:absolute; z-index:99; left: 561px; top: 3px; width:430px; height:34px;text-align:right;color: #FFAC04; font-size: 12px; font-weight: bold; }
 #main { width:827px; background: url('../images/frontpage_bg_rpt.jpg') repeat-y; }
 #main-top { height: 46px; width: 100%; background: none; position: relative; top:1px; }

diff --git a/templates/WotLK/css/newhp.css b/templates/WotLK/css/newhp.css
@@ -42,10 +42,10 @@ ul.bullet-list li { list-style: none; background: url('../images/bullet.gif') no
 
 
 /* === Drop Down Menu's === */
-#droppf {position: absolute; right: 32px; top: 39px; z-index:99; width: 145px;}
-#dropps {position: absolute; right: 180px; top: 39px; z-index:99; width: 145px;}
-#droppt {position: absolute; right: 328px; top: 39px; z-index:99; width: 145px;}
-#droppfo {position: absolute; right: 476px; top: 39px; z-index:99; width: 145px;}
+#droppf {position: absolute; right: 32px; top: 62px; z-index:99; width: 145px;}
+#dropps {position: absolute; right: 180px; top: 62px; z-index:99; width: 145px;}
+#droppt {position: absolute; right: 328px; top: 62px; z-index:99; width: 145px;}
+#droppfo {position: absolute; right: 476px; top: 62px; z-index:99; width: 145px;}
 /* === END Drop Down Menu's === */
 
 #rightbox { background: url(../images/plainbox/plainbox-bg.jpg) repeat-y 0 0; width: 305px; border-top: 1px solid #49402c; border-bottom: 1px solid #49402c; padding-bottom: 5px; padding-top: 5px; position: relative; z-index: 2; margin-top: 15px; margin-left: 6px;}

diff --git a/templates/blizzlike/body_header.php b/templates/blizzlike/body_header.php
@@ -34,7 +34,6 @@
 <script src="<?php echo $Template['path']; ?>/js/detection.js" type="text/javascript"></script>
 <script src="<?php echo $Template['path']; ?>/js/functions.js" type="text/javascript"></script>
 <script type="text/javascript" src="<?php echo $Template['script_path']; ?>/js/global.js"></script>
-<script type="text/javascript" src="<?php echo $Template['script_path']; ?>/js/compressed/controls.js"></script>
 <script type="text/javascript" src="<?php echo $Template['script_path']; ?>/js/compressed/behaviour.js"></script>
 <script type="text/javascript" src="<?php echo $Template['script_path']; ?>/js/core.js"></script>
 <script type="text/javascript"><!--
@@ -121,7 +120,7 @@ function loadPage(list) {
 									{
 									?>
 										<?php echo $user['username']." | "; ?>
-										<a href="<?php echo mw_url('account'); ?>"> <?php echo $user['web_points']; ?> <?php echo $lang['web_points'];?></a>
+										<a href="<?php echo mw_url('account'); ?>"> <?php echo $user['web_points']; ?> <?php echo $lang['web_points'];?></a>&nbsp;&nbsp;
 										<input type="image" src="<?php echo $Template['path']; ?>/images/buttons/button-profile.gif" name="action" value="profile"/>
 										<input type="image" src="<?php echo $Template['path']; ?>/images/buttons/button-logout.gif" name="action" value="logout"/>
 								<?php 
@@ -132,7 +131,7 @@ function loadPage(list) {
 										Login: <input name="login" size="14" type="text"/>
 										Password: <input name="pass" size="14" type="password"/>
 										<input type="hidden" name="action" value="login">
-										<input type="image" src="<?php echo $Template['path']; ?>/images/buttons/button-login.gif" value="Login"/>
+										<div style="padding-top: 5px;"><input type="image" src="<?php echo $Template['path']; ?>/images/buttons/button-login.gif" value="Login"/></div>
 								<?php 
 									} 
 								?>
@@ -220,7 +219,7 @@ function loadPage(list) {
                           <div style="clear: both;"></div>
                         </div>
                       </td><td valign="top">
-                        <div id="mainwrapper">
+                        <div id="mainwrapper"><br><br>
 						<div id="main">
                             <div id="main-content-wrapper">
                               <div id="main-content">