tienda 1.1.2 → 2.0.1

data/app/views/tienda/delivery_services/index.html.haml

@@ -1,27 +1,37 @@
 - @page_title = t('tienda.delivery_services.delivery_services')
 
-= content_for :header do
-  %p.buttons= link_to t('tienda.delivery_services.new'), :new_delivery_service, :class => 'button green'
-  %h2.delivery_services= t('tienda.delivery_services.delivery_services')
+.row
+  .col-md-12
+    %h1.page-header
+      = t('tienda.delivery_services.delivery_services')
+      -# %small Lorem ipsum dolor
+/ /. ROW
+.row
+  .col-md-12
+    %p.pull-right
+      = link_to t('tienda.delivery_services.new'), :new_delivery_service, class: 'btn btn-primary'
 
-.table
-  %table.data
-    %thead
-      %tr
-        %th= t('tienda.delivery_services.name')
-        %th= t('tienda.delivery_services.prices')
-        %th= t('tienda.delivery_services.courier')
-        %th= t('tienda.delivery_services.active?')
-        %th= t('tienda.delivery_services.default?')
-    %tbody
-      - if @delivery_services.empty?
-        %tr.empty
-          %td{:colspan => 5}= t('tienda.delivery_services.no_services')
-      - else
-        - for delivery_service in @delivery_services
-          %tr
-            %td= link_to delivery_service.name, [:edit, delivery_service]
-            %td= link_to t('tienda.delivery_services.set_prices'), [delivery_service, :delivery_service_prices]
-            %td= delivery_service.courier
-            %td= boolean_tag delivery_service.active?
-            %td= boolean_tag delivery_service.default?
+.panel.panel-default
+  .panel-heading
+    Listing delivery services
+  .panel-body
+    %table.table.table-hover
+      %thead
+        %tr
+          %th= t('tienda.delivery_services.name')
+          %th= t('tienda.delivery_services.prices')
+          %th= t('tienda.delivery_services.courier')
+          %th= t('tienda.delivery_services.active?')
+          %th= t('tienda.delivery_services.default?')
+      %tbody
+        - if @delivery_services.empty?
+          %tr.empty
+            %td{:colspan => 5}= t('tienda.delivery_services.no_services')
+        - else
+          - for delivery_service in @delivery_services
+            %tr
+              %td= link_to delivery_service.name, [:edit, delivery_service]
+              %td= link_to t('tienda.delivery_services.set_prices'), [delivery_service, :delivery_service_prices]
+              %td= delivery_service.courier
+              %td= boolean_tag delivery_service.active?
+              %td= boolean_tag delivery_service.default?

data/app/views/tienda/delivery_services/new.html.haml

@@ -1,6 +1,15 @@
 - @page_title = t('tienda.delivery_services.delivery_services')
 
-= content_for :header do
-  %p.buttons= link_to t('tienda.delivery_services.back'), :delivery_services, :class => 'button'
-  %h2.delivery_services= t('tienda.delivery_services.delivery_services')
+.row
+  .col-md-12
+    %h1.page-header
+      = t('tienda.delivery_services.delivery_services')
+      -# %small Lorem ipsum dolor
+/ /. ROW
+
+.row
+  .col-md-12
+    %p.pull-right
+      = link_to t('tienda.delivery_services.back'), :delivery_services, class: 'btn btn-default'
+
 = render 'form'

data/app/views/tienda/orders/_form.html.haml

@@ -1,55 +1,80 @@
 = field_set_tag t('tienda.orders.billing_address') do
