comable_backend 0.3.2 → 0.3.3

data/app/views/comable/admin/shipment_methods/_form.slim

@@ -1,49 +1,29 @@
-= form_for [comable, :admin, @shipment_method] do |f|
-  / TODO: Standardize
-  - if @shipment_method.errors.any?
-    #error_explanation
-      h2
-        = pluralize(@shipment_method.errors.count, 'error')
-        | prohibited this shipment_method from being saved:
-
-      ul
-        - @shipment_method.errors.full_messages.each do |message|
-          li = message
+= error_messages_for @shipment_method
 
-  .panel.panel-inverse
-    .panel-heading
-      .panel-title
-        = Comable.t('admin.nav.shipment_methods.edit')
+= form_for [comable, :admin, @shipment_method] do |f|
+  .hidden
+    = f.submit
 
-    .panel-body
-      .form-horizontal
-        fieldset
-          .form-group
-            .col-sm-3.control-label
-              = f.label :name
-            .col-sm-6
-              = f.text_field :name
+  fieldset
+    .col-sm-3
+      legend
+        = Comable.t('admin.general')
 
-          .form-group
-            .col-sm-3.control-label
-              = f.label :fee
-            .col-sm-6
-              = f.text_field :fee
+    .col-sm-9
+      .form-group
+        = f.label :name
+        = f.text_field :name
 
-          .form-group
-            .col-sm-3.control-label
-              = f.label :traking_url
-            .col-sm-6
-              = f.text_field :traking_url, placeholder: 'http://'
+      .form-group
+        = f.label :fee
+        = f.text_field :fee
 
-          .form-group
-            .col-sm-offset-3.col-sm-6
-              .checkbox
-                = f.label :activate_flag do
-                  = f.check_box :activate_flag
-                  = f.object.class.human_attribute_name(:activate_flag)
+      .form-group
+        = f.label :traking_url
+        = f.text_field :traking_url, placeholder: 'http://'
 
-    .panel-footer
-      = link_to Comable.t('admin.actions.cancel'), comable.admin_shipment_methods_path, class: 'btn btn-default'
-      .pull-right
-        = f.submit
+      .form-group
+        .checkbox
+          = f.label :activate_flag do
+            = f.check_box :activate_flag
+            = f.object.class.human_attribute_name(:activate_flag)

data/app/views/comable/admin/shipment_methods/edit.slim

@@ -1,28 +1,27 @@
-#comable-shipment-method
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li
-      = link_to Comable.t('admin.nav.shipment_method'), comable.admin_shipment_methods_path
-    li.active
-      = @shipment_method.name
+.comable-page
+  .comable-main-fixed-top
+    .comable-page-heading
+      ul.pull-right.list-inline
+        li
+          = link_to_save
 
-  h1.page-header
-    = @shipment_method.name
+      h1.page-header
+        ol.breadcrumb
+          li>
+            = link_to Comable.t('admin.nav.shipment_method'), comable.admin_shipment_methods_path
+          li.active
+            = @shipment_method.name
 
-  .row
-    section.col-sm-8
-      = render 'form'
-      hr
-      .panel.panel-danger
-        .panel-heading type="button" data-toggle="collapse" data-target="#comable-danger" aria-expanded="false" aria-controls="comable-danger"
-          strong
-            span.fa.fa-angle-down>
-            = Comable.t('admin.actions.destroy')
-        #comable-danger.collapse
-          .panel-body
-            p
-              = Comable.t('admin.confirmation_to_remove_product')
-            = link_to Comable.t('admin.actions.destroy'), comable.admin_shipment_method_path(@shipment_method), method: :delete, class: 'btn btn-danger'
-
-    nav.col-sm-4
+  .comable-page-body
+    = render 'form'
+    hr
+    .panel.panel-danger
+      .panel-heading type="button" data-toggle="collapse" data-target="#comable-danger"
+        strong
+          span.fa.fa-angle-down>
+          = Comable.t('admin.actions.destroy')
+      #comable-danger.collapse
+        .panel-body
+          p
+            = Comable.t('admin.confirmation_to_remove_product')
+          = link_to Comable.t('admin.actions.destroy'), comable.admin_shipment_method_path(@shipment_method), method: :delete, class: 'btn btn-danger'

data/app/views/comable/admin/shipment_methods/index.slim

