Merge branch 'master' of https://github.com/LukeShu/Leaguer

Conflicts:
	app/views/tournaments/_form.html.erb

2 files changed, 25 insertions, 0 deletions

diff --git a/app/assets/javascripts/application/layout.js.coffee b/app/assets/javascripts/application/layout.js.coffee
new file mode 100644
index 0000000..da0bc67
--- /dev/null
+++ b/app/assets/javascripts/application/layout.js.coffee
@@ -0,0 +1,21 @@
+json_url = "/alerts.json"
+
+page_visited = false 
+starting_size = 0
+update = (alerts) ->
+	if !page_visited
+		starting_size = alerts.length
+		page_visited = true
+
+	if alerts.length > starting_size
+		$("#alerts-ajax").css("display", "inline");
+		return
+
+	setTimeout (->
+		$.ajax(url: json_url).done update
+		return
+	), 2000
+
+# Now kick off the whole process
+window.onload = ->
+	$.ajax(url: json_url).done update
\ No newline at end of file
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 9e9e63a..b274a0d 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -24,6 +24,10 @@ header > nav {
 	}
 }
 
+#alerts-ajax {
+	display: none;
+}
+
 .btn-custom-orange { 
 	color: white;
 	background-color: rgb(255, 69, 0);