card 1.17.4 → 1.18.0

data/mod/05_standard/set/all/rich_html/header.rb

@@ -1,44 +1,39 @@
 format :html do
-
   view :header do |args|
-
-    %{
-      <div class="card-header #{ args[:header_class] }">
-        <div class="card-header-title #{ args[:title_class] }">
-          #{ _optional_render :toggle, args, :hide }
-          #{ _optional_render :title, args }
+    %(
+      <div class="card-header #{args[:header_class]}">
+        <div class="card-header-title #{args[:title_class]}">
+          #{_optional_render :toggle, args, :hide}
+          #{_optional_render :title, args}
         </div>
-        #{ _optional_render :type_info, args, :hide }
+        #{_optional_render :type_info, args, :hide}
       </div>
-      #{ _optional_render :toolbar, args, :hide }
-    }
+      #{_optional_render :toolbar, args, :hide}
+    )
   end
 
   def default_header_args args
-    if @slot_view == :open && toolbar_pinned?
-      args[:optional_toolbar] ||= :show
-    end
-    if show_view?(:toolbar,args.merge(default_visibility: :hide)) && card.type_code != :basic
+    args[:optional_toolbar] ||= :show if @slot_view == :open && toolbar_pinned?
+    if show_view?(:toolbar, args.merge(default_visibility: :hide)) && card.type_code != :basic
       args[:optional_type_info] ||= :show
     end
   end
 
   view :subheader do |args|
     args[:subheader] ||= toolbar_view_title(@slot_view) || _render_title(args)
-    %{
+    %(
       <div class="card-subheader navbar-inverse btn-primary active">
-        #{ args[:subheader] }
-        #{ autosaved_draft_link if card.drafts.present? && @slot_view == :edit }
+        #{args[:subheader]}
+        #{autosaved_draft_link if card.drafts.present? && @slot_view == :edit}
       </div>
-    }
+    )
   end
 
-
   view :toggle do |args|
-    verb, adjective, direction = ( args[:toggle_mode] == :close ? %w{ open open expand } : %w{ close closed collapse-down } )
+    verb, adjective, direction = (args[:toggle_mode] == :close ? %w( open open expand ) : %w( close closed collapse-down ))
 
     link_to  glyphicon(direction),
-             path( view: adjective ),
+             path(view: adjective),
              remote: true,
              title: "#{verb} #{card.name}",
              class: "#{verb}-icon toggler slotter nodblclick"
@@ -53,11 +48,11 @@ format :html do
   end
 
   view :navbar_right do |args|
-    render_link_list args.merge(class: "nav navbar-nav navbar-right")
+    render_link_list args.merge(class: 'nav navbar-nav navbar-right')
   end
 
   view :navbar_left do |args|
-    render_link_list args.merge(class: "nav navbar-nav navbar-left")
+    render_link_list args.merge(class: 'nav navbar-nav navbar-left')
   end
 
   def show_follow?
@@ -67,6 +62,4 @@ format :html do
   def structure_editable?
     card.structure && card.template.ok?(:update)
   end
-
 end
-

data/mod/05_standard/set/all/rich_html/menu.rb

@@ -12,34 +12,34 @@ format :html do
   end
 
   view :menu_link do |args|
-    path_opts = {slot: {home_view: args[:home_view]}}
+    path_opts = { slot: { home_view: args[:home_view] } }
     path_opts[:is_main] = true if main?
-    css_class = if show_view?(:horizontal_menu,args.merge(default_visibility: :hide, optional: true))
+    css_class = if show_view?(:horizontal_menu, args.merge(default_visibility: :hide, optional: true))
                   'visible-xs'
                 else
                   'show-on-hover'
                 end
     wrap_with :div, class: "vertical-card-menu card-menu #{css_class}" do
-        content_tag :div, class: 'btn-group slotter card-slot pull-right' do
-          view_link(glyphicon(args[:menu_icon]), :vertical_menu, path_opts: path_opts).html_safe
-        end
+      content_tag :div, class: 'btn-group slotter card-slot pull-right' do
+        view_link(glyphicon(args[:menu_icon]), :vertical_menu, path_opts: path_opts).html_safe
+      end
     end
   end
 
   view :vertical_menu, tags: :unknown_ok do |args|