@@ -1,50 +1,38 @@
-#comable-shipment-method
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li.active
-      = Comable.t('admin.nav.shipment_method')
-
-  h1.page-header
-    = Comable.t('admin.nav.shipment_method')
-    small<
-      = @shipment_methods.total_count
-      = Comable.t('admin.results')
+.comable-page
+  .comable-page-heading
+    ul.pull-right.list-inline
+      li
+        = link_to Comable.t('admin.actions.new'), comable.new_admin_shipment_method_path, class: 'btn btn-default'
 
-  .row
-    section.col-sm-8
-      - if @shipment_methods.empty?
-        = Comable.t('admin.not_found')
-      - else
-        .panel.panel-inverse
-          .panel-heading
-            .panel-title
-              = Comable.t('admin.index')
-          table.table.table-striped
-            thead
-              th
-                = @shipment_methods.klass.human_attribute_name(:name)
-              th
-                = @shipment_methods.klass.human_attribute_name(:fee)
-              th
-                = @shipment_methods.klass.human_attribute_name(:traking_url)
-            tbody
-              - @shipment_methods.each do |shipment_method|
-                tr
-                  td
-                    = link_to shipment_method.name, comable.admin_shipment_method_path(shipment_method)
-                    - unless shipment_method.activate_flag
-                      span.fa.fa-eye-slash.text-muted<
-                  td
-                    = number_to_currency shipment_method.fee
-                  td
-                    = truncate shipment_method.traking_url
+    h1.page-header
+      = Comable.t('admin.nav.shipment_method')
+      small<
+        = @shipment_methods.total_count
+        = Comable.t('admin.results')
 
-        .text-center
-          = paginate @shipment_methods, theme: :comable_backend
+  .comable-page-body
+    - if @shipment_methods.empty?
+      = Comable.t('admin.not_found')
+    - else
+      table.table.table-striped
+        thead
+          th
+            = @shipment_methods.klass.human_attribute_name(:name)
+          th
+            = @shipment_methods.klass.human_attribute_name(:fee)
+          th
+            = @shipment_methods.klass.human_attribute_name(:traking_url)
+        tbody
+          - @shipment_methods.each do |shipment_method|
+            tr
+              td
+                = link_to shipment_method.name, comable.admin_shipment_method_path(shipment_method)
+                - unless shipment_method.activate_flag
+                  span.fa.fa-eye-slash.text-muted<
+              td
+                = number_to_currency shipment_method.fee
+              td
+                = truncate shipment_method.traking_url
 
-    nav.col-sm-4
-      #comable-affix
-        .panel
-          .list-group
-            = link_to Comable.t('admin.actions.new'), comable.new_admin_shipment_method_path, class: 'list-group-item'
+      .text-center
+        = paginate @shipment_methods, theme: :comable_backend

data/app/views/comable/admin/shipment_methods/new.slim

@@ -1,17 +1,16 @@
-#comable-shipment-method
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li
-      = link_to Comable.t('admin.nav.shipment_method'), comable.admin_shipment_methods_path
-    li.active
-      = Comable.t('admin.actions.new')
+.comable-page
+  .comable-main-fixed-top
+    .comable-page-heading
+      ul.pull-right.list-inline
+        li
+          = link_to_save
 
-  h1.page-header
-    = Comable.t('admin.actions.new')
+      h1.page-header
+        ol.breadcrumb
+          li>
+            = link_to Comable.t('admin.nav.shipment_method'), comable.admin_shipment_methods_path
+          li.active
+            = Comable.t('admin.actions.new')
 
-  .row
-    section.col-sm-8
-      = render 'form'
-
-    nav.col-sm-4
+  .comable-page-body
+    = render 'form'

data/app/views/comable/admin/stocks/_form.slim

@@ -1,40 +1,34 @@
+= error_messages_for @stock
+
 - url = comable.admin_product_stocks_path(@product) if @stock.new_record?
-- url ||= comable.admin_product_stock_path(@product, @stock)
+- url ||= comable.admin_stock_path(@stock)
+
 = form_for @stock, url: url do |f|
-  .panel.panel-inverse
-    .panel-heading
-      .panel-title
+  .hidden
+    = f.submit
+
+  fieldset
+    .col-sm-3
+      legend
         = Comable.t('admin.general')
