Merge pull request #3 from eoconnell/masterHEADmaster

Some more stuff

30 files changed, 13 insertions, 1123 deletions

diff --git a/modules/cu3er/config.xml b/modules/cu3er/config.xml
deleted file mode 100644
index 6cfef6e..0000000
--- a/modules/cu3er/config.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<cu3er>
-	<settings>	
-		<auto_play> 
-			<defaults symbol="linear" /> 
-			<tweenIn x="5" y="5" width="630" height="10" tint="0xFFFFFF" alpha="0.5"/> 
-			<tweenOver alpha="1"/> 
-		</auto_play> 
-	
-		<prev_button>				
-			<tweenIn x="20" y="150" width="80" height="80" alpha="0" /> 
-			<tweenOver alpha="0" /> 
-		</prev_button> 
-		
-		<next_button>			
-			<tweenIn x="610" y="150" width="80" height="80" alpha="0" /> 
-			<tweenOver alpha="0" /> 
-		</next_button> 
-		
-		<prev_symbol> 
-			<defaults type="2" /> 
-			<tweenIn x="25" y="150" alpha=".5" scaleX="2.0" scaleY="2.0"  /> 
-			<tweenOver time="0.15" x="30" scaleX="2.5" scaleY="2.5" /> 
-		</prev_symbol> 
-			
-		<next_symbol> 
-			<defaults type="2" /> 
-			<tweenIn x="615" y="150" alpha=".5" scaleX="2.0" scaleY="2.0" /> 
-			<tweenOver time="0.15" x="620" scaleX="2.5" scaleY="2.5" /> 
-		</next_symbol>		
- 
-		<description> 
-				<defaults
-					round_corners="0, 0, 0, 0"
-					 
-					heading_font="Verdana"
-					heading_text_size="42"
-					heading_text_color="0xFFFFFF"          
-					heading_text_margin="0, 0, 0,24"  
-					 
-					paragraph_font="Verdana"
-					paragraph_text_size="11"
-					paragraph_text_color="0xFFFFFF"
-					paragraph_text_margin="0, 0, 0, 24"       
-				/>
-			<tweenIn x="0" y="220" width="640" height="100" alpha="0.15" /> 
-			<tweenOver alpha="0.3"/> 
-		</description>	
-	
-		<transitions slicing="vertical" direction="down" duration="1.0" delay="0.2" cube_color="0x000000" /> 
-	
-	</settings> 
- 
- 
-	<slides> 
-	
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/team2.png</url>
-		</slide> 
-		
-		<transition direction="left"/>		
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/arma2.png</url>
-			<link target="_self">http://www.3rd-infantry-division.org/forums/index.php?board=13.0</link> 
-		</slide> 
-		
-		<transition duration="0.6" delay=".2" direction="down"/>		
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/agwc3.png</url> 
-		</slide>	
-		
-		<transition num="3" slicing="horizontal" direction="left" delay="0.05"/>			
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/recruitmentGT.png</url> 
-		</slide> 
-			
-		<transition num="3"/>		
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/arma2move.png</url>  
-		</slide>				
-			
-	</slides> 
-</cu3er>
\ No newline at end of file
diff --git a/modules/cu3er/config2.xml b/modules/cu3er/config2.xml
deleted file mode 100644
index 90db48a..0000000
--- a/modules/cu3er/config2.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<cu3er>
-	<settings>	
-	
-		<auto_play> 
-			<defaults symbol="linear" /> 
-			<tweenIn x="5" y="5" width="6" height="1" tint="0xFFFFFF" alpha="0.5"/> 
-			<tweenOver alpha="1"/> 
-		</auto_play> 
-	
-		<prev_button>				
-			<tweenIn x="20" y="150" width="80" height="80" alpha="0" /> 
-			<tweenOver alpha="0" /> 
-		</prev_button> 
-		
-		<next_button>			
-			<tweenIn x="610" y="150" width="80" height="80" alpha="0" /> 
-			<tweenOver alpha="0" /> 
-		</next_button> 
-		
-	
- 
-		<description> 
-				<defaults
-					round_corners="0, 0, 0, 0"
-					 
-					heading_font="Verdana"
-					heading_text_size="42"
-					heading_text_color="0xFFFFFF"          
-					heading_text_margin="0, 0, 0,24"  
-					 
-					paragraph_font="Verdana"
-					paragraph_text_size="11"
-					paragraph_text_color="0xFFFFFF"
-					paragraph_text_margin="0, 0, 0, 24"       
-				/>
-			<tweenIn x="0" y="220" width="640" height="100" alpha="0.15" /> 
-			<tweenOver alpha="0.3"/> 
-		</description>	
-	
-		<transitions slicing="vertical" direction="down" duration="1.0" delay="0.2" cube_color="0x000000" /> 
-	
-	</settings> 
- 
- 
-	<slides> 
-	
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/team2.png</url>
-		</slide> 
-		
-		<transition direction="left"/>		
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/arma2.png</url>
-			<link target="_self">http://www.3rd-infantry-division.org/forums/index.php?board=13.0</link> 
-		</slide> 
-		
-		<transition duration="0.6" delay=".2" direction="down"/>		
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/agwc3.png</url> 
-			<link target="_blank">http://www.armedglobalwarfare.com</link>
-		</slide>	
-		
-		<transition num="3" slicing="horizontal" direction="left" delay="0.05"/>			
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/recruitmentGT.png</url> 
-		</slide> 
-			
-		<transition num="3"/>		
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/arma2move.png</url>  
-		</slide>				
-			
-	</slides> 
-</cu3er>
-
diff --git a/modules/cu3er/cu3er.swf b/modules/cu3er/cu3er.swf
deleted file mode 100644
index eac3a9e..0000000
--- a/modules/cu3er/cu3er.swf
+++ /dev/null
diff --git a/modules/cu3er/cuber.html b/modules/cu3er/cuber.html
deleted file mode 100644
index c7eee14..0000000
--- a/modules/cu3er/cuber.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--  STEP ONE: insert path to SWFObject JavaScript -->

-<script type="text/javascript" src="js/swfobject/swfobject.js"></script>

-

-<!--  STEP TWO: configure SWFObject JavaScript and embed CU3ER slider -->

-<script type="text/javascript">

-		var flashvars = {};

-		flashvars.xml = "config2.xml";

-		flashvars.font = "font.swf";

-		var attributes = {};

