card 1.15.1 → 1.15.2

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

@@ -2,20 +2,19 @@ format :html do
   def slot_options args
     @@slot_option_keys ||= Card::Chunk::Include.options.reject { |k| k == :view }.unshift :home_view
     options_hash = {}
-  
+
     if @context_names.present?
       options_hash['name_context'] = @context_names.map( &:key ) * ','
     end
-  
+
     @@slot_option_keys.inject(options_hash) do |hash, opt|
       hash[opt] = args[opt] if args[opt].present?
       hash
     end
-  
+
     JSON( options_hash )
   end
-  
-  
+
   def wrap args = {}
     classes = [
       ( 'card-slot' unless args[:no_slot] ),
@@ -24,7 +23,7 @@ format :html do
       ( "STRUCTURE-#{args[:structure].to_name.key}" if args[:structure]),
       card.safe_set_keys
     ].compact
-  
+
     div = %{<div id="#{card.cardname.url_key}" data-card-id="#{card.id}" data-card-name="#{h card.name}" style="#{h args[:style]}" class="#{classes*' '}" } +
       %{data-slot='#{html_escape_except_quotes slot_options( args )}'>#{ output yield }</div>}
 
@@ -45,16 +44,26 @@ format :html do
       yield args
     end
   end
-  
+
+  def panel args={}
+    wrap_with :div, :class=>"card-frame #{args[:panel_class]}" do
+      output(yield)
+    end
+  end
+
   def frame args={}
-    args[:slot_class] = "card-frame #{args[:slot_class]}"
     wrap args do
-      %{
-        #{ _render_header args }
-        #{ %{ <div class="card-subheader">#{ args[:subheader] }</div> } if args[:subheader] }
-        #{ _optional_render :help, args.merge(:help_class=>'alert alert-info'), :hide }
-        #{ wrap_body args do output( yield args ) end }
-      }
+      [
+        _optional_render( :menu, args ),
+        panel(args) 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),
+            wrap_body(args) { output( yield args ) } ,
+          ]
+        end
+      ]
     end
   end
 
@@ -67,7 +76,8 @@ format :html do
       end
     end
   end
-  
+
+
   # alert_types: 'success', 'info', 'warning', 'danger'
   def alert alert_type, args={}
     css_class = "alert alert-#{alert_type} "
@@ -82,24 +92,32 @@ format :html do
       close_button + output( yield args)
     end
   end
-  
+
   def wrap_main(content)
     return content if params[:layout]=='none'
     %{<div id="main">#{content}</div>}
   end
-  
-  def wrap_with tag, html_args={}
-    content_tag( tag, html_args ) do 
-      output( yield ).html_safe
+
+  def wrap_with tag, content_or_args={}, html_args={}
+    if block_given?
+      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
+      end
     end
   end
-  
-  def wrap_each_with tag, args={}
-    yield(args).map do |item|
+
+  def wrap_each_with tag, content_or_args={}, args={}
+    content = block_given? ? yield(args) : content_or_args
+    args    = block_given? ? content_or_args : args
+    content.compact.map do |item|
       wrap_with tag, args do
         item
       end
     end.join "\n"
   end
-  
-end
+
+end

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

@@ -65,7 +65,7 @@ event :validate_accountability, :on=>:create, :before=>:approve do
 end
 
 event :require_email, :on=>:create, :after=>:approve do
-  unless subcards["+#{Card[:email].name}"] 
+  unless subcards["+#{Card[:email].name}"]
     errors.add :email, 'required'
   end
 end
@@ -90,7 +90,7 @@ event :generate_confirmation_token, :on=>:create, :before=>:process_subcards, :w
   subcards["+#{Card[:token].name}"] = {:content => generate_token }
 end
 
-event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_reset_token? } do  
+event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_reset_token? } do
   case ( result = authenticate_by_token @env_token )
   when Integer
     Auth.signin result
@@ -110,7 +110,7 @@ event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_r
 end
 
 def edit_password_success_args
-  { 
+  {
     :id=>left.name,
     :view=>:related,
     :related=>{ :name=>"+#{Card[:account].name}", :view=>'edit' }
@@ -126,7 +126,7 @@ event :reset_token do
     token_card.update_attributes! :content => generate_token
   end
 end
-  
+
 
 event :send_welcome_email do
   if ((welcome = Card['welcome email']) && welcome.type_code == :email_template)
@@ -158,12 +158,12 @@ def changes_visible? act
 end
 
 def send_change_notice act, followed_set, follow_option
-  if changes_visible?(act) 
+  if changes_visible?(act)
     Auth.as(left.id) do
       Card[:follower_notification_email].deliver(
         :context       => act.card,
         :to            => email,
-        :follower      => left.name, 
+        :follower      => left.name,
         :followed_set  => followed_set,
         :follow_option => follow_option
       )
@@ -172,9 +172,10 @@ def send_change_notice act, followed_set, follow_option
 end
 
 
-format :email do  
+format :email do
   view :mail do |args|
     args[:to] ||= card.email
     super args
   end
 end
+

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

@@ -3,7 +3,7 @@ format :html do
 
   view :closed_rule, :tags=>:unknown_ok do |args|
     return 'not a rule' if !card.is_rule? #these are helpful for handling non-rule rstar cards until we have real rule sets
-      
+
     rule_card = find_current_rule_card
 
     rule_content = !rule_card ? '' : begin
@@ -31,12 +31,14 @@ format :html do
     '</tr>'
   end
 
-  
+
+
+
   view :open_rule, :tags=>:unknown_ok do |args|
     return 'not a rule' if !card.is_rule?
-    current_rule = args[:current_rule]  
+    current_rule = args[:current_rule]
     setting_name = args[:setting_name]
-    
+
     edit_mode = !params[:success] && card.ok?( ( card.new_card? ? :create : :update ) )
     #~~~~~~ handle reloading due to type change
     if params[:type_reload] && card_args=params[:card]
@@ -49,25 +51,25 @@ format :html do
       end
       edit_mode = true
     end
-    
+
     opts = {
       :rule_context => card,   # determines the set options and the success view
       :set_context  => card.rule_set_name,
     }
     rule_view = edit_mode ? :edit_rule : :show_rule
 
-    %{     
+    %{
       <tr class="card-slot open-rule #{rule_view.to_s.sub '_', '-'}">
         <td class="rule-cell" colspan="3">
           <div class="rule-setting">
             #{ view_link setting_name.sub(/^\*/,''), :closed_rule, :class=>'close-rule-link slotter' }
             #{ card_link setting_name, :text=>"all #{setting_name} rules", :class=>'setting-link', :target=>'wagn_setting' }
           </div>
-          
+
           <div class="alert alert-info rule-instruction">
             #{ process_content "{{#{setting_name}+*right+*help|content}}" }
           </div>
-          
+
           <div class="card-body">
             #{ subformat( current_rule )._render rule_view, opts }
           </div>
@@ -76,19 +78,19 @@ format :html do
     }
 
   end
-  
+
   def default_open_rule_args args
     current_rule_card = find_current_rule_card || begin
       Card.new :name=> "#{Card[:all].name}+#{card.rule_user_setting_name}"
     end
-    
+
     args.reverse_merge! :current_rule => current_rule_card, :setting_name => card.rule_setting_name
   end
-  
+
 
   view :show_rule, :tags=>:unknown_ok do |args|
     return 'not a rule' if !card.is_rule?
-    
+
     if !card.new_card?
       set = card.rule_set
       args[:item] ||= :link
@@ -112,16 +114,17 @@ format :html do
       %{
         #{ hidden_success_formgroup args[:success]}
         #{ editor args }
+        #{ edit_buttons args }
       }
     end
   end
-  
+
   def default_edit_rule_args args
     args[:rule_context] ||= card
-    args[:set_context]  ||= card.rule_set_name 
+    args[:set_context]  ||= card.rule_set_name
     args[:set_selected]   = params[:type_reload] ? card.rule_set_name : false
     args[:set_options], args[:fallback_set] = args[:rule_context].set_options
-    
+
     args[:success] ||= {}
     args[:success].reverse_merge!( {
       :card => args[:rule_context],
@@ -130,18 +133,59 @@ format :html do
       :item => 'view_rule'
     })
   end
-  
-  
+
+  view :related_edit_rule, :tags=>:unknown_ok do |args|
+    delete_button = if !card.new_card?
+                      b_args = { :remote=>true, :class=>'rule-delete-button slotter', 'data-slot-selector'=>'.card-slot.related-view', :type=>'button' }
+                      b_args[:href] = path :action=>:delete, :success=>args[:success]
+                      if (fset = args[:fallback_set]) && (fcard = Card.fetch(fset))
+                        b_args['data-confirm']="Deleting will revert to #{card.rule_setting_name} rule for #{fcard.label }"
+                      end
+                      %{<span class="rule-delete-section">#{ button_tag 'Delete', b_args }</span>}
+                    end
+
+    frame do
+      form_for card, :url=>path(:action=>:update, :no_id=>true), :html=>
+          {:class=>"card-form card-rule-form" } do |form|
+        @form = form
+        %{
+          #{ hidden_success_formgroup args[:success]}
+          #{ editor args }
+          #{
+            wrap_with( :div, :class=>'button-area' ) 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]} )
+             ]
+            end
+          }
+        }
+      end
+    end
+  end
+
+  def default_related_edit_rule_args args
+    args[:success] = {
+        :view => :open,
+        :item => nil,
+        :card => args[:parent] || card,
+        :id => (args[:parent] && args[:parent].cardname.url_key) || card.cardname.url_key
+      }
+    default_edit_rule_args args
+  end
+
+
   # used keys for args:
   # :success,  :set_selected, :set_options, :rule_context
