From 8e219bdd770e5d62acca853ff0a47e32dc1b1dcf Mon Sep 17 00:00:00 2001
From: MatthewM <mcm@they-got.us>
Date: Thu, 20 Dec 2012 16:12:16 -0500
Subject: [PATCH] Moved the javascript to header.html from memos.html to make
 it easier to intergrate the overlay feedback and do tweaks

---
 .../webcpanel/templates/default/header.html   | 51 +++++++++++++++++++
 .../templates/default/memoserv/memos.html     | 51 -------------------
 2 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/modules/extra/webcpanel/templates/default/header.html b/modules/extra/webcpanel/templates/default/header.html
index 35bffaa23..15148838a 100644
--- a/modules/extra/webcpanel/templates/default/header.html
+++ b/modules/extra/webcpanel/templates/default/header.html
@@ -7,6 +7,57 @@
 	<script type="text/javascript">
 		var t=5000; // Time in ms to display an overlay if one will be displayed	
 	</script>
+	{IF EXISTS CMDR} 
+	<script type="text/javascript">
+	$(document).ready(function() \{
+	
+		/*Modal*/
+		var id = "#dialog";
+			
+		showModal();
+
+		$('.close').click(function (e) \{
+			e.preventDefault();	
+			hideModal();
+		\});
+	
+		$('#mask').click(function () \{
+			hideModal();
+		\});	
+		
+		function hideModal() \{
+			if ($('#mask').not(':hidden')) \{
+				$('.master').fadeTo('slow',1.0);	
+				$('#mask, .window').fadeOut(200);
+			\}					
+		\}
+		
+		function showModal() \{				
+			var mHeight = $(document).height();	
+			var mWidth = $(window).width();
+			
+			var alertMsg = '<br/>{CMDR}<br/>';
+
+			$('#mask').css(\{'width': mWidth, 'height': mHeight\});	
+			$('#mask').fadeIn(200);		
+			$('#mask').fadeTo('fast',0.75);
+		
+			$('#dialogMsg').html(alertMsg);
+			var top = mHeight/2-$(id).height()/2;
+			var left= mWidth/2-$(id).width()/2;
+			
+			$(id).css('top', top);
+			$(id).css('left', left);
+			$('.master').fadeTo('fast',0.3);								
+			
+			$(id).fadeIn(500);
+			setTimeout(hideModal, t);		
+			
+		\}			
+						
+	\});
+	</script>
+	{END IF}
 </head>
 <body>
 	<div id="boxes">
diff --git a/modules/extra/webcpanel/templates/default/memoserv/memos.html b/modules/extra/webcpanel/templates/default/memoserv/memos.html
index 4d0024f91..4239a926f 100644
--- a/modules/extra/webcpanel/templates/default/memoserv/memos.html
+++ b/modules/extra/webcpanel/templates/default/memoserv/memos.html
@@ -1,55 +1,4 @@
 {INCLUDE header.html}
-		{IF EXISTS CMDR} 
-			<script type="text/javascript">
-			$(document).ready(function() \{
-			
-				/*Modal*/
-				var id = "#dialog";
-					
-				showModal();
-		
-				$('.close').click(function (e) \{
-					e.preventDefault();	
-					hideModal();
-				\});
-			
-				$('#mask').click(function () \{
-					hideModal();
-				\});	
-				
-				function hideModal() \{
-					if ($('#mask').not(':hidden')) \{
-						$('.master').fadeTo('slow',1.0);	
-						$('#mask, .window').fadeOut(200);
-					\}					
-				\}
-				
-				function showModal() \{				
-					var mHeight = $(document).height();	
-					var mWidth = $(window).width();
-					
-					var alertMsg = '<br/>{CMDR}<br/>';
-
-					$('#mask').css(\{'width': mWidth, 'height': mHeight\});	
-					$('#mask').fadeIn(200);		
-					$('#mask').fadeTo('fast',0.75);
-				
-					$('#dialogMsg').html(alertMsg);
-					var top = mHeight/2-$(id).height()/2;
-					var left= mWidth/2-$(id).width()/2;
-					
-					$(id).css('top', top);
-					$(id).css('left', left);
-					$('.master').fadeTo('fast',0.3);								
-					
-					$(id).fadeIn(500);
-					setTimeout(hideModal, t);		
-					
-				\}			
-								
-			\});
-			</script>
-		{END IF}
 		<b>Channels you have access in:</b><br/>
 		{FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES}
 			<a href="/memoserv/memos?channel={ECH}" class="channel">{CH}</a> 
