From 19b04a49d01af1917385c166501ef086eddae437 Mon Sep 17 00:00:00 2001
From: guntasgrewal <guntasgrewal@gmail.com>
Date: Wed, 23 Apr 2014 22:50:29 -0400
Subject: The users with permissions to send alerts can now create new alerts.

---
 app/views/alerts/index.html.erb        | 20 ++++++++++++--------
 app/views/layouts/application.html.erb |  5 ++++-
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'app/views')

diff --git a/app/views/alerts/index.html.erb b/app/views/alerts/index.html.erb
index 458b951..1d441a2 100644
--- a/app/views/alerts/index.html.erb
+++ b/app/views/alerts/index.html.erb
@@ -12,14 +12,18 @@
   </thead>
 
   <tbody>
-    <% @alerts.each do |alert| %>
-      <tr>
-        <td><%= alert.author %></td>
-        <td><%= alert.message %></td>
-        <td><%= link_to 'Show', alert %></td>
-        <td><%= link_to 'Edit', edit_alert_path(alert) %></td>
-        <td><%= link_to 'Destroy', alert, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
+    <% if !@alerts.nil? %>
+      <% @alerts.each do |alert| %>
+        <tr>
+          <td><%= alert.author %></td>
+          <td><%= alert.message %></td>
+          <td><%= link_to 'Show', alert %></td>
+          <td><%= link_to 'Edit', edit_alert_path(alert) %></td>
+          <td><%= link_to 'Destroy', alert, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        </tr>
+      <% end %> 
+    <% else %>
+      <td><p>There are no alerts!</p></td>
     <% end %>
   </tbody>
 </table>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index d318129..15eba29 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -27,11 +27,14 @@
 	<div id="log-buttons">
 		<% if signed_in? %>
 			<%= link_to current_user.user_name, current_user, :class => "user" %>
-			<%= link_to "Messages", pms_path %>
+			<%= link_to "Messages", pms_path, :class => "signup" %>
 			<%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %>
 			<% if current_user.can? :edit_server %>
 				<%= link_to "Server settings", edit_server_path, :class => "server" %>
 			<% end %>
+			<% if current_user.can? :create_alert %>
+				<%= link_to "Create Alert", new_alert_path, :class => "signin" %>
+			<% end %>
 		<% else %>
 			<%= link_to "Log in", new_session_path, :class => "signin" %>
 			<%= link_to "Sign up", new_user_path, :class => "signup" %>
-- 
cgit v1.2.3-2-g168b