handcart 0.0.3 → 0.0.4

data/config/locales/en.yml

@@ -4,8 +4,9 @@ en:
       short: "%d %B %Y"
   time:
     formats:
-      short: "%d %B %Y,%l:%M %P"
+      short: "%d %b %Y,%l:%M %P"
       only_time: "%l:%M %P"
+      only_date: "%d %B %Y"
   activerecord:
     attributes:
       handcart/ip_address:

data/lib/handcart.rb

@@ -6,7 +6,8 @@ require 'haml'
 require 'sass/rails'
 require "handcart/simple_form"
 require 'jquery-rails'
-require 'twitter-bootstrap-rails'
+require 'bootstrap-sass'
+require 'kaminari'
 
 module Handcart
   module Strategies

data/lib/handcart/simple_form.rb

@@ -1,6 +1,8 @@
 # lib/my-engine/simple-form.rb
 require 'simple_form'
 
+# https://gist.github.com/tokenvolt/6599141
+
 # Use this setup block to configure all options available in SimpleForm.
 SimpleForm.setup do |config|
   # Wrappers are used by the form builder to generate a
@@ -48,22 +50,37 @@ SimpleForm.setup do |config|
     b.use :error, wrap_with: { tag: :span, class: :error }
   end
 
-  config.wrappers :bootstrap, tag: 'div', class: 'control-group', error_class: 'error' do |b|
+  config.wrappers :bootstrap, tag: 'div', class: 'form-group', error_class: 'has-error',
+      defaults: { input_html: { class: 'default_class' } } do |b|
+
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper tag: 'div', class: 'col-sm-3' do |ba|
+      ba.use :input
+    end
+    b.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block has-error' }
+  end
+
+  config.wrappers :nested, tag: 'div', class: 'form-group', error_class: 'has-error',
+      defaults: { input_html: { class: 'default_class' } } do |b|
+
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper tag: 'div', class: 'controls' do |ba|
+    b.wrapper tag: 'div', class: 'col-lg-10' do |ba|
       ba.use :input
-      ba.use :error, wrap_with: { tag: 'span', class: 'help-inline' }
-      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
     end
+    b.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block has-error' }
   end
 
-  config.wrappers :prepend, tag: 'div', class: "control-group", error_class: 'error' do |b|
+  config.wrappers :prepend, tag: 'div', class: "form-group", error_class: 'has-error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper tag: 'div', class: 'controls' do |input|
+    b.wrapper tag: 'div', class: 'col-sm-4' do |input|
       input.wrapper tag: 'div', class: 'input-prepend' do |prepend|
         prepend.use :input
       end
@@ -72,11 +89,11 @@ SimpleForm.setup do |config|
     end
   end
 
-  config.wrappers :append, tag: 'div', class: "control-group", error_class: 'error' do |b|
+  config.wrappers :append, tag: 'div', class: "form-group", error_class: 'has-error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper tag: 'div', class: 'controls' do |input|
+    b.wrapper tag: 'div', class: 'col-sm-4' do |input|
       input.wrapper tag: 'div', class: 'input-append' do |append|
         append.use :input
       end
@@ -91,6 +108,9 @@ SimpleForm.setup do |config|
   # buttons and other elements.
   config.default_wrapper = :bootstrap
 
+  # The default wrapper to be used by the FormBuilder.
+  # config.default_wrapper = :default
+
   # Define the way to render check boxes / radio buttons with labels.
   # Defaults to :nested for bootstrap config.
   #   inline: input + label
@@ -100,7 +120,9 @@ SimpleForm.setup do |config|
   # Default class for buttons
   config.button_class = 'btn'
 
-  # Method used to tidy up errors.
+  # Method used to tidy up errors. Specify any Rails Array method.
+  # :first lists the first message for each field.
+  # Use :to_sentence to list all errors for each field.
   # config.error_method = :first
 
   # Default tag used for error notification helper.
