card 1.15.7 → 1.16.0

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

@@ -4,10 +4,10 @@ format :html do
     if args[:structure] || card.structure
       # multi-card editing
 
-      if args[:core_edit] #need better name!
+      if args[:core_edit] #need better name
         _render_core args
       else
-        process_relative_tags args
+        process_relative_tags :optional_toolbar=>:hide, :structure=>args[:structure]
       end
 
     else
@@ -25,11 +25,14 @@ format :html do
 
 
   def form_for_multi
-    block = Proc.new {}
-    builder = ActionView::Base.default_form_builder
     card.name = card.name.gsub(/^#{Regexp.escape(root.card.name)}\+/, '+') if root.card.new_card?  ##FIXME -- need to match other relative inclusions.
 
-    builder.new("card[subcards][#{card.relative_name}]", card, template, {}, block)
+    # doesn't work anymore in Rails 4
+    # TODO -- check whether forms work with the new instantiate_builder call
+    # block = Proc.new {}
+    # builder = ActionView::Base.default_form_builder
+    # builder.new("card[subcards][#{card.relative_name}]", card, template, {}, block)
+    builder = instantiate_builder("card[subcards][#{card.relative_name}]", card, {})
   end
 
   def form
@@ -188,16 +191,20 @@ format :html do
     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?
+    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?
 
     formgroup fancy_title( args[:title] ), content, opts
   end
 
   def process_relative_tags args
-    _render_raw(args).scan( /\{\{\s*\+[^\}]*\}\}/ ).map do |inc| #fixme - wrong place for regexp!
-      process_content( inc ).strip
-    end.join
+    nested_fields(args).map do |chunk|
+      nested_card = fetch_nested_card chunk.options
+      nest nested_card, chunk.options.reverse_merge(args)
+    end.join "\n"
+    # _render_raw(args).scan( /\{\{\s*\+[^\}]*\}\}/ ).map do |inc| #fixme - wrong place for regexp!
+    #   process_content( inc ).strip
+    # end.join
   end
 
   # form helpers

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

@@ -1,19 +1,41 @@
 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>
+        #{ _optional_render :type_info, args, :hide }
+      </div>
+      #{ _optional_render :toolbar, args, :hide }
+    }
+  end
+
+  def default_header_args args
+    if @slot_view == :open
+      if (show_view?(:toolbar,args.merge(:default_visibility=>:hide)) || toolbar_pinned?) && card.type_code != :basic
+        args[:optional_type_info] ||= :show
+      end
+      if toolbar_pinned?
+        args[:optional_toolbar] ||= :show
+      end
+    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 }
       </div>
-      #{ _optional_render :toolbar, args, (toolbar_pinned? ? :show : :hide) }
-      #{ _optional_render :edit_toolbar, args, (edit_toolbar_pinned? ? :show : :hide)}
-      #{ _optional_render :account_toolbar, args, :hide}
     }
   end
 
+
   view :toggle do |args|
     verb, adjective, direction = ( args[:toggle_mode] == :close ? %w{ open open expand } : %w{ close closed collapse-down } )
 
@@ -41,7 +63,7 @@ format :html do
   end
 
   def show_follow?
-    Auth.signed_in? && !card.new_card?
+    Auth.signed_in? && !card.new_card? && card.followable?
   end
 
   def structure_editable?

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

@@ -6,7 +6,7 @@ format :html do
       [
         _optional_render(:horizontal_menu, args, :hide),
         _render_menu_link(args),
-        _render_modal_slot(args)
+        _render_modal_slot(args.merge(:modal_id=>card.cardname.safe_key))
       ]
     end
   end
@@ -32,7 +32,7 @@ format :html 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( :ul, items.html_safe, :class=>'dropdown-menu', :role=>'menu'),
       ]
     end
   end
@@ -47,7 +47,7 @@ format :html do
     menu_items = []
     menu_items << menu_edit_link(args)            if args[:show_menu_item][:edit]
     menu_items << menu_discuss_link(args)         if args[:show_menu_item][:discuss]
-    menu_items << _render_follow_modal_link(args) if args[:show_menu_item][:follow]
+    menu_items << _render_follow_link(args.merge(:icon=>true)) if args[:show_menu_item][:follow]
     menu_items << menu_page_link(args)            if args[:show_menu_item][:page]
     menu_items << menu_rules_link(args)           if args[:show_menu_item][:rules]
     menu_items << menu_account_link(args)         if args[:show_menu_item][:account]