-    .panel-body
-      .form-horizontal
-        .form-group
-          .col-sm-3.control-label
-            = f.label :code
-          .col-sm-6
-            = f.text_field :code
+      .help-block
 
-        .form-group
-          .col-sm-3.control-label
-            = f.label :quantity
-          .col-sm-6
-            = f.text_field :quantity
+    .col-sm-9
+      .form-group
+        = f.label :code
+        = f.text_field :code
 
-        - if @product.sku?
-          - if @product.sku_h?
-            .form-group
-              .col-sm-3.control-label
-                = f.label :sku_h_choice_name, @product.sku_h_item_name
-              .col-sm-6
-                = f.text_field :sku_h_choice_name
+      .form-group
+        = f.label :quantity
+        = f.text_field :quantity
 
-          - if @product.sku_v?
-            .form-group
-              .col-sm-3.control-label
-                = f.label :sku_v_choice_name, @product.sku_v_item_name
-              .col-sm-6
-                = f.text_field :sku_v_choice_name
+      - if @stock.sku?
+        - if @stock.sku_h?
+          .form-group
+            = f.label :sku_h_choice_name, @stock.sku_h_item_name
+            = f.text_field :sku_h_choice_name
 
-    .panel-footer
-      = link_to Comable.t('admin.actions.cancel'), comable.admin_product_stocks_path(@product), class: 'btn btn-default'
-      .pull-right
-        = f.submit
+        - if @stock.sku_v?
+          .form-group
+            = f.label :sku_v_choice_name, @stock.sku_v_item_name
+            = f.text_field :sku_v_choice_name

data/app/views/comable/admin/stocks/edit.slim

@@ -1,46 +1,37 @@
-#comable-product
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li
-      = link_to Comable.t('admin.nav.product'), comable.admin_products_path
-    li
-      = link_to @product.name, comable.admin_product_path(@product)
-    li
-      = link_to Comable.t('admin.nav.products.stock'), comable.admin_product_stocks_path(@product)
-    li.active
-      = @stock.name_with_sku
+.comable-page
+  .comable-main-fixed-top
+    .comable-page-heading
+      ul.pull-right.list-inline
+        li.dropdown
+          = link_to '#', class: 'btn btn-default', 'data-toggle' => 'dropdown' do
+            i.fa.fa-bars
+          ul.dropdown-menu.dropdown-menu-right
+            li
+              = link_to Comable.t('admin.nav.products.detail'), comable.admin_product_path(@stock.product)
+            - if @stock.sku?
+              li.divider
+              li
+                = link_to Comable.t('admin.actions.new'), comable.new_admin_product_stock_path(@stock.product)
+        li
+          = link_to_save
 
-  h1.page-header
-    = @stock.name_with_sku
-    small< = @stock.code
+      h1.page-header
+        ol.breadcrumb
+          li>
+            = link_to Comable.t('admin.nav.stock'), comable.admin_stocks_path
+          li.active
+            = @stock.name_with_sku
 
-  .row
-    section.col-sm-8
-      = render 'form'
-      hr
-      .panel.panel-danger
-        .panel-heading type="button" data-toggle="collapse" data-target="#comable-danger" aria-expanded="false" aria-controls="comable-danger"
-          strong
-            span.fa.fa-angle-down>
-            = Comable.t('admin.actions.destroy')
-        #comable-danger.collapse
-          .panel-body
-            p
-              = Comable.t('admin.confirmation_to_remove_stock')
-            = link_to Comable.t('admin.actions.destroy'), comable.admin_product_stock_path(@product, @stock), method: :delete, class: 'btn btn-danger'
-
-    nav.col-sm-4
-      #comable-affix data-spy="affix"
-        .panel
-          .list-group
-            = link_to Comable.t('admin.nav.products.detail'), comable.admin_product_path(@product), class: 'list-group-item'
-            = link_to Comable.t('admin.nav.products.stock'), comable.admin_product_stocks_path(@product), class: 'list-group-item disabled'
-
-        .panel
-          .list-group
-            - if @product.sku?
-                = link_to Comable.t('admin.actions.new'), comable.new_admin_product_stock_path, class: 'list-group-item'
-            = link_to comable.product_path(@product), class: 'list-group-item' do
-              span.fa.fa-external-link>
-              = Comable.t('admin.check_this_product_in_frontend')
+  .comable-page-body
+    = render 'form'
+    hr
+    .panel.panel-danger
+      .panel-heading type="button" data-toggle="collapse" data-target="#comable-danger"
+        strong
+          span.fa.fa-angle-down>
+          = Comable.t('admin.actions.destroy')
+      #comable-danger.collapse
+        .panel-body
+          p
+            = Comable.t('admin.confirmation_to_remove_stock')
+          = link_to Comable.t('admin.actions.destroy'), comable.admin_stock_path(@stock), method: :delete, class: 'btn btn-danger'