@@ -136,10 +158,10 @@ SimpleForm.setup do |config|
   # config.label_text = lambda { |label, required| "#{required} #{label}" }
 
   # You can define the class to use on all labels. Default is nil.
-  config.label_class = 'control-label'
+  config.label_class = 'col-sm-2'
 
   # You can define the class to use on all forms. Default is simple_form.
-  # config.form_class = :simple_form
+  config.form_class = "simple_form form-horizontal"
 
   # You can define which elements should obtain additional classes
   # config.generate_additional_classes_for = [:wrapper, :label, :input]
@@ -147,8 +169,11 @@ SimpleForm.setup do |config|
   # Whether attributes are required by default (or not). Default is true.
   # config.required_by_default = true
 
-  # Tell browsers whether to use default HTML5 validations (novalidate option).
-  # Default is enabled.
+  # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+  # These validations are enabled in SimpleForm's internal config but disabled by default
+  # in this configuration, which is recommended due to some quirks from different browsers.
+  # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
+  # change this configuration to true.
   config.browser_validations = false
 
   # Collection of methods to detect if a file type was given.
@@ -159,15 +184,16 @@ SimpleForm.setup do |config|
   # matches the regexp as value.
   # config.input_mappings = { /count/ => :integer }
 
+  # Custom wrappers for input types. This should be a hash containing an input
+  # type as key and the wrapper that will be used for all inputs with specified type.
+  # config.wrapper_mappings = { string: :prepend }
+
   # Default priority for time_zone inputs.
   # config.time_zone_priority = nil
 
   # Default priority for country inputs.
   # config.country_priority = nil
 
-  # Default size for text inputs.
-  # config.default_input_size = 50
-
   # When false, do not use translations for labels.
   # config.translate_labels = true
 
@@ -176,4 +202,7 @@ SimpleForm.setup do |config|
 
   # Cache SimpleForm inputs discovery
   # config.cache_discovery = !Rails.env.development?
+
+  # Default class for inputs
+  config.input_class = 'form-control'
 end

data/lib/handcart/simple_form_bootstrap.rb

@@ -0,0 +1,86 @@
+# https://gist.github.com/tokenvolt/6599141
+inputs = %w[
+  CollectionSelectInput
+  DateTimeInput
+  FileInput
+  GroupedCollectionSelectInput
+  NumericInput
+  PasswordInput
+  RangeInput
+  StringInput
+  TextInput
+]
+
+inputs.each do |input_type|
+  superclass = "SimpleForm::Inputs::#{input_type}".constantize
+
+  new_class = Class.new(superclass) do
+    def input_html_classes
+      super.push('form-control')
+    end
+  end
+
+  Object.const_set(input_type, new_class)
+end
+
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+
+  config.wrappers :bootstrap, tag: 'div', class: 'form-group', error_class: 'has-error',
+      defaults: { input_html: { class: 'default_class' } } do |b|
+
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper tag: 'div', class: 'col-sm-3' do |ba|
+      ba.use :input
+    end
+    b.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block has-error' }
+  end
+
+  config.wrappers :nested, tag: 'div', class: 'form-group', error_class: 'has-error',
+      defaults: { input_html: { class: 'default_class' } } do |b|
+
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper tag: 'div', class: 'col-lg-10' do |ba|
+      ba.use :input
+    end
+    b.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block has-error' }
+  end
+
+  config.wrappers :prepend, tag: 'div', class: "form-group", error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper tag: 'div', class: 'col-sm-4' do |input|
+      input.wrapper tag: 'div', class: 'input-prepend' do |prepend|
+        prepend.use :input
+      end
+      input.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+      input.use :error, wrap_with: { tag: 'span', class: 'help-inline' }
+    end
+  end
+
+  config.wrappers :append, tag: 'div', class: "form-group", error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper tag: 'div', class: 'col-sm-4' do |input|
+      input.wrapper tag: 'div', class: 'input-append' do |append|
+        append.use :input
+      end
+      input.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+      input.use :error, wrap_with: { tag: 'span', class: 'help-inline' }
+    end
+  end
+
+  # Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
+  # Check the Bootstrap docs (http://twitter.github.com/bootstrap)
+  # to learn about the different styles for forms and inputs,
+  # buttons and other elements.
+  config.default_wrapper = :bootstrap
+end