-    items = menu_item_list(args).map {|item| "<li class='#{args[:item_class]}'>#{item}</li>"}.join "\n"
+    items = menu_item_list(args).map { |item| "<li class='#{args[:item_class]}'>#{item}</li>" }.join "\n"
     wrap_with :ul, class: 'btn-group pull-right slotter' do
       [
-        content_tag( :span, "<a href='#'>#{ glyphicon args[:menu_icon] }</a>".html_safe,
-                     class: 'open-menu dropdown-toggle', 'data-toggle'=>'dropdown', 'aria-expanded'=>'false'),
-        content_tag( :ul, items.html_safe, class: 'dropdown-menu', role: 'menu'),
+        content_tag(:span, "<a href='#'>#{glyphicon args[:menu_icon]}</a>".html_safe,
+                    class: 'open-menu dropdown-toggle', 'data-toggle' => 'dropdown', 'aria-expanded' => 'false'),
+        content_tag(:ul, items.html_safe, class: 'dropdown-menu', role: 'menu')
       ]
     end
   end
 
   view :horizontal_menu do |args|
     content_tag :div, class: 'btn-group slotter pull-right card-menu horizontal-card-menu hidden-xs' do
-      menu_item_list(args.merge(html_args: {class: 'btn btn-default'})).join("\n").html_safe
+      menu_item_list(args.merge(html_args: { class: 'btn btn-default' })).join("\n").html_safe
     end
   end
 
@@ -57,7 +57,7 @@ format :html do
 
   def menu_edit_link args
     path_opts = { view: :edit }
-    menu_item('edit', 'edit', path_opts, args[:html_args] )
+    menu_item('edit', 'edit', path_opts, args[:html_args])
   end
 
   def menu_discuss_link args
@@ -65,33 +65,31 @@ format :html do
   end
 
   def menu_page_link args
-    menu_item('page', 'new-window', {card: card}, args[:html_args])
+    menu_item('page', 'new-window', { card: card }, args[:html_args])
   end
 
   def menu_rules_link args
-    menu_item('rules', 'wrench', {view: :options}, args[:html_args])
+    menu_item('rules', 'wrench', { view: :options }, args[:html_args])
   end
 
   def menu_account_link args
-    path_opts = { related: {name: '+*account',view: :edit} }
+    path_opts = { related: { name: '+*account', view: :edit } }
     menu_item('account', 'user', path_opts, args[:html_args])
   end
 
   def menu_more_link args
     path_opts = {
-        view: args[:home_view] || :open,
-        slot: {show: :toolbar}
-      }
+      view: args[:home_view] || :open,
+      slot: { show: :toolbar }
+    }
     menu_item('', 'option-horizontal', path_opts, args[:html_args])
   end
 
-
   def menu_item text, icon, target, html_args={}
     link_text = "#{glyphicon(icon)}<span class='menu-item-label'>#{text}</span>".html_safe
     smart_link link_text, target, html_args || {}
   end
 
-
   def default_menu_link_args args
     args[:menu_icon] ||= 'cog'
   end
@@ -107,12 +105,12 @@ format :html do
 
   def show_menu_items
     disc_tagname = Card.fetch(:discussion, skip_modules: true).cardname
-    disc_card = unless card.new_card? or card.junction? && card.cardname.tag_name.key == disc_tagname.key
-      Card.fetch "#{card.name}+#{disc_tagname}", skip_modules: true, new: {}
+    disc_card = unless card.new_card? || card.junction? && card.cardname.tag_name.key == disc_tagname.key
+                  Card.fetch "#{card.name}+#{disc_tagname}", skip_modules: true, new: {}
     end
 
     res = {
-      discuss:    disc_card && disc_card.ok?( disc_card.new_card? ? :comment : :read ),
+      discuss:    disc_card && disc_card.ok?(disc_card.new_card? ? :comment : :read),
       page:       card.name.present? && !main?,
       rules:      card.virtual?
     }

data/mod/05_standard/set/all/rich_html/modal.rb

@@ -1,10 +1,10 @@
 format :html do
   view :modal_link do |args|
     path_opts = args[:path_opts] || {}
-    path_opts.merge!(layout: :modal)
+    path_opts[:layout] = :modal
     html_args = args[:html_args] || {}
-    html_args.merge!('data-target' => '#modal-main-slot',
-                     'data-toggle' => 'modal')
+    html_args['data-target'] = '#modal-main-slot'
+    html_args['data-toggle'] = 'modal'
     link_to(args[:text] || _render_title(args), path(path_opts), html_args)
   end
 