-  .splitContainer
-    %dl.third
-      %dt= f.label :first_name, t('tienda.orders.first_name')
-      %dd= f.text_field :first_name, :class => 'focus text'
-    %dl.third
-      %dt= f.label :last_name, t('tienda.orders.last_name')
-      %dd= f.text_field :last_name, :class => 'text'
-    %dl.third
-      %dt= f.label :company, t('tienda.orders.company')
-      %dd= f.text_field :company, :class => 'text'
-  %dl
-    %dt= f.label :billing_address1, t('tienda.orders.address')
-    %dd.space= f.text_field :billing_address1, :class => 'text'
-    %dd.space= f.text_field :billing_address2, :class => 'text'
-    %dd.space= f.text_field :billing_address3, :class => 'text'
-    %dd.space= f.text_field :billing_address4, :class => 'text'
-  .splitContainer
-    %dl.half
-      %dt= f.label :billing_postcode, t('tienda.orders.post_code')
-      %dd= f.text_field :billing_postcode, :class => 'text'
-    %dl.half
-      %dt= f.label :billing_country_id, t('tienda.orders.country')
-      %dd= f.collection_select :billing_country_id, Tienda::Country.ordered, :id, :name, {:include_blank => true}, {:data => {:placeholder => t('tienda.orders.select_country')}}
+  .row
+    .col-md-4
+      .form-group
+        = f.label :first_name, t('tienda.orders.first_name')
+        = f.text_field :first_name, class: 'focus form-control'
+    .col-md-4
+      .form-group
+        = f.label :last_name, t('tienda.orders.last_name')
+        = f.text_field :last_name, class: 'form-control'
+    .col-md-4
+      .form-group
+        = f.label :company, t('tienda.orders.company')
+        = f.text_field :company, class: 'form-control'
+  .row
+    .col-md-12
+       
+  .row
+    .col-md-12
+      .form-group
+        = f.label :billing_address1, t('tienda.orders.address')
+        = f.text_field :billing_address1, class: 'form-control'
+        = f.text_field :billing_address2, class: 'form-control'
+        = f.text_field :billing_address3, class: 'form-control'
+        = f.text_field :billing_address4, class: 'form-control'
+  .row
+    .col-md-12
+       
+  .row
+    .col-md-6
+      .form-group
+        = f.label :billing_postcode, t('tienda.orders.post_code')
+        = f.text_field :billing_postcode, class: 'form-control'
+    .col-md-6
+      .form-group
+        = f.label :billing_country_id, t('tienda.orders.country')
+        = f.collection_select :billing_country_id, Tienda::Country.ordered, :id, :name, {include_blank: true}, {class: 'form-control', data: {placeholder: t('tienda.orders.select_country')}}
+  .row
+    .col-md-12
+       
+  .row
+    .col-md-4
+      .form-group
+        = f.label :email_address, t('tienda.orders.email_address')
+        = f.text_field :email_address, class: 'form-control'
+    .col-md-4
+      .form-group
+        = f.label :phone_number, t('tienda.orders.phone_number')
+        = f.text_field :phone_number, class: 'form-control'
+    .col-md-4
+      .form-group
+        = f.label :separate_delivery_address, t('tienda.orders.separate_delivery_address')
+        .checkbox
+          %label
+            = f.check_box :separate_delivery_address
+            = t('tienda.orders.use_separate_delivery_address?')
 