data/lib/handcart/version.rb

@@ -1,3 +1,3 @@
 module Handcart
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -12,5 +12,5 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require twitter/bootstrap
+//= require bootstrap
 //= require_tree .

data/spec/dummy/app/assets/stylesheets/{application.css → application.css.scss}

@@ -9,7 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require twitter-bootstrap-static/bootstrap
- *= require twitter-bootstrap-static/fontawesome
  *= require_tree .
  */
+@import "bootstrap";

data/spec/dummy/app/assets/stylesheets/layout.css.scss

@@ -4,5 +4,5 @@ footer {
 }
 
 td.action-button {
-  width: 2em;
+  width: 3em;
 }

data/spec/dummy/app/controllers/application_controller.rb

@@ -4,4 +4,5 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
   helper Handcart::ApplicationHelper
+  helper Handcart::BootstrapFlashHelper
 end

data/spec/dummy/app/controllers/master/companies_controller.rb

@@ -35,7 +35,7 @@ class Master::CompaniesController < MasterController
 
   def destroy
     @company.destroy
-    redirect_to companies_url, notice: 'Company was successfully destroyed.'
+    redirect_to companies_url, notice: 'Company was successfully removed.'
   end
 
   private

data/spec/dummy/app/views/kaminari/_first_page.html.haml

@@ -0,0 +1,2 @@
+%li
+  = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote

data/spec/dummy/app/views/kaminari/_gap.html.haml

@@ -0,0 +1,2 @@
+%li.disabled
+  = link_to raw(t 'views.pagination.truncate'), '#'

data/spec/dummy/app/views/kaminari/_last_page.html.haml

@@ -0,0 +1,2 @@
+%li
+  = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {remote: remote}

data/spec/dummy/app/views/kaminari/_next_page.html.haml

@@ -0,0 +1,2 @@
+%li
+  = link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote

data/spec/dummy/app/views/kaminari/_page.html.haml

@@ -0,0 +1,2 @@
+%li{class: "#{'active' if page.current?}"}
+  = link_to page, page.current? ? '#' : url, {remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil}

data/spec/dummy/app/views/kaminari/_paginator.html.haml

@@ -0,0 +1,11 @@
+= paginator.render do
+  %ul.pagination
+    = first_page_tag unless current_page.first?
+    = prev_page_tag unless current_page.first?
+    - each_page do |page|
+      - if page.left_outer? || page.right_outer? || page.inside_window?
+        = page_tag page
+      - elsif !page.was_truncated?
+        = gap_tag
+    = next_page_tag unless current_page.last?
+    = last_page_tag unless current_page.last?

data/spec/dummy/app/views/kaminari/_prev_page.html.haml

@@ -0,0 +1,2 @@
+%li
+  = link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote

data/spec/dummy/app/views/layouts/_navbar.html.haml

@@ -1,7 +1,8 @@
-%ul.nav
-  - unless (Handcart.ip_authorization.ip_authorization_strategy == :none)
-    %li{class: (params[:controller] == "ip_addresses") ? "active" : nil}
-      = link_to main_app.ip_addresses_path do
-        %i.icon-screenshot
-        My IP Addresses
+#navbar-collapse-1.collapse.navbar-collapse
+  %ul.nav.navbar-nav
+    - unless (Handcart.ip_authorization.ip_authorization_strategy == :none)
+      %li{class: (params[:controller] == "ip_addresses") ? "active" : nil}
+        = link_to main_app.ip_addresses_path do
+          %span.glyphicon.glyphicon-screenshot
+          My IP Addresses
 