@@ -56,11 +56,8 @@ format :html do
   end
 
   def menu_edit_link args
-    opts = {
-             :view=>:edit,
-             :path_opts=>{ :slot=>{:show=>'edit_toolbar', :hide=>'type_link'}}
-           }
-    menu_item('edit', 'edit', opts, args[:html_args] )
+    path_opts = { :view=>:edit }
+    menu_item('edit', 'edit', path_opts, args[:html_args] )
   end
 
   def menu_discuss_link args
@@ -68,7 +65,7 @@ format :html do
   end
 
   def menu_page_link args
-    menu_item('page', 'new-window', {:page=>card}, args[:html_args])
+    menu_item('page', 'new-window', {:card=>card}, args[:html_args])
   end
 
   def menu_rules_link args
@@ -76,39 +73,25 @@ format :html do
   end
 
   def menu_account_link args
-    opts = { :related=>{:name=>'+*account',:view=>:edit,:slot=>{:hide=>'edit_toolbar'}},
-             :path_opts=>{:slot=>{:show=>:account_toolbar}} }
-    menu_item('account', 'user',opts, args[:html_args])
+    path_opts = { :related=>{:name=>'+*account',:view=>:edit} }
+    menu_item('account', 'user', path_opts, args[:html_args])
   end
 
   def menu_more_link args
