card 1.15.2 → 1.15.3

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

@@ -8,8 +8,8 @@ format :html do
           #{ _optional_render :title, args }
         </div>
       </div>
-      #{ _optional_render :toolbar, args, :hide}
-      #{ _optional_render :edit_toolbar, args, :hide}
+      #{ _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

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

@@ -2,7 +2,7 @@ format :html do
   view :menu, :denial=>:blank, :tags=>:unknown_ok do |args|
     return _render_template_closer if args[:menu_hack] == :template_closer
     return '' if card.unknown?
-    wrap_with :div, :class=>'menu-slot' do
+    wrap_with :div, :class=>'menu-slot nodblclick' do
       [
         _optional_render(:horizontal_menu, args, :hide),
         _render_menu_link(args),
@@ -19,10 +19,10 @@ format :html do
                 else
                   'show-on-hover'
                 end
-    content_tag :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
+    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
     end
   end
 
@@ -57,15 +57,14 @@ format :html do
 
   def menu_edit_link args
     opts = {
-             :view=>:related,
-             :path_opts=>{ :related=>{:name=>card.name, :view=>:edit, :slot=>{:hide=>'header'}},
-                           :slot=>{:show=>'edit_toolbar', :hide=>'type_link'}}
+             :view=>:edit,
+             :path_opts=>{ :slot=>{:show=>'edit_toolbar', :hide=>'type_link'}}
            }
     menu_item('edit', 'edit', opts, args[:html_args] )
   end
 
   def menu_discuss_link args
-    menu_item('discuss', 'comment', { :related=>Card[:discussion].name }, args[:html_args])
+    menu_item('discuss', 'comment', { :related=>Card[:discussion].key }, args[:html_args])
   end
 
   def menu_page_link args
@@ -77,7 +76,7 @@ format :html do
   end
 
   def menu_account_link args
-    opts = { :related=>{:name=>'+*account',:view=>:edit},
+    opts = { :related=>{:name=>'+*account',:view=>:edit,:slot=>{:hide=>'edit_toolbar'}},
              :path_opts=>{:slot=>{:show=>:account_toolbar}} }
     menu_item('account', 'user',opts, args[:html_args])
   end

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

@@ -1,4 +1,13 @@
+
 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
@@ -21,14 +30,19 @@ format :html do
 
   def close_link css_class
     wrap_with :ul, :class=>"nav navbar-nav #{css_class}" do
-      wrap_with :li do
-        view_link(glyphicon('remove'), :open)
-      end
+      [
+        toolbar_pin_link,
+        "<li>#{view_link(glyphicon('remove'), :home, :title=>'cancel')}</li>"
+      ]
     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
@@ -43,14 +57,7 @@ format :html do
             _optional_render(:edit_nests_button,   args, :show),
           ]
         end),
-        (wrap_with :ul, :class=>'nav navbar-nav navbar-right' do
-          wrap_each_with :li do
-            [
-              (view_link('autosaved draft', :edit, :path_opts=>{:edit_draft=>true, :slot=>{:show=>:edit_toolbar}}, :class=>'navbar-link slotter') if card.drafts.present?),
-              view_link(glyphicon('remove', 'hidden-xs'), :open)
-            ]
-          end
-        end)
+        content_tag( :ul, navbar_right.html_safe, :class=>'nav navbar-nav navbar-right' )
       ]
     end
   end
@@ -58,12 +65,13 @@ format :html do
   view :account_toolbar do |args|
     if card.accountable?
       links = []
-      links << account_pill( 'account', true, :view=>:edit)
+      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", 'data-slot-selector'=>'.card-body > .card-slot' do
+      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'),
@@ -77,7 +85,7 @@ format :html do
       [
         _optional_render(:history_button, args, :show),
         _optional_render(:delete_button,  args, (card.ok?(:delete) ? :show : :hide)),
-        _optional_render(:refresh_button, args)
+        _optional_render(:refresh_button, args, :hide)
       ]
     end
   end
@@ -106,12 +114,12 @@ format :html do
     toolbar_button('rules', 'wrench', 'hidden-xs hidden-sm', :view=>'options')
   end
   view :related_button do |args|
-    btn_dropdown(glyphicon('tree-deciduous')+' related', [
-      menu_item('children',       'baby-formula', :related=>'*children'),
-      menu_item('mates',          'bed',          :related=>'*mates'),
-
-      menu_item('references out', 'log-out',      :related=>'*refers_to'),
-      menu_item('references in',  'log-in',       :related=>'*referred_to_by')
+    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})
 
     ], :class=>'related')
   end