-  .splitContainer
-    %dl.third
-      %dt= f.label :email_address, t('tienda.orders.email_address')
-      %dd= f.text_field :email_address, :class => 'text'
-    %dl.third
-      %dt= f.label :phone_number, t('tienda.orders.phone_number')
-      %dd= f.text_field :phone_number, :class => 'text'
-    %dl.third
-      %dt= f.label :separate_delivery_address, t('tienda.orders.separate_delivery_address')
-      %dd.checkbox
-        = f.check_box :separate_delivery_address
-        = f.label :separate_delivery_address, t('tienda.orders.use_separate_delivery_address?')
-
-= field_set_tag t('tienda.orders.delivery_address'), :class => 'delivery' do
-  %dl
-    %dt= f.label :delivery_name, t('tienda.orders.delivery_name')
-    %dd= f.text_field :delivery_name, :class => 'text'
-  %dl
-    %dt= f.label :delivery_address1, t('tienda.orders.address')
-    %dd.space= f.text_field :delivery_address1, :class => 'text'
-    %dd.space= f.text_field :delivery_address2, :class => 'text'
-    %dd.space= f.text_field :delivery_address3, :class => 'text'
-    %dd.space= f.text_field :delivery_address4, :class => 'text'
-  .splitContainer
-    %dl.half
-      %dt= f.label :delivery_postcode, t('tienda.orders.post_code')
-      %dd= f.text_field :delivery_postcode, :class => 'text'
-    %dl.half
-      %dt= f.label :delivery_country_id, t('tienda.orders.country')
-      %dd= f.collection_select :delivery_country_id, Tienda::Country.ordered, :id, :name, {:include_blank => true}, {:data => {:placeholder => t('tienda.orders.select_country')}}
+= field_set_tag t('tienda.orders.delivery_address'), class: 'delivery' do
+  .row
+    .col-md-12
+      .form-group
+        = f.label :delivery_name, t('tienda.orders.delivery_name')
+        = f.text_field :delivery_name, class: 'form-control'
+  .row
+    .col-md-12
+      .form-group
+        = f.label :delivery_address1, t('tienda.orders.address')
+        = f.text_field :delivery_address1, class: 'form-control'
+        = f.text_field :delivery_address2, class: 'form-control'
+        = f.text_field :delivery_address3, class: 'form-control'
+        = f.text_field :delivery_address4, class: 'form-control'
+  .row
+    .col-md-6
+      .form-group
+        = f.label :delivery_postcode, t('tienda.orders.post_code')
+        = f.text_field :delivery_postcode, class: 'form-control'
+    .col-md-6
+      .form-group
+        = f.label :delivery_country_id, t('tienda.orders.country')
+        = f.collection_select :delivery_country_id, Tienda::Country.ordered, :id, :name, {include_blank: true}, {class: 'form-control', data: {placeholder: t('tienda.orders.select_country')}}

data/app/views/tienda/orders/_order_details.html.haml

@@ -1,57 +1,60 @@
-.details
-  .left
-    %dl
-      %dt= t('tienda.orders.name')
-      %dd= @order.full_name
-      %dt= t('tienda.orders.company')
-      %dd= @order.company.blank? ? '-' : @order.company
-      %dt
+.panel.panel-default
+  .panel-heading
+    Order Details
+  .panel-body
+    .col-md-6
+      %dl
+        %dt= t('tienda.orders.name')
+        %dd= @order.full_name
+        %dt= t('tienda.orders.company')
+        %dd= @order.company.blank? ? '-' : @order.company
+        %dt
+          - if @order.separate_delivery_address?
+            = t('tienda.orders.billing_address')
+          - else
+            = t('tienda.orders.billing_delivery_address')
+
+        %dd= @order.billing_address1
+        %dd= @order.billing_address2
+        %dd= @order.billing_address3
+        %dd= @order.billing_address4
+        %dd= @order.billing_postcode
+        %dd= @order.billing_country.try(:name)
         - if @order.separate_delivery_address?
-          = t('tienda.orders.billing_address')
-        - else
-          = t('tienda.orders.billing_delivery_address')
+          %dt= t('tienda.orders.delivery_address')
+          %dd= @order.delivery_name
+          %dd= @order.delivery_address1
+          %dd= @order.delivery_address2
+          %dd= @order.delivery_address3
+          %dd= @order.delivery_address4
+          %dd= @order.delivery_postcode
+          %dd= @order.delivery_country.try(:name)
+    .col-md-6
+      %dl
+        %dt= t('tienda.orders.email_address')
+        %dd= mail_to @order.email_address
+        %dt= t('tienda.orders.telephone')
+        %dd= @order.phone_number
+        %dt= t('tienda.orders.weight')
+        %dd= number_to_weight @order.total_weight
+        - if @order.received?
+          %dt= t('tienda.orders.build_time')
+          %dd= distance_of_time_in_words(@order.created_at, @order.received_at)
+        - if @order.invoiced?
+          %dt= t('tienda.orders.invoice_number')
+          %dd= @order.invoice_number
+        %dt= t('tienda.orders.order_balance')
+        %dd= boolean_tag @order.paid_in_full?, nil, true_text: number_to_currency(@order.balance), false_text: number_to_currency(@order.balance)
+      - if @order.accepted? && !@order.shipped?
+        = form_tag [:ship, @order] do
+          .form-group
+            = label_tag 'consignment_number', t('tienda.orders.consignment_number')
+            = text_field_tag 'consignment_number', '', class: 'form-control'
+          .form-group
+            = submit_tag t('tienda.orders.mark_as_shipped') , class: 'btn btn-primary btn-sm'
 
