From d3f6c4bd2a85b8f9ecfd18815a9b65b0c179f7d2 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Sun, 2 Sep 2012 14:56:47 +0200 Subject: [PATCH] design fixes for table view without list --- .../sections/manage_tables.html.slim | 4 +- app/views/user/list_products.html.slim | 4 +- .../user/list_products_for_table.html.slim | 39 ++++++++++--------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/app/views/suppliers/sections/manage_tables.html.slim b/app/views/suppliers/sections/manage_tables.html.slim index 8d742b72..3bde4d9d 100644 --- a/app/views/suppliers/sections/manage_tables.html.slim +++ b/app/views/suppliers/sections/manage_tables.html.slim @@ -1,9 +1,9 @@ - model_class = Section .page-header= title t('section.manage_tables.title', section: Section.model_name.human.downcase, title: @section.title) - content_for :row do - ul.nav.nav-pills + ul.nav.nav-tabs - for section in @section.supplier.sections - li class=(section == @section ? 'active' : nil) = link_to section.title, [:suppliers, section] + li class=(section == @section ? 'active' : nil) = link_to section.title, [:manage_tables, :suppliers, section] .span9 .well.section-tables-container.section-tables-active - for table in @section.tables diff --git a/app/views/user/list_products.html.slim b/app/views/user/list_products.html.slim index 11987c36..6290e495 100644 --- a/app/views/user/list_products.html.slim +++ b/app/views/user/list_products.html.slim @@ -7,10 +7,10 @@ .well table#products-table.table tbody - table#active-order-table.table.table-striped.hide + table#active-order-table.table.hide thead tr - th Product + th= Product.model_name.human th # th.currency Total th diff --git a/app/views/user/list_products_for_table.html.slim b/app/views/user/list_products_for_table.html.slim index 487558b4..7552a007 100644 --- a/app/views/user/list_products_for_table.html.slim +++ b/app/views/user/list_products_for_table.html.slim @@ -1,25 +1,26 @@ .page-header .table-number= @table.number h4= t('user.show_products.title', products: Product.model_name.human_plural) -table#products-table.table.table-striped.table-hover - tbody -table#active-order-table.table.table-striped.hide - thead - tr - th Product - th # - th.currency Total - th - tbody - tfoot - tr - td colspan=2 - button class="btn btn-primary" onClick="Quser.order_selected_products({table_id: '#{@table.id}'})" Bestellen - |  - button class="btn btn btn-warning" onClick="Quser.clear_selected_products()" Clear - td.currency - strong#active-order-total - td +.well + table#products-table.table.table-hover + tbody + table#active-order-table.table.hide + thead + tr + th= Product.model_name.human + th # + th.currency Total + th + tbody + tfoot + tr + td colspan=2 + button class="btn btn-primary" onClick="Quser.order_selected_products({table_id: '#{@table.id}'})" Bestellen + |  + button class="btn btn btn-warning" onClick="Quser.clear_selected_products()" Clear + td.currency + strong#active-order-total + td - content_for :footer do javascript: jQuery(function(){