Minor features/fixes

* Fix admin sub menus
* Show email address in people#index
* Add User Area link in navbar
* Smaller textareas on proposal#new so you don't have to scroll
* Counting of registrations, users and people
* Use datatables for users and people
* Show event type on admin/events#show
This commit is contained in:
Henne Vogelsang 2013-05-07 14:46:33 +02:00 committed by Henne Vogelsang
parent a557f3750e
commit 3022e8b8e6
11 changed files with 151 additions and 21 deletions

View file

@ -30,20 +30,22 @@
%li
= link_to "Schedule ", admin_conference_schedule_path(@conference.short_title)
%ul.nav.secondary-nav.pull-right
%li
= link_to "User Area", root_url
- if !@conference.nil?
%li.dropdown
= link_to "#", :class => "dropdown-toggle" do
= link_to "#", :class => "dropdown-toggle", :id =>'drop1', "data-toggle" => 'dropdown' do
Export
<b class="caret"></b>
%ul.dropdown-menu
%ul.dropdown-menu{:role => 'menu', "aria-labelledby" => "drop1"}
%li= link_to "JSON", "#"
%li= link_to "HTML", "#"
%li.dropdown
- unless Conference.count == 1 && !has_role?(current_user, "admin")
= link_to "#", :class => "dropdown-toggle" do
= link_to "#", :class => "dropdown-toggle", :id => 'drop2', "data-toggle" => 'dropdown' do
Conferences
<b class="caret"></b>
%ul.dropdown-menu
%ul.dropdown-menu{:role => 'menu', "aria-labelledby" => "drop2"}
- conferences = Conference.order("created_at DESC")
- unless conferences.nil?
- conferences.each do |c|
@ -54,4 +56,4 @@
- if has_role?(current_user, "admin")
%li= link_to "Users", admin_users_path
%li= link_to "People", admin_people_path
%li= link_to "Log out", destroy_user_session_path, :method => :delete
%li= link_to "Log out", destroy_user_session_path, :method => :delete