@@ -131,29 +139,28 @@ format :html do
     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', true)
+    pill_view_link 'content', :edit, args
   end
   view :edit_name_button do |args|
-    pill_view_link( 'name','edit_name')
+    pill_view_link 'name',:edit_name, args
   end
   view :edit_type_button do |args|
-    pill_view_link( 'type', 'edit_type')
+    pill_view_link 'type', :edit_type, args
   end
   view :edit_rules_button do |args|
     if structure_editable?
-      rule_items = []
-      rule_items << pill_card_link('structure', card.structure, false, :view=>:edit, :slot=>{:hide=>:toggle})
-      rule_items << pill_view_link('...', 'options')
-      pill_dropdown('rules', rule_items)
+      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', 'options')
+      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_card_link('nests', nests, false,  :slot=>{:hide=>'header', :items=>{:view=>:options, :hide=>'set_label'}})
+      pill_view_link 'nests', :edit_nests, args
     end
   end
 
@@ -162,38 +169,33 @@ format :html do
       view_link(glyphicon('edit'),'edit_type', :class=>'navbar-link slotter', 'data-toggle'=>'tooltip', :title=>'edit type')
   end
 
-  def toolbar_button text, symbol, hide, target
-    btn_class = 'btn btn-default'
+  def toolbar_button text, symbol, hide, tag_args
+    tag_args[:class] = [ tag_args[:class], 'btn btn-default' ].compact * ' '
+    tag_args[:title] ||= text
     link_text = "#{glyphicon symbol}<span class='menu-item-label #{hide}'>#{text}</span>"
 
-    if target[:page]
-      card_link target[:page], :class=>btn_class, :text=>link_text, :path_opts=>{:slot=>{:show=>:toolbar}}
-    elsif target[:view]
-      view_link link_text, target[:view], :class=>btn_class, :path_opts=>{:slot=>{:show=>:toolbar}}
+    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}}
+      view_link link_text, viewname, tag_args
     else
-      target[:class] ||= ''
-      target[:class] += " #{btn_class}"
-      path_opts = target.delete(:path_opts) || {}
-      path_opts.merge! :action=>target.delete(:action)
-      link_to link_text, path_opts, target
+      path_opts = tag_args.delete(:path_opts) || {}
+      path_opts.merge! :action=>tag_args.delete(:action)
+      link_to link_text, path_opts, tag_args
     end
   end
 
-  def pill_view_link name, view, active=false, path_opts={}
-    opts = {:class=>'slotter', :role=>'pill', 'data-slot-selector'=>'.card-body > .card-slot',
-            :path_opts=>path_opts.merge(:slot=>{:hide=>'toggle menu header'})}
-    li_pill view_link(name, view, opts), active
-  end
-
-  def pill_card_link name, card, active=false, path_opts={}
-    opts = {:text=>name, :role=>'pill', :remote=>true, :class=>'slotter', 'data-slot-selector'=>'.card-body > .card-slot',
-            :path_opts=>path_opts}
-    li_pill card_link(card, opts), active
+  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
   end
 
   def account_pill name, active=false, path_opts={}
-    opts = {:text=>name, :role=>'pill', :remote=>true,
-            :path_opts=>path_opts.merge(:slot=>{:hide=>:toggle})}
+    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
 
@@ -201,37 +203,64 @@ format :html do
     "<li role='presentation' #{"class='active'" if active}>#{content}</li>"
   end
 
-  def pill_dropdown name, items
+  def pill_dropdown name, items, active=false
     %{
-      <li role="presentation" class="dropdown">
+      <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>
-        <ul class="dropdown-menu" role="menu">
-          #{items.map {|item| "<li>#{item}</li>"}.join "\n"}
-        </ul>
+        #{ dropdown_list items }
       </li>
     }
   end
 
-
-  def btn_dropdown name, items, opts={}
-    dropdown =
-      if items.kind_of? Array
-        items.map {|item| "<li>#{item}</li>"}.join "\n"
-      else
-        items
-      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" aria-expanded="false">
-          #{name}
+        <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>
-        <ul class="dropdown-menu #{opts[:class] if opts[:class]}" role="menu">
-          #{dropdown}
-        </ul>
+        #{ dropdown_list items, opts[:class] }
       </div>
     }
   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>
+    }
+  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>
+    }
+  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>
+    }
+  end
+
+  def edit_toolbar_close_link
+    link = view_link glyphicon('remove', 'hidden-xs'), :home, :path_opts=>{:slot=>{:hide=>:edit_toolbar}}
+    "<li>#{link}</li>"
+  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>"
+  end
+
 end

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