data/mod/05_standard/set/all/rich_html/toolbar.rb

@@ -5,8 +5,8 @@ format :html do
   end
 
   view :toolbar do |args|
-    navbar "toolbar-#{card.cardname.safe_key}-#{args[:home_view]}", toggle_align: :left, class: "slotter toolbar", navbar_type: 'inverse',
-          collapsed_content: close_link(args.merge(class: 'pull-right visible-xs')) do
+    navbar "toolbar-#{card.cardname.safe_key}-#{args[:home_view]}", toggle_align: :left, class: 'slotter toolbar', navbar_type: 'inverse',
+                                                                    collapsed_content: close_link(args.merge(class: 'pull-right visible-xs')) do
       [
         close_link(args.merge(class: 'hidden-xs navbar-right')),
         (wrap_with(:form, class: 'navbar-form navbar-left') do
@@ -14,7 +14,7 @@ format :html do
             (account_split_button(args) if card.accountable?),
             activity_split_button(args),
             rules_split_button(args),
-            edit_split_button(args),
+            edit_split_button(args)
           ]
         end),
         (wrap_with(:form, class: 'navbar-form navbar-right') do
@@ -39,7 +39,7 @@ format :html do
     when :edit, :edit_name, :edit_type, :edit_structure, :edit_nests
       'edit'
     when :related
-      if args[:related_card] && (tag=args[:related_card].tag)
+      if args[:related_card] && (tag = args[:related_card].tag)
         case tag.codename
         when 'discussion', 'editors'
           'engage'
@@ -54,18 +54,17 @@ format :html do
     end
   end
 
-
   def toolbar_view_title view
-    if view  == :edit_rules
+    if view == :edit_rules
       current_set_card.name
     else
-      {edit: 'content', edit_name: 'name', edit_type: 'type', edit_structure: 'structure', edit_nests: 'nests', history: 'history', common_rules: 'common', recent_rules: 'recent', grouped_rules: 'all', edit_nest_rules: 'nests'}[view]
+      { edit: 'content', edit_name: 'name', edit_type: 'type', edit_structure: 'structure', edit_nests: 'nests', history: 'history', common_rules: 'common', recent_rules: 'recent', grouped_rules: 'all', edit_nest_rules: 'nests' }[view]
     end
   end
 
   def activity_split_button args
-    discuss = smart_link 'discuss',  { related: Card[:discussion].key }
-    editors = smart_link 'editors',  { related: Card[:editors].key }
+    discuss = smart_link 'discuss',  related: Card[:discussion].key
+    editors = smart_link 'editors',  related: Card[:editors].key
     toolbar_split_button 'activity', { view: :history }, args do
       {
         history:    (_render_history_link if card.history?),
@@ -75,13 +74,14 @@ format :html do
       }
     end
   end
+
   def rules_split_button args
-    recent = smart_link 'recent',   {view: :edit_rules, slot: {rule_view: :recent_rules}}
-    common = smart_link 'common',   {view: :edit_rules, slot: {rule_view: :common_rules}}
-    group  = smart_link 'by group', {view: :edit_rules, slot: {rule_view: :grouped_rules}}
-    all    = smart_link 'by name',  {view: :edit_rules, slot: {rule_view: :all_rules}}
-    nests  = smart_link 'nests',    {view: :edit_nest_rules, slot: {rule_view: :field_related_rules}}
-    toolbar_split_button 'rules',   {view: :edit_rules }, args do
+    recent = smart_link 'recent',   view: :edit_rules, slot: { rule_view: :recent_rules }
+    common = smart_link 'common',   view: :edit_rules, slot: { rule_view: :common_rules }
+    group  = smart_link 'by group', view: :edit_rules, slot: { rule_view: :grouped_rules }
+    all    = smart_link 'by name',  view: :edit_rules, slot: { rule_view: :all_rules }
+    nests  = smart_link 'nests',    view: :edit_nest_rules, slot: { rule_view: :field_related_rules }
+    toolbar_split_button 'rules',   { view: :edit_rules }, args do
       {
         common_rules:    common,
         grouped_rules:   group,
@@ -92,30 +92,31 @@ format :html do
       }
     end
   end
+
   def edit_split_button args
-    toolbar_split_button 'edit', {view: :edit}, args do
+    toolbar_split_button 'edit', { view: :edit }, args do
       {
         edit:       _render_edit_content_link(args),
         edit_nests: (_render_edit_nests_link if !card.structure && args[:nested_fields].present?),
-        structure:  (smart_link 'structure', {view: :edit_structure} if structure_editable?),
+        structure:  (smart_link 'structure', view: :edit_structure if structure_editable?),
         edit_name:  _render_edit_name_link,
-        edit_type:  _render_edit_type_link,
+        edit_type:  _render_edit_type_link
       }
     end
   end
+
   def account_split_button args
-    toolbar_split_button 'account', {related: Card[:account].key}, args do
+    toolbar_split_button 'account', { related: Card[:account].key }, args do
       {
-        account: smart_link('details',{related: {name: "#{card.name}+#{Card[:account].key}", view: :edit}}),
-        roles:   smart_link('roles',  {related: Card[:roles].key}),
-        created: smart_link('created',{related: Card[:created].key}),
-        edited:  smart_link('edited', {related: Card[:edited].key}),
-        follow:  smart_link('follow', {related: Card[:follow].key})
+        account: smart_link('details', related: { name: "#{card.name}+#{Card[:account].key}", view: :edit }),
+        roles:   smart_link('roles',  related: Card[:roles].key),
+        created: smart_link('created', related: Card[:created].key),
+        edited:  smart_link('edited', related: Card[:edited].key),
+        follow:  smart_link('follow', related: Card[:follow].key)
       }
     end
   end
 
-
   def toolbar_split_button name, button_args, args
     button = button_link name, button_args, class: ('active' if args[:active_toolbar_button] == name)
     active_item =
@@ -129,16 +130,13 @@ format :html do
         @slot_view
       end
     split_button button, args.merge(active_item: active_item) do
-        yield
+      yield
     end
   end
 
-
   def close_link args
-    link_opts = {title: 'cancel'}
-    if args[:subslot]
-      link_opts[:path_opts] = {slot: {subframe: true}}
-    end
+    link_opts = { title: 'cancel' }
+    link_opts[:path_opts] = { slot: { subframe: true } } if args[:subslot]
 
     link = view_link glyphicon('remove'), :home, link_opts.merge(class: 'btn-toolbar-control btn btn-primary')
     css_class = ['nav navbar-nav', args[:class]].compact.join "\n"
@@ -148,8 +146,9 @@ format :html do
         link
       ]
     end