-		attributes.wmode = "transparent";

-		attributes.id = "slider";

-		swfobject.embedSWF("cu3er.swf", "cu3er-container", "640", "320", "9", "expressInstall.swf", flashvars, attributes);

-</script>

-<style type="text/css">

-<!--

-#cu3er-container {width:640px; outline:0;}

--->

-</style>

-

-<!--  STEP THREE: insert CU3ER div container -->

-<div id="cu3er-container">

-    <a href="http://www.adobe.com/go/getflashplayer">

-        <img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />

-    </a>

-</div>
\ No newline at end of file
diff --git a/modules/cu3er/demo.htm b/modules/cu3er/demo.htm
deleted file mode 100644
index 8ff0064..0000000
--- a/modules/cu3er/demo.htm
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>CU3ER - demo!</title>
-
-<!--  STEP ONE: insert path to SWFObject JavaScript -->
-<script type="text/javascript" src="js/swfobject/swfobject.js"></script>
-
-<!--  STEP TWO: configure SWFObject JavaScript and embed CU3ER slider -->
-<script type="text/javascript">
-		var flashvars = {};
-		flashvars.xml = "config2.xml";
-		flashvars.font = "font.swf";
-		var attributes = {};
-		attributes.wmode = "transparent";
-		attributes.id = "slider";
-		swfobject.embedSWF("cu3er.swf", "cu3er-container", "640", "320", "9", "expressInstall.swf", flashvars, attributes);
-</script>
-<style type="text/css">
-<!--
-body { margin: 5% auto; text-align:center;}
-#cu3er-container {width:600px; outline:0;}
--->
-</style>
-</head>
-<body>
-<!--  STEP THREE: insert CU3ER div container -->
-<div id="cu3er-container">
-    <a href="http://www.adobe.com/go/getflashplayer">
-        <img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />
-    </a>
-</div>
-</body>
-</html>
diff --git a/modules/cu3er/images/agwc3.png b/modules/cu3er/images/agwc3.png
deleted file mode 100644
index 7b6f9a7..0000000
--- a/modules/cu3er/images/agwc3.png
+++ /dev/null
diff --git a/modules/cu3er/images/arma2.png b/modules/cu3er/images/arma2.png
deleted file mode 100644
index 94fab4a..0000000
--- a/modules/cu3er/images/arma2.png
+++ /dev/null
diff --git a/modules/cu3er/images/arma2move.png b/modules/cu3er/images/arma2move.png
deleted file mode 100644
index 6bffbae..0000000
--- a/modules/cu3er/images/arma2move.png
+++ /dev/null
diff --git a/modules/cu3er/images/holidays.png b/modules/cu3er/images/holidays.png
deleted file mode 100644
index 48a1c72..0000000
--- a/modules/cu3er/images/holidays.png
+++ /dev/null
diff --git a/modules/cu3er/images/newsite.png b/modules/cu3er/images/newsite.png
deleted file mode 100644
index b2d2b69..0000000
--- a/modules/cu3er/images/newsite.png
+++ /dev/null
diff --git a/modules/cu3er/images/recruitmentGT.png b/modules/cu3er/images/recruitmentGT.png
deleted file mode 100644
index c74ae8c..0000000
--- a/modules/cu3er/images/recruitmentGT.png
+++ /dev/null
diff --git a/modules/cu3er/images/slide_1.jpg b/modules/cu3er/images/slide_1.jpg
deleted file mode 100644
index 77706a2..0000000
--- a/modules/cu3er/images/slide_1.jpg
+++ /dev/null
diff --git a/modules/cu3er/images/slide_2.jpg b/modules/cu3er/images/slide_2.jpg
deleted file mode 100644
index 3707266..0000000
--- a/modules/cu3er/images/slide_2.jpg
+++ /dev/null
diff --git a/modules/cu3er/images/slide_3.jpg b/modules/cu3er/images/slide_3.jpg
deleted file mode 100644
index c633d52..0000000
--- a/modules/cu3er/images/slide_3.jpg
+++ /dev/null
diff --git a/modules/cu3er/images/slide_4.jpg b/modules/cu3er/images/slide_4.jpg
deleted file mode 100644
index 08bc870..0000000
--- a/modules/cu3er/images/slide_4.jpg
+++ /dev/null
diff --git a/modules/cu3er/images/slide_5.jpg b/modules/cu3er/images/slide_5.jpg
deleted file mode 100644
index 2564999..0000000
--- a/modules/cu3er/images/slide_5.jpg
+++ /dev/null
diff --git a/modules/cu3er/images/team.png b/modules/cu3er/images/team.png
deleted file mode 100644
index fe307c1..0000000
--- a/modules/cu3er/images/team.png
+++ /dev/null
diff --git a/modules/cu3er/images/team2.png b/modules/cu3er/images/team2.png
deleted file mode 100644
index 889a266..0000000
--- a/modules/cu3er/images/team2.png
+++ /dev/null
diff --git a/modules/cu3er/images/teamwork.png b/modules/cu3er/images/teamwork.png
deleted file mode 100644
index 99f760b..0000000
--- a/modules/cu3er/images/teamwork.png
+++ /dev/null
diff --git a/modules/cu3er/index.php b/modules/cu3er/index.php
deleted file mode 100644
index ad84154..0000000
--- a/modules/cu3er/index.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php 

-/**

- * Bayonet Content Management System

- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell

- *

- * This program is free software: you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation, either version 3 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program.  If not, see <http://www.gnu.org/licenses/>.

- */

-?>

-<?php  OpenContent();  ?>

-<!--  STEP ONE: insert path to SWFObject JavaScript -->

-<script type="text/javascript" src="modules/cu3er/js/swfobject/swfobject.js"></script>

-

-<!--  STEP TWO: configure SWFObject JavaScript and embed CU3ER slider -->

-<script type="text/javascript">

-		var flashvars = {};

-		flashvars.xml = "modules/cu3er/config2.xml";

-		flashvars.font = "font.swf";

-		var attributes = {};

-		attributes.wmode = "transparent";

-		attributes.id = "slider";

-		swfobject.embedSWF("modules/cu3er/cu3er.swf", "cu3er-container", "640", "320", "9", "modules/cu3er/js/swfobject/expressInstall.swf", flashvars, attributes);

-</script>

-<style type="text/css">

-<!--

-#cu3er-container {width:640px; outline:0;}

