mtl 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44b92a6793c60cb944ae9c28cd6f9150822fd50a
-  data.tar.gz: f3835d1ab87ff6bfa760afbb412968199d8fab2c
+  metadata.gz: b9187be6ff3dc7c7f070adf654ab5c397f121e4c
+  data.tar.gz: 2eb50dbbe841ba2fe5b87b79afb4273db0c6b7d6
 SHA512:
-  metadata.gz: 64d0e8d7462b7047f29674d0cdfd5983e7a86e7191d1cd2f26bd2f212721b14b5391f5b23617a90e0e123590ce0273d6285dda6e8a086c8501a2f54bd210b403
-  data.tar.gz: 8525dc5946545f84f4dd750b24f5b59b8397acbeefe3ebd71f8f95a085224d1d42778690387bcaf130f0618c1091cceb4b1b195a8bd2b35c85668270e705865a
+  metadata.gz: 7139d663f45aeede5fbc95b4907dfacfdbca58fc9fc2abfd681a26d1adb2fc73ba2288b9ceecd79ea741f218eef033e7f485aa72f1b09e6b2baa174e4cc03452
+  data.tar.gz: f4ff6660f74eb92fabce331534e4b4f5418bbe976e065c4fd997c4a994f67919ab882b2e8627cee14314ffbd41568354912a7330b7f4721a76a5cab7a79f35f5

data/app/assets/stylesheets/mtl/all.scss

@@ -13,6 +13,7 @@
 @import './extend/grid';
 
 @import 'materialize/navbar';
+@import './extend/navbar';
 
 // @import 'materialize/roboto';
 @import './extend/roboto-rails'; // using asset_url's

data/app/assets/stylesheets/mtl/extend/_forms.scss

@@ -98,3 +98,10 @@
     }
   }
 }
+
+.input-field.switch {
+  label {
+    position: static;
+  }
+}
+

data/app/assets/stylesheets/mtl/extend/_navbar.scss

@@ -0,0 +1,3 @@
+.navbar-fixed.navbar-fixed-extended {
+  height: 112px;
+}

data/app/views/mtl/header.html.erb

@@ -1,5 +1,5 @@
 <header class="<%= mtl_class %>">
-  <%= mtl_navbar fixed: mtl_fixed do |nav| %>
+  <%= mtl_nav.render fixed: mtl_fixed do |nav| %>
     <%- if mtl_back  %>
       <%= link_to mtl_back, class: 'mtl-layout-default-header-back left' do %>
         <i class="material-icons">arrow_back</i>
@@ -17,7 +17,7 @@
     <%- end %>
 
     <%- if mtl_content %>
-      <%= capture(nav, &mtl_content) %>
+      <%= mtl_content %>
     <%- end %>
   <%- end %>
 </header>

data/lib/generators/mtl/templates/simple_form.rb

@@ -1,4 +1,5 @@
 require 'mtl/simple_form/suffix'
+require 'mtl/simple_form/switch_input'
 
 # Copyright 2016 Patrick Lindsay
 # https://github.com/patricklindsay/simple_form-materialize
@@ -24,22 +25,6 @@ require 'mtl/simple_form/suffix'
 #
 # 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
-  # complete input. You can remove any component from the
-  # wrapper, change the order or even add your own to the
-  # stack. The options given below are used to wrap the
-  # whole input.
-  config.wrappers :material_checkbox,
-                  hint_class: :field_with_hint, error_class: 'has-error' do |b|
-    b.use :input
-    b.use :label
-
-    b.use :hint,  wrap_with: { tag: :span, class: 'help-block' }
-    b.use :error, wrap_with: { tag: :span, class: 'error-block' }
-
-    b.use :html5
-  end
-
   config.wrappers :disabled_form do |b|
     b.use :label
     b.use :input, disabled: true, readonly: true
@@ -173,9 +158,7 @@ SimpleForm.setup do |config|
 
   # 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 = {
-    switch: :material_checkbox
-  }
+  # config.wrapper_mappings = {}
 
   # Namespaces where SimpleForm should look for custom input classes that
   # override default inputs.

data/lib/mtl/rails/navbar_presenter.rb

@@ -13,16 +13,16 @@ module Mtl
 
       def render(options = {}, &block)
         nav = view.content_tag :nav, view.safe_join([render_main(options, &block),
-                                                     render_extended(@extended_options, &@extended_block)].compact),
+                                                     render_extended(@extended_block, @extended_options)].compact),
                                class: @extended_block ? 'nav-extended' : nil
 
