card 1.16.6 → 1.16.7

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

@@ -6,7 +6,7 @@ format :html do
 
   def show view, args
     if show_layout?
-      args.merge! :view=>view if view
+      args.merge! view: view if view
       @main_opts = args
       self.render :layout
     else
@@ -20,16 +20,16 @@ format :html do
     !Env.ajax? || params[:layout]
   end
 
-  view :layout, :perms=>:none do |args|
+  view :layout, perms: :none do |args|
     output [
-      process_content(get_layout_content, :content_opts=>{ :chunk_list=>:references }),
+      process_content(get_layout_content, content_opts: { chunk_list: :references }),
       _render_modal_slot(args)
     ]
   end
 
 
   view :content do |args|
-    wrap args.reverse_merge(:slot_class=>'card-content') do
+    wrap args.reverse_merge(slot_class: 'card-content') do
       [
         _optional_render( :menu, args, :hide ),
         _render_core( args )
@@ -38,8 +38,8 @@ format :html do
   end
 
   view :content_panel do |args|
-    wrap args.reverse_merge(:slot_class=>'card-content panel panel-default') do
-      wrap_with :div, :class=>'panel-body' do
+    wrap args.reverse_merge(slot_class: 'card-content panel panel-default') do
+      wrap_with :div, class: 'panel-body' do
         [
           _optional_render( :menu, args, :hide ),
           _render_core( args )
@@ -48,12 +48,12 @@ format :html do
     end
   end
 
-  view :titled, :tags=>:comment do |args|
+  view :titled, tags: :comment do |args|
     wrap args do
       [
         _optional_render( :menu, args ),
         _render_header( args ),
-        wrap_body( :content=>true ) { _render_core args },
+        wrap_body( content: true ) { _render_core args },
         optional_render( :comment_box, args )
       ]
     end
@@ -64,7 +64,7 @@ format :html do
       [
         _optional_render( :menu, args ),
         "<label>#{ _render_title args }</label>",
-        wrap_body( :body_class=>'closed-content', :content=>true ) do
+        wrap_body( body_class: 'closed-content', content: true ) do
           _render_closed_content args
         end
       ]
@@ -74,20 +74,20 @@ format :html do
   view :title do |args|
     title = fancy_title args[:title], args[:title_class]
     title =  _optional_render( :title_editable, args, :hide) ||
-             _optional_render( :title_link, args.merge( :title_ready=>title ), :hide ) ||
+             _optional_render( :title_link, args.merge( title_ready: title ), :hide ) ||
              title
     add_name_context
     title
   end
 
   view :title_link do |args|
-    card_link card.cardname, :text=>( args[:title_ready] || showname(args[:title]) )
+    card_link card.cardname, text: ( args[:title_ready] || showname(args[:title]) )
   end
 
   view :type_info do |args|
     %{
       <span class="type-info pull-right">
-        #{card_link(card.type_name, :text=>"#{card.type_name}", :class=>'navbar-link')}
+        #{card_link(card.type_name, text: "#{card.type_name}", class: 'navbar-link')}
       </span>
     }.html_safe
   end
@@ -98,17 +98,17 @@ format :html do
     end
     res = links.shift
     links.each_with_index do |link, index|
-      res += card_link card.cardname.parts[0..index+1].join('+'), :text=>glyphicon('plus','header-icon')
+      res += card_link card.cardname.parts[0..index+1].join('+'), text: glyphicon('plus','header-icon')
       res += link
     end
     res += ' '
-    res.concat view_link(glyphicon('edit','header-icon'),:edit_name, :class=>'slotter', 'data-toggle'=>'tooltip', :title=>'edit name')
+    res.concat view_link(glyphicon('edit','header-icon'),:edit_name, class: 'slotter', 'data-toggle'=>'tooltip', title: 'edit name')
     res.concat _optional_render(:type_link,args,:show)
   end
 
-  view :open, :tags=>:comment do |args|
+  view :open, tags: :comment do |args|
     args[:optional_toggle] ||= main? ? :hide : :show
-    frame args.merge(:content=>true) do
+    frame args.merge(content: true) do
       [
         _render_open_content( args ),
         optional_render( :comment_box, args )
@@ -119,7 +119,7 @@ format :html do
 
 
 =begin
-  view :anchor, :perms=>:none, :tags=>:unknown_ok do |args|
+  view :anchor, perms: :none, tags: :unknown_ok do |args|
     %{ <a id="#{card.cardname.url_key}" name="#{card.cardname.url_key}"></a> }
   end
 =end
@@ -127,11 +127,11 @@ format :html do
   view :type do |args|
     klasses = ['cardtype']
     klass = args[:type_class] and klasses << klass
-    card_link card.type_card.name, :class=>klasses
+    card_link card.type_card.name, class: klasses
   end
 
   view :closed do |args|
-    frame args.reverse_merge(:content=>true, :body_class=>'closed-content', :toggle_mode=>:close, :optional_toggle=>:show, :optional_toolbar=>:hide ) do
+    frame args.reverse_merge(content: true, body_class: 'closed-content', toggle_mode: :close, optional_toggle: :show, optional_toolbar: :hide ) do
       _optional_render :closed_content, args
     end
   end
@@ -158,7 +158,7 @@ format :html do
 
   view :related do |args|
     if args[:related_card]
-      frame args.merge(:optional_toolbar=>:show) do
+      frame args.merge(optional_toolbar: :show) do
         nest( args[:related_card], args[:related_args])
       end
     end
@@ -168,22 +168,22 @@ format :html do
     if rparams = args[:related] || params[:related]
       rcard = rparams[:card] || begin
                 rcardname = rparams[:name].to_name.to_absolute_name( card.cardname)
-                Card.fetch rcardname, :new=>{}
+                Card.fetch rcardname, new: {}
               end
 
       #subheader =  with_name_context(card.name) { showname rcard.name }
       subheader =  with_name_context(card.name) { subformat(rcard)._render_title(args) }
       add_name_context card.name
       nest_args = ( rparams[:slot] || {} ).deep_symbolize_keys.reverse_merge(
-        :view            => ( rparams[:view] || :open ),
-        :optional_header => :hide,
-        :optional_menu   => :show,
-        :subheader       => subheader,
-        :optional_toggle => :hide,
-        :optional_help   => :show,
-        :parent          => card,
-        :subframe        => true,
-        :subslot         => true
+        view:            ( rparams[:view] || :open ),
+        optional_header: :hide,
+        optional_menu:   :show,
+        subheader:       subheader,
+        optional_toggle: :hide,
+        optional_help:   :show,
+        parent:          card,
+        subframe:        true,
+        subslot:         true
       )
       nest_args[:optional_comment_box] = :show if rcard.show_comment_box_in_related?
 
@@ -194,14 +194,14 @@ format :html do
 
 
 
-  view :help, :tags=>:unknown_ok do |args|
+  view :help, tags: :unknown_ok do |args|
     text = if args[:help_text]
       args[:help_text]
     else
-      setting = card.new_card? ? [ :add_help, { :fallback => :help } ] : :help
+      setting = card.new_card? ? [ :add_help, { fallback: :help } ] : :help
       if help_card = card.rule_card( *setting ) and help_card.ok? :read
         with_inclusion_mode :normal do
-          process_content _render_raw( args.merge :structure=>help_card.name ), :content_opts=>{ :chunk_list=>:references }
+          process_content _render_raw( args.merge structure: help_card.name ), content_opts: { chunk_list: :references }
           # render help card with current card's format so current card's context is used in help card inclusions
         end
       end
@@ -218,7 +218,7 @@ format :html do
         when :create then 'added'
         when :delete then 'deleted'
         else
-          link_to('edited', path(:view=>:history), :class=>'last-edited', :rel=>'nofollow')
+          link_to('edited', path(view: :history), class: 'last-edited', rel: 'nofollow')
         end
 
       %{

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

@@ -1,7 +1,7 @@
 format :html do
   ###---( TOP_LEVEL (used by menu) NEW / EDIT VIEWS )
 
-  view :new, :perms=>:create, :tags=>:unknown_ok do |args|
+  view :new, perms: :create, tags: :unknown_ok do |args|
     frame_and_form :create, args, 'main-success'=>'REDIRECT' do
       [
         _optional_render( :name_formgroup,     args ),
@@ -39,7 +39,7 @@ format :html do
     # type field
     if ( !params[:type] and !args[:type] and
         ( main? || card.simple? || card.is_template? ) and
-        Card.new( :type_id=>card.type_id ).ok? :create #otherwise current type won't be on menu
+        Card.new( type_id: card.type_id ).ok? :create #otherwise current type won't be on menu
       )
       args[:optional_type_formgroup] = :show
     else
@@ -49,22 +49,22 @@ format :html do
 
 
     cancel = if main?
-      { :class=>'redirecter', :href=>Card.path_setting('/*previous') }
+      { class: 'redirecter', href: Card.path_setting('/*previous') }
     else
-      { :class=>'slotter',    :href=>path( :view=>:missing         ) }
+      { class: 'slotter',    href: path( view: :missing         ) }
     end
 
     args[:buttons] ||= %{
-      #{ button_tag 'Submit', :class=>'create-submit-button', :disable_with=>'Submitting', :situation=>'primary' }
-      #{ button_tag 'Cancel', :type=>'button', :class=>"create-cancel-button #{cancel[:class]}", :href=>cancel[:href] }
+      #{ button_tag 'Submit', class: 'create-submit-button', disable_with: 'Submitting', situation: 'primary' }
+      #{ button_tag 'Cancel', type: 'button', class: "create-cancel-button #{cancel[:class]}", href: cancel[:href] }
     }
 
   end
 
 
 
-  view :edit, :perms=>:update, :tags=>:unknown_ok do |args|
-    frame_and_form :update, args.merge(:optional_toolbar=>:show) do
+  view :edit, perms: :update, tags: :unknown_ok do |args|
+    frame_and_form :update, args.merge(optional_toolbar: :show) do
       [
         _optional_render( :content_formgroup, args ),
         _optional_render( :button_formgroup,   args )
@@ -78,15 +78,15 @@ format :html do
     args[:optional_toolbar] ||= :show
 
     args[:buttons] ||= %{
-      #{ button_tag 'Submit', :class=>'submit-button', :disable_with=>'Submitting', :situation=>'primary' }
-      #{ button_tag 'Cancel', :class=>'cancel-button slotter', 'data-slot-selector'=>args[:cancel_slot_selector],
-       :href=>(args[:cancel_path] || path), :type=>'button' }
+      #{ button_tag 'Submit', class: 'submit-button', disable_with: 'Submitting', situation: 'primary' }
+      #{ button_tag 'Cancel', class: 'cancel-button slotter', 'data-slot-selector'=>args[:cancel_slot_selector],
+       href: (args[:cancel_path] || path), type: 'button' }
     }
   end
 
 
-  view :edit_name, :perms=>:update do |args|
-    frame_and_form( { :action=>:update, :id=>card.id }, args, 'main-success'=>'REDIRECT' ) do
+  view :edit_name, perms: :update do |args|
+    frame_and_form( { action: :update, id: card.id }, args, 'main-success'=>'REDIRECT' ) do
       [
         _render_name_formgroup( args ),
         _optional_render( :confirm_rename, args ),
@@ -117,22 +117,22 @@ format :html do
     referers = args[:referers] = card.extended_referencers
     args[:hidden] ||= {}
     args[:hidden].reverse_merge!(
-      :success  => '_self',
-      :old_name => card.name,
-      :referers => referers.size,
-      :card     => { :update_referencers => false }
+      success:  '_self',
+      old_name: card.name,
+      referers: referers.size,
+      card:     { update_referencers: false }
     )
     args[:optional_toolbar] ||= :show
     args[:buttons] = %{
-      #{ button_tag 'Rename and Update', :disable_with=>'Renaming', :class=>'renamer-updater', :situation=>'primary' }
-      #{ button_tag 'Rename',            :disable_with=>'Renaming', :class=>'renamer'         }
-      #{ button_tag 'Cancel', :class=>'slotter',  :type=>'button', :href=>path }
+      #{ button_tag 'Rename and Update', disable_with: 'Renaming', class: 'renamer-updater', situation: 'primary' }
+      #{ button_tag 'Rename',            disable_with: 'Renaming', class: 'renamer'         }
+      #{ button_tag 'Cancel', class: 'slotter',  type: 'button', href: path }
     }
 
   end
 
 
-  view :edit_type, :perms=>:update do |args|
+  view :edit_type, perms: :update do |args|
     frame_and_form :update, args do
     #'main-success'=>'REDIRECT: _self', # adding this back in would make main cards redirect on cardtype changes
       [
@@ -145,35 +145,35 @@ format :html do
   def default_edit_type_args args
     args[:variety] = :edit #YUCK!
     args[:optional_toolbar] ||= :show
-    args[:hidden] ||= { :success=>{:view=>:edit} }
+    args[:hidden] ||= { success: {view: :edit} }
     args[:buttons] = %{
-      #{ button_tag 'Submit', :disable_with=>'Submitting', :situation=>'primary' }
-      #{ button_tag 'Cancel', :href=>path(:view=>:edit), :type=>'button', :class=>'slotter' }
+      #{ button_tag 'Submit', disable_with: 'Submitting', situation: 'primary' }
+      #{ button_tag 'Cancel', href: path(view: :edit), type: 'button', class: 'slotter' }
     }
   end
 
-  view :edit_rules, :tags=>:unknown_ok do |args|
+  view :edit_rules, tags: :unknown_ok do |args|
     view = args[:rule_view] || :common_rules
     slot_args = {
-        :rule_view=>view, :optional_set_navbar=>:show, :optional_set_label=>:hide, :optional_rule_navbar=>:hide
+        rule_view: view, optional_set_navbar: :show, optional_set_label: :hide, optional_rule_navbar: :hide
       }
-    _render_related args.merge(:related=>{:card=>current_set_card, :view=>:open, :slot=>slot_args})
+    _render_related args.merge(related: {card: current_set_card, view: :open, slot: slot_args})
   end
 
   def default_edit_rules_args args
     args[:optional_toolbar] ||= :show
   end
 
-  view :options, {:view=>:edit_rules, :mod=>All::RichHtml::Editing::HtmlFormat} # for backwards compatibility
+  view :options, {view: :edit_rules, mod: All::RichHtml::Editing::HtmlFormat} # for backwards compatibility
 
   view :edit_structure do |args|
     slot_args = {
-        :cancel_slot_selector=>'.card-slot.related-view',
-        :cancel_path=>card.format.path(:view=>:edit),
-        :optional_edit_toolbar=>:hide,
-        :hidden=>{:success=>{:view=>:open, 'slot[subframe]'=>true}}
+        cancel_slot_selector: '.card-slot.related-view',
+        cancel_path: card.format.path(view: :edit),
+        optional_edit_toolbar: :hide,
+        hidden: {success: {view: :open, 'slot[subframe]'=>true}}
       }
-    render_related args.merge(:related=>{:card=>card.structure, :view=>:edit, :slot=>slot_args})
+    render_related args.merge(related: {card: card.structure, view: :edit, slot: slot_args})
   end
 
   def default_edit_structure_args args
@@ -183,7 +183,7 @@ format :html do
   view :edit_nests do |args|
     frame args do
       with_inclusion_mode :edit do
-        process_relative_tags :optional_toolbar=>:hide
+        process_relative_tags optional_toolbar: :hide
       end
     end
   end
@@ -196,7 +196,7 @@ format :html do
     frame args do
 #      with_inclusion_mode :edit do
        nested_fields(args).map do |chunk|
-         nest Card.fetch("#{chunk.referee_name}+*self"), :view=>:titled, :rule_view=>view, :optional_set_label=>:hide, :optional_rule_navbar=>:show
+         nest Card.fetch("#{chunk.referee_name}+*self"), view: :titled, rule_view: view, optional_set_label: :hide, optional_rule_navbar: :show
        end
     end
   end

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

@@ -7,7 +7,7 @@ format :html do
       if args[:core_edit] #need better name
         _render_core args
       else
-        process_relative_tags :optional_toolbar=>:hide, :structure=>args[:structure]
+        process_relative_tags optional_toolbar: :hide, structure: args[:structure]
       end
 
     else
@@ -16,7 +16,7 @@ format :html do
 
       if [ args[:optional_type_formgroup], args[:optional_name_formgroup] ].member? :show
         # display content field in formgroup for consistency with other fields
-        formgroup '', field, :editor=>:content
+        formgroup '', field, editor: :content
       else
         editor_wrap( :content ) { field }
       end
@@ -52,7 +52,7 @@ format :html do
 
   def card_form_opts action, html={}
     url, action = case action
-      when Symbol ;  [ path(:action=>action) , action          ]
+      when Symbol ;  [ path(action: action) , action          ]
       when Hash   ;  [ path(action)          , action[:action] ]
       when String ;  [ card_path(action)     , nil             ] #deprecated
       else        ;  raise Card::Error, "unsupported card_form action class: #{action.class}"
@@ -66,22 +66,22 @@ format :html do
     html[:recaptcha] ||= 'on' if card.recaptcha_on?
     html.delete :recaptcha if html[:recaptcha] == :off
 
-    { :url=>url, :remote=>true, :html=>html }
+    { url: url, remote: true, html: html }
   end
 
   def editor_wrap type=nil
-    content_tag( :div, :class=>"editor#{ " #{type}-editor" if type }" ) { yield.html_safe }
+    content_tag( :div, class: "editor#{ " #{type}-editor" if type }" ) { yield.html_safe }
   end
 
   def formgroup title, content, opts={}
     help_text =
       case opts[:help]
-      when String ; _render_help :help_class=>'help-block', :help_text=> opts[:help]
-      when true   ; _render_help :help_class=>'help-block'
+      when String ; _render_help help_class: 'help-block', help_text: opts[:help]
+      when true   ; _render_help help_class: 'help-block'
       else        ; nil
       end
 
-    div_args = { :class=>['form-group', opts[:class]].compact*' ' }
+    div_args = { class: ['form-group', opts[:class]].compact*' ' }
     div_args[:card_id  ] = card.id     if card.real?
     div_args[:card_name] = h card.name if card.name.present?
 
@@ -115,16 +115,16 @@ format :html do
   # FIELDSET VIEWS
 
   view :name_formgroup do |args|
-    formgroup 'name', raw( name_field form ), :editor=>'name', :help=>args[:help]
+    formgroup 'name', raw( name_field form ), editor: 'name', help: args[:help]
   end
 
   view :type_formgroup do |args|
     field = if args[:variety] == :edit #FIXME dislike this api -ef
-      type_field :class=>'type-field edit-type-field'
+      type_field class: 'type-field edit-type-field'
     else
-      type_field :class=>"type-field live-type-field", :href=>path(:view=>:new), 'data-remote'=>true
+      type_field class: "type-field live-type-field", href: path(view: :new), 'data-remote'=>true
     end
-    formgroup 'type', field, :editor => 'type', :class=>'type-formgroup'
+    formgroup 'type', field, editor: 'type', class: 'type-formgroup'
   end
 
 
@@ -144,8 +144,8 @@ format :html do
   def name_field form=nil, options={}
     form ||= self.form
     text_field( :name, {
-      :value=>card.name, #needed because otherwise gets wrong value if there are updates
-      :autocomplete=>'off'
+      value: card.name, #needed because otherwise gets wrong value if there are updates
+      autocomplete: 'off'
     }.merge(options))
   end
 
@@ -168,8 +168,8 @@ format :html do
     @nested = options[:nested]
     card.last_action_id_before_edit = card.last_action_id
     revision_tracking = if card && !card.new_card? && !options[:skip_rev_id]
-      hidden_field :last_action_id_before_edit, :class=>'current_revision_id'
-      #hidden_field_tag 'card[last_action_id_before_edit]', card.last_action_id, :class=>'current_revision_id'
+      hidden_field :last_action_id_before_edit, class: 'current_revision_id'
+      #hidden_field_tag 'card[last_action_id_before_edit]', card.last_action_id, class: 'current_revision_id'
     end
     %{
       #{ revision_tracking
@@ -182,14 +182,14 @@ format :html do
 # FIELD VIEWS
 
   view :editor do |args|
-    text_area :content, :rows=>3, :class=>'tinymce-textarea card-content', :id=>unique_id
+    text_area :content, rows: 3, class: 'tinymce-textarea card-content', id: unique_id
   end
 
-  view :edit_in_form, :perms=>:update, :tags=>:unknown_ok do |args|
+  view :edit_in_form, perms: :update, tags: :unknown_ok do |args|
     eform = form_for_multi
 
-    content = content_field eform, args.merge( :nested=>true )
-    opts = { :editor=>'content', :help=>true, :class=>'card-editor' }
+    content = content_field eform, args.merge( nested: true )
+    opts = { editor: 'content', help: true, class: 'card-editor' }
 
     content      += raw( "\n #{ eform.hidden_field :type_id }" )  if card.new_card?
     opts[:class] += " RIGHT-#{ card.cardname.tag_name.safe_key }" if card.cardname.junction?