From 20fe1d8b1361e7eeea2c1e256c96b8a650516434 Mon Sep 17 00:00:00 2001
From: dave <dave>
Date: Fri, 18 Sep 2009 03:29:13 +0000
Subject: [PATCH] - Switch to a global message status area

---
 admin/award_awards.php  | 10 +---------
 common.inc.php          | 17 +++++++++++++++--
 sfiab.js                | 22 ++--------------------
 theme/default/sfiab.css | 13 ++++++++++++-
 4 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/admin/award_awards.php b/admin/award_awards.php
index 50afb21..12d1c3b 100644
--- a/admin/award_awards.php
+++ b/admin/award_awards.php
@@ -91,7 +91,7 @@
 
 	//now add the new ones
 	if(!is_array($_POST['categories']) || !is_array($_POST['divisions'])) {
-		echo error(i18n("Invalid data"));
+		error_("Invalid data");
 		exit;
 	}
 
@@ -255,7 +255,6 @@ function update_awardinfo()
 	var id = award_id;
     if(!award_id) return false;
 //	alert("id="+award_id);
-	notice_div_id('award_notice');
 	$.getJSON("<?=$_SERVER['PHP_SELF']?>?action=awardinfo_load&id="+id,  
 		function(json){
 			$("#awardinfo_id").val(json.id);
@@ -283,7 +282,6 @@ function awardinfo_save()
 function update_eligibility()
 {
 	var id = award_id;
-	notice_div_id('eligibility_notice');
 	$.getJSON("<?=$_SERVER['PHP_SELF']?>?action=eligibilty_load&id="+id,  
 		function(json){
 			$("#eligibility_id").val(json.id);
@@ -311,7 +309,6 @@ function prizelist_refresh()
 function update_prizeinfo()
 {
 	var id = award_id;
-	notice_div_id('prize_notice');
 	$.getJSON("<?=$_SERVER['PHP_SELF']?>?action=prizeinfo_load&id="+id,
 		function(json) {
 			$(".prizelist_tr").remove();
@@ -396,7 +393,6 @@ function prize_create()
 function update_feeder()
 {
 	var id = award_id;
-	notice_div_id('feeder_notice');
 	$.getJSON("<?=$_SERVER['PHP_SELF']?>?action=feeder_load&id="+id,
 		function(json) {
 			$("#feeder_id").val(id);
@@ -461,7 +457,6 @@ $(document).ready(function() {
 
 <div id="editor_tab_awardinfo">
 	<h4><?=i18n("Award Info")?></h4>
-	<div id="award_notice" class="notice_area"></div> 
 	<form id="awardinfo">
 	<input type="hidden" name="id" id="awardinfo_id" value="0" />
 	<table class="tableedit">
@@ -520,7 +515,6 @@ $(document).ready(function() {
 <? /* Next Tab */ ?>
 <div id="editor_tab_eligibility">
 	<h4><?=i18n("Eligibility")?></h4>
-	<div id="eligibility_notice" class="notice_area"></div> 
 	<br />
 	<form id="eligibility">
 	<input type="hidden" id="eligibility_id" name="id" value="" />
@@ -557,7 +551,6 @@ $(document).ready(function() {
 <?  /* Next Tab */ ?>
 
 <div id="editor_tab_prizes">
-	<div id="prize_notice" class="notice_area"></div> 
 	<h4><?=i18n("Prizes")?></h4>
 	<br />
 	<table id="prizelist" class="tableview"> 
@@ -622,7 +615,6 @@ $(document).ready(function() {
 
 <? /* Next Tab */ ?>
 <div id="editor_tab_feeder">
-	<div id="feeder_notice" class="notice_area"></div> 
 	<h4><?=i18n("Feeder Fairs")?></h4>
 	<form id="feeder_form">
 	<input type="hidden" id="feeder_id" name="award_awards_id" value=""/>
diff --git a/common.inc.php b/common.inc.php
index 916bf74..cb16337 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -394,6 +394,7 @@ if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config")
 	require_once("../translationseditor.inc.php");
 ?>
 
+<div id="notice_area" class="notice_area"></div>
 <div id="header">
 <?
 if(file_exists($prependdir."data/logo-100.gif"))
@@ -1139,10 +1140,22 @@ function message_push($m)
 	$_SESSION['messages'][] = $m;
 }
 
-function happy_($str, $timeout=5000, $i18n_array=array())
+function notice_($str, $timeout=5000, $i18n_array=array(), $type='notice')
 {
+	if($timeout == -1) $timeout = 5000;
 	echo "<script type=\"text/javascript\">
-		notice_create('happy',\"".i18n($str,$i18n_array)."\",$timeout);
+		notice_create('$type',\"".i18n($str,$i18n_array)."\",$timeout);
 		</script>";
 }
+
+function happy_($str, $timeout=5000, $i18n_array=array())
+{
+	notice_($str, $timeout, $i18n_array, 'happy');
+}
+function error_($str, $timeout=5000, $i18n_array=array())
+{
+	notice_($str, $timeout, $i18n_array, 'error');
+}
+
+
 ?>
diff --git a/sfiab.js b/sfiab.js
index 13a8266..2d1434e 100644
--- a/sfiab.js
+++ b/sfiab.js
@@ -40,8 +40,6 @@ function confirmChanges()
 }
 
 var _notice_id = 0;
-var _notice_div_id = 'notice_div';
-
 function notice_delete(id)
 {
 	$("#notice_"+id).slideUp('slow', function() {
@@ -52,28 +50,12 @@ function notice_delete(id)
 function notice_create(type,str,timeout)
 {
 	_notice_id++;
-	var style="padding: 0.1em 0; text-align: center; position: relative; ";
-	$("#"+_notice_div_id).append("<div id=\"notice_"+_notice_id+"\" class=\""+type+"\" style=\""+style+"\">"+str+"</div>");
-	$("#"+_notice_div_id).fadeTo('fast', 0.85);
+	$("#notice_area").append("<div id=\"notice_"+_notice_id+"\" class=\"notice "+type+"\" >"+str+"</div>");
 	$("#notice_"+_notice_id).effect('bounce');
+	$("#notice_"+_notice_id).fadeTo('fast', 0.85);
 	setTimeout("notice_delete("+_notice_id+")", timeout);
 }
 
-function notice_div_id(id)
-{
-	if(id == '') id = 'notice_div';
-
-	var par = $("#"+id).parent();
-	var o = par.offset();
-	var w = par.outerWidth();
-	$("#"+id).css( { left: o.left+"px", top: o.top+"px", width: w+"px"} );
-//	$("#"+id).css( { left: 0, top: 0, width: "100%" });
-	$("#"+id).show();
-
-	_notice_div_id = id;
-}
-
-
 /* Stuff to do after the document loads */
 $(document).ready(function() 
 {
diff --git a/theme/default/sfiab.css b/theme/default/sfiab.css
index 13900bf..e61b426 100644
--- a/theme/default/sfiab.css
+++ b/theme/default/sfiab.css
@@ -314,9 +314,20 @@ tr.externalaward {
 
 }
 
-
+/* Notice area floating along the top of the page */
 div.notice_area {
+	left: 0;
+	top: 0;
+	width: 100%;
 	position: fixed;
+	z-index: 9999;
+}
+
+div.notice_area div.notice {
+	padding: 0.1em 0;
+	text-align: center;
+	position: relative;
+	font-size: 1.2em;
 }
 
 /* The popup windows created with jquery-ui use the following classes: