card 1.15.1 → 1.15.2

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

@@ -9,15 +9,15 @@ format :html do
         _optional_render( :content_formgroups, args ),
         _optional_render( :button_formgroup,   args )
       ]
-    end  
+    end
   end
-  
 
-  def default_new_args args    
+
+  def default_new_args args
     hidden = args[:hidden] ||= {}
     hidden[:success] ||= card.rule(:thanks) || '_self'
     hidden[:card   ] ||={}
-    
+
     args[:optional_help] ||= :show
 
     # name field / title
@@ -35,9 +35,9 @@ format :html do
     end
     args[:optional_name_formgroup] ||= :hide
 
-    
+
     # type field
-    if ( !params[:type] and !args[:type] and 
+    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
       )
@@ -53,15 +53,16 @@ format :html do
     else
       { :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] }
     }
-    
+
   end
 
-  
+
+
   view :edit, :perms=>:update, :tags=>:unknown_ok do |args|
     frame_and_form :update, args do
       [
@@ -71,15 +72,17 @@ format :html do
     end
   end
 
+
   def default_edit_args args
-    args[:optional_help] = :show
-    
-    args[:buttons] = %{
+    args[:optional_help] ||= :show
+
+    args[:buttons] ||= %{
       #{ button_tag 'Submit', :class=>'submit-button', :disable_with=>'Submitting', :situation=>'primary' }
       #{ button_tag 'Cancel', :class=>'cancel-button slotter', :href=>path, :type=>'button' }
     }
   end
-  
+
+
   view :edit_name, :perms=>:update do |args|
     frame_and_form( { :action=>:update, :id=>card.id }, args, 'main-success'=>'REDIRECT' ) do
       [
@@ -90,6 +93,7 @@ format :html do
     end
   end
 
+
   view :confirm_rename do |args|
     referers = args[:referers]
     dependents = card.dependents
@@ -108,7 +112,7 @@ format :html do
 
 
   def default_edit_name_args args
-    referers = args[:referers] = card.extended_referencers  
+    referers = args[:referers] = card.extended_referencers
     args[:hidden] ||= {}
     args[:hidden].reverse_merge!(
       :success  => '_self',
@@ -121,7 +125,7 @@ format :html do
       #{ button_tag 'Rename',            :disable_with=>'Renaming', :class=>'renamer'         }
       #{ button_tag 'Cancel', :class=>'slotter', :type=>'button', :href=>path(:view=>:edit, :id=>card.id)}
     }
-    
+
   end
 
 
@@ -140,7 +144,7 @@ format :html do
     args[:hidden] ||= { :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 'Cancel', :href=>path(:view=>:edit), :type=>'button', :class=>'slotter' }
+    }
   end
 end

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

@@ -7,61 +7,23 @@ format :html do
           #{ _optional_render :toggle, args, :hide }
           #{ _optional_render :title, args }
         </div>
-        #{ _optional_render :menu, args }
       </div>
+      #{ _optional_render :toolbar, args, :hide}
+      #{ _optional_render :edit_toolbar, args, :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 } )
-  
-    link_to  glyphicon(direction), #content_tag(:span, '', :class=>"glyphicon glyphicon-#{direction}"),
+
+    link_to  glyphicon(direction),
              path( :view=>adjective ),
              :remote => true,
              :title => "#{verb} #{card.name}",
              :class => "#{verb}-icon toggler slotter nodblclick"
   end
 
-  
-  view :menu, :tags=>:unknown_ok do |args|
-    return _render_template_closer if args[:menu_hack] == :template_closer
-    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_virtual=>true, :skip_modules=>true, :new=>{}
-    end
-
-    @menu_vars = {
-      :self          => card.name,
-      :linkname      => card.cardname.url_key,
-      :type          => card.type_name,
-      :structure     => card.structure && card.template.ok?(:update) && card.template.name,
-      :discuss       => disc_card && disc_card.ok?( disc_card.new_card? ? :comment : :read ),
-      :piecenames    => card.junction? && card.cardname.piece_names[0..-2].map { |n| { :item=>n.to_s } },
-      :related_sets  => card.related_sets.map { |name,label| { :text=>label, :path_opts=>{ :current_set => name } } }
-    }
-    if card.real?
-      @menu_vars.merge!({
-        :edit      => card.ok?(:update),
-        :account   => card.account && card.ok?(:update),
-        :show_follow    => show_follow?,
-        :follow_menu    => show_follow? && render_follow_link(:label=>''),
-        :follow_submenu => show_follow? && render_follow_link,
-        :creator   => card.creator.name,
-        :updater   => card.updater.name,
-        :delete    => card.ok?(:delete) && link_to( 'delete', :action=>:delete,
-        :class     => 'slotter standard-delete', :remote => true, :'data-confirm' => "Are you sure you want to delete #{card.name}?"
-        )
-      })
-    end
-
-    json = html_escape_except_quotes JSON( @menu_vars )
-    %{<span class="card-menu-link" data-menu-vars='#{json}'>#{_render_menu_link}</span>}
-  end
-
-  view :menu_link do |args|
-    glyphicon 'cog'
-  end
-
   view :link_list do |args|
     content_tag :ul, :class=>args[:class] do
       item_links(args).map do |al|
@@ -69,19 +31,22 @@ format :html do
       end.join "\n"
     end
   end
-  
+
   view :navbar_right do |args|
     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")
   end
-  
+
   def show_follow?
     Auth.signed_in? && !card.new_card?
   end
-  
-  
+
+  def structure_editable?
+    card.structure && card.template.ok?(:update)
+  end
+
 end
 

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

@@ -0,0 +1,147 @@
+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
+      [
+        _optional_render(:horizontal_menu, args, :hide),
+        _render_menu_link(args),
+        _render_modal_slot(args)
+      ]
+    end
+  end
+
+  view :menu_link do |args|
+    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))
+                  'visible-xs'
+                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
+    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"
+    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')
+      ]
+    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
+    end
+  end
+
+  def menu_item_list args
+    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 << 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]
+    menu_items << menu_more_link(args)            if args[:show_menu_item][:more]
+    menu_items
+  end
+
+  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'}}
+           }
+    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])
+  end
+
+  def menu_page_link args
+    menu_item('page', 'new-window', {:page=>card}, args[:html_args])
+  end
+
+  def menu_rules_link args
+    menu_item('rules', 'wrench', {:view=>:options}, args[:html_args])
+  end
+
+  def menu_account_link args
+    opts = { :related=>{:name=>'+*account',:view=>:edit},
+             :path_opts=>{:slot=>{:show=>:account_toolbar}} }
+    menu_item('account', 'user',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])
+  end
+
+  def menu_item text, icon, target, html_args=nil
+    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
+  end
+
+  def default_menu_link_args args
+    args[:menu_icon] ||= 'cog'
+  end
+
+  def default_vertical_menu_args args
+    default_menu_link_args args
+    args.merge! :show_menu_item=>show_menu_items
+  end
+
+  def default_horizontal_menu_args args
+    args.merge! :show_menu_item=>show_menu_items
+  end
+
+  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_virtual=>true, :skip_modules=>true, :new=>{}
+    end
+
+    res = {
+      :discuss    => disc_card && disc_card.ok?( disc_card.new_card? ? :comment : :read ),
+      :page       => card.name.present? && !main?,
+      :rules      => card.virtual?
+    }
+    if card.real?
+      res.merge!(
+        :edit      => card.ok?(:update) || structure_editable?,
+        :account   => card.account && card.ok?(:update),
+        :follow    => show_follow?,
+        :more      => true
+      )
+    end
+    res
+  end
+end

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