-  def editor args      
+  def editor args
     wrap_with( :div, :class=>'card-editor' ) do
       [
         (type_formgroup( args ) if card.right.rule_type_editable),
         formgroup( 'rule', content_field( form, args.merge(:skip_rev_id=>true) ), :editor=>'content' ),
-        set_formgroup( args )
+        set_selection( args )
       ]
-    end + edit_buttons( args )
+    end
   end
 
 
@@ -152,8 +196,8 @@ format :html do
       'data-remote' => true
     ), :editor=>'type'
   end
-  
-  
+
+
   def hidden_success_formgroup args
     %{
       #{ hidden_field_tag 'success[id]', args[:id] || args[:card].name }
@@ -161,15 +205,24 @@ format :html do
       #{ hidden_field_tag 'success[item]', args[:item] }
     }
   end
-  
+
+  def set_selection args
+    wrap_with( :div, :class=>'row') do
+      [
+        set_formgroup( args ),
+        related_set_formgroup( args)
+      ]
+    end
+  end
+
   def set_formgroup args
     current_set_key = card.new_card? ? Card[:all].cardname.key : card.rule_set_key   # (should have a constant for this?)
     tag = args[:rule_context].rule_user_setting_name
     narrower_rules = []
-    option_list = 
+    option_list =
       wrap_each_with :li, :class=>'radio' do
         args[:set_options].map do |set_name, state|
-          
+
           checked    = ( args[:set_selected] == set_name or current_set_key && args[:set_options].length==1 )
           is_current = (state == :current)
           warning = if narrower_rules.present?
@@ -192,9 +245,29 @@ format :html do
          end
 
        end
-    formgroup 'set', "<ul>#{ option_list }</ul>", :editor => 'set'
+    formgroup 'set', "<ul>#{ option_list }</ul>", :editor => 'set', :class=>'col-xs-6'
+  end
+
+  def related_set_formgroup args
+    related_sets = args[:set_context] && Card.fetch(args[:set_context]).prototype.related_sets
+    return '' unless related_sets && related_sets.size > 0
+    tag = args[:rule_context].rule_user_setting_name
+    option_list =
+      wrap_each_with :li, :class=>'radio' do
+        related_sets.map do |set_name, label|
+          rule_name  = "#{set_name}+#{tag}"
+          rule_card  = Card.fetch rule_name, :skip_modules=>true
+          radio_button( :name, rule_name) + %{
+              <label class="set-label">
+                #{ card_link set_name, :text=>label, :target=>'wagn_set' }
+                #{"<em> #{card_link "#{set_name}+#{card.rule_user_setting_name}", :text=>"(exists)"}</em>" if rule_card}
+              </label>
+             }.html_safe
+        end
+      end
+    formgroup 'related set', "<ul>#{ option_list }</ul>", :editor => 'set', :class=>'col-xs-6'
   end
