small changes

This commit is contained in:
raluka 2015-08-24 17:17:29 +02:00
parent 35714f350e
commit aa1ff51b58
2 changed files with 2 additions and 2 deletions

View file

@ -25,7 +25,7 @@
%b.caret %b.caret
%ul.dropdown-menu %ul.dropdown-menu
= render 'layouts/user_menu' = render 'layouts/user_menu'
- if can? :manage, Conference - if can? :manage, Comment
%ul.nav.navbar-nav.navbar-right %ul.nav.navbar-nav.navbar-right
%li.dropdown %li.dropdown
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", id: "unread-comments-preview"} %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", id: "unread-comments-preview"}

View file

@ -15,7 +15,7 @@ Osem::Application.routes.draw do
namespace :admin do namespace :admin do
resources :users resources :users
resources :people resources :people
resources :comments resources :comments, only: [:index]
resources :conference do resources :conference do
member do member do
get :roles get :roles