data/app/views/comable/admin/stocks/index.slim

@@ -1,81 +1,62 @@
-#comable-stock
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li
-      = link_to Comable.t('admin.nav.product'), comable.admin_products_path
-    li
-      = link_to @product.name, comable.admin_product_path(@product)
-    li.active
-      = Comable.t('admin.nav.products.stock')
+.comable-page
+  .comable-page-heading
+    ul.pull-right.list-inline
+      li
+        .btn-group role="group"
+          = link_to_previous_page @stocks, '<', class: 'btn btn-default' do
+            .btn.btn-default disabled="disabled"
+              | <
+          = link_to_next_page @stocks, '>', class: 'btn btn-default' do
+            .btn.btn-default disabled="disabled"
+              | >
 
-  h1.page-header
-    = Comable.t('admin.nav.products.stock')
-    small<
-      = @stocks.total_count
-      = Comable.t('admin.results')
+    h1.page-header
+      = Comable.t('admin.nav.stock')
+      small<
+        = @stocks.total_count
+        = Comable.t('admin.results')
 
-  .row
-    section.col-sm-8
-      .panel.panel-inverse
-        .panel-heading
-          .panel-title
-            = Comable.t('admin.index')
-        - if @stocks.empty?
-          .panel-body
-            = Comable.t('admin.not_found')
-        - else
-          table.table.table-striped
-            thead
-              th
-                = sort_link [:comable, @q], :code, product_id: @product.id
-              th
-                = sort_link [:comable, @q], :quantity, product_id: @product.id
-              - if @product.sku?
-                - if @product.sku_h?
-                  th
-                    = sort_link [:comable, @q], :sku_h_choice_name, @product.sku_h_item_name, product_id: @product.id
-                - if @product.sku_v?
-                  th
-                    = sort_link [:comable, @q], :sku_v_choice_name, @product.sku_v_item_name, product_id: @product.id
-            tbody
-              - @stocks.each do |stock|
-                tr
-                  td
-                    = link_to stock.code, comable.admin_product_stock_path(@product, stock)
-                  td
-                    strong class="#{(stock.quantity <= 0) ? 'text-danger' : (stock.quantity <= 10) ? 'text-warning' : 'text-success'}"
-                      = number_with_delimiter stock.quantity
-                  - if @product.sku?
-                    - if @product.sku_h?
-                      td
-                        = stock.sku_h_choice_name
-                    - if @product.sku_v?
-                      td
-                        = stock.sku_v_choice_name
+  .comable-page-body
+    .comable-search
+      = search_form_for @q, url: comable.admin_stocks_path do |f|
+        .input-group
+          span.input-group-btn
+            button.btn.btn-default.dropdown-toggle type="button" data-toggle="dropdown"
+              i.fa.fa-search
+              span.caret<
+            ul.dropdown-menu role="menu"
+              li
+                = link_to Comable.t('admin.clear_search_conditions'), comable.admin_stocks_path
+          = f.text_field :code_cont, class: 'form-control'
+          span.input-group-btn
+            = f.submit Comable.t('admin.search'), class: 'btn btn-default'
+
+    section
+      - if @stocks.empty?
+        = Comable.t('admin.not_found')
+      - else
+        table.table.table-striped
+          thead
+            th
+              = sort_link [:comable, @q], :code
+            th
+              = sort_link [:comable, @q], :quantity
+            th
+              = sort_link [:comable, @q], :sku_h_choice_name
+            th
+              = sort_link [:comable, @q], :sku_v_choice_name
+          tbody
+            - @stocks.each do |stock|
+              tr
+                td
+                  = link_to stock.code, comable.admin_stock_path(stock)
+                td
+                  strong class="#{(stock.quantity <= 0) ? 'text-danger' : (stock.quantity <= 10) ? 'text-warning' : 'text-success'}"
+                    = number_with_delimiter stock.quantity
+                td
+                  = stock.sku_h_choice_name
+                td
+                  = stock.sku_v_choice_name
 
         .text-center
           = paginate @stocks, theme: :comable_backend
