From f19044ae6abec86778868f0db72773d4fe2e54f2 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Tue, 11 Dec 2012 01:02:52 +0100
Subject: [PATCH] routing fixes

---
 app/views/user/history_list.html.slim            | 6 ++++--
 app/views/user/list_history.html.slim            | 4 ++--
 app/views/user/list_products_for_table.html.slim | 8 ++++----
 config/routes.rb                                 | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/views/user/history_list.html.slim b/app/views/user/history_list.html.slim
index d85b6c94..64556131 100644
--- a/app/views/user/history_list.html.slim
+++ b/app/views/user/history_list.html.slim
@@ -1,5 +1,7 @@
-.page-header
-  h1.page-title data-t="history_list.title" = t('user.history_list.title', list: List.model_name.human)
+= top_bar title: 'history_list.title' do
+  .pull-right
+    .table-number
+    .supplier-name
 dl.dl-horizontal
   dt data-t="attributes.list.created_at" = List.human_attribute_name(:created_at)
   dd.list-created-at
diff --git a/app/views/user/list_history.html.slim b/app/views/user/list_history.html.slim
index 156ead0a..7dfa5057 100644
--- a/app/views/user/list_history.html.slim
+++ b/app/views/user/list_history.html.slim
@@ -1,5 +1,5 @@
-.page-header
-  h1 data-t="list_history.title" = t('user.list_history.title')
+= top_bar title: 'list_history.title' do
+  span
 nav.pagination
 ul#list-history-container
 - onload_javascript "Qstorage.page = 1; Quser.load_list_history()"
diff --git a/app/views/user/list_products_for_table.html.slim b/app/views/user/list_products_for_table.html.slim
index 81d59b49..9e4e43e1 100644
--- a/app/views/user/list_products_for_table.html.slim
+++ b/app/views/user/list_products_for_table.html.slim
@@ -1,7 +1,7 @@
-.page-header
-  .table-number
-  .supplier-name
-  h4= t('user.show_products.title', products: Product.model_name.human_plural)
+= top_bar title: 'show_products.title' do
+  .pull-right
+    .table-number
+    .supplier-name
 .well
   table#products-table.table.table-hover
     tbody
diff --git a/config/routes.rb b/config/routes.rb
index 7b34325d..9c7e5adc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -35,7 +35,7 @@ Qwaiter::Application.routes.draw do
 
   # USER
   #default_url_options format: 'html'
-  get '/user/home' => 'index#home', as: :user_root
+  get '/user/index' => 'user#index', as: :user_root
   get '/user' => 'user#index'
   get '/user/active_list(.:format)' => 'user#active_list', as: :user_active_list
   get '/user/list_info' => 'user#list_info', as: :user_list_info, via: [:get, :options]