updated rails to 4.2.4

app/views/layouts/_admin_sidebar.html.haml

@@ -29,9 +29,14 @@
         Dashboard
   - if can? :show, @conference
     %li{:class=> "#{active_nav_li(edit_admin_conference_path(@conference.short_title))}"}
-      = link_to(edit_admin_conference_path(@conference.short_title)) do
-        %span.fa.fa-home
-        Basics
+      - if can? :edit, @conference
+        = link_to(edit_admin_conference_path(@conference.short_title)) do
+          %span.fa.fa-home
+          Basics
+      - else
+        %a
+          %span.fa.fa-home
+          Basics
       %ul
         - if can? :update, Contact.new(conference_id: @conference.id)
           %li{:class=> "#{active_nav_li(edit_admin_conference_contact_path(@conference.short_title))}"}

app/views/layouts/_navigation.html.haml

@@ -13,17 +13,34 @@
         %ul.nav.navbar-nav#splash-nav
           = content_for :splash_nav
       -if user_signed_in?
-        %ul.nav.navbar-nav.navbar-right
-          %li.dropdown
-            %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", id: "current-user-detail"}
-              - if not current_user.name.blank?
-                #{current_user.name}
-              -else
-                #{current_user.email}
-              = image_tag(current_user.gravatar_url(size: '18'), title: "Yo #{current_user.name}!", :alt => '')
-              %b.caret
-            %ul.dropdown-menu
-              = render 'layouts/user_menu'
+        .btn-group.pull-right
+          %ul.nav.navbar-nav.navbar-right
+            %li.dropdown
+              %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", id: "current-user-detail"}
+                - if not current_user.name.blank?
+                  #{current_user.name}
+                -else
+                  #{current_user.email}
+                = image_tag(current_user.gravatar_url(size: '18'), title: "Yo #{current_user.name}!", :alt => '')
+                %b.caret
+              %ul.dropdown-menu
+                = render 'layouts/user_menu'
+          - if can? :index, Comment
+            %ul.nav.navbar-nav.navbar-right
+              %li.dropdown
+                %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"}
+                  - if unread_notifications(current_user)
+                    Notifications (#{unread_notifications(current_user).length})
+                    %span.fa.fa-comment
+                    %b.caret
+                    %ul.dropdown-menu
+                      - if unread_notifications(current_user).length > 0
+                        %li.dropdown-header Last 5 Comments for:
+                        - unread_notifications(current_user).limit(5).group_by{ |comment| comment.commentable}.each do |event, comments|
+                          %li= link_to("#{event.title}(#{comments.count})", admin_conference_event_path(event.conference.short_title, event.id))
+                        %li.divider
+                        %li= link_to "See all unread Comments (#{unread_notifications(current_user).length})", admin_comments_path
+                      %li= link_to 'See all Comments', admin_comments_path(anchor: 'all_comments')
       - else
         %ul.nav.navbar-nav.navbar-right
           - if CONFIG['authentication']['ichain']['enabled']

app/views/layouts/_unread_comment.html.haml

@@ -0,0 +1,2 @@
+%li= link_to("New comment for: #{unread_comment.commentable.title}", admin_conference_event_path(unread_comment.commentable.conference.short_title, unread_comment.commentable_id))
+

app/views/layouts/_user_menu.html.haml

@@ -21,14 +21,15 @@
     = link_to(destroy_user_session_path, :method=>'delete') do
       %span.fa.fa-minus
       Sign out
-- if can? :manage, Conference
+- if can? :access, Admin
   %li.divider
     %li
-      = link_to(admin_conference_index_path()) do
-        - if Conference.any?
+      - if Conference.any?
+        = link_to(admin_conference_index_path()) do
           %span.fa.fa-home
-            Administration
-        - else
+          Administration
+      - if can? :create, Conference
+        =link_to(new_admin_conference_path) do
           %span.fa.fa-plus
           Create Conference
     -if @conference and @conference.id and can? :show, @conference