-    opts = { :view=>args[:home_view] || :open,
-             :path_opts=>{:slot=>{:show=>:toolbar}}}
-    menu_item('', 'option-horizontal', opts, args[:html_args])
+    path_opts = {
+        :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=nil
+
+  def menu_item text, icon, target, html_args={}
     link_text = "#{glyphicon(icon)}<span class='menu-item-label'>#{text}</span>".html_safe
-    target.merge!(html_args) if html_args
-    if target[:view]
-      view_link(link_text, target.delete(:view), target)
-    elsif target[:page]
-      card_link target.delete(:page), target.merge(:text=>link_text)
-    elsif target[:related]
-      target[:path_opts] ||= {}
-
-      target[:path_opts][:related] =
-        if target[:related].kind_of? String
-          {:name=>"+#{target.delete(:related)}"}
-        else
-          target[:related]
-        end
-      view_link link_text, :related, target
-    else
-      link_to link_text, {:action=>target.delete(:action)}, target
-    end
+    smart_link link_text, target, html_args || {}
   end
 
+
   def default_menu_link_args args
     args[:menu_icon] ||= 'cog'
   end

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

@@ -1,28 +1,64 @@
 format :html do
-  def default_modal_content_args args
-    args[:buttons] ||= button_tag 'Close', 'data-dismiss'=>'modal'
-  end
 
-  view :modal_link do |args|
-    args[:html_args] ||= {}
-    args[:html_args].merge!('data-target'=>"#modal-#{card.cardname.safe_key}", 'data-toggle'=>'modal')
-    link_to(args[:text] || _render_title(args), path(:view=>:modal_content), args[:html_args])
-  end
 
-  view :modal_link_and_dialog do |args|
-    _render_modal_link(args) + _render_modal(args)
+
+
+  view :modal_link do |args|
+    path_opts = args[:path_opts] || {}
+    path_opts.merge!(:layout=>:modal)
+    html_args = args[:html_args] || {}
+    #html_args.merge!('data-target'=>"#modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}",
+    html_args.merge!('data-target'=>"#modal-main-slot",
+      'data-toggle'=>'modal')
+    link_to(args[:text] || _render_title(args), path(path_opts), html_args)
   end
 
   view :modal_slot do |args|
-    wrap_with(:div, :class=>'modal fade', :role=>'dialog', :id=>"modal-#{card.cardname.safe_key}") do
+    #wrap_with(:div, :class=>'modal fade', :role=>'dialog', :id=>"modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}") do
+    id = "modal-"
+    id += (args[:modal_id] || 'main-slot')
+    wrap_with(:div, :class=>'modal fade', :role=>'dialog', :id=>id) do
       wrap_with(:div, :class=>'modal-dialog') do
         content_tag :div, :class=>'modal-content' do
-          _optional_render :modal_content, args, :hide
+          ''
         end
       end
     end
   end
 
+
+  view :modal_menu, :tags=>:unknown_ok do |args|
+    popout_params = {}
+    popout_params[:view] = params[:view] if params[:view]
+    # we probably want to pass on a lot more params than just view, but not all of them
+    # (eg we don't want layout, id, controller...)
+    wrap_with :div, :class=>'modal-menu' do
+      [
+        link_to( glyphicon('remove'), '', :class=>'close-modal pull-right close', 'data-dismiss'=>'modal'),
+        link_to( glyphicon('new-window'), popout_params, :class=>'pop-out-modal pull-right close ' )
+      ]
+    end
+  end
+
+  view :modal_footer, :tags=>:unknown_ok do |args|
+    args[:buttons] || ''
+  end
+
+  def default_modal_footer_args args
+    args[:buttons] ||=  button_tag 'Close', :class=>'btn-xs close-modal pull-right', 'data-dismiss'=>'modal'
+  end
+
+=begin
+  def default_modal_content_args args
+    args[:buttons] ||= button_tag 'Close', 'data-dismiss'=>'modal'
+  end
+
+  view :modal_link_and_dialog do |args|
+    _render_modal_link(args) + _render_modal(args)
+  end
+
+
+
   # use modal_content for ajax calls to fill a modal_slot with content
   view :modal_content do |args|
     output [
@@ -51,4 +87,6 @@ format :html do
   view :modal do |args|
     _render_modal_slot args.merge(:optional_modal_content=>:show)
   end
+=end
+
 end

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

@@ -1,130 +1,181 @@
 
 format :html do
-  def edit_toolbar_pinned?
-    Card[:edit_toolbar_pinned].content == 'true'
-  end
-
   def toolbar_pinned?
     Card[:toolbar_pinned].content == 'true'
   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('pull-right visible-xs') do
+          :collapsed_content=>close_link(args.merge(:class=>'pull-right visible-xs')) do
       [
-        (wrap_with(:p, :class=>"navbar-text navbar-left") do
-          _optional_render(:type_link,args,:show)
+        close_link(args.merge(:class=>'hidden-xs navbar-right')),
+        (wrap_with(:form, :class=>'navbar-form navbar-left') do
+          [
+            (account_split_button(args) if card.accountable?),
+            engage_split_button(args),
+            rules_split_button(args),
+            edit_split_button(args),
+          ]
         end),
-        close_link('hidden-xs navbar-right'),
-        %{
-          <form class="navbar-form navbar-right">
-            <div class="form-group">
-              #{_optional_render :toolbar_buttons_advanced, args, :show}
-              #{_optional_render :toolbar_buttons, args, :show}
-            </div>
-          </form>
-        }.html_safe,
+        (wrap_with(:form, :class=>'navbar-form navbar-right') do
+          content_tag :div, :class=>'form-group' do
+            _optional_render(:toolbar_buttons, args, :show)
+          end
+        end)
       ]
     end
   end
+  def default_toolbar_args args
+    args[:nested_fields] = nested_fields(args)
+    args[:active_toolbar_button] ||= active_toolbar_button @slot_view, args
+  end
 
-  def close_link css_class
-    wrap_with :ul, :class=>"nav navbar-nav #{css_class}" do
-      [
-        toolbar_pin_link,
-        "<li>#{view_link(glyphicon('remove'), :home, :title=>'cancel')}</li>"
-      ]
+  def active_toolbar_button active_view, args
+    case active_view
+    when :follow, :editors
+      'engage'
+    when :edit_rules, :edit_nest_rules
+      'rules'
+    when :edit, :edit_name, :edit_type, :edit_structure, :edit_nests, :history
+      'edit'
+    when :related
+      if args[:related_card] && (tag=args[:related_card].tag)
+        case tag.codename
+        when 'discussion', 'editors'
+          'engage'
+        when 'account', 'roles', 'edited', 'created', 'follow'
+          'account'
+        else
+          'rules'
+        end
+      end
     end
   end
 
-  view :edit_toolbar do |args|
-    id = "edit-toolbar-#{card.cardname.safe_key}-#{args[:home_view]}"
-    navbar_right = ''
-    navbar_right += edit_toolbar_autosave_link if card.drafts.present?
-    navbar_right += edit_toolbar_pin_link
-    navbar_right += edit_toolbar_close_link
 
-    navbar id, :toggle=>'Edit<span class="caret"></span>', :toggle_align=>:left,
-               :class=>'slotter toolbar', :navbar_type=>'inverse', :collapsed_content=>close_link('pull-right visible-xs') do
-      [
-        content_tag(:span, 'Edit:', :class=>"navbar-text hidden-xs"),
-        (wrap_with :ul, :class=>'nav navbar-nav nav-pills' do
-          [
-            _optional_render(:edit_content_button, args, :show),
-            _optional_render(:edit_name_button,    args, :show),
-            _optional_render(:edit_type_button,    args, :show),
-            _optional_render(:edit_rules_button,   args, :show),
-            _optional_render(:edit_nests_button,   args, :show),
-          ]
-        end),
-        content_tag( :ul, navbar_right.html_safe, :class=>'nav navbar-nav navbar-right' )
-      ]
+  def toolbar_view_title view
+    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]
     end
   end
 
-  view :account_toolbar do |args|
-    if card.accountable?
-      links = []
-      links << account_pill( 'account', true, :view=>:edit, :slot=>{:hide=>'edit_toolbar'})
-      links << account_pill( 'roles')
-      links << account_pill( 'created')
-      links << account_pill( 'edited')
-      links << account_pill( 'follow')
-      navbar 'account-toolbar',:toggle_align=>:left, :collapsed_content=>close_link('pull-right visible-xs'), :navbar_type=>'inverse',
-      :class=>"slotter toolbar", :nav_opts=>{'data-slot-selector'=>'.card-slot.related-view > .card-frame > .card-body > .card-slot'} do
-        [
-          content_tag(:ul, links.join("\n").html_safe, :class=>'nav navbar-nav nav-pills'),
-          content_tag(:ul, "<li>#{view_link(glyphicon('remove','hidden-xs'), :open)}</li>".html_safe, :class=>'nav navbar-nav navbar-right'),
-        ]
-      end
+  def engage_split_button args
+    discuss = smart_link 'discuss', { :related=>Card[:discussion].key }
+    editors = smart_link 'editors', { :related=>Card[:editors].key }
+    toolbar_split_button 'engage',  { :related=>Card[:discussion].key }, args do
+      {
+        :discuss => discuss,
+        :follow  =>_render_follow_link(args),
+        :editors => editors
+      }
+    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
+      {
+        :common_rules  => common,
+        :grouped_rules => group,
+        :all_rules     => all,
+        :separator       => (separator if args[:nested_fields].present?),
+        :recent_rules    => (recent if recently_edited_settings?),
+        :edit_nest_rules => (nests if args[:nested_fields].present?)
+      }
+    end
+  end
+  def edit_split_button args
+    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?),
+        :edit_structure => (smart_link 'structure', {:view => :edit_structure} if structure_editable?),
+        :edit_name      => _render_edit_name_link,
+        :edit_type      => _render_edit_type_link,
+        :separator      => separator,
+        :history        => (_render_history_link if card.history?)
+      }
+    end
+  end
+  def account_split_button args
+    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})
+      }
     end
   end
 