-  
+
   def edit_buttons  args
     delete_button = if !card.new_card?
                       b_args = { :remote=>true, :class=>'rule-delete-button slotter', :type=>'button' }
@@ -210,14 +283,14 @@ format :html 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, :success=>true )
      ]
     end
   end
-  
+
 =begin
   view :edit_rule2 do |args|
-    
+
     card_form :update do
       [
         _optional_render( :type_formgroup,    args ),
@@ -228,54 +301,8 @@ format :html do
     end
   end
 =end
-  
-  def default_follow_item_args args
-    args[:condition] ||= Env.params[:condition] || '*always'
-  end
-  
-  view :follow_item, :tags=>:unknown_ok do |args|
-    if card.new_card? || !card.include_item?(args[:condition])
-      button_view = :add_button
-      form_opts = {:add_item=>args[:condition]}
-    else
-      button_view = :delete_button
-      form_opts = {:drop_item=>args[:condition]}
-    end
 
-    text = if (option_card = Card.fetch args[:condition])
-             option_card.description(card.rule_set)
-           else
-             card.rule_set.follow_label
-           end
-    link_target = if card.rule_set.tag.codename == 'self'
-                    card.rule_set_name.left
-                  else
-                    "#{card.rule_set_name}+by name"
-                  end
-    wrap do
-      card_form({:action=>:update, :name=>card.name, :success=>{:view=>:follow_item}}, 
-              :hidden=>{:condition=>args[:condition]}.merge(form_opts)) do
-        output [
-          _optional_render(button_view, args),
-          card_link( link_target, :text=>text)
-        ]
-      end
-    end
-  end
-  
-  view :delete_button do |args|
-    button_tag :type=>:submit, :class=>'btn-xs btn-item-delete btn-primary', 'aria-label'=>'Left Align' do
-      tag :span, :class=>"glyphicon glyphicon-ok", 'aria-hidden'=>"true"
-    end 
 
-  end
-  
-  view :add_button do |args|
-    button_tag :type=>:submit, :class=>'btn-xs btn-item-add', 'aria-label'=>'Left Align' do
-      tag :span, :class=>"glyphicon glyphicon-plus", 'aria-hidden'=>"true"
-    end
-  end
-  
 
   private
 
@@ -289,7 +316,7 @@ format :html do
       end
     else
       card
-    end 
+    end
   end
 
 end
@@ -339,15 +366,15 @@ end
 #~~~~~~~~~~ determine the set options to which the user can apply the rule.
 def set_options
 
-  first =  new_card? ? 0 : set_prototype.set_names.index{|s| s.to_name.key == rule_set_key} 
+  first =  new_card? ? 0 : set_prototype.set_names.index{|s| s.to_name.key == rule_set_key}
   rule_cnt = 0
   res = []
   fallback_set = nil
   set_prototype.set_names[first..-1].each do |set_name|
     if Card.exists?("#{set_name}+#{rule_user_setting_name}")
       rule_cnt += 1
-      res << if rule_cnt == 1 
-               [set_name,:current] 
+      res << if rule_cnt == 1
+               [set_name,:current]
              else
                fallback_set ||= set_name
                [set_name,:overwritten]
@@ -356,7 +383,7 @@ def set_options
       res << (rule_cnt < 1 ? [set_name,:enabled] : [set_name,:disabled])
     end
   end
-  
+
   # fallback_set = if first > 0
   #                 res[0..(first-1)].find do |set_name|
   #                   Card.exists?("#{set_name}+#{rule_user_setting_name}")
@@ -370,7 +397,7 @@ def set_options
   # (for anything more general, they must explicitly choose to "DELETE" the current one)
   # the narrowest rule should be the one attached to the set being viewed.  So, eg, if you're looking at the "*all plus" set, you shouldn't
   # have the option to create rules based on arbitrary narrower sets, though narrower sets will always apply to whatever prototype we create
-  
+
   return res, fallback_set
 end
 
@@ -384,7 +411,7 @@ end
 
 
 
-# 
+#
 
 =begin
 
@@ -396,7 +423,7 @@ def repair_set
     include_set_modules
   end
 end
- 
+
 def method_missing method_id, *args
   if !@set_repair_attempted and repair_set
     send method_id, *args