tienda 1.1.2 → 2.0.1

data/app/views/tienda/products/edit.html.haml

@@ -1,8 +1,16 @@
 - @page_title = t('tienda.products.products')
-= content_for :header do
-  %p.buttons
-    = link_to t('tienda.products.variants') , [@product, :variants], :class => 'button'
-    = link_to t('tienda.products.stock_levels') , stock_level_adjustments_path(:item_id => @product.id, :item_type => @product.class), :class => 'button', :rel => 'dialog', :data => {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
-    = link_to t('tienda.products.back_to_products') , :products, :class => 'button'
-  %h2.products= t('tienda.products.products')
+
+.row
+  .col-md-12
+    %h1.page-header
+      = t('tienda.products.products')
+      -# %small Lorem ipsum dolor
+/ /. ROW
+.row
+  .col-md-12
+    .pull-right
+      = link_to t('tienda.products.variants') , [@product, :variants], class: 'btn btn-default'
+      = link_to t('tienda.products.stock_levels') , stock_level_adjustments_path(item_id: @product.id), class: 'btn btn-default', rel: 'dialog', data: {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
+      = link_to t('tienda.products.back_to_products') , :products, class: 'btn btn-default'
+%br
 = render 'form'

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

@@ -1,9 +1,37 @@
 - @page_title = t('tienda.products.products')
 
-= content_for :header do
-  %p.buttons
-    = link_to t('tienda.products.new_product'), :new_product, :class => 'button green'
-    = link_to t('tienda.products.import_products'), :import_products, :class => 'button gray'
-  %h2.products= t('tienda.products.products')
-
-= render 'table', :products => @products
+.row
+  .col-md-12
+    %h1.page-header
+      = t('tienda.products.products')
+      -# %small Lorem ipsum dolor
+/ /. ROW
+.row
+  .col-md-12
+    .pull-left
+      .btn-group
+        %button.btn.btn-default.dropdown-toggle{"data-toggle" => "dropdown"}
+          = "Filter#{': ' + params[:filter].humanize unless params[:filter].blank?}"
+          %span.caret
+        %ul.dropdown-menu
+          %li
+            %a{href: products_path(filter: :active)} Active
+          %li
+            %a{href: products_path(filter: :inactive)} Inactive
+          %li.divider
+          %li
+            %a{href: products_path(filter: :in_stock)} In stock
+          %li
+            %a{href: products_path(filter: :no_stock)} Not in stock
+          %li.divider
+          %li
+            %a{href: products_path} All products
+    .pull-right
+      = link_to t('tienda.products.new_product'), :new_product, class: 'btn btn-primary'
+      = link_to t('tienda.products.import_products'), :import_products, class: 'btn btn-default'
+%br
+.panel.panel-default
+  .panel-heading
+    Listing products
+  .panel-body
+    = render 'table', products: @products

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

@@ -1,12 +1,14 @@
 - @page_title =  t('tienda.sessions.admin_login')
+
 = display_flash
+  
 .loginArea
-  = form_tag :login, :class => 'login' do
-    %p.field
-      = text_field_tag 'email_address', params[:email_address], :class => 'focus', :placeholder => t('tienda.sessions.email')
-    %p.field
-      = password_field_tag 'password', params[:password], :class => '', :placeholder =>  t('tienda.sessions.password')
+  = form_tag :login, class: 'login' do
+    .form-group
+      = text_field_tag 'email_address', params[:email_address], class: 'form-control focus', placeholder: t('tienda.sessions.email')
+    .form-group
+      = password_field_tag 'password', params[:password], class: 'form-control ', placeholder:  t('tienda.sessions.password')
     %p.submit
-      = submit_tag t('tienda.sessions.login'), :class => 'button green'
+      = submit_tag t('tienda.sessions.login'), class: 'btn btn-primary'
     %p.reset
       = link_to t('tienda.sessions.reset_password?'), login_reset_path

data/app/views/tienda/sessions/reset.html.haml

@@ -1,12 +1,12 @@
 - @page_title =  t('tienda.sessions.reset_password')
 
 = display_flash
+
 .loginArea
-  %h2= t('tienda.sessions.reset_password')
   = form_tag :login_reset, :class => 'login' do
-    %p.field
-      = text_field_tag 'email_address', params[:email_address], :class => 'focus', :placeholder => t('tienda.sessions.email')
+    .form-group
+      = text_field_tag 'email_address', params[:email_address], class: 'form-control focus', placeholder: t('tienda.sessions.email')
     %p.submit
-      = submit_tag t('tienda.sessions.reset')  , :class => 'button green'
+      = submit_tag t('tienda.sessions.reset'), class: 'btn btn-primary'
     %p.reset
-      = link_to t('tienda.sessions.back_to_login') , login_path
+      = link_to t('tienda.sessions.back_to_login'), login_path

data/app/views/tienda/settings/edit.html.haml

@@ -1,19 +1,25 @@
 - @page_title = t("tienda.settings.settings")
 
-= content_for :header do
-  %h2.settings= t("tienda.settings.settings")
+.row
+  .col-md-12
+    %h1.page-header
+      = t("tienda.settings.settings")
+      %small Lorem ipsum dolor
+/ /. ROW
 
-= form_tag :url => settings_path do |f|
+.panel.panel-default
+  .panel-body
+    = form_tag({url: settings_path}, {class: 'form-horizontal'}) do |f|
 
-  - Tienda.settings_groups.each do |group, fields|
-    = field_set_tag t("tienda.settings.#{group}") do
-      - fields.each do |f|
-        %dl.sided
-          %dt= settings_label f
-          %dd
-            = settings_field f
-            - if v = t("tienda.settings.help")[f]
-              %p.help= v
+      - Tienda.settings_groups.each do |group, fields|
+        = field_set_tag t("tienda.settings.#{group}") do
+          - fields.each do |f|
+            .form-group
+              = settings_label f, 'control-label col-md-3'
+              .col-md-9
+                = settings_field f, class: 'form-control'
+                - if v = t("tienda.settings.help")[f]
+                  %span.help-block= v
 
-  %p.submit.sided
-    = submit_tag t("tienda.settings.save_settings"), :class => 'button green'
+      %p.submit.sided
+        = submit_tag t("tienda.settings.save_settings"), class: 'btn btn-primary'

data/app/views/tienda/stock_level_adjustments/_table.html.haml

@@ -0,0 +1,33 @@
+.table
+  .alert.alert-info
+    = t('tienda.stock_level_adjustments.current_stock_level_html', item_stock: @item.stock_count).html_safe
+    %span.float-right= page_entries_info @stock_level_adjustments
+
+  .alert.alert-danger.hidden
+    Probando
+
+  = form_for @new_sla, remote: request.xhr? do |f|
+    = hidden_field_tag 'item_id', params[:item_id]
+    %table.table.table-hover
+      %thead
+        %tr
+          %th{:width => '25%'}= t('tienda.stock_level_adjustments.date')
+          %th{:width => '50%'}= t('tienda.stock_level_adjustments.description')
+          %th{:width => '25%'}= t('tienda.stock_level_adjustments.adjustment')
+      %tbody
+        %tr.form
+          %td= Date.today.to_s(:long)
+          %td.desc= f.text_field :description, class: 'form-control'
+          %td.adjustment
+            .form-group.input-group
+              = f.text_field :adjustment, class: 'form-control'
+              %span.input-group-btn
+                = f.submit t('tienda.stock_level_adjustments.add'), class: 'btn btn-success'
+
+        - for sla in @stock_level_adjustments
+          %tr
+            %td= l(sla.created_at, format: :long)
+            %td= sla.description
+            %td= sla.adjustment > 0  ? "+#{sla.adjustment}" : sla.adjustment
+
+    = paginate @stock_level_adjustments

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

@@ -1,40 +1,21 @@
-- @page_title = t('tienda.stock_level_adjustments.stock_levels_title', item_name: @item.name)
+- @page_title = t('tienda.stock_level_adjustments.stock_levels_for', item_name: @item.name)
 
-= content_for :header do
-  %p.buttons
-    - case @item
-    - when Tienda::Product
-      - @active_nav = :products
-      = link_to t('tienda.stock_level_adjustments.edit_product'), [:edit, @item], :class => 'button'
-      = link_to t('tienda.stock_level_adjustments.back_to_product'), :products, :class => 'button'
-
-  %h2.products= t('tienda.stock_level_adjustments.stock_levels_for', item_name: @item.name)
-
-.table
-  %p.info
-    = t('tienda.stock_level_adjustments.current_stock_level_html', item_stock: @item.stock).html_safe
-    %span.float-right= page_entries_info @stock_level_adjustments
-
-  = form_for @new_sla do |f|
-    = hidden_field_tag 'item_type', params[:item_type]
-    = hidden_field_tag 'item_id', params[:item_id]
-    %table.data
-      %thead
-        %tr
-          %th{:width => '25%'}= t('tienda.stock_level_adjustments.date')
-          %th{:width => '50%'}= t('tienda.stock_level_adjustments.description')
-          %th{:width => '25%'}= t('tienda.stock_level_adjustments.adjustment')
-      %tbody
-        %tr.form
-          %td
-          %td.desc= f.text_field :description
-          %td.adjustment
-            = f.text_field :adjustment
-            = f.submit t('tienda.stock_level_adjustments.add'), :class => 'button button-mini green'
-        - for sla in @stock_level_adjustments
-          %tr
-            %td= l(sla.created_at, format: :long)
-            %td= sla.description
-            %td= sla.adjustment > 0  ? "+#{sla.adjustment}" : sla.adjustment
-
-    = paginate @stock_level_adjustments
+- if request.xhr?
+  .modal-header
+    %button.close{aria: {hidden: 'true', dismiss: 'modal'}, type: 'button'} ×
+    %h4.modal-title= t('tienda.stock_level_adjustments.stock_levels_for', item_name: @item.name)
+  .modal-body
+    = render 'table'
+  .modal-footer
+    %button.btn.btn-default{data: {dismiss: 'modal'}, type: 'button'} Close
+- else
+  .row
+    .col-md-12
+      %h1.page-header
+        = t('tienda.stock_level_adjustments.stock_levels_for', item_name: @item.name)
+  %br
+  .panel.panel-default
+    .panel-heading
+      Stock Level Adjustments
+    .panel-body
+      = render 'table'

data/app/views/tienda/tax_rates/form.html.haml

@@ -1,28 +1,44 @@
 - @page_title = t('tienda.tax_rates.tax_rates')
-= content_for :header do
-  %p.buttons= link_to t('tienda.tax_rates.back_to_tax_rates'), :tax_rates, :class => 'button grey'
-  %h2.tax_rates= t('tienda.tax_rates.tax_rates')
 
-= form_for @tax_rate do |f|
-  = f.error_messages
-  = field_set_tag t('tienda.tax_rates.rate_details') do
-    .splitContainer
-      %dl.half
-        %dt= f.label :name, t('tienda.tax_rates.name')
-        %dd= f.text_field :name, :class => 'focus text'
-      %dl.half
-        %dt= f.label :rate, t('tienda.tax_rates.rate')
-        %dd= f.text_field :rate, :class => 'text'
+.row
+  .col-md-12
+    %h1.page-header
+      = t('tienda.tax_rates.tax_rates')
+      -# %small Lorem ipsum dolor
+/ /. ROW
+.row
+  .col-md-12
+    %p.pull-right
+      = link_to t('tienda.tax_rates.back_to_tax_rates'), :tax_rates, class: 'btn btn-default'
 
-  = field_set_tag t('tienda.tax_rates.country_restriction') do
-    %dl
-      %dd
-        = f.select :address_type, Tienda::TaxRate::ADDRESS_TYPES.map { |a| [t('tienda.tax_rates.address_type_option', address: t("tienda.tax_rates.#{a}")).html_safe, a]}, {}, :class => 'chosen-basic'
-    %dl
-      %dd
-        = f.collection_select :country_ids, Tienda::Country.ordered, :id, :name, {}, {:class => 'chosen', :multiple => true, :data => {:placeholder => t('tienda.tax_rates.all_countries') }}
-  %p.submit
-    - unless @tax_rate.new_record?
-      %span.right= link_to t('tienda.delete'), @tax_rate, :class => 'button purple', :method => :delete, :data => {:confirm => t('tienda.tax_rates.delete_confirmation') }
-    = f.submit t('tienda.submit'), :class => 'button green'
-    = link_to t('tienda.cancel'), :tax_rates, :class => 'button'
+.panel.panel-default
+  .panel-body
+    = form_for @tax_rate do |f|
+      = f.error_messages
+      = field_set_tag t('tienda.tax_rates.rate_details') do
+        .row
+          .col-md-6
+            .form-group
+              = f.label :name, t('tienda.tax_rates.name')
+              = f.text_field :name, class: 'focus form-control'
+          .col-md-6
+            .form-group
+              = f.label :rate, t('tienda.tax_rates.rate')
+              = f.text_field :rate, class: 'form-control'
+
+      = field_set_tag t('tienda.tax_rates.country_restriction') do
+        .row
+          .col-md-12
+            .form-group
+              = f.select :address_type, Tienda::TaxRate::ADDRESS_TYPES.map { |a| [t('tienda.tax_rates.address_type_option', address: t("tienda.tax_rates.#{a}")).html_safe, a]}, {}, class: 'form-control'
+        .row
+          .col-md-12
+            .form-group
+              = f.collection_select :country_ids, Tienda::Country.ordered, :id, :name, {}, {class: 'form-control', multiple: true, data: {placeholder: t('tienda.tax_rates.all_countries') }}
+      .row
+        .col-md-12
+          .form-group
+            - unless @tax_rate.new_record?
+              %span.pull-right= link_to t('tienda.delete'), @tax_rate, class: 'btn btn-danger', method: :delete, data: {confirm: t('tienda.tax_rates.delete_confirmation') }
+            = f.submit t('tienda.submit'), class: 'btn btn-primary'
+            = link_to t('tienda.cancel'), :tax_rates, class: 'btn btn-default'

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

@@ -1,17 +1,27 @@
 - @page_title = t('tienda.tax_rates.tax_rates')
 
-= content_for :header do
-  %p.buttons= link_to t('tienda.tax_rates.new_tax_rate'), :new_tax_rate, :class => 'button green'
-  %h2.tax_rates= t('tienda.tax_rates.tax_rates')
+.row
+  .col-md-12
+    %h1.page-header
+      = t('tienda.tax_rates.tax_rates')
+      -# %small Lorem ipsum dolor
+/ /. ROW
+.row
+  .col-md-12
+    %p.pull-right
+      = link_to t('tienda.tax_rates.new_tax_rate'), :new_tax_rate, class: 'btn btn-primary'
 
-.table
-  %table.data
-    %thead
-      %tr
-        %th= t('tienda.tax_rates.name')
-        %th= t('tienda.tax_rates.rate')
-    %tbody
-      - for tax_rate in @tax_rates
+.panel.panel-default
+  .panel-heading
+    Listing tax rates
+  .panel-body
+    %table.table.table-hover
+      %thead
         %tr
-          %td= link_to tax_rate.name, [:edit, tax_rate]
-          %td= tax_rate.rate
+          %th= t('tienda.tax_rates.name')
+          %th= t('tienda.tax_rates.rate')
+      %tbody
+        - for tax_rate in @tax_rates
+          %tr
+            %td= link_to tax_rate.name, [:edit, tax_rate]
+            %td= tax_rate.rate

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

@@ -1,27 +1,39 @@
 = form_for @user do |f|
   = f.error_messages
-  = field_set_tag t('tienda.users.user_details') do
-    .splitContainer
-      %dl.half
-        %dt= f.label :first_name, t('tienda.users.first_name')
-        %dd= f.text_field :first_name, :class => 'focus text'
-      %dl.half
-        %dt= f.label :last_name, t('tienda.users.last_name')
-        %dd= f.text_field :last_name, :class => 'text'
-  = field_set_tag t("tienda.users.login") do
-    .splitContainer
-      %dl.third
-        %dt= f.label :email_address, t('tienda.users.email')
-        %dd= f.text_field :email_address, :class => 'text'
-      %dl.third
-        %dt= f.label :password, t('tienda.users.password')
-        %dd= f.password_field :password, :class => 'text'
-      %dl.third
-        %dt= f.label :password_confirmation, t('tienda.users.password_confirmation')
-        %dd= f.password_field :password_confirmation, :class => 'text'
+  .panel.panel-default
+    .panel-heading
+      = t('tienda.users.user_details')
+    .panel-body
+      .row
+        .col-md-6
+          .form-group
+            = f.label :first_name, t('tienda.users.first_name')
+            = f.text_field :first_name, class: 'focus form-control'
+        .col-md-6
+          .form-group
+            = f.label :last_name, t('tienda.users.last_name')
+            = f.text_field :last_name, class: 'form-control'
+  .panel.panel-default
+    .panel-heading
+      = t("tienda.users.login")
+    .panel-body
+      .row
+        .col-md-4
+          .form-group
+            = f.label :email_address, t('tienda.users.email')
+            = f.text_field :email_address, class: 'form-control'
+        .col-md-4
+          .form-group
+            = f.label :password, t('tienda.users.password')
+            = f.password_field :password, class: 'form-control'
+        .col-md-4
+          .form-group
+            = f.label :password_confirmation, t('tienda.users.password_confirmation')
+            = f.password_field :password_confirmation, class: 'form-control'
 
-  %p.submit
-    - unless @user.new_record?
-      %span.right= link_to t('tienda.delete'), @user, :class => 'button purple', :method => :delete, :data => {:confirm => t('tienda.users.delete_confirmation')}
-    = f.submit  t('tienda.submit'), :class => 'button green'
-    = link_to t('tienda.cancel'), :users, :class => 'button'
+  .panel.panel-default
+    .panel-body
+      - unless @user.new_record?
+        %span.pull-right= link_to t('tienda.delete'), @user, class: 'btn btn-danger', method: :delete, data: {confirm: t('tienda.users.delete_confirmation')}
+      = f.submit  t('tienda.submit'), class: 'btn btn-primary'
+      = link_to t('tienda.cancel'), :users, class: 'btn btn-default'

data/app/views/tienda/users/edit.html.haml

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

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

@@ -1,17 +1,27 @@
 - @page_title = t('tienda.users.users')
 
-= content_for :header do
-  %p.buttons= link_to t('tienda.users.new_user'), :new_user, :class => 'button green'
-  %h2.users= t('tienda.users.users')
+.row
+  .col-md-12
+    %h1.page-header
+      = t('tienda.users.users')
+      -# %small Lorem ipsum dolor
+/ /. ROW
+.row
+  .col-md-12
+    %p.pull-right
+      = link_to t('tienda.users.new_user'), :new_user, class: 'btn btn-primary'
 
-.table
-  %table.data
-    %thead
-      %tr
-        %th= t('tienda.users.name')
-        %th= t('tienda.users.email')
-    %tbody
-      - for user in @users
+.panel.panel-default
+  .panel-heading
+    Listing users
+  .panel-body
+    %table.table.table-hover
+      %thead
         %tr
-          %td= link_to user.full_name, [:edit, user]
-          %td= user.email_address
+          %th= t('tienda.users.name')
+          %th= t('tienda.users.email')
+      %tbody
+        - for user in @users
+          %tr
+            %td= link_to user.full_name, [:edit, user]
+            %td= user.email_address

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

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