-  view :toolbar_buttons do |args|
-    wrap_with(:div, :class=>'btn-group') do
-      [
-        _optional_render(:history_button, args, :show),
-        _optional_render(:delete_button,  args, (card.ok?(:delete) ? :show : :hide)),
-        _optional_render(:refresh_button, args, :hide)
-      ]
+
+  def toolbar_split_button name, button_args, args
+    button = button_link name, button_args, :class=>('active' if args[:active_toolbar_button] == name)
+    active_item =
+      if @slot_view == :related
+        if args[:rule_view]
+          args[:rule_view].to_sym
+        elsif args[:related_card] && (r = args[:related_card].right) && (cn = r.codename)
+          cn.to_sym
+        end
+      else
+        @slot_view
+      end
+    split_button button, args.merge(:active_item=>active_item) do
+        yield
     end
   end
 
-  view :toolbar_buttons_advanced do |args|
-    wrap_with(:div, :class=>'btn-group') do
-      [
-        _optional_render(:rules_button,   args, :show),
-        _optional_render(:related_button, args, :show),
-      ]
+
+  def close_link args
+    link_opts = {:title=>'cancel'}
+    if args[:subslot]
+      link_opts[:path_opts] = {:slot=>{:subframe=>true}}
     end
+
+    link = view_link glyphicon('remove'), :home, link_opts
+    css_class = ['nav navbar-nav', args[:class]].compact.join "\n"
+    list_tag link, :class=>css_class
   end
 
