# HG changeset patch
# User Jittat Fakcharoenphol <jittat@gmail.com>
# Date 2010-01-28 00:41:54
# Node ID eda4ffd09089b70acbdb2b8fa0c69f88fd3c796e
# Parent  4e9b3507dc8416abb7de26ceb8af494cee2be91a
# Parent  4488d204f4270d914a8cc5374df46c4f8d4cb49b

Merge branch 'master' into codejom (bug fix)

diff --git a/app/views/main/list.html.haml b/app/views/main/list.html.haml
--- a/app/views/main/list.html.haml
+++ b/app/views/main/list.html.haml
@@ -1,15 +1,14 @@
 - content_for :head do
   = javascript_include_tag :defaults
-  %script{:type => 'text/javascript', :src => '/javascripts/announcement_refresh.js'}
+  = javascript_include_tag 'announcement_refresh.js'
 
 = user_title_bar(@user)
 
-- if @announcements.length!=0
-  .announcementbox
-    %span{:class => 'title'}
-      Announcements
-    #announcementbox-body
-      = render :partial => 'announcement', :collection => @announcements
+.announcementbox{:style => (@announcements.length==0 ? "display:none" : "")}
+  %span{:class => 'title'}
+    Announcements
+  #announcementbox-body
+    = render :partial => 'announcement', :collection => @announcements
 
 %hr/
 
diff --git a/public/javascripts/announcement_refresh.js b/public/javascripts/announcement_refresh.js
--- a/public/javascripts/announcement_refresh.js
+++ b/public/javascripts/announcement_refresh.js
@@ -18,8 +18,13 @@
 	    method: 'get',
 	    parameters: { recent: Announcement.mostRecentId },
 	    onSuccess: function(transport) {
-		var announcementBody = 	$("announcementbox-body");
-		announcementBody.insert({ top: transport.responseText });
+		if(transport.responseText.match(/\S/)!=null) {
+ 		    var announcementBody = $("announcementbox-body");
+		    announcementBody.insert({ top: transport.responseText });
+		    var announcementBoxes = $$(".announcementbox");
+		    if(announcementBoxes.length!=0)
+			announcementBoxes[0].show();
+		}
 	    }
 	});
 	Announcement.registerRefreshEventTimer();
@@ -30,4 +35,4 @@
 	    Announcement.refreshAnnouncement();
 	}, 30000);
     }
-};
\ No newline at end of file
+};