--->

-</style>

-

-<!--  STEP THREE: insert CU3ER div container -->

-<div id="cu3er-container" style="background-color:black;">

-    <a href="http://www.adobe.com/go/getflashplayer">

-        <img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />

-    </a>

-</div>

-<?php CloseContent(); ?>

-

-<?php //include'cuber.html'; ?> 

-

-/* <description> 

-				<link target="_blank">http://www.3rd-infantry-division.org/forums/index.php?board=13.0</link>	

-				<heading>Enlist Today!</heading> 

-				<paragraph>Some text.</paragraph> 

-			</description>	 */		

diff --git a/modules/cu3er/js/swfobject/expressInstall.swf b/modules/cu3er/js/swfobject/expressInstall.swf
deleted file mode 100644
index e972996..0000000
--- a/modules/cu3er/js/swfobject/expressInstall.swf
+++ /dev/null
diff --git a/modules/cu3er/js/swfobject/swfobject.js b/modules/cu3er/js/swfobject/swfobject.js
deleted file mode 100644
index 9378c8f..0000000
--- a/modules/cu3er/js/swfobject/swfobject.js
+++ /dev/null
@@ -1,777 +0,0 @@
-/*!	SWFObject v2.2 <http://code.google.com/p/swfobject/> 
-	is released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
-*/
-
-var swfobject = function() {
-	
-	var UNDEF = "undefined",
-		OBJECT = "object",
-		SHOCKWAVE_FLASH = "Shockwave Flash",
-		SHOCKWAVE_FLASH_AX = "ShockwaveFlash.ShockwaveFlash",
-		FLASH_MIME_TYPE = "application/x-shockwave-flash",
-		EXPRESS_INSTALL_ID = "SWFObjectExprInst",
-		ON_READY_STATE_CHANGE = "onreadystatechange",
-		
-		win = window,
-		doc = document,
-		nav = navigator,
-		
-		plugin = false,
-		domLoadFnArr = [main],
-		regObjArr = [],
-		objIdArr = [],
-		listenersArr = [],
-		storedAltContent,
-		storedAltContentId,
-		storedCallbackFn,
-		storedCallbackObj,
-		isDomLoaded = false,
-		isExpressInstallActive = false,
-		dynamicStylesheet,
-		dynamicStylesheetMedia,
-		autoHideShow = true,
-	
-	/* Centralized function for browser feature detection
-		- User agent string detection is only used when no good alternative is possible
-		- Is executed directly for optimal performance
-	*/	
-	ua = function() {
-		var w3cdom = typeof doc.getElementById != UNDEF && typeof doc.getElementsByTagName != UNDEF && typeof doc.createElement != UNDEF,
-			u = nav.userAgent.toLowerCase(),
-			p = nav.platform.toLowerCase(),
-			windows = p ? /win/.test(p) : /win/.test(u),
-			mac = p ? /mac/.test(p) : /mac/.test(u),
-			webkit = /webkit/.test(u) ? parseFloat(u.replace(/^.*webkit\/(\d+(\.\d+)?).*$/, "$1")) : false, // returns either the webkit version or false if not webkit
-			ie = !+"\v1", // feature detection based on Andrea Giammarchi's solution: http://webreflection.blogspot.com/2009/01/32-bytes-to-know-if-your-browser-is-ie.html
-			playerVersion = [0,0,0],
-			d = null;
-		if (typeof nav.plugins != UNDEF && typeof nav.plugins[SHOCKWAVE_FLASH] == OBJECT) {
-			d = nav.plugins[SHOCKWAVE_FLASH].description;
-			if (d && !(typeof nav.mimeTypes != UNDEF && nav.mimeTypes[FLASH_MIME_TYPE] && !nav.mimeTypes[FLASH_MIME_TYPE].enabledPlugin)) { // navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin indicates whether plug-ins are enabled or disabled in Safari 3+
-				plugin = true;
-				ie = false; // cascaded feature detection for Internet Explorer
-				d = d.replace(/^.*\s+(\S+\s+\S+$)/, "$1");
-				playerVersion[0] = parseInt(d.replace(/^(.*)\..*$/, "$1"), 10);
-				playerVersion[1] = parseInt(d.replace(/^.*\.(.*)\s.*$/, "$1"), 10);
-				playerVersion[2] = /[a-zA-Z]/.test(d) ? parseInt(d.replace(/^.*[a-zA-Z]+(.*)$/, "$1"), 10) : 0;
-			}
-		}
-		else if (typeof win.ActiveXObject != UNDEF) {
-			try {
-				var a = new ActiveXObject(SHOCKWAVE_FLASH_AX);
-				if (a) { // a will return null when ActiveX is disabled
-					d = a.GetVariable("$version");
-					if (d) {
-						ie = true; // cascaded feature detection for Internet Explorer
-						d = d.split(" ")[1].split(",");
-						playerVersion = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)];
-					}
-				}
-			}
-			catch(e) {}
-		}
-		return { w3:w3cdom, pv:playerVersion, wk:webkit, ie:ie, win:windows, mac:mac };
-	}(),
-	
-	/* Cross-browser onDomLoad
-		- Will fire an event as soon as the DOM of a web page is loaded
-		- Internet Explorer workaround based on Diego Perini's solution: http://javascript.nwbox.com/IEContentLoaded/
-		- Regular onload serves as fallback
-	*/ 
-	onDomLoad = function() {
-		if (!ua.w3) { return; }
-		if ((typeof doc.readyState != UNDEF && doc.readyState == "complete") || (typeof doc.readyState == UNDEF && (doc.getElementsByTagName("body")[0] || doc.body))) { // function is fired after onload, e.g. when script is inserted dynamically 
-			callDomLoadFunctions();
-		}
-		if (!isDomLoaded) {
-			if (typeof doc.addEventListener != UNDEF) {
-				doc.addEventListener("DOMContentLoaded", callDomLoadFunctions, false);
-			}		
-			if (ua.ie && ua.win) {
-				doc.attachEvent(ON_READY_STATE_CHANGE, function() {
-					if (doc.readyState == "complete") {
-						doc.detachEvent(ON_READY_STATE_CHANGE, arguments.callee);
-						callDomLoadFunctions();
-					}
-				});
-				if (win == top) { // if not inside an iframe
-					(function(){
-						if (isDomLoaded) { return; }
-						try {
-							doc.documentElement.doScroll("left");
-						}
-						catch(e) {
-							setTimeout(arguments.callee, 0);
-							return;
-						}
-						callDomLoadFunctions();
-					})();
-				}
-			}
-			if (ua.wk) {
-				(function(){
-					if (isDomLoaded) { return; }
-					if (!/loaded|complete/.test(doc.readyState)) {
-						setTimeout(arguments.callee, 0);
-						return;
-					}
-					callDomLoadFunctions();
-				})();
-			}
-			addLoadEvent(callDomLoadFunctions);
-		}
-	}();
-	
-	function callDomLoadFunctions() {
-		if (isDomLoaded) { return; }
-		try { // test if we can really add/remove elements to/from the DOM; we don't want to fire it too early
-			var t = doc.getElementsByTagName("body")[0].appendChild(createElement("span"));
-			t.parentNode.removeChild(t);
-		}
-		catch (e) { return; }
-		isDomLoaded = true;
-		var dl = domLoadFnArr.length;
-		for (var i = 0; i < dl; i++) {
-			domLoadFnArr[i]();
-		}
-	}
-	
-	function addDomLoadEvent(fn) {
-		if (isDomLoaded) {
-			fn();
-		}
-		else { 
-			domLoadFnArr[domLoadFnArr.length] = fn; // Array.push() is only available in IE5.5+
-		}
-	}
-	
-	/* Cross-browser onload
-		- Based on James Edwards' solution: http://brothercake.com/site/resources/scripts/onload/
-		- Will fire an event as soon as a web page including all of its assets are loaded 
-	 */
-	function addLoadEvent(fn) {
-		if (typeof win.addEventListener != UNDEF) {
-			win.addEventListener("load", fn, false);
-		}
-		else if (typeof doc.addEventListener != UNDEF) {
-			doc.addEventListener("load", fn, false);
-		}
-		else if (typeof win.attachEvent != UNDEF) {
-			addListener(win, "onload", fn);
-		}
-		else if (typeof win.onload == "function") {
-			var fnOld = win.onload;
-			win.onload = function() {
-				fnOld();
-				fn();
-			};
-		}
-		else {
-			win.onload = fn;
-		}
-	}
-	
-	/* Main function
-		- Will preferably execute onDomLoad, otherwise onload (as a fallback)
-	*/
-	function main() { 
-		if (plugin) {
-			testPlayerVersion();
-		}
-		else {
-			matchVersions();
-		}
-	}
-	
-	/* Detect the Flash Player version for non-Internet Explorer browsers
-		- Detecting the plug-in version via the object element is more precise than using the plugins collection item's description:
-		  a. Both release and build numbers can be detected
-		  b. Avoid wrong descriptions by corrupt installers provided by Adobe
-		  c. Avoid wrong descriptions by multiple Flash Player entries in the plugin Array, caused by incorrect browser imports
-		- Disadvantage of this method is that it depends on the availability of the DOM, while the plugins collection is immediately available
-	*/
-	function testPlayerVersion() {
-		var b = doc.getElementsByTagName("body")[0];
-		var o = createElement(OBJECT);
-		o.setAttribute("type", FLASH_MIME_TYPE);
-		var t = b.appendChild(o);
-		if (t) {
-			var counter = 0;
-			(function(){
-				if (typeof t.GetVariable != UNDEF) {
-					var d = t.GetVariable("$version");
-					if (d) {
-						d = d.split(" ")[1].split(",");
-						ua.pv = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)];
-					}
-				}
-				else if (counter < 10) {
-					counter++;
-					setTimeout(arguments.callee, 10);
-					return;
-				}
-				b.removeChild(o);
-				t = null;
-				matchVersions();
-			})();
-		}
-		else {
-			matchVersions();
-		}
-	}
-	
-	/* Perform Flash Player and SWF version matching; static publishing only
-	*/
-	function matchVersions() {
-		var rl = regObjArr.length;
-		if (rl > 0) {
-			for (var i = 0; i < rl; i++) { // for each registered object element
-				var id = regObjArr[i].id;
-				var cb = regObjArr[i].callbackFn;
-				var cbObj = {success:false, id:id};
-				if (ua.pv[0] > 0) {
-					var obj = getElementById(id);
-					if (obj) {
-						if (hasPlayerVersion(regObjArr[i].swfVersion) && !(ua.wk && ua.wk < 312)) { // Flash Player version >= published SWF version: Houston, we have a match!
-							setVisibility(id, true);
-							if (cb) {
-								cbObj.success = true;
-								cbObj.ref = getObjectById(id);
-								cb(cbObj);
-							}
-						}
-						else if (regObjArr[i].expressInstall && canExpressInstall()) { // show the Adobe Express Install dialog if set by the web page author and if supported
-							var att = {};
-							att.data = regObjArr[i].expressInstall;
-							att.width = obj.getAttribute("width") || "0";
-							att.height = obj.getAttribute("height") || "0";
-							if (obj.getAttribute("class")) { att.styleclass = obj.getAttribute("class"); }
-							if (obj.getAttribute("align")) { att.align = obj.getAttribute("align"); }
-							// parse HTML object param element's name-value pairs
-							var par = {};
-							var p = obj.getElementsByTagName("param");
-							var pl = p.length;
-							for (var j = 0; j < pl; j++) {
-								if (p[j].getAttribute("name").toLowerCase() != "movie") {
-									par[p[j].getAttribute("name")] = p[j].getAttribute("value");
-								}
-							}
-							showExpressInstall(att, par, id, cb);
-						}
-						else { // Flash Player and SWF version mismatch or an older Webkit engine that ignores the HTML object element's nested param elements: display alternative content instead of SWF
-							displayAltContent(obj);
-							if (cb) { cb(cbObj); }
-						}
-					}
-				}
-				else {	// if no Flash Player is installed or the fp version cannot be detected we let the HTML object element do its job (either show a SWF or alternative content)
-					setVisibility(id, true);
-					if (cb) {
-						var o = getObjectById(id); // test whether there is an HTML object element or not
-						if (o && typeof o.SetVariable != UNDEF) { 
-							cbObj.success = true;
-							cbObj.ref = o;
-						}
-						cb(cbObj);
-					}
-				}
-			}
-		}
-	}
-	
-	function getObjectById(objectIdStr) {
-		var r = null;
-		var o = getElementById(objectIdStr);
-		if (o && o.nodeName == "OBJECT") {
-			if (typeof o.SetVariable != UNDEF) {
-				r = o;
-			}
-			else {
-				var n = o.getElementsByTagName(OBJECT)[0];
-				if (n) {
-					r = n;
-				}
-			}
-		}
-		return r;
-	}
-	
-	/* Requirements for Adobe Express Install
-		- only one instance can be active at a time
-		- fp 6.0.65 or higher
-		- Win/Mac OS only
-		- no Webkit engines older than version 312
-	*/
-	function canExpressInstall() {
-		return !isExpressInstallActive && hasPlayerVersion("6.0.65") && (ua.win || ua.mac) && !(ua.wk && ua.wk < 312);
-	}
-	
-	/* Show the Adobe Express Install dialog
-		- Reference: http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=6a253b75
-	*/
-	function showExpressInstall(att, par, replaceElemIdStr, callbackFn) {
-		isExpressInstallActive = true;
-		storedCallbackFn = callbackFn || null;
-		storedCallbackObj = {success:false, id:replaceElemIdStr};
-		var obj = getElementById(replaceElemIdStr);
-		if (obj) {
-			if (obj.nodeName == "OBJECT") { // static publishing
-				storedAltContent = abstractAltContent(obj);
-				storedAltContentId = null;
-			}
-			else { // dynamic publishing
-				storedAltContent = obj;
-				storedAltContentId = replaceElemIdStr;
-			}
-			att.id = EXPRESS_INSTALL_ID;
-			if (typeof att.width == UNDEF || (!/%$/.test(att.width) && parseInt(att.width, 10) < 310)) { att.width = "310"; }
-			if (typeof att.height == UNDEF || (!/%$/.test(att.height) && parseInt(att.height, 10) < 137)) { att.height = "137"; }
-			doc.title = doc.title.slice(0, 47) + " - Flash Player Installation";
-			var pt = ua.ie && ua.win ? "ActiveX" : "PlugIn",
-				fv = "MMredirectURL=" + win.location.toString().replace(/&/g,"%26") + "&MMplayerType=" + pt + "&MMdoctitle=" + doc.title;
-			if (typeof par.flashvars != UNDEF) {
-				par.flashvars += "&" + fv;
-			}
-			else {
-				par.flashvars = fv;
-			}
-			// IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it,
-			// because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
-			if (ua.ie && ua.win && obj.readyState != 4) {
-				var newObj = createElement("div");
-				replaceElemIdStr += "SWFObjectNew";
-				newObj.setAttribute("id", replaceElemIdStr);
-				obj.parentNode.insertBefore(newObj, obj); // insert placeholder div that will be replaced by the object element that loads expressinstall.swf
-				obj.style.display = "none";
-				(function(){
-					if (obj.readyState == 4) {
-						obj.parentNode.removeChild(obj);
-					}
-					else {
-						setTimeout(arguments.callee, 10);
-					}
-				})();
-			}
-			createSWF(att, par, replaceElemIdStr);
-		}
-	}
-	
-	/* Functions to abstract and display alternative content
-	*/
-	function displayAltContent(obj) {
-		if (ua.ie && ua.win && obj.readyState != 4) {
-			// IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it,
-			// because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
-			var el = createElement("div");
-			obj.parentNode.insertBefore(el, obj); // insert placeholder div that will be replaced by the alternative content
-			el.parentNode.replaceChild(abstractAltContent(obj), el);
-			obj.style.display = "none";
-			(function(){
-				if (obj.readyState == 4) {
-					obj.parentNode.removeChild(obj);
-				}
-				else {
-					setTimeout(arguments.callee, 10);
-				}
-			})();
-		}
-		else {
-			obj.parentNode.replaceChild(abstractAltContent(obj), obj);
-		}
-	} 
-
-	function abstractAltContent(obj) {
-		var ac = createElement("div");
-		if (ua.win && ua.ie) {
-			ac.innerHTML = obj.innerHTML;
-		}
-		else {
-			var nestedObj = obj.getElementsByTagName(OBJECT)[0];
-			if (nestedObj) {
-				var c = nestedObj.childNodes;
-				if (c) {
-					var cl = c.length;
-					for (var i = 0; i < cl; i++) {
-						if (!(c[i].nodeType == 1 && c[i].nodeName == "PARAM") && !(c[i].nodeType == 8)) {
-							ac.appendChild(c[i].cloneNode(true));
-						}
-					}
-				}
-			}
-		}
-		return ac;
-	}
-	
-	/* Cross-browser dynamic SWF creation
-	*/
-	function createSWF(attObj, parObj, id) {
-		var r, el = getElementById(id);
-		if (ua.wk && ua.wk < 312) { return r; }
-		if (el) {
-			if (typeof attObj.id == UNDEF) { // if no 'id' is defined for the object element, it will inherit the 'id' from the alternative content
-				attObj.id = id;
-			}
-			if (ua.ie && ua.win) { // Internet Explorer + the HTML object element + W3C DOM methods do not combine: fall back to outerHTML
-				var att = "";
-				for (var i in attObj) {
-					if (attObj[i] != Object.prototype[i]) { // filter out prototype additions from other potential libraries
-						if (i.toLowerCase() == "data") {
-							parObj.movie = attObj[i];
-						}
-						else if (i.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword
-							att += ' class="' + attObj[i] + '"';
-						}
-						else if (i.toLowerCase() != "classid") {
-							att += ' ' + i + '="' + attObj[i] + '"';
-						}
-					}
-				}
-				var par = "";
-				for (var j in parObj) {
-					if (parObj[j] != Object.prototype[j]) { // filter out prototype additions from other potential libraries
-						par += '<param name="' + j + '" value="' + parObj[j] + '" />';
-					}
-				}
-				el.outerHTML = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"' + att + '>' + par + '</object>';
-				objIdArr[objIdArr.length] = attObj.id; // stored to fix object 'leaks' on unload (dynamic publishing only)
-				r = getElementById(attObj.id);	
-			}
-			else { // well-behaving browsers
-				var o = createElement(OBJECT);
-				o.setAttribute("type", FLASH_MIME_TYPE);
-				for (var m in attObj) {
-					if (attObj[m] != Object.prototype[m]) { // filter out prototype additions from other potential libraries
-						if (m.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword
-							o.setAttribute("class", attObj[m]);
-						}
-						else if (m.toLowerCase() != "classid") { // filter out IE specific attribute
-							o.setAttribute(m, attObj[m]);
-						}
-					}
-				}
-				for (var n in parObj) {
-					if (parObj[n] != Object.prototype[n] && n.toLowerCase() != "movie") { // filter out prototype additions from other potential libraries and IE specific param element
-						createObjParam(o, n, parObj[n]);
-					}
-				}
-				el.parentNode.replaceChild(o, el);
-				r = o;
-			}
-		}
-		return r;
-	}
-	
-	function createObjParam(el, pName, pValue) {
-		var p = createElement("param");
-		p.setAttribute("name", pName);	
-		p.setAttribute("value", pValue);
-		el.appendChild(p);
-	}
-	
-	/* Cross-browser SWF removal
-		- Especially needed to safely and completely remove a SWF in Internet Explorer
-	*/
-	function removeSWF(id) {
-		var obj = getElementById(id);
-		if (obj && obj.nodeName == "OBJECT") {
-			if (ua.ie && ua.win) {
-				obj.style.display = "none";
-				(function(){
-					if (obj.readyState == 4) {
-						removeObjectInIE(id);
-					}
-					else {
-						setTimeout(arguments.callee, 10);
-					}
-				})();
-			}
-			else {
-				obj.parentNode.removeChild(obj);
-			}
-		}
-	}
-	
-	function removeObjectInIE(id) {
-		var obj = getElementById(id);
-		if (obj) {
-			for (var i in obj) {
-				if (typeof obj[i] == "function") {
-					obj[i] = null;
-				}
-			}
-			obj.parentNode.removeChild(obj);
-		}
-	}
-	
-	/* Functions to optimize JavaScript compression
-	*/
-	function getElementById(id) {
-		var el = null;
-		try {
-			el = doc.getElementById(id);
-		}
-		catch (e) {}
-		return el;
-	}
-	
-	function createElement(el) {
-		return doc.createElement(el);
-	}
-	
-	/* Updated attachEvent function for Internet Explorer
-		- Stores attachEvent information in an Array, so on unload the detachEvent functions can be called to avoid memory leaks
-	*/	
-	function addListener(target, eventType, fn) {
-		target.attachEvent(eventType, fn);
-		listenersArr[listenersArr.length] = [target, eventType, fn];
-	}
-	
-	/* Flash Player and SWF content version matching
-	*/
-	function hasPlayerVersion(rv) {
-		var pv = ua.pv, v = rv.split(".");
-		v[0] = parseInt(v[0], 10);
-		v[1] = parseInt(v[1], 10) || 0; // supports short notation, e.g. "9" instead of "9.0.0"
-		v[2] = parseInt(v[2], 10) || 0;
-		return (pv[0] > v[0] || (pv[0] == v[0] && pv[1] > v[1]) || (pv[0] == v[0] && pv[1] == v[1] && pv[2] >= v[2])) ? true : false;
-	}
-	
-	/* Cross-browser dynamic CSS creation
-		- Based on Bobby van der Sluis' solution: http://www.bobbyvandersluis.com/articles/dynamicCSS.php
-	*/	
-	function createCSS(sel, decl, media, newStyle) {
-		if (ua.ie && ua.mac) { return; }
-		var h = doc.getElementsByTagName("head")[0];
-		if (!h) { return; } // to also support badly authored HTML pages that lack a head element
-		var m = (media && typeof media == "string") ? media : "screen";
-		if (newStyle) {
-			dynamicStylesheet = null;
-			dynamicStylesheetMedia = null;
-		}
-		if (!dynamicStylesheet || dynamicStylesheetMedia != m) { 
-			// create dynamic stylesheet + get a global reference to it
-			var s = createElement("style");
-			s.setAttribute("type", "text/css");
-			s.setAttribute("media", m);
-			dynamicStylesheet = h.appendChild(s);
-			if (ua.ie && ua.win && typeof doc.styleSheets != UNDEF && doc.styleSheets.length > 0) {
-				dynamicStylesheet = doc.styleSheets[doc.styleSheets.length - 1];
-			}
-			dynamicStylesheetMedia = m;
-		}
-		// add style rule
-		if (ua.ie && ua.win) {
-			if (dynamicStylesheet && typeof dynamicStylesheet.addRule == OBJECT) {
-				dynamicStylesheet.addRule(sel, decl);
-			}
-		}
-		else {
-			if (dynamicStylesheet && typeof doc.createTextNode != UNDEF) {
-				dynamicStylesheet.appendChild(doc.createTextNode(sel + " {" + decl + "}"));
-			}
-		}
-	}
-	
-	function setVisibility(id, isVisible) {
-		if (!autoHideShow) { return; }
-		var v = isVisible ? "visible" : "hidden";
-		if (isDomLoaded && getElementById(id)) {
-			getElementById(id).style.visibility = v;
-		}
-		else {
-			createCSS("#" + id, "visibility:" + v);
-		}
-	}
-
-	/* Filter to avoid XSS attacks
-	*/
-	function urlEncodeIfNecessary(s) {
-		var regex = /[\\\"<>\.;]/;
-		var hasBadChars = regex.exec(s) != null;
-		return hasBadChars && typeof encodeURIComponent != UNDEF ? encodeURIComponent(s) : s;
-	}
-	
-	/* Release memory to avoid memory leaks caused by closures, fix hanging audio/video threads and force open sockets/NetConnections to disconnect (Internet Explorer only)
-	*/
-	var cleanup = function() {
-		if (ua.ie && ua.win) {
-			window.attachEvent("onunload", function() {
-				// remove listeners to avoid memory leaks
-				var ll = listenersArr.length;
-				for (var i = 0; i < ll; i++) {
-					listenersArr[i][0].detachEvent(listenersArr[i][1], listenersArr[i][2]);
-				}
-				// cleanup dynamically embedded objects to fix audio/video threads and force open sockets and NetConnections to disconnect
-				var il = objIdArr.length;
-				for (var j = 0; j < il; j++) {
-					removeSWF(objIdArr[j]);
-				}
-				// cleanup library's main closures to avoid memory leaks
-				for (var k in ua) {
-					ua[k] = null;
-				}
-				ua = null;
-				for (var l in swfobject) {
-					swfobject[l] = null;
-				}
-				swfobject = null;
-			});
-		}
-	}();
-	
-	return {
-		/* Public API
-			- Reference: http://code.google.com/p/swfobject/wiki/documentation
-		*/ 
-		registerObject: function(objectIdStr, swfVersionStr, xiSwfUrlStr, callbackFn) {
-			if (ua.w3 && objectIdStr && swfVersionStr) {
-				var regObj = {};
-				regObj.id = objectIdStr;
-				regObj.swfVersion = swfVersionStr;
-				regObj.expressInstall = xiSwfUrlStr;
-				regObj.callbackFn = callbackFn;
-				regObjArr[regObjArr.length] = regObj;
-				setVisibility(objectIdStr, false);
-			}
-			else if (callbackFn) {
-				callbackFn({success:false, id:objectIdStr});
-			}
-		},
-		
-		getObjectById: function(objectIdStr) {
-			if (ua.w3) {
-				return getObjectById(objectIdStr);
-			}
-		},
-		
-		embedSWF: function(swfUrlStr, replaceElemIdStr, widthStr, heightStr, swfVersionStr, xiSwfUrlStr, flashvarsObj, parObj, attObj, callbackFn) {
-			var callbackObj = {success:false, id:replaceElemIdStr};
-			if (ua.w3 && !(ua.wk && ua.wk < 312) && swfUrlStr && replaceElemIdStr && widthStr && heightStr && swfVersionStr) {
-				setVisibility(replaceElemIdStr, false);
-				addDomLoadEvent(function() {
-					widthStr += ""; // auto-convert to string
-					heightStr += "";
-					var att = {};
-					if (attObj && typeof attObj === OBJECT) {
-						for (var i in attObj) { // copy object to avoid the use of references, because web authors often reuse attObj for multiple SWFs
-							att[i] = attObj[i];
-						}
-					}
-					att.data = swfUrlStr;
-					att.width = widthStr;
-					att.height = heightStr;
-					var par = {}; 
-					if (parObj && typeof parObj === OBJECT) {
-						for (var j in parObj) { // copy object to avoid the use of references, because web authors often reuse parObj for multiple SWFs
-							par[j] = parObj[j];
-						}
-					}
-					if (flashvarsObj && typeof flashvarsObj === OBJECT) {
-						for (var k in flashvarsObj) { // copy object to avoid the use of references, because web authors often reuse flashvarsObj for multiple SWFs
-							if (typeof par.flashvars != UNDEF) {
-								par.flashvars += "&" + k + "=" + flashvarsObj[k];
-							}
-							else {
-								par.flashvars = k + "=" + flashvarsObj[k];
-							}
-						}
-					}
-					if (hasPlayerVersion(swfVersionStr)) { // create SWF
-						var obj = createSWF(att, par, replaceElemIdStr);
-						if (att.id == replaceElemIdStr) {
-							setVisibility(replaceElemIdStr, true);
-						}
-						callbackObj.success = true;
-						callbackObj.ref = obj;
-					}
-					else if (xiSwfUrlStr && canExpressInstall()) { // show Adobe Express Install
-						att.data = xiSwfUrlStr;
-						showExpressInstall(att, par, replaceElemIdStr, callbackFn);
-						return;
-					}
-					else { // show alternative content
-						setVisibility(replaceElemIdStr, true);
-					}
-					if (callbackFn) { callbackFn(callbackObj); }
-				});
-			}
-			else if (callbackFn) { callbackFn(callbackObj);	}
-		},
-		
-		switchOffAutoHideShow: function() {
-			autoHideShow = false;
-		},
-		
-		ua: ua,
-		
-		getFlashPlayerVersion: function() {
-			return { major:ua.pv[0], minor:ua.pv[1], release:ua.pv[2] };
-		},
-		
-		hasFlashPlayerVersion: hasPlayerVersion,
-		
-		createSWF: function(attObj, parObj, replaceElemIdStr) {
-			if (ua.w3) {
-				return createSWF(attObj, parObj, replaceElemIdStr);
-			}
-			else {
-				return undefined;
-			}
-		},
-		
-		showExpressInstall: function(att, par, replaceElemIdStr, callbackFn) {
-			if (ua.w3 && canExpressInstall()) {
-				showExpressInstall(att, par, replaceElemIdStr, callbackFn);
-			}
-		},
-		
-		removeSWF: function(objElemIdStr) {
-			if (ua.w3) {
-				removeSWF(objElemIdStr);
-			}
-		},
-		
-		createCSS: function(selStr, declStr, mediaStr, newStyleBoolean) {
-			if (ua.w3) {
-				createCSS(selStr, declStr, mediaStr, newStyleBoolean);
-			}
-		},
-		
-		addDomLoadEvent: addDomLoadEvent,
-		
-		addLoadEvent: addLoadEvent,
-		
-		getQueryParamValue: function(param) {
-			var q = doc.location.search || doc.location.hash;
-			if (q) {
-				if (/\?/.test(q)) { q = q.split("?")[1]; } // strip question mark
-				if (param == null) {
-					return urlEncodeIfNecessary(q);
-				}
-				var pairs = q.split("&");
-				for (var i = 0; i < pairs.length; i++) {
-					if (pairs[i].substring(0, pairs[i].indexOf("=")) == param) {
-						return urlEncodeIfNecessary(pairs[i].substring((pairs[i].indexOf("=") + 1)));
-					}
-				}
-			}
-			return "";
-		},
-		
-		// For internal usage only
-		expressInstallCallback: function() {
-			if (isExpressInstallActive) {
-				var obj = getElementById(EXPRESS_INSTALL_ID);
-				if (obj && storedAltContent) {
-					obj.parentNode.replaceChild(storedAltContent, obj);
-					if (storedAltContentId) {
-						setVisibility(storedAltContentId, true);
-						if (ua.ie && ua.win) { storedAltContent.style.display = "block"; }
-					}
-					if (storedCallbackFn) { storedCallbackFn(storedCallbackObj); }
-				}
-				isExpressInstallActive = false;
-			} 
-		}
-	};
-}();
diff --git a/modules/cu3er/license.txt b/modules/cu3er/license.txt
deleted file mode 100644
index 24f51bb..0000000
--- a/modules/cu3er/license.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-Copyright (c) 2010, Stefan Kovac
-All rights reserved.
-
-By downloading CU3ER v0.9.2 - flash 3D slider, you agree to the following:
-
-Stefan Kovac grants you the non-exclusive, non-transferable license 
-to use CU3ER subject to the restrictions defined below.
-
-    * You may use CU3ER in personal and / or commercial projects.
-
-    * You may implement CU3ER in an unlimited number of websites and 
-      offline presentations, as long as you are acting as the administrator
-      and / or developer for those websites and / or presentations.
-
-    * You may deploy SWFs containing CU3ER as part of hired work for 
-      a third party as long as the SWF is unique to said party and not 
-      replicated / resold / redistributed as part of a template, 
-      application or service to additional parties.
-
-    * SWF containing CU3ER may not be embedded as part of a template, 
-      application, and / or web site where stated template, application, 
-      and/or web site is re-sold and / or re-distributed for independent 
-      use by third parties, without specific prior written permission.
- 
-    * SWFs containing CU3ER may not be embedded in a template, content 
-      management system, and / or online web service in a manner where the 
-      SWF is replicated and used as a slideshow viewer for photos contributed 
-      by more than one party.
-
-    * CU3ER may not be sub-licensed or resold.
-
-    * You agree not to decompile, reverse engineer, disassemble, or otherwise 
-      determine or attempt to determine source code for the executable code 
-      of CU3ER, and agrees not to permit or authorize anyone else to do so.
-
-    * CU3ER redistribution must reproduce the above copyright notice, this 
-      list of conditions and the disclaimer in the documentation and/or 
-      other materials provided with the distribution.
-
-    * Neither the name of CU3ER nor the name of it contributor (Stefan Kovac) 
-      may be used to endorse or promote products associated with CU3ER without 
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY STEFAN KOVAC ''AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL STEFAN KOVAC BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/modules/news/functions.php b/modules/news/functions.php
index 790a00e..5fd722c 100644
--- a/modules/news/functions.php
+++ b/modules/news/functions.php
@@ -181,7 +181,7 @@ function displayNews($data, $short = false){
 						</tr>
 					</table>
 			</div>
-			<div class="content">
+			<div class="content news">
 				<img src="modules/news/categories/<?php echo $news['catimage']; ?>" alt="<?php echo $news['catname']; ?>" align="right" />
 				<?php 
 					if($short) {
diff --git a/modules/news/style.css b/modules/news/style.css
index fe98982..b271757 100644
--- a/modules/news/style.css
+++ b/modules/news/style.css
@@ -81,7 +81,7 @@
 #comments .comment_author {
 	position: absolute;
 	left: -120px;
-	width: 100px;
+	//width: 100px;
 	color: #8d8d8d;
 	font-size: 10px;
 	line-height: 14px;
@@ -109,7 +109,7 @@
 	left: auto;
 	right: 20px;
 	bottom: 10px;
-	width: 200px;
+	//width: 200px;
 	height: 40px;
 }
 #comments .children .comment_author p {
@@ -122,7 +122,7 @@
 	display: block;
 }
 #comments .children .comment_author img {