-
-    nav.col-sm-4
-      #comable-affix
-        .panel
-          .list-group
-            = link_to Comable.t('admin.nav.products.detail'), comable.admin_product_path(@product), class: 'list-group-item'
-            = link_to Comable.t('admin.nav.products.stock'), comable.admin_product_stocks_path(@product), class: 'list-group-item disabled'
-
-        .panel
-          .list-group
-            = link_to Comable.t('admin.actions.new'), comable.new_admin_product_stock_path(@product), class: 'list-group-item'
-
-        .panel
-          .panel-body
-            = search_form_for @q, url: comable.new_admin_product_stock_path(@product) do |f|
-              .form-horizontal
-                .form-group
-                  .col-sm-3.control-label
-                    = f.label :code
-                  .col-sm-9
-                    = f.text_field :code_cont
-                .text-right
-                  = f.submit Comable.t('admin.search'), class: 'btn btn-default'

data/app/views/comable/admin/stocks/new.slim

@@ -1,17 +1,18 @@
-#comable-product
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li.active
-      = link_to Comable.t('admin.nav.product'), comable.admin_products_path
-    li.active
-      = Comable.t('admin.actions.new')
+.comable-page
+  .comable-main-fixed-top
+    .comable-page-heading
+      ul.pull-right.list-inline
+        li
+          = link_to_save
 
-  h1.page-header
-    = Comable.t('admin.actions.new')
+      h1.page-header
+        ol.breadcrumb
+          li>
+            = link_to Comable.t('admin.nav.stock'), comable.admin_stocks_path
+          li>
+            = link_to @product.name, comable.admin_product_path(@product)
+          li.active
+            = Comable.t('admin.actions.new')
 
-  .row
-    section.col-sm-8
-      = render 'form'
-
-    nav.col-sm-4
+  .comable-page-body
+    = render 'form'

data/app/views/comable/admin/store/_form.slim

@@ -1,50 +1,34 @@
-- if @store.errors.any?
-  #error_explanation
-    h2
-      = pluralize(@store.errors.count, "error")
-      | prohibited this store from being saved:
-    ul
-      - @store.errors.full_messages.each do |message|
-        li = message
+= error_messages_for @store
 
 = form_for @store, url: comable.admin_store_path, method: :patch do |f|
-  .panel.panel-inverse
-    .panel-heading
-      .panel-title
-        = Comable.t('admin.nav.stores.edit')
+  .hidden
+    = f.submit
 
-    .panel-body
-      .form-horizontal
-        .form-group
-          .col-sm-3.control-label
-            = f.label :name
-          .col-sm-6
-            = f.text_field :name, placeholder: f.object.class.default_name
+  fieldset
+    .col-sm-3
+      legend
+        = Comable.t('admin.general')
+      .help-block
 
-        .form-group
-          .col-sm-3.control-label
-            = f.label :meta_keywords
-          .col-sm-6
-            = f.text_field :meta_keywords
+    .col-sm-9
+      .form-group
+        = f.label :name
+        = f.text_field :name, placeholder: f.object.class.default_name
 
-        .form-group
-          .col-sm-3.control-label
-            = f.label :meta_description
-          .col-sm-6
-            = f.text_field :meta_description
+      .form-group
+        = f.label :meta_keywords
+        = f.text_field :meta_keywords
 
-        .form-group
-          .col-sm-3.control-label
-            = f.label :email_sender
-          .col-sm-6
-            = f.email_field :email_sender
+      .form-group
+        = f.label :meta_description
+        = f.text_field :meta_description
 
-        .form-group
-          .col-sm-offset-3.col-sm-6
-            .checkbox
-              = f.label :email_activate_flag do
-                = f.check_box :email_activate_flag
-                = f.object.class.human_attribute_name(:email_activate_flag)
+      .form-group
+        = f.label :email_sender
+        = f.email_field :email_sender
 
-    .panel-footer.text-right
-      = f.submit Comable.t('admin.actions.update')
+      .form-group
+        .checkbox
+          = f.label :email_activate_flag do
+            = f.check_box :email_activate_flag
+            = f.object.class.human_attribute_name(:email_activate_flag)