basic renaming from notification rule to notification subscription

flyingmachine · Nov 13, 2012 · c254ee1 · c254ee1
1 parent 8aa54c6
commit c254ee1
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    whoops (0.3.4)
+    whoops (0.3.5)
       haml
       kaminari
       mongo
@@ -155,7 +155,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)

diff --git a/app/assets/stylesheets/whoops.css.scss b/app/assets/stylesheets/whoops.css.scss
@@ -25,12 +25,12 @@ li {
   }
 }
 
-.container-fluid {
+#main {
   padding-bottom:1em;
 }
 
 /* sidebar */
-.cntainer-fluid .sidebar {
+.container-fluid .sidebar {
   margin-left:-20px;  
   margin-top:-20px;
   padding-left:20px;

diff --git a/...trollers/notification_rules_controller.rb → .../notification_subscriptions_controller.rb b/...trollers/notification_rules_controller.rb → .../notification_subscriptions_controller.rb
@@ -1,4 +1,4 @@
-class NotificationRulesController < ApplicationController
+class NotificationSubscriptionsController < ApplicationController
   layout 'whoops'
 
   def index

diff --git a/app/views/layouts/whoops.html.haml b/app/views/layouts/whoops.html.haml
@@ -15,9 +15,9 @@
       .listfill
         .container-fluid
           = link_to "Event Groups", whoops_event_groups_path, :class => "brand"
-          = link_to "Notification Rules", whoops_notification_rules_path, :class => "brand"
+          = link_to "Notification Subscriptions", whoops_notification_subscriptions_path, :class => "brand"
           = link_to "Whoops Documentation", "http://www.whoopsapp.com/", :class => "documentation"
-    .container-fluid
+    .container-fluid#main
       .sidebar
         = yield :sidebar
       .content

diff --git a/app/views/notification_rules/_form.html.haml → ...otification_subscriptions/_form.html.haml b/app/views/notification_rules/_form.html.haml → ...otification_subscriptions/_form.html.haml
diff --git a/app/views/notification_rules/edit.html.haml → ...notification_subscriptions/edit.html.haml b/app/views/notification_rules/edit.html.haml → ...notification_subscriptions/edit.html.haml
diff --git a/app/views/notification_rules/index.html.haml → ...otification_subscriptions/index.html.haml b/app/views/notification_rules/index.html.haml → ...otification_subscriptions/index.html.haml
diff --git a/config/routes.rb b/config/routes.rb
@@ -4,5 +4,5 @@
   end
 
   resources :events, :as => "whoops_events"
-  resources :notification_rules, :as => "whoops_notification_rules"
+  resources :notification_subscriptions, :as => "whoops_notification_subscriptions"
 end