-	width: 40px;
+	//width: 40px;
 	height: 40px;
 	float: right;
 }
@@ -162,7 +162,7 @@
 	display: none;
 }
 #comments .input {
-	width: 456px;
+	//width: 456px;
 	padding: 4px 5px;
 	background: #fff;
 	border: 1px solid #ced0d0;
@@ -172,12 +172,12 @@
 	margin-bottom: 10px;
 }
 #comments .children .input {
-	width: 431px;
+	//width: 431px;
 }
 #comments .textarea {
 	padding-top: 20px;
 	padding-left: 20px;
-	width: 448px;
+	//width: 448px;
   	max-width: 468px;
 	height: 135px;
 	font-size: 12px;
@@ -185,17 +185,17 @@
 	font-family: Tahoma, Arial, Helvetica, sans-serif;
 }
 #comments .children .textarea {
-	width: 423px;
+	//width: 423px;
 }
 #comments #submit_comment {
-	width: 12.0em;
+	//width: 12.0em;
 	height: 3.0em;
 	float: right;
 	margin-right: 7px;
 	margin-top: 10px;
 }
 #wpUserLinks_form #submit_comment {
-	width: 12.0em;
+	//width: 12.0em;
 	height: 3.0em;
 	margin-top: 10px;
 }
@@ -204,7 +204,7 @@
 }
 #cancel-comment-reply {
 	float: left;
