summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-04 11:50:33 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-04 11:50:33 -0500
commit47db24fe712877d919256c431d0c5fcbbd431a45 (patch)
tree46467115a36377f25949f5f0ab3839676da50ccb
parent42c241f0d533e243a01560d28e8cd7e3b90a6165 (diff)
make notifications be shown an all pages
-rw-r--r--app/views/alerts/show.html.erb2
-rw-r--r--app/views/games/show.html.erb2
-rw-r--r--app/views/layouts/application.html.erb2
-rw-r--r--app/views/matches/show.html.erb2
-rw-r--r--app/views/pms/show.html.erb2
-rw-r--r--app/views/servers/show.html.erb2
-rw-r--r--app/views/teams/show.html.erb2
-rw-r--r--app/views/tournaments/show.html.erb2
-rw-r--r--app/views/users/show.html.erb2
9 files changed, 2 insertions, 16 deletions
diff --git a/app/views/alerts/show.html.erb b/app/views/alerts/show.html.erb
index eeab7f7..5dda2c9 100644
--- a/app/views/alerts/show.html.erb
+++ b/app/views/alerts/show.html.erb
@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
<p>
<strong>Author:</strong>
<%= @alert.author %>
diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb
index 7986016..88bf91c 100644
--- a/app/views/games/show.html.erb
+++ b/app/views/games/show.html.erb
@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
<p>
<strong>Name:</strong>
<%= @game.name %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 0362062..4651efc 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -29,6 +29,8 @@
</header>
</div>
+<% if notice %><div id="notice"><p><%= notice %></p></div><% end %>
+
<div class="container"><%= yield %></div>
<hr>
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 0b02ae7..9c9cbb4 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
<p>
<strong>Tournament:</strong>
<%= @match.tournament %>
diff --git a/app/views/pms/show.html.erb b/app/views/pms/show.html.erb
index 5ee483f..2a03716 100644
--- a/app/views/pms/show.html.erb
+++ b/app/views/pms/show.html.erb
@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
<p>
<strong>Author:</strong>
<%= @pm.author %>
diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb
index 039cd8f..67f7647 100644
--- a/app/views/servers/show.html.erb
+++ b/app/views/servers/show.html.erb
@@ -1,4 +1,2 @@
-<p id="notice"><%= notice %></p>
-
<%= link_to 'Edit', edit_server_path(@server) %> |
<%= link_to 'Back', servers_path %>
diff --git a/app/views/teams/show.html.erb b/app/views/teams/show.html.erb
index 5b18d33..ab49d65 100644
--- a/app/views/teams/show.html.erb
+++ b/app/views/teams/show.html.erb
@@ -1,4 +1,2 @@
-<p id="notice"><%= notice %></p>
-
<%= link_to 'Edit', edit_team_path(@team) %> |
<%= link_to 'Back', teams_path %>
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 30df788..0d9dd10 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
<p>
<strong>Game:</strong>
<%= @tournament.game %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 9455a3c..d8cc82b 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
<p>
<strong>Name:</strong>
<%= @user.name %>