-      %dd= @order.billing_address1
-      %dd= @order.billing_address2
-      %dd= @order.billing_address3
-      %dd= @order.billing_address4
-      %dd= @order.billing_postcode
-      %dd= @order.billing_country.try(:name)
-      - if @order.separate_delivery_address?
-        %dt= t('tienda.orders.delivery_address')
-        %dd= @order.delivery_name
-        %dd= @order.delivery_address1
-        %dd= @order.delivery_address2
-        %dd= @order.delivery_address3
-        %dd= @order.delivery_address4
-        %dd= @order.delivery_postcode
-        %dd= @order.delivery_country.try(:name)
-  .right
-    %dl
-      %dt= t('tienda.orders.email_address')
-      %dd= mail_to @order.email_address
-      %dt= t('tienda.orders.telephone')
-      %dd= @order.phone_number
-      %dt= t('tienda.orders.weight')
-      %dd= number_to_weight @order.total_weight
-      - if @order.received?
-        %dt= t('tienda.orders.build_time')
-        %dd= distance_of_time_in_words(@order.created_at, @order.received_at)
-      - if @order.invoiced?
-        %dt= t('tienda.orders.invoice_number')
-        %dd= @order.invoice_number
-      %dt= t('tienda.orders.order_balance')
-      %dd= boolean_tag @order.paid_in_full?, nil, :true_text => number_to_currency(@order.balance), :false_text => number_to_currency(@order.balance)
-    - if @order.accepted? && !@order.shipped?
-      = form_tag [:ship, @order] do
-        %dl.form
-          %dt.padding= label_tag 'consignment_number', t('tienda.orders.consignment_number')
-          %dd= text_field_tag 'consignment_number', '', :class => 'text'
+      - unless @order.accepted? || @order.rejected?
         %dl.form
-          %dd= submit_tag t('tienda.orders.mark_as_shipped') , :class => 'button green button-mini'
-
-    - unless @order.accepted? || @order.rejected?
-      %dl.form
-        %dd
-          = link_to t('tienda.orders.accept'), [:accept, @order], :method => :post, :class => 'button green'
-          = link_to t('tienda.orders.reject'), [:reject, @order], :method => :post, :class => 'button purple'
+          %dd
+            = link_to t('tienda.orders.accept'), [:accept, @order], method: :post, class: 'btn btn-primary'
+            = link_to t('tienda.orders.reject'), [:reject, @order], method: :post, class: 'btn btn-danger'

data/app/views/tienda/orders/_order_items.html.haml

@@ -1,6 +1,8 @@
-.order_items
-  .table
-    %table.data
+.panel.panel-default
+  .panel-heading
+    = t('tienda.orders.order_items')
+  .panel-body
+    %table.table.table-hover
       %thead
         %tr
           %th.qty= t('tienda.orders.qty')

data/app/views/tienda/orders/_payments_form.html.haml

@@ -1,15 +1,19 @@
 = form_for [@order, Tienda::Payment.new(:amount => @order.balance)] do |f|
-  %dl.text
-    %dt= f.label :method, t('tienda.orders.method')
-    %dd= f.text_field :method, :class => 'text'
-  %dl.text
-    %dt= f.label :reference, t('tienda.orders.reference')
-    %dd= f.text_field :reference, :class => 'text'
-  %dl.amount
-    %dt= f.label :amount, t('tienda.orders.amount')
-    %dd
-      .moneyInput
-        .currency= Tienda.settings.currency_unit.html_safe
-        = f.text_field :amount, :class => 'text'
-  %dl.submit
-    %dd= f.submit t('tienda.orders.add_payment') , :class => 'button green'
+  .col-md-3
+    .form-group
+      = f.label :method, t('tienda.orders.method')
+      = f.text_field :method, class: 'form-control'
+  .col-md-3
+    .form-group
+      = f.label :reference, t('tienda.orders.reference')
+      = f.text_field :reference, class: 'form-control'
+  .col-md-3
+    .form-group
+      = f.label :amount, t('tienda.orders.amount')
+      .form-group.input-group
+        %span.input-group-addon= Tienda.settings.currency_unit.html_safe
+        = f.text_field :amount, class: 'form-control'
+  .col-md-3
+    .form-group
+      %br
+      = f.submit t('tienda.orders.add_payment') , class: 'btn btn-primary'

