From 767cfdd76e910d43031ae429880e04b48bc6537a Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Thu, 16 May 2013 22:48:37 -0400
Subject: [PATCH] Improve announcements; remove debug console.log

---
 channel.js                 | 2 +-
 www/assets/js/callbacks.js | 4 +++-
 www/channel.html           | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/channel.js b/channel.js
index facbeaff..7041756f 100644
--- a/channel.js
+++ b/channel.js
@@ -59,7 +59,7 @@ var Channel = function(name) {
         new Filter("monospace", "`([^`]+)`", "g", "<code>$1</code>"),
         new Filter("bold", "(.)\\*([^\\*]+)\\*", "g", "$1<strong>$2</strong>"),
         new Filter("italic", "(^| )_([^_]+)_", "g", "$1<em>$2</em>"),
-        new Filter("inline spoiler", "\\[spoiler\\](.*)\\[\\/spoiler\\]", "ig", "<span class=\"spoiler\">$1</span>")
+        new Filter("inline spoiler", "\\[spoiler\\](.*)\\[\\/spoiler\\]", "ig", "<span class=\"spoiler\">$1</span>"),
     ];
     this.motd = {
         motd: "",
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index db50cca0..585ad747 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -27,8 +27,10 @@ Callbacks = {
     },
 
     announcement: function(data) {
+        $("#announcerow").html("");
+        $("#announcerow").css("display", "");
         var div = $("<div/>").addClass("alert")
-            .insertAfter($(".row")[0]);
+            .appendTo($("#announcerow"));
         $("<button/>").addClass("close pull-right").text("×")
             .appendTo(div)
             .click(function() { div.remove(); });
diff --git a/www/channel.html b/www/channel.html
index 55435609..71451f5b 100644
--- a/www/channel.html
+++ b/www/channel.html
@@ -53,6 +53,8 @@
                 <h1 id="drinkcount"></h1>
             </div>
         </div>
+        <div class="row-fluid" id="announcerow" style="display: none">
+        </div>
         <div class="row" id="main" style="margin-top: 20px;">
             <div class="span5" id="chatdiv">
                 <p id="usercount"></p>