@@ -0,0 +1,54 @@
+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)
+  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-dialog') do
+        content_tag :div, :class=>'modal-content' do
+          _optional_render :modal_content, args, :hide
+        end
+      end
+    end
+  end
+
+  # use modal_content for ajax calls to fill a modal_slot with content
+  view :modal_content do |args|
+    output [
+      wrap_with( :div, _render_modal_header(args), :class=>'modal-header' ),
+      wrap_with( :div, _render_modal_body(args),   :class=>'modal-body' ),
+      wrap_with( :div, _render_modal_footer(args), :class=>'modal-footer' ),
+    ]
+  end
+
+  view :modal_header do |args|
+    _render_modal_title(args)
+  end
+
+  view :modal_body do |args|
+    _render_core(args)
+  end
+
+  view :modal_footer do |args|
+    args[:buttons] || ''
+  end
+
+  view :modal_title do |args|
+    "<h4>#{_render_title args.merge(:title_class=>'modal-title')}</h4>"
+  end
+
+  view :modal do |args|
+    _render_modal_slot args.merge(:optional_modal_content=>:show)
+  end
+end

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

@@ -0,0 +1,237 @@
+format :html do
+  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
+      [
+        (wrap_with(:p, :class=>"navbar-text navbar-left") do
+          _optional_render(:type_link,args,:show)
+        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,
+      ]
+    end
+  end
+
+  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
+    end
+  end
+
+  view :edit_toolbar do |args|
+    id = "edit-toolbar-#{card.cardname.safe_key}-#{args[:home_view]}"
+
+    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),
+        (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)
+      ]
+    end
+  end
+
+  view :account_toolbar do |args|
+    if card.accountable?
+      links = []
+      links << account_pill( 'account', true, :view=>:edit)
+      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
+        [
+          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
+    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)
+      ]
+    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),
+      ]
+    end
+  end
+
+  view :edit_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),
+      ]
+    end
+  end
+
+  view :rules_button do |args|
+    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')
+
+    ], :class=>'related')
+  end
+  view :history_button do |args|
+    toolbar_button('history', 'time', 'hidden-xs hidden-sm hidden-md', :view=>'history')
+  end
+  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}?"
+                  )
+  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', true)
+  end
+  view :edit_name_button do |args|
+    pill_view_link( 'name','edit_name')
+  end
+  view :edit_type_button do |args|
+    pill_view_link( 'type', 'edit_type')
+  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)
+    else
+      pill_view_link('rules', 'options')
+    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'}})
+    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')
+  end
+
+  def toolbar_button text, symbol, hide, target
+    btn_class = 'btn btn-default'
+    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}}
+    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
+    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
+  end
+
+  def account_pill name, active=false, path_opts={}
+    opts = {:text=>name, :role=>'pill', :remote=>true,
+            :path_opts=>path_opts.merge(:slot=>{:hide=>:toggle})}
+    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
+    %{
+      <li role="presentation" class="dropdown">
+        <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>
+      </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
+    %{
+      <div class="btn-group" role="group">
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+          #{name}
+          <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu #{opts[:class] if opts[:class]}" role="menu">
+          #{dropdown}
+        </ul>
+      </div>
+    }
+  end
+end