-        nav = view.content_tag :div, nav, class: 'navbar-fixed' if options[:fixed]
-        nav
+        return nav unless options[:fixed]
+        view.content_tag :div, nav, class: ['navbar-fixed', @extended_block ? 'navbar-fixed-extended' : nil]
       end
 
       def extended(options = {}, &block)
         @extended_options = options
-        @extended_block = block
+        @extended_block = view.capture(&block)
         nil
       end
 
@@ -32,9 +32,9 @@ module Mtl
         view.content_tag(:div, view.capture(self, &block), class: [options[:class], 'nav-wrapper'].flatten.compact)
       end
 
-      def render_extended(options = {}, &block)
-        return unless block_given?
-        view.content_tag(:div, view.capture(&block), class: [options[:class], 'nav-content'].flatten.compact)
+      def render_extended(content, options = {})
+        return unless content.presence
+        view.content_tag(:div, content, class: [options[:class], 'nav-content'].flatten.compact)
       end
     end
   end

data/lib/mtl/rails/view_helpers.rb

@@ -362,15 +362,12 @@ module Mtl
       # @return [String] HTML safe string
       def mtl_header(title = translate('.title', default: 'Menu'), **options, &block)
         mtl_class = ['mtl-layout-default-header', options[:class]].compact.flatten.join(' ')
-
-        render file: 'mtl/header', locals: {
-          mtl_content: block,
-          mtl_title: title.presence,
-          mtl_back: options.fetch(:back, false),
-          mtl_menu: options.fetch(:menu, 'nav-menu'),
-          mtl_fixed: options.fetch(:fixed, false),
-          mtl_class: mtl_class
-        }
+        mtl_nav = NavbarPresenter.new(self)
+        mtl_content = block_given? ? capture(mtl_nav, &block) : nil
+        render file: 'mtl/header', locals: { mtl_title: title.presence, mtl_back: options.fetch(:back, false),
+                                             mtl_menu: options.fetch(:menu, 'nav-menu'),
+                                             mtl_fixed: options.fetch(:fixed, false), mtl_class: mtl_class,
+                                             mtl_nav: mtl_nav, mtl_content: mtl_content }
       end
 
       # Renders an avatar link, for the given url with the name's initials

data/lib/mtl/simple_form/switch_input.rb

@@ -0,0 +1,29 @@
+require 'simple_form'
+
+# :nodoc:
+module SimpleForm
+  # :nodoc:
+  module Inputs
+    # :nodoc:
+    class SwitchInput < ::SimpleForm::Inputs::BooleanInput
+      def input(_wrapper_options = nil)
+        template.content_tag(:div, class: :switch) do
+          build_hidden_field_for_checkbox +
+            template.label_tag(nil) do
+              build_check_box_without_hidden_field(input_html_options) +
+                template.content_tag(:span, nil, class: :lever) +
+                label_text
+            end
+        end
+      end
+
+      def label_input(wrapper_options = nil)
+        input(wrapper_options)
+      end
+
+      def label(_wrapper_options = nil)
+        ''
+      end
+    end
+  end
+end

data/lib/mtl/version.rb

@@ -1,5 +1,5 @@
 module Mtl
-  VERSION = '1.1.4'.freeze
+  VERSION = '1.1.5'.freeze
   MATERIALIZE_VERSION = '0.98.0'.freeze
   ICONS_VERSION = '2.2.3'.freeze
   LODASH_VERSION = '4.14.1'.freeze

data/spec/mtl/rails/navbar_presenter_spec.rb

@@ -90,7 +90,7 @@ RSpec.describe Mtl::Rails::NavbarPresenter, dom: true do
 
         'Hello'
       end).to match_dom <<-HTML
-        <div class="navbar-fixed">
+        <div class="navbar-fixed navbar-fixed-extended">
           <nav class="nav-extended">
             <div class="nav-wrapper">
               Hello

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtl
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Marco Plüss
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -155,6 +155,7 @@ files:
 - app/assets/stylesheets/mtl/extend/_grid.scss
 - app/assets/stylesheets/mtl/extend/_material-icons.scss
 - app/assets/stylesheets/mtl/extend/_mixins.scss
+- app/assets/stylesheets/mtl/extend/_navbar.scss
 - app/assets/stylesheets/mtl/extend/_roboto-rails.scss
 - app/assets/stylesheets/mtl/extend/_side-nav.scss
 - app/assets/stylesheets/mtl/extend/_toc.scss
@@ -174,6 +175,7 @@ files:
 - lib/mtl/rails/navbar_presenter.rb
 - lib/mtl/rails/view_helpers.rb
 - lib/mtl/simple_form/suffix.rb
+- lib/mtl/simple_form/switch_input.rb
 - lib/mtl/version.rb
 - mtl.gemspec
 - package.json