Merge branch 'develop' into document_link_param_option

Author: pascalwengerter

Gemfile

@@ -13,6 +13,7 @@ gemspec
 
 # To use a debugger
 # gem 'byebug', group: [:development, :test]
+# gem 'pry-byebug', group: [:development, :test]
 
 gem "trailblazer"
 gem "trailblazer-rails"

app/concepts/matestack/ui/core/app/app.rb

@@ -17,7 +17,6 @@ class App < Trailblazer::Cell
     include ActionView::Helpers::JavaScriptHelper
     include ActionView::Helpers::NumberHelper
     include ActionView::Helpers::OutputSafetyHelper
-    include ActionView::Helpers::RecordTagHelper
     # include ActionView::Helpers::RenderingHelper
     include ActionView::Helpers::SanitizeHelper
     include ActionView::Helpers::TagHelper

app/concepts/matestack/ui/core/component/dynamic.rb

@@ -18,7 +18,6 @@ class Dynamic < Trailblazer::Cell
     include ActionView::Helpers::JavaScriptHelper
     include ActionView::Helpers::NumberHelper
     include ActionView::Helpers::OutputSafetyHelper
-    include ActionView::Helpers::RecordTagHelper
     # include ActionView::Helpers::RenderingHelper
     include ActionView::Helpers::SanitizeHelper
     include ActionView::Helpers::TagHelper

app/concepts/matestack/ui/core/fieldset/fieldset.haml

@@ -0,0 +1,5 @@
+%fieldset{@tag_attributes}
+  -if options[:text].nil? && block_given?
+    = yield
+  - else 
+    = options[:text]

app/concepts/matestack/ui/core/fieldset/fieldset.rb

@@ -0,0 +1,9 @@
+module Matestack::Ui::Core::Fieldset
+  class Fieldset < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        disabled: options[:disabled]
+      })
+    end
+  end
+end

app/concepts/matestack/ui/core/figure/figure.haml

@@ -0,0 +1,3 @@
+%figure{@tag_attributes}
+  - if block_given?
+    = yield

app/concepts/matestack/ui/core/figure/figure.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Figure
+  class Figure < Matestack::Ui::Core::Component::Static
+
+  end
+end

app/concepts/matestack/ui/core/ins/ins.haml

@@ -0,0 +1,5 @@
+%ins{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/ins/ins.rb

@@ -0,0 +1,9 @@
+module Matestack::Ui::Core::Ins
+  class Ins < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        cite: options[:cite],
+        datetime: options[:datetime]
+      })
+  end
+end

app/concepts/matestack/ui/core/js/core.js

@@ -10,7 +10,6 @@ import html from 'html/html'
 import transition from 'transition/transition'
 import action from 'action/action'
 import form from 'form/form'
-import view from 'view/view'
 import onclick from 'onclick/onclick'
 import collectionContent from 'collection/content/content'
 import collectionFilter from 'collection/filter/filter'