From d1f49a42186c591d157c7b23bdbe777c1497897e Mon Sep 17 00:00:00 2001
From: Petko Bordjukov <bordjukov@gmail.com>
Date: Wed, 15 Oct 2014 11:48:01 +0300
Subject: [PATCH] Tweaks

---
 .../management/_navigation.css.scss           |  2 +-
 app/views/layouts/management.html.slim        | 15 +++++----
 .../management/conferences/show.html.slim     |  2 +-
 app/views/management/users/index.html.slim    | 33 +++++++++++--------
 config/routes.rb                              |  1 -
 5 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/management/_navigation.css.scss b/app/assets/stylesheets/management/_navigation.css.scss
index 5fcbf15..2b9f268 100644
--- a/app/assets/stylesheets/management/_navigation.css.scss
+++ b/app/assets/stylesheets/management/_navigation.css.scss
@@ -1,6 +1,6 @@
 .navigation {
     @extend .navbar;
-    @extend .navbar-default;
+    @extend .navbar-inverse;
     @extend .navbar-static-top;
 
     .header {
diff --git a/app/views/layouts/management.html.slim b/app/views/layouts/management.html.slim
index 596347a..ed8182f 100644
--- a/app/views/layouts/management.html.slim
+++ b/app/views/layouts/management.html.slim
@@ -36,7 +36,6 @@ html
                 - Conference.where.not(id: @conference.id).each do |conference|
                   li
                     = link_to conference.title, management_conference_path(conference)
-
         li.dropdown
           a.dropdown-toggle href="#" data-toggle="dropdown"
             i.fa.fa-flag.fa-fw>
@@ -48,13 +47,17 @@ html
                 = link_to t("locales.#{locale}"), "?locale=#{locale}"
       .sidebar.collapsable
         ul.nav#side-menu
-          li
-            a.active href="index.html"
-              i.fa.fa-dashboard.fa-fw
-              | Dashboard
           li class="#{controller_name == 'conferences' ? 'active' : nil}"
             = link_to management_conferences_path
-              = fa_icon :group, text: Conference.model_name.human(count: 2).mb_chars.capitalize
+              = fa_icon 'group fw', text: Conference.model_name.human(count: 2).mb_chars.capitalize
+            ul.nav.nav-second-level
+              - Conference.all.each do |conference|
+                li
+                  = link_to conference.title, management_conference_path(conference)
+          li class="#{controller_name == 'users' ? 'active' : nil}"
+            = link_to management_users_path
+              = fa_icon 'user fw', text: User.model_name.human(count: 2).mb_chars.capitalize
+
 
     div.content#page-wrapper
       == yield
diff --git a/app/views/management/conferences/show.html.slim b/app/views/management/conferences/show.html.slim
index 59b893b..80a2457 100644
--- a/app/views/management/conferences/show.html.slim
+++ b/app/views/management/conferences/show.html.slim
@@ -10,7 +10,7 @@
       .panel-heading
         .row
           .col-xs-3
-            = fa_icon 'bullhorn 5x'
+            = fa_icon 'files-o 5x'
           .col-xs-9.text-right
             .huge
               = @conference.events.count
diff --git a/app/views/management/users/index.html.slim b/app/views/management/users/index.html.slim
index 720f0f4..634f7d3 100644
--- a/app/views/management/users/index.html.slim
+++ b/app/views/management/users/index.html.slim
@@ -1,15 +1,20 @@
+- content_for :title
+  = User.model_name.human(count: 2).mb_chars.capitalize
+
 .row
-  .panel.panel-primary
-    .panel-heading
-      h3.panel-title = User.model_name.human(count: 2)
-    table.record-table
-      thead
-        tr
-          th.picture = SpeakerProfile.human_attribute_name(:picture)
-          th = User.human_attribute_name(:email)
-          th = SpeakerProfile.human_attribute_name(:first_name)
-          th = SpeakerProfile.human_attribute_name(:last_name)
-          th.admin = SpeakerProfile.human_attribute_name(:admin)
-          th.actions
-      tbody
-        = render @users
+  .col-lg-12
+    .panel.panel-primary
+      .panel-heading
+        h3.panel-title = User.model_name.human(count: 2)
+      .panel-body
+        table.table.table-striped data-table="true"
+          thead
+            tr
+              th.picture = SpeakerProfile.human_attribute_name(:picture)
+              th = User.human_attribute_name(:email)
+              th = SpeakerProfile.human_attribute_name(:first_name)
+              th = SpeakerProfile.human_attribute_name(:last_name)
+              th.admin = SpeakerProfile.human_attribute_name(:admin)
+              th.actions
+          tbody
+            = render @users
diff --git a/config/routes.rb b/config/routes.rb
index a102e58..1e003db 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -33,7 +33,6 @@ Rails.application.routes.draw do
           get 'undecided'
           get 'backup'
           get 'confirmed'
-          post 'send_acceptance_notifications'
         end
       end
     end