diff options
| -rw-r--r-- | app/views/layouts/navigation/_page_header.html.slim | 6 | ||||
| -rw-r--r-- | lib/af83/decorator/link.rb | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/views/layouts/navigation/_page_header.html.slim b/app/views/layouts/navigation/_page_header.html.slim index 23bc64db0..cd4d41793 100644 --- a/app/views/layouts/navigation/_page_header.html.slim +++ b/app/views/layouts/navigation/_page_header.html.slim @@ -24,15 +24,13 @@ - if action_links&.primary&.any? - action_links.primary.each do |link| = link.to_html do |l| - - if !l.class? - - l.class "btn btn-default #{l.disabled ? "disabled" : ""}" + - l.default_class "btn btn-default #{l.disabled ? "disabled" : ""}" - if action_links&.secondary&.any? .row.mb-sm .col-lg-12.text-right - action_links.secondary.each do |link| = link.to_html do |l| - - if !l.class? - - l.class "btn btn-primary #{l.disabled ? "disabled" : ""}" + - l.default_class "btn btn-primary #{l.disabled ? "disabled" : ""}" - if content_for? :page_header_content = yield :page_header_content diff --git a/lib/af83/decorator/link.rb b/lib/af83/decorator/link.rb index 10e6091aa..fd50069fe 100644 --- a/lib/af83/decorator/link.rb +++ b/lib/af83/decorator/link.rb @@ -25,8 +25,11 @@ class AF83::Decorator::Link link_class args end - def class? - @options[:link_class] && !@options[:link_class].empty? + def default_class *args + has_class = @options[:link_class] && !@options[:link_class].empty? + return if has_class + + self.class args end def method_missing name, *args, &block |