-  view :edit_toolbar_buttons do |args|
+  view :toolbar_buttons do |args|
     wrap_with(:div, :class=>'btn-group') do
       [
-        _optional_render(:edit_content_button,   args, :show),
-        _optional_render(:edit_structure_button, args, :show),
-        _optional_render(:edit_name_button,      args, :show),
-        _optional_render(:edit_type_button,      args, :show),
+        _optional_render(:related_button, args, :show),
+        toolbar_pin_button,
+        _optional_render(:delete_button,  args, (card.ok?(:delete) ? :show : :hide)),
+        _optional_render(:refresh_button, args, :hide),
+        _optional_render(:history_button, args, :hide),
       ]
     end
   end
 
-  view :rules_button do |args|
-    toolbar_button('rules', 'wrench', 'hidden-xs hidden-sm', :view=>'options')
-  end
+
   view :related_button do |args|
     path_opts = {:slot=>{:show=>:toolbar}}
-    btn_dropdown('related', 'tree-deciduous', [
-      menu_item('children',       'baby-formula', {:related=>'*children', :path_opts=>path_opts}),
-      menu_item('mates',          'bed',          {:related=>'*mates', :path_opts=>path_opts}),
-      menu_item('references out', 'log-out',      {:related=>'*refers_to', :path_opts=>path_opts}),
-      menu_item('references in',  'log-in',       {:related=>'*referred_to_by', :path_opts=>path_opts})
+    page_link =
+      if main?
+        menu_item ' refresh', 'refresh', path_opts.merge(:card=>card), args[:html_args]
+      else
+        menu_item ' page', 'new-window', path_opts.merge(:card=>card), args[:html_args]
+      end
 
-    ], :class=>'related')
-  end
-  view :history_button do |args|
-    toolbar_button('history', 'time', 'hidden-xs hidden-sm hidden-md', :view=>'history')
+    dropdown_button '', :class=>'related', :icon=>'eye-open' do
+      [
+        page_link,
+        separator,
+        menu_item(' children',       'baby-formula', path_opts.merge(:related=>'*children')),
+        menu_item(' mates',          'bed',          path_opts.merge(:related=>'*mates')),
+        menu_item(' references out', 'log-out',      path_opts.merge(:related=>'*refers_to')),
+        menu_item(' references in',  'log-in',       path_opts.merge(:related=>'*referred_to_by'))
+      ]
+    end
   end
   view :delete_button do |args|
     toolbar_button('delete', 'trash', 'hidden-xs hidden-sm hidden-md hidden-lg',
@@ -135,42 +186,14 @@ format :html do
                     :'data-confirm' => "Are you sure you want to delete #{card.name}?"
                   )
   end
-  view :refresh_button do |args|
-    toolbar_button('refresh', 'refresh', 'hidden-xs hidden-sm hidden-md hidden-lg', :view=>args[:home_view] || :open)
-  end
-
-  view :edit_content_button do |args|
-    pill_view_link 'content', :edit, args
-  end
-  view :edit_name_button do |args|
-    pill_view_link 'name',:edit_name, args
-  end
-  view :edit_type_button do |args|
-    pill_view_link 'type', :edit_type, args
-  end
-  view :edit_rules_button do |args|
-    if structure_editable?
-      active = [:edit_rules, :edit_structure].include? args.delete(:active_toolbar_view)
-      rule_items = pill_view_link 'structure', :edit_structure, args
-      rule_items += pill_view_link '...', :edit_rules, args
-      pill_dropdown 'rules', rule_items, active
-    else
-      pill_view_link 'rules', :edit_rules, args
-    end
-  end
-  view :edit_nests_button do |args|
-    if (nests = card.fetch(:trait=>:includes)) && nests.item_names.present?
-      pill_view_link 'nests', :edit_nests, args
-    end
-  end
 
-  view :type_link do |args|
-    card_link(card.type_name, :text=>"Type: #{card.type_name}", :class=>'navbar-link') +
-      view_link(glyphicon('edit'),'edit_type', :class=>'navbar-link slotter', 'data-toggle'=>'tooltip', :title=>'edit type')
+  def toolbar_pin_button
+    button_tag glyphicon('pushpin'), :situation=>:primary, :remote=>true, :title=>"#{'un' if toolbar_pinned?}pin", :class=>"toolbar-pin #{'in' unless toolbar_pinned?}active"
   end
 
-  def toolbar_button text, symbol, hide, tag_args
-    tag_args[:class] = [ tag_args[:class], 'btn btn-default' ].compact * ' '
+  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[:title] ||= text
     link_text = "#{glyphicon symbol}<span class='menu-item-label #{hide}'>#{text}</span>"
 