-	width: 120px;
+	//width: 120px;
 	height: 30px;
 	margin-top: 8px;
 }
@@ -215,7 +215,7 @@
 	font-size: 9px;
 	text-transform: uppercase;
 	height: 22px;
-	width: 70px;
+	//width: 70px;
 	text-align: center;
 	padding-bottom: 2px;
 	letter-spacing: -0.05em;
diff --git a/modules/newsreel/index.php b/modules/newsreel/index.php
index d067295..9222dc2 100644
--- a/modules/newsreel/index.php
+++ b/modules/newsreel/index.php
@@ -117,7 +117,7 @@ window.onload = init_Slides;	//starts the reels movement
 	<a href="http://www.3rd-infantry-division.org/forums/index.php?board=13.0"><img src="modules/newsreel/slides/<?php echo $startSRC; ?>" name="myBanner" alt="newsreel" style="padding:0px;" /></a>
 
 </div>
-	<table border="0" cellspacing="0" cellpadding="0" style="height:21px;" width="100%">
+	<table border="0" cellspacing="0" cellpadding="0" style="height:21px;" width="640px">
 	<tr>
 <?php
 $y=0; 
diff --git a/modules/rudi/images/medals/esm.jpg b/modules/rudi/images/medals/esm.jpg
deleted file mode 100644
index 2dbbcca..0000000
--- a/modules/rudi/images/medals/esm.jpg
+++ /dev/null
diff --git a/modules/rudi/images/ranks/large/CW2.gif b/modules/rudi/images/ranks/large/CW2.gif
new file mode 100644
index 0000000..bc7f0fd
--- /dev/null
+++ b/modules/rudi/images/ranks/large/CW2.gif
diff --git a/modules/rudi/images/ranks/large/WO1.gif b/modules/rudi/images/ranks/large/WO1.gif
new file mode 100644
index 0000000..049eaa7
--- /dev/null
+++ b/modules/rudi/images/ranks/large/WO1.gif
diff --git a/modules/rudi/images/ranks/small/CW2.png b/modules/rudi/images/ranks/small/CW2.png
new file mode 100644
index 0000000..f4e0125
--- /dev/null
+++ b/modules/rudi/images/ranks/small/CW2.png