-    #list_tag link, class: css_class
+    # list_tag link, class: css_class
   end
+
   def toolbar_pin_button
     button_tag glyphicon('pushpin'), situation: :primary, remote: true, title: "#{'un' if toolbar_pinned?}pin", class: "btn-toolbar-control toolbar-pin #{'in' unless toolbar_pinned?}active"
   end
@@ -160,17 +159,14 @@ format :html do
         _optional_render(:delete_button,  args, (card.ok?(:delete) ? :show : :hide)),
         _optional_render(:refresh_button, args, :show),
         _optional_render(:related_button, args, :show),
-        _optional_render(:history_button, args, :hide),
+        _optional_render(:history_button, args, :hide)
       ]
     end
   end
 
-
-
-
-  view :related_button do |args|
-    path_opts = {slot: {show: :toolbar}}
-    dropdown_button '', icon: 'education', class: 'related' do #, icon: 'eye-open' do
+  view :related_button do |_args|
+    path_opts = { slot: { show: :toolbar } }
+    dropdown_button '', icon: 'education', class: 'related' do # , icon: 'eye-open' do
       [
         menu_item(' children',       'baby-formula', path_opts.merge(related: '*children')),
         menu_item(' mates',          'bed',          path_opts.merge(related: '*mates')),
@@ -179,49 +175,45 @@ format :html do
       ]
     end
   end
-  view :refresh_button do |args|
-    path_opts = {slot: {show: :toolbar},page: card}
+  view :refresh_button do |_args|
+    path_opts = { slot: { show: :toolbar }, page: card }
     icon = main? ? 'refresh' : 'new-window'
     toolbar_button('refresh', icon, 'hidden-xs hidden-sm hidden-md hidden-lg', path_opts: path_opts)
   end
 
