From ddc301d78f1b76e15d0dd97376b17d6608fdca7f Mon Sep 17 00:00:00 2001
From: Robbie Antenesse <gamedev@alamantus.com>
Date: Mon, 21 Dec 2015 13:36:25 -0700
Subject: [PATCH] Separated announcements from notifications so the
 announcement doesn't come back every time you add a new word.

---
 css/lexiconga.css | 4 ++++
 css/styles.css    | 4 ++--
 index.php         | 7 +++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/css/lexiconga.css b/css/lexiconga.css
index 1bbb438..635547a 100644
--- a/css/lexiconga.css
+++ b/css/lexiconga.css
@@ -85,6 +85,10 @@ input, textarea, select, option, button {
 	background: #efdfc0;
 }
 
+#announcementArea {
+    background:#a0c066;
+}
+
 #notificationArea {
     background:#c0c088;
 }
diff --git a/css/styles.css b/css/styles.css
index c495f0f..1c23cc6 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -149,7 +149,7 @@ input[type=checkbox] {
     margin: 0 10px 0 0;
 }
 
-#notificationArea {
+#announcementArea, #notificationArea {
     text-align:center;
     padding:10px;
     border-radius:5px;
@@ -341,7 +341,7 @@ searchTerm {
     border: 1px solid black;
 }
 
-#notificationCloseButton,
+#announcementCloseButton, #notificationCloseButton,
 #settingsButton, #settingsScreenCloseButton,
 #settingsSaveButtons button, #infoScreenCloseButton {
     float: right;
diff --git a/index.php b/index.php
index 3788d75..b99167b 100644
--- a/index.php
+++ b/index.php
@@ -48,10 +48,13 @@ require_once(SITE_LOCATION . '/php/notificationconditiontree.php');
         </div>
     </header>
     <contents>
-    <div id="notificationArea" style="display:<?php echo (($announcement || $notificationMessage) ? "block" : "none"); ?>;">
+    <div id="announcementArea" style="display:<?php echo (($announcement) ? "block" : "none"); ?>;margin-bottom:10px;">
+        <span id="announcementCloseButton" class="clickable" onclick="document.getElementById('announcementArea').style.display='none';">Close</span>
+        <div id="announcement"><?php echo $announcement; ?></div>
+    </div>
+    <div id="notificationArea" style="display:<?php echo (($notificationMessage) ? "block" : "none"); ?>;">
         <span id="notificationCloseButton" class="clickable" onclick="document.getElementById('notificationArea').style.display='none';">Close</span>
         <div id="notificationMessage"><?php echo $notificationMessage; ?></div>
-        <div id="announcement" style="margin-top:<?php echo (($announcement && $notificationMessage) ? "15px" : "0"); ?>;"><?php echo $announcement; ?></div>
     </div>
     <div id="leftColumn">
     <form id="wordEntryForm">