@@ -16,6 +16,7 @@ format :html do
   end
 
   def wrap args = {}
+    @slot_view = @current_view
     classes = [
       ( 'card-slot' unless args[:no_slot] ),
       "#{ @current_view }-view",
@@ -60,6 +61,7 @@ format :html do
             _optional_render( :header, args, :show),
             (%{ <div class="card-subheader">#{ args[:subheader] }</div> } if args[:subheader]),
             _optional_render( :help, args.merge(:help_class=>'alert alert-info'), :hide),
+            (_render( :close_related_link, args) if @slot_view == :related),
             wrap_body(args) { output( yield args ) } ,
           ]
         end
@@ -120,4 +122,8 @@ format :html do
     end.join "\n"
   end
 
+  view :close_related_link do |args|
+    card_link( args[:parent], :text=>glyphicon('remove'), :view=>:home, :remote=>true, :class=>'pull-right slotter close-related-view', :title=>'cancel', 'data-slot-selector'=>'.card-slot.related-view')
+  end
+
 end

data/mod/05_standard/set/right/discussion.rb

@@ -0,0 +1,3 @@
+def show_comment_box_in_related?
+  true
+end

data/mod/05_standard/set/rstar/rules.rb

@@ -156,7 +156,9 @@ format :html do
              [
                delete_button,
                button_tag( 'Submit', :class=>'rule-submit-button', :situation=>'primary' ),
-               card_link( args[:success][:id], :text=>'Cancel', :class=>'rule-cancel-button btn btn-default', :path_opts=>{:view=>args[:success][:view]} )
+               card_link( args[:success][:id], :text=>'Cancel', :class=>'rule-cancel-button btn btn-default',
+                 :path_opts=>{:view=>args[:success][:view], :success=>'true'}
+               )
              ]
             end
           }
@@ -277,13 +279,13 @@ format :html do
                       end
                       %{<span class="rule-delete-section">#{ button_tag 'Delete', b_args }</span>}
                     end
-    cancel_path = path :view=>( card.new_card? ? :closed_rule : :open_rule )
+    cancel_path = path :view=>( card.new_card? ? :closed_rule : :open_rule ), :success=>'true'
     wrap_with( :div, :class=>'button-area' ) do
      [
        delete_button,
        button_tag( 'Submit', :class=>'rule-submit-button', :situation=>'primary' ),
        button_tag( 'Cancel', :class=>'rule-cancel-button slotter', :type=>'button',
-                             :href=>cancel_path, :success=>true )
+                             :href=>cancel_path )
      ]
     end
   end
@@ -411,24 +413,3 @@ end
 
 
 
-#
-
-=begin
-
-def repair_set
-  @set_repair_attempted = true
-  if real?
-    reset_patterns
-    template # repair happens in template loading
-    include_set_modules
-  end
-end
-
-def method_missing method_id, *args
-  if !@set_repair_attempted and repair_set
-    send method_id, *args
-  else
-    super
-  end
-end
-=end

data/mod/05_standard/set/type/cardtype.rb

@@ -11,8 +11,37 @@ format :html do
       %{<div>Sorry, this card must remain a Cardtype so long as there are <strong>#{ card.name }</strong> cards.</div>}
     else
       super args
-    end  
+    end
   end
+
+  view :add_link do |args|
+    args[:title] ||= "Add #{card.name}"
+    link_to _render_title(args), _render_add_path(args), :class=>args[:css_class]
+  end
+
+  view :add_button, :view=>:add_link
+  def default_add_button_args args
+    args[:css_class] = 'btn btn-default'
+  end
+
+  view :add_url do |args|
+    card_url _render_add_path(args)
+  end
+
+  view :add_path do |args|
+    path_args = {}
+    if args[:params]
+      context = ((@parent && @parent.card) || card).name
+      Rack::Utils.parse_nested_query(args[:params]).each do |key, value|
+         value = value.to_name.to_absolute(context) if value
+         key   = key.to_name.to_absolute(context)
+         path_args[key] = value
+      end
+    end
+    path_args[:action] = 'new'
+    page_path card.cardname, path_args
+  end
+
 end
 
 
@@ -28,7 +57,7 @@ def followed_by? user_id = nil
 end
 
 def default_follow_set_card
-  Card.fetch("#{name}+*type") 
+  Card.fetch("#{name}+*type")
 end