-
-  view :delete_button do |args|
+  view :delete_button do |_args|
     toolbar_button('delete', 'trash', 'hidden-xs hidden-sm hidden-md hidden-lg',
-                    action: :delete,
-                    class: 'slotter',
-                    remote: true,
-                    path_opts: {success: main? ? 'REDIRECT: *previous' : "TEXT: #{card.name} deleted"},
-                    :'data-confirm' => "Are you sure you want to delete #{card.name}?"
+                   action: :delete,
+                   class: 'slotter',
+                   remote: true,
+                   path_opts: { success: main? ? 'REDIRECT: *previous' : "TEXT: #{card.name} deleted" },
+                   :'data-confirm' => "Are you sure you want to delete #{card.name}?"
                   )
   end
 
-
-
   def toolbar_button text, symbol, hide=nil, tag_args={}
     hide ||= 'hidden-xs hidden-sm hidden-md hidden-lg'
-    tag_args[:class] = [ tag_args[:class], 'btn btn-primary' ].compact * ' '
+    tag_args[:class] = [tag_args[:class], 'btn btn-primary'].compact * ' '
     tag_args[:title] ||= text
     link_text = "#{glyphicon symbol}<span class='menu-item-label #{hide}'>#{text}</span>"
 
     if cardname = tag_args.delete(:page)
       card_link cardname, class: klass, text: link_text
     elsif viewname = tag_args.delete(:view)
-      tag_args[:path_opts] ||= {slot: {show: :toolbar}}
+      tag_args[:path_opts] ||= { slot: { show: :toolbar } }
       view_link link_text, viewname, tag_args
     else
       path_opts = tag_args.delete(:path_opts) || {}
-      path_opts.merge! action: tag_args.delete(:action) if tag_args[:action]
+      path_opts[:action] = tag_args.delete(:action) if tag_args[:action]
       link_to link_text, path_opts, tag_args
 
     end
   end
+
   def autosaved_draft_link
-    view_link('autosaved draft', :edit, path_opts: {edit_draft: true, slot: {show: :toolbar}}, class: 'navbar-link slotter pull-right')
+    view_link('autosaved draft', :edit, path_opts: { edit_draft: true, slot: { show: :toolbar } }, class: 'navbar-link slotter pull-right')
   end
 
-
-
   def default_edit_content_link_args args
     args[:title] ||= 'content'
   end
@@ -258,8 +250,7 @@ format :html do
     view_link text, view, args
   end
 
-
   def recently_edited_settings?
-     (rs = Card[:recent_settings]) && rs.item_names.present?
+    (rs = Card[:recent_settings]) && rs.item_names.present?
   end
 end

data/mod/05_standard/set/all/rich_html/wrapper.rb

@@ -4,7 +4,7 @@ format :html do
     options_hash = {}
 
     if @context_names.present?
-      options_hash['name_context'] = @context_names.map( &:key ) * ','
+      options_hash['name_context'] = @context_names.map(&:key) * ','
     end
 
     options_hash[:subslot] = 'true' if args[:subslot]
@@ -14,41 +14,41 @@ format :html do
       hash
     end
 
-    JSON( options_hash )
+    JSON(options_hash)
   end
 
-  def wrap args = {}
+  def wrap args={}
     @slot_view = @current_view
     classes = [
-        ( 'card-slot' unless args[:no_slot] ),
-        "#{ @current_view }-view",
-        ( args[:slot_class] if args[:slot_class] ),
-        ( "STRUCTURE-#{args[:structure].to_name.key}" if args[:structure]),
-        card.safe_set_keys
-      ].compact.join ' '
+      ('card-slot' unless args[:no_slot]),
+      "#{@current_view}-view",
+      (args[:slot_class] if args[:slot_class]),
+      ("STRUCTURE-#{args[:structure].to_name.key}" if args[:structure]),
+      card.safe_set_keys
+    ].compact.join ' '
     data = {
-        'card-id'   => card.id,
-        'card-name' => h(card.name),
-        'slot'      => html_escape_except_quotes(slot_options( args ))
-      }
+      'card-id' => card.id,
+      'card-name' => h(card.name),
+      'slot'      => html_escape_except_quotes(slot_options(args))
+    }
     div =
       content_tag :div, output(yield).html_safe,
-      id: card.cardname.url_key, data: data, style: h(args[:style]), class: classes
+                  id: card.cardname.url_key, data: data, style: h(args[:style]), class: classes
 