data/app/views/tienda/orders/_payments_table.html.haml

@@ -1,6 +1,6 @@
 - unless @payments.empty?
   .table
-    %table.data
+    %table.table.table-hover
       %thead
         %tr
           %th= t('tienda.orders.id')
@@ -27,11 +27,12 @@
                   #{t('tienda.orders.from_payment')} ##{payment.parent_payment_id}
             - else
               %td= number_to_currency payment.amount
-              %td= boolean_tag payment.refunded?, nil, :true_text => number_to_currency(payment.amount_refunded)
+              %td= boolean_tag payment.refunded?, nil, true_text: number_to_currency(payment.amount_refunded)
             %td.refund
               - if payment.refundable?
-                = link_to t('tienda.orders.refund'), [:refund, @order, payment], :class => 'button purple button-mini', :rel => 'dialog'
+                = link_to t('tienda.orders.refund'), [:refund, @order, payment], class: 'btn btn-danger btn-sm', rel: 'dialog'
               - else
-                = link_to t('tienda.delete'), [@order, payment], :class => 'button purple button-mini', :data => {:confirm => t('tienda.orders.payment_remove_confirmation') }, :method => :delete
+                = link_to t('tienda.delete'), [@order, payment], class: 'btn btn-danger btn-sm', data: {confirm: t('tienda.orders.payment_remove_confirmation') }, method: :delete
 - else
-  %p.notice= t('tienda.orders.no_payments')
+  .alert.alert-warning
+    = t('tienda.orders.no_payments')

data/app/views/tienda/orders/_search_form.html.haml

@@ -1,24 +1,40 @@
-.orderSearch{:style => action_name == 'search' ? "display:block" : ''}
-  = search_form_for @query, :url => search_orders_path, :html => { :method => :post } do |f|
-    %dl.left
-      %dt= f.label :id_eq, t('tienda.orders.order_number')
-      %dd= f.text_field :id_eq
-      %dt= f.label :first_name_or_last_name_or_company_cont, t('tienda.orders.customer')
-      %dd= f.text_field :first_name_or_last_name_or_company_cont
-      %dt= f.label :address1_or_address2_or_address3_or_address4_or_postcode_cont, t('tienda.orders.billing_address')
-      %dd= f.text_field :billing_address1_or_billing_address2_or_billing_address3_or_billing_address4_or_billing_postcode_cont
-      %dt= f.label :consignment_number_cont, t('tienda.orders.consignment_number')
-      %dd= f.text_field :consignment_number_cont
-      %dt= f.label :received_at_eq, t('tienda.orders.received_between')
-      %dd
-        = f.text_field :received_at_gteq, :class => 'small'
-        →
-        = f.text_field :received_at_lteq, :class => 'small'
-    %dl.right
-      %dt= f.label :email_address_cont, t('tienda.orders.email_address')
-      %dd= f.text_field :email_address_cont
-      %dt= f.label :phone_number_cont, t('tienda.orders.phone_number')
-      %dd= f.text_field :phone_number_cont
-      %dt= f.label :status_eq, t('tienda.orders.status')
-      %dd= f.select :status_eq, [nil] + Tienda::Order::STATUSES.map { |s| [t("tienda.orders.statuses.#{s}"), s]}
-      %dd= f.submit  t('tienda.orders.search'), :class => 'button green button'
+.panel.panel-default.search-orders.hide{style: action_name == 'search' ? 'display:block' : ''}
+  .panel-heading
+    Search orders
+  .panel-body
+    = search_form_for @query, url: search_orders_path, html: { method: :post } do |f|
+      .row
+        .col-md-6
+          .form-group
+            = f.label :id_eq, t('tienda.orders.order_number')
+            = f.text_field :id_eq, class: 'form-control'
+          .form-group
+            = f.label :first_name_or_last_name_or_company_cont, t('tienda.orders.customer')
+            = f.text_field :first_name_or_last_name_or_company_cont, class: 'form-control'
+          .form-group
+            = f.label :address1_or_address2_or_address3_or_address4_or_postcode_cont, t('tienda.orders.billing_address')
+            = f.text_field :billing_address1_or_billing_address2_or_billing_address3_or_billing_address4_or_billing_postcode_cont, class: 'form-control'
+          .form-group
+            = f.label :consignment_number_cont, t('tienda.orders.consignment_number')
+            = f.text_field :consignment_number_cont, class: 'form-control'
+          .row
+            .col-md-12
+              = f.label :received_at_eq, t('tienda.orders.received_between')
+            .col-md-5
+              = f.text_field :received_at_gteq, class: 'form-control col-md-5'
+            .col-md-1
+              %p.form-control-static
+                →
+            .col-md-6
+              = f.text_field :received_at_lteq, class: 'form-control col-md-5'
+        .col-md-6
+          .form-group
+            = f.label :email_address_cont, t('tienda.orders.email_address')
+            = f.text_field :email_address_cont, class: 'form-control'
+          .form-group
+            = f.label :phone_number_cont, t('tienda.orders.phone_number')
+            = f.text_field :phone_number_cont, class: 'form-control'
+          .form-group
+            = f.label :status_eq, t('tienda.orders.status')
+            = f.select :status_eq, [nil] + Tienda::Order::STATUSES.map { |s| [t("tienda.orders.statuses.#{s}"), s]}, {}, class: 'form-control'
+          = f.submit  t('tienda.orders.search'), class: 'btn btn-primary'