data/spec/dummy/app/views/layouts/application.html.haml

@@ -17,31 +17,33 @@
     = javascript_include_tag "application"
 
   %body
-    .navbar.navbar-fluid-top
-      .navbar-inner
-        .container-fluid
-          %a.btn.btn-navbar(data-target=".nav-collapse" data-toggle="collapse")
+    %nav.navbar.navbar-default{role: "navigation"}
+      .container-fluid
+        .navbar-header
+          %button.navbar-toggle{"data-target" => "#navbar-collapse-1", "data-toggle" => "collapse", type: "button"}
             %span.icon-bar
             %span.icon-bar
             %span.icon-bar
-          %a.brand(href=subdomain_root_path) Dummy
-          = render "layouts/navbar"
+          %a.navbar-brand{href: subdomain_root_path}
+            %span.glyphicon.glyphicon-home
+            Dummy
+        = render "layouts/navbar"
 
-    .container-fluid
-      .row-fluid
+    .container
+      .row
         - if content_for?(:sidebar)
-          .span9
+          .col-lg-9
             %div.flash-message
               = bootstrap_flash
             - if content_for?(:sub_title)
               .page-header
                 %h3.sub-title.inline= content_for?(:sub_title) ? yield(:sub_title) : t('.default_sub_title')
             %div= yield
-          .span3
+          .col-lg-3
             .well.sidebar-nav
               %ul.nav.nav-list= yield(:sidebar)
         - else
-          .span12
+          .col-lg-12
             %div.flash-message
               = bootstrap_flash
             - if content_for?(:sub_title)

data/spec/dummy/app/views/layouts/master.html.haml

@@ -17,32 +17,33 @@
     = javascript_include_tag "application"
 
   %body
-    .navbar.navbar-fluid-top.navbar-inverse
-      .navbar-inner
-        .container-fluid
-          %a.btn.btn-navbar(data-target=".nav-collapse" data-toggle="collapse")
+    %nav.navbar.navbar-inverse{role: "navigation"}
+      .container-fluid
+        .navbar-header
+          %button.navbar-toggle{"data-target" => "#navbar-collapse-1", "data-toggle" => "collapse", type: "button"}
             %span.icon-bar
             %span.icon-bar
             %span.icon-bar
-          %a.brand(href=master_root_path)
+          %a.navbar-brand{href: master_root_path}
+            %span.glyphicon.glyphicon-home
             Master Dummy Backend
-          = render "layouts/master/navbar"
+        = render "layouts/master/navbar"
 
-    .container-fluid
-      .row-fluid
+    .container
+      .row
         - if content_for?(:sidebar)
-          .span9
+          .col-lg-9
             %div.flash-message
               = bootstrap_flash
             - if content_for?(:sub_title)
               .page-header
                 %h3.sub-title.inline= content_for?(:sub_title) ? yield(:sub_title) : t('.default_sub_title')
             %div= yield
-          .span3
+          .col-lg-3
             .well.sidebar-nav
               %ul.nav.nav-list= yield(:sidebar)
         - else
-          .span12
+          .col-lg-12
             %div.flash-message
               = bootstrap_flash
             - if content_for?(:sub_title)

data/spec/dummy/app/views/layouts/master/_navbar.html.haml

@@ -1,9 +1,11 @@
-%ul.nav
-  %li
-    = link_to handcart_path do
-      %i.icon-heart
-      Handcart
-  %li{class: (params[:controller] == "companies") ? "active" : nil}
-    = link_to main_app.companies_path do
-      %i.icon-briefcase
-      Companies
+#navbar-collapse-1.collapse.navbar-collapse
+  %ul.nav.navbar-nav
+    %li
+      = link_to handcart_path do
+        %span.glyphicon.glyphicon-heart
+        Handcart
+    %li{class: (params[:controller] == "companies") ? "active" : nil}
+      = link_to main_app.companies_path do
+        %span.glyphicon.glyphicon-briefcase
+        Companies
+