-    if params[:debug] == 'slot' && !tagged( @current_view, :no_wrap_comments )
+    if params[:debug] == 'slot' && !tagged(@current_view, :no_wrap_comments)
       name = h card.name
       space = '  ' * @depth
-      %{<!--\n\n#{ space }BEGIN SLOT: #{ name }\n\n-->#{ div }<!--\n\n#{space}END SLOT: #{ name }\n\n-->}
+      %(<!--\n\n#{space}BEGIN SLOT: #{name}\n\n-->#{div}<!--\n\n#{space}END SLOT: #{name}\n\n-->)
     else
       div
     end
   end
 
   def wrap_body args={}
-    css_classes = [ 'card-body' ]
+    css_classes = ['card-body']
     css_classes << args[:body_class]                      if args[:body_class]
-    css_classes += [ 'card-content', card.safe_set_keys ] if args[:content]
-    content_tag :div, class: css_classes.compact*' ' do
+    css_classes += ['card-content', card.safe_set_keys] if args[:content]
+    content_tag :div, class: css_classes.compact * ' ' do
       yield args
     end
   end
@@ -67,13 +67,13 @@ format :html do
       show_subheader = show_view?(:toolbar, args.merge(default_visibility: :hide)) && @current_view != :related && @current_view != :open
       wrap args do
         [
-          _optional_render( :menu, args ),
+          _optional_render(:menu, args),
           panel(args) do
             [
-              _optional_render( :header, args, :show),
-              _optional_render( :subheader, args,(show_subheader ? :show : :hide)),
-              _optional_render( :help, args.merge(help_class: 'alert alert-info'), :hide),
-              wrap_body(args) { output( block.call(args) ) } ,
+              _optional_render(:header, args, :show),
+              _optional_render(:subheader, args, (show_subheader ? :show : :hide)),
+              _optional_render(:help, args.merge(help_class: 'alert alert-info'), :hide),
+              wrap_body(args) { output(yield(args)) }
             ]
           end
         ]
@@ -84,13 +84,13 @@ format :html do
   def subframe args={}
     wrap args do
       [
-        _optional_render( :menu, args.merge(optional_horizontal_menu: :hide) ),
-        _optional_render( :subheader, args, :show),
-        _optional_render( :help, args.merge(help_class: 'alert alert-info'), :hide),
+        _optional_render(:menu, args.merge(optional_horizontal_menu: :hide)),
+        _optional_render(:subheader, args, :show),
+        _optional_render(:help, args.merge(help_class: 'alert alert-info'), :hide),
         panel(args) do
           [
-            _optional_render( :header, args, :hide),
-            wrap_body(args) { output( yield args ) } ,
+            _optional_render(:header, args, :hide),
+            wrap_body(args) { output(yield args) }
           ]
         end
       ]
@@ -102,40 +102,39 @@ format :html do
     form_opts[:hidden] = args.delete(:hidden)
     frame args do
       card_form action, form_opts do
-        output( yield args )
+        output(yield args)
       end
     end
   end
 
-
   # alert_types: 'success', 'info', 'warning', 'danger'
   def alert alert_type, args={}
     css_class = "alert alert-#{alert_type} "
     css_class += 'alert-dismissible ' if args[:dismissible]
     css_class += args[:alert_class] if args[:alert_class]
-    close_button = args[:dismissible] ? %{
+    close_button = args[:dismissible] ? %(
         <button type="button" class="close" data-dismiss="alert" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
-      } : ''
+      ) : ''
     content_tag :div, class: css_class, role: 'alert' do
-      close_button + output( yield args)
+      close_button + output(yield args)
     end
   end
 
-  def wrap_main(content)
-    return content if Env.ajax? || params[:layout]=='none'
-    %{<div id="main">#{content}</div>}
+  def wrap_main content
+    return content if Env.ajax? || params[:layout] == 'none'
+    %(<div id="main">#{content}</div>)
   end
 
   def wrap_with tag, content_or_args={}, html_args={}
     if block_given?
-      content_tag( tag, content_or_args ) do
-        output( yield ).html_safe
+      content_tag(tag, content_or_args) do
+        output(yield).html_safe
       end
     else
-      content_tag( tag, html_args ) do
-        output( content_or_args ).html_safe
+      content_tag(tag, html_args) do
+        output(content_or_args).html_safe
       end
     end
   end