@@ -181,86 +204,55 @@ format :html do
       view_link link_text, viewname, tag_args
     else
       path_opts = tag_args.delete(:path_opts) || {}
-      path_opts.merge! :action=>tag_args.delete(:action)
+      path_opts.merge! :action=>tag_args.delete(:action) if tag_args[:action]
       link_to link_text, path_opts, tag_args
     end
   end
 
-  def pill_view_link name, view, args
-    active_view = args[:active_toolbar_view] || args[:home_view]
-    opts = {:class=>'slotter', :role=>'pill'}
-    li_pill view_link(name, view, opts), active_view == view
+  def autosaved_draft_link
+    view_link('autosaved draft', :edit, :path_opts=>{:edit_draft=>true, :slot=>{:show=>:edit_toolbar}}, :class=>'navbar-link slotter pull-right')
   end
 
-  def account_pill name, active=false, path_opts={}
-    opts = {:text=>name, :role=>'pill', :remote=>true, :path_opts=>path_opts}
-    opts[:path_opts][:slot] ||= {}
-    opts[:path_opts][:slot][:hide] = "toggle #{opts[:path_opts][:slot][:hide]}"
-    li_pill card_link("#{card.name}+*#{name}", opts), active
-  end
 
-  def li_pill content, active
-    "<li role='presentation' #{"class='active'" if active}>#{content}</li>"
-  end
 
-  def pill_dropdown name, items, active=false
-    %{
-      <li role="presentation" class="dropdown #{'active' if active}">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-expanded="false">
-          #{name} <span class="caret"></span>
-        </a>
-        #{ dropdown_list items }
-      </li>
-    }
+  def default_edit_content_link_args args
+    args[:title] ||= 'content'
   end
-
-  def btn_dropdown name, icon, items, opts={}
-    %{
-      <div class="btn-group" role="group">
-        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="#{name}" aria-expanded="false">
-          #{glyphicon icon} #{name}
-          <span class="caret"></span>
-        </button>
-        #{ dropdown_list items, opts[:class] }
-      </div>
-    }
+  view :edit_content_link do |args|
+    toolbar_view_link :edit, args
   end
-
-  def dropdown_list items, extra_css_class=nil
-    if items.kind_of? Array
-      items = items.map {|item| "<li>#{item}</li>"}.join "\n"
-    end
-    %{
-      <ul class="dropdown-menu #{extra_css_class}" role="menu">
-        #{items}
-      </ul>
-    }
+  def default_edit_name_link_args args
+    args[:title] ||= 'name'
   end
-
-  def toolbar_pin_link
-    %{
-      <li class='toolbar-pin #{'in' unless toolbar_pinned?}active'>
-        <a href='#' title='#{'un' if toolbar_pinned?}pin'>#{glyphicon 'pushpin'}</a>
-      </li>
-    }
+  view :edit_name_link do |args|
+    toolbar_view_link :edit_name, args
   end
-
-  def edit_toolbar_pin_link
-    %{
-      <li class='edit-toolbar-pin #{'in' unless edit_toolbar_pinned?}active'>
-        <a href='#' title='#{'un' if edit_toolbar_pinned?}pin'>#{glyphicon 'pushpin'}</a>
-      </li>
-    }
+  def default_edit_type_link_args args
+    args[:title] ||= 'type'
   end
-
-  def edit_toolbar_close_link
-    link = view_link glyphicon('remove', 'hidden-xs'), :home, :path_opts=>{:slot=>{:hide=>:edit_toolbar}}
-    "<li>#{link}</li>"
+  view :edit_type_link do |args|
+    toolbar_view_link :edit_type, args
+  end
+  def default_history_link_args args
+    args[:title] ||= 'history'
+  end
+  view :history_link do |args|
+    toolbar_view_link :history, args
+  end
+  def default_edit_nests_link_args args
+    args[:title] ||= 'nests'
+  end
+  view :edit_nests_link do |args|
+    toolbar_view_link :edit_nests, args
   end
 
-  def edit_toolbar_autosave_link
-    link = view_link('autosaved draft', :edit, :path_opts=>{:edit_draft=>true, :slot=>{:show=>:edit_toolbar}}, :class=>'navbar-link slotter')
-    "<li>#{link}</li>"
+  def toolbar_view_link view, args
+    text = args.delete(:title)
+    view_link text, view, args
   end
 
+
+  def recently_edited_settings?
+     (rs = Card[:recent_settings]) && rs.item_names.present?
+  end
 end