data/app/views/tienda/orders/_status_bar.html.haml

@@ -1,35 +1,39 @@
-.status-bar
-  %ul
-    - if @order.received?
-      %li.received
-        %h4= t('tienda.orders.order_received')
-        %p
-          = t('tienda.orders.status_bar.on_date', on: @order.received_at.to_s(:short))
-          = t('tienda.orders.status_bar.from_ip', ip: @order.ip_address)
+.panel.panel-default
+  .panel-heading
+    Order Status
+  .panel-body
+    .status-bar
+      %ul
+        - if @order.received?
+          %li.received
+            %h4= t('tienda.orders.order_received')
+            %p
+              = t('tienda.orders.status_bar.on_date', on: @order.received_at.to_s(:short))
+              = t('tienda.orders.status_bar.from_ip', ip: @order.ip_address)
 
-    - if @order.accepted?
-      %li.accepted
-        %h4= t('tienda.orders.order_accepted')
-        %p
-          = t('tienda.orders.status_bar.on_date', on: @order.accepted_at.to_s(:short))
-          - if @order.accepter
-            = t('tienda.orders.status_bar.by_user', user: @order.accepter.short_name)
+        - if @order.accepted?
+          %li.accepted
+            %h4= t('tienda.orders.order_accepted')
+            %p
+              = t('tienda.orders.status_bar.on_date', on: @order.accepted_at.to_s(:short))
+              - if @order.accepter
+                = t('tienda.orders.status_bar.by_user', user: @order.accepter.short_name)
 
-    - elsif @order.rejected?
-      %li.rejected
-        %h4= t('tienda.orders.order_rejected')
-        %p
-          = t('tienda.orders.status_bar.on_date', on: @order.rejected_at.to_s(:short))
-          - if @order.rejecter
-            = t('tienda.orders.status_bar.by_user', user: @order.rejecter.short_name)
+        - elsif @order.rejected?
+          %li.rejected
+            %h4= t('tienda.orders.order_rejected')
+            %p
+              = t('tienda.orders.status_bar.on_date', on: @order.rejected_at.to_s(:short))
+              - if @order.rejecter
+                = t('tienda.orders.status_bar.by_user', user: @order.rejecter.short_name)
 
-    - if @order.shipped?
-      %li.shipped
-        %h4= t('tienda.orders.order_shipped')
-        %p
-          = t('tienda.orders.status_bar.on_date', on: @order.shipped_at.to_s(:short))
-          = t('tienda.orders.status_bar.by_user', user: @order.shipper.try(:short_name) || 'Unknown')
-        - if @order.delivery_service && @order.courier_tracking_url
-          %p= link_to t('tienda.orders.status_bar.tracking_url'), @order.courier_tracking_url
-        - else
-          %p= t('tienda.orders.status_bar.consignment_no_html', consignment_number: @order.consignment_number)
+        - if @order.shipped?
+          %li.shipped
+            %h4= t('tienda.orders.order_shipped')
+            %p
+              = t('tienda.orders.status_bar.on_date', on: @order.shipped_at.to_s(:short))
+              = t('tienda.orders.status_bar.by_user', user: @order.shipper.try(:short_name) || 'Unknown')
+            - if @order.delivery_service && @order.courier_tracking_url
+              %p= link_to t('tienda.orders.status_bar.tracking_url'), @order.courier_tracking_url
+            - else
+              %p= t('tienda.orders.status_bar.consignment_no_html', consignment_number: @order.consignment_number)

data/app/views/tienda/orders/index.html.haml

@@ -1,39 +1,46 @@
 - @page_title = t('tienda.orders.orders')
 
-= content_for :header do
-  %p.buttons
-    = link_to t('tienda.orders.new_order'), :new_order, :class => 'button green'
-    = link_to t('tienda.orders.search_orders'), '#', :class => 'button', :rel => 'searchOrders'
-  %h2.orders
-    = t('tienda.orders.orders')
-    %span= page_entries_info @orders
+.row
+  .col-md-12
+    %h1.page-header
+      = t('tienda.orders.orders')
+      %small= page_entries_info @orders
+/ /. ROW
+.row
+  .col-md-12
+    %p.pull-right
+      = link_to t('tienda.orders.new_order'), :new_order, class: 'btn btn-primary'
+      = link_to t('tienda.orders.search_orders'), '#', class: 'btn btn-default', rel: 'searchOrders'
 
 = render 'search_form'
 
-.table
-  %table.data
-    %thead
-      %tr
-        %th= t('tienda.orders.number')
-        %th= t('tienda.orders.customer')
-        %th= t('tienda.orders.status')
-        %th= t('tienda.orders.products')
-        %th= t('tienda.orders.total')
-        %th= t('tienda.orders.payment')
-    %tbody
-      - if @orders.empty?
-        %tr.empty
-          %td{:colspan => 6}= t('tienda.orders.no_orders')
-      - else
-        - for order in @orders
-          %tr
-            %td= link_to order.number, order
-            %td= order.customer_name
-            %td= status_tag order.status
-            %td
-              %ul
-                - for item in order.order_items
-                  %li #{item.quantity} x #{item.ordered_item.full_name}
-            %td= number_to_currency order.total
-            %td= boolean_tag order.paid_in_full?, nil, :true_text => number_to_currency(order.amount_paid), :false_text => number_to_currency(order.amount_paid)
-= paginate @orders
+.panel.panel-default
+  .panel-heading
+    Listing orders
+  .panel-body
+    %table.table.table-hover
+      %thead
+        %tr
+          %th= t('tienda.orders.number')
+          %th= t('tienda.orders.customer')
+          %th= t('tienda.orders.status')
+          %th= t('tienda.orders.products')
+          %th= t('tienda.orders.total')
+          %th= t('tienda.orders.payment')
+      %tbody
+        - if @orders.empty?
+          %tr.empty
+            %td{colspan: 6}= t('tienda.orders.no_orders')
+        - else
+          - for order in @orders
+            %tr
+              %td= link_to order.number, order
+              %td= order.customer_name
+              %td= status_tag order.status
+              %td
+                %ul
+                  - for item in order.order_items
+                    %li #{item.quantity} x #{item.ordered_item.full_name}
+              %td= number_to_currency order.total
+              %td= boolean_tag order.paid_in_full?, nil, true_text: number_to_currency(order.amount_paid), false_text: number_to_currency(order.amount_paid)
+  = paginate @orders