card 1.15.7 → 1.16.0

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

@@ -7,6 +7,8 @@ format :html do
       options_hash['name_context'] = @context_names.map( &:key ) * ','
     end
 
+    options_hash[:subslot] = 'true' if args[:subslot]
+
     @@slot_option_keys.inject(options_hash) do |hash, opt|
       hash[opt] = args[opt] if args[opt].present?
       hash
@@ -18,15 +20,20 @@ format :html do
   def wrap args = {}
     @slot_view = @current_view
     classes = [
-      ( 'card-slot' unless args[:no_slot] ),
-      "#{ @current_view }-view",
-      ( args[:slot_class] if args[:slot_class] ),
-      ( "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>}
+        ( 'card-slot' unless args[:no_slot] ),
+        "#{ @current_view }-view",
+        ( args[:slot_class] if args[:slot_class] ),
+        ( "STRUCTURE-#{args[:structure].to_name.key}" if args[:structure]),
+        card.safe_set_keys
+      ].compact.join ' '
+    data = {
+        'card-id'   => card.id,
+        'card-name' => h(card.name),
+        'slot'      => html_escape_except_quotes(slot_options( args ))
+      }
+    div =
+      content_tag :div, output(yield).html_safe,
+      :id=>card.cardname.url_key, :data=>data, :style=>h(args[:style]), :class=>classes
 
     if params[:debug] == 'slot' && !tagged( @current_view, :no_wrap_comments )
       name = h card.name
@@ -52,16 +59,37 @@ format :html do
     end
   end
 
-  def frame args={}
+  def frame args={}, &block
+    if args[:subframe]
+      args.delete(:panel_class)
+      subframe args, &block
+    else
+      show_subheader = show_view?(:toolbar, args.merge(:default_visibility=>:hide)) && @current_view != :related && @current_view != :open
+      wrap args do
+        [
+          _optional_render( :menu, args ),
+          panel(args) do
+            [
+              _optional_render( :header, args, :show),
+              _optional_render( :subheader, args,(show_subheader ? :show : :hide)),
+              _optional_render( :help, args.merge(:help_class=>'alert alert-info'), :hide),
+              wrap_body(args) { output( block.call(args) ) } ,
+            ]
+          end
+        ]
+      end
+    end
+  end
+
+  def subframe args={}
     wrap args do
       [
-        _optional_render( :menu, args ),
+        _optional_render( :menu, args.merge(:optional_horizontal_menu=>:hide) ),
+        _optional_render( :subheader, args, :show),
+        _optional_render( :help, args.merge(:help_class=>'alert alert-info'), :hide),
         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),
-            (_render( :close_related_link, args) if @slot_view == :related),
+            _optional_render( :header, args, :hide),
             wrap_body(args) { output( yield args ) } ,
           ]
         end
@@ -96,7 +124,7 @@ format :html do
   end
 
   def wrap_main(content)
-    return content if params[:layout]=='none'
+    return content if Env.ajax? || params[:layout]=='none'
     %{<div id="main">#{content}</div>}
   end
 
@@ -121,9 +149,4 @@ format :html do
       end
     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/rstar/rules.rb

@@ -1,3 +1,9 @@
+event :save_recently_edited_settings, :before=>:extend, :on=>:save, :when=>proc{|c| c.is_rule? } do
+  if (recent = Card[:recent_settings])
+    recent.insert_item 0, cardname.right
+    recent.save
+  end
+end
 
 format :html do
 
@@ -32,8 +38,6 @@ format :html do
   end
 
 
-
-
   view :open_rule, :tags=>:unknown_ok do |args|
     return 'not a rule' if !card.is_rule?
     current_rule = args[:current_rule]
@@ -76,7 +80,6 @@ format :html do
         </td>
       </tr>
     }
-
   end
 
   def default_open_rule_args args
@@ -87,7 +90,6 @@ format :html do
     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?
 
@@ -107,9 +109,14 @@ format :html do
 
   view :edit_rule, :tags=>:unknown_ok do |args|
     return 'not a rule' if !card.is_rule?
+    form_args = { :url=>path(:action=>:update, :no_id=>true),
+       :html=> {:class=>"card-form card-rule-form" } }
+    if args[:remote]
+      form_args[:remote] = true
+      form_args[:html][:class] += ' slotter'
+    end
 
-    form_for card, :url=>path(:action=>:update, :no_id=>true), :remote=>true, :html=>
-        {:class=>"card-form card-rule-form slotter" } do |form|
+    form_for card, form_args do |form|
       @form = form
       %{
         #{ hidden_success_formgroup args[:success]}
@@ -119,7 +126,10 @@ format :html do
     end
   end
 
+  view :related_edit_rule, :view=>:edit_rule
+
   def default_edit_rule_args args
+    args[:remote]       ||= true
     args[:rule_context] ||= card
     args[:set_context]  ||= card.rule_set_name
     args[:set_selected]   = params[:type_reload] ? card.rule_set_name : false
@@ -132,51 +142,41 @@ format :html do
       :view => 'open_rule',
       :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], :success=>'true'}
-               )
-             ]
-            end
-          }
-        }
+    args[:delete_button] ||= delete_button args
+    args[:cancel_button] ||=
+      begin
+        cancel_path = path :view=>( card.new_card? ? :closed_rule : :open_rule ), :success=>false
+        button_tag( 'Cancel', :class=>'rule-cancel-button slotter', :type=>'button',
+                          :href=>cancel_path )
       end
-    end
   end
 
   def default_related_edit_rule_args args
-    args[:success] = {
-        :view => :open,
-        :item => nil,
+    args[:remote]  ||= false
+    args[:success] ||= {
         :card => args[:parent] || card,
-        :id => (args[:parent] && args[:parent].cardname.url_key) || card.cardname.url_key
+        :id => (args[:parent] && args[:parent].cardname.url_key) || card.cardname.url_key,
+        :view => :open,
+        :item => nil
       }
     default_edit_rule_args args
+    args[:delete_button] = delete_button args, '.card-slot.related-view'
+    args[:cancel_button] = card_link( args[:success][:id], :text=>'Cancel',
+      :class=>'rule-cancel-button btn btn-default', :path_opts=>{:view=>args[:success][:view]} )
   end
 
+  def delete_button args, slot_selector=nil
+    if !card.new_card?
+      b_args = { :remote=>true, :class=>'rule-delete-button slotter', :type=>'button' }
+      b_args['data-slot-selector'] = slot_selector if slot_selector
+      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
+  end
 
   # used keys for args:
   # :success,  :set_selected, :set_options, :rule_context
@@ -271,21 +271,11 @@ format :html do
   end
 
   def edit_buttons  args
-    delete_button = if !card.new_card?
-                      b_args = { :remote=>true, :class=>'rule-delete-button slotter', :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
-    cancel_path = path :view=>( card.new_card? ? :closed_rule : :open_rule ), :success=>'true'
     wrap_with( :div, :class=>'button-area' ) do
      [
-       delete_button,
+       args[:delete_button],
        button_tag( 'Submit', :class=>'rule-submit-button', :situation=>'primary' ),
-       button_tag( 'Cancel', :class=>'rule-cancel-button slotter', :type=>'button',
-                             :href=>cancel_path )
+       args[:cancel_button]
      ]
     end
   end

data/mod/05_standard/set/self/all.rb

@@ -3,9 +3,10 @@ event :admin_tasks, :on=>:update, :before=>:approve do
   if task = Env.params[:task]
     if Auth.always_ok?
       case task.to_sym
-      when :clear_cache           ;  Card::Cache.reset_global
+      when :clear_cache           ;  Card::Cache.reset_global; Card::ViewCache.reset
       when :repair_references     ;  Card::Reference.repair_all
       when :empty_trash           ;  Card.empty_trash
+      when :clear_view_cache      ;  Card::ViewCache.reset
       when :delete_old_revisions  ;  Card::Action.delete_old
       when :delete_old_sessions
         if months = Env.params[:months].to_i and months > 0

data/mod/05_standard/set/self/head.rb

@@ -2,8 +2,8 @@ format :html do
 
   view :raw do |args|
     %(
-      <meta charset="UTF-8">  
-      <meta name="viewport" content="width=device-width, initial-scale=1.0"/>    
+      <meta charset="UTF-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
       #{ head_title       }
       #{ head_buttons     }
       #{ head_stylesheets }

data/mod/05_standard/set/self/signin.rb

@@ -5,7 +5,7 @@ format :html do
     args.merge! :optional_help=>:show
     super args
   end
-  
+
   def default_title_args args
     args[:title] ||= 'Sign In'
   end
@@ -14,34 +14,34 @@ format :html do
     # annoying step designed to avoid table of contents.  sigh
     _render_core( args )
   end
-  
+
   view :closed_content do |args|
     ''
   end
-  
+
   def default_core_args args={}
     args[:buttons] = button_tag 'Sign in', :situation=>'primary'
     if Card.new(:type_id=>Card::SignupID).ok? :create
       args[:buttons] += link_to( '...or sign up!', card_path("account/signup"))
     end
-    args[:buttons] += raw("<div style='float:right'>#{ view_link 'RESET PASSWORD', :edit }</div>") #FIXME - hardcoded styling
+    args[:buttons] += raw("<div style='float:right'>#{ view_link 'RESET PASSWORD', :edit, :path_opts=>{:slot=>{:hide=>:toolbar}} }</div>") #FIXME - hardcoded styling
     args
   end
-  
+
   view :core do |args|
     account = card.fetch :trait=>:account, :new=>{}
-  
+
     form_args = {
       :hidden => { :success=>"REDIRECT: #{interrupted_action || '*previous'}" },
       :recaptcha => :off
     }
-  
+
     with_inclusion_mode :edit do
       card_form :update, form_args do
         [
           Auth.as_bot do
             subformat(account)._render :content_formgroup, :structure=>true, :items=>{:autocomplete=>'on'}
-          end, 
+          end,
           _optional_render( :button_formgroup, args )
         ].join
       end
@@ -54,16 +54,16 @@ format :html do
       :title=>'Forgot Password',
       :optional_help=>:hide,
       :buttons => button_tag( 'Reset my password', :situation=>'primary' ),
-      :structure => true,      
-      :hidden => { 
+      :structure => true,
+      :hidden => {
         :reset_password => true,
         :success => { :view => :reset_password_success }
       }
     } )
-    
+
     Auth.as_bot { super args }
   end
-  
+
   view :raw do |args|
     '{{+*email|title:email;type:Phrase}}'
   end
@@ -74,14 +74,14 @@ format :html do
 
 end
 
-event :signin, :before=>:approve, :on=>:update do 
+event :signin, :before=>:approve, :on=>:update do
   email = subcards["+#{Card[:email   ].name}"]
   email &&= email['content']
   pword = subcards["+#{Card[:password].name}"]
   pword &&= pword['content']
 
-  abort :failure, 'bad signin args' unless email && pword  
-  
+  abort :failure, 'bad signin args' unless email && pword
+
   if signin_id = Auth.authenticate( email, pword )
     Auth.signin signin_id
   else
@@ -92,7 +92,7 @@ event :signin, :before=>:approve, :on=>:update do
       else                         ; "Wrong password"
       end
     abort :failure
-  end  
+  end
 end
 
 event :signin_success, :after=>:signin do
@@ -102,10 +102,10 @@ end
 event :send_reset_password_token, :before=>:signin, :on=>:update, :when=>proc{ |c| Env.params[:reset_password] } do
   email = subcards["+#{Card[:email].name}"]
   email &&= email['content']
-  
+
   if accted = Auth[ email.strip.downcase ] and accted.account.active?
     accted.account.send_reset_password_token
-    abort :success    
+    abort :success
   else
     if accted
       errors.add :account, 'not active'

data/mod/05_standard/set/self/stats.rb

@@ -40,6 +40,18 @@ format :html do
             months
           </td>
         </tr>
+        #{
+          if Card.config.view_cache
+            %{
+              <tr>
+                <td>view cache</td>
+                <td>#{ Card::ViewCache.count }</td>
+                <td>#{link_to 'clear view cache',  card_path( 'update/:all?task=clear_view_cache' ) }</td>
+              </tr>
+            }
+          end
+        }
+
         <tr>
           <td>memory now</td>
           <td>#{ newmem }M</td>
@@ -58,14 +70,14 @@ format :html do
                 <td>#{ newmem - oldmem }M</td>
                 <td></td>
               </tr>
-              
+
             }
           end
         }
       </table>
     }
   end
-  
+
   def delete_sessions_link months
     link_to months, card_path( "update/:all?task=delete_old_sessions&months=#{months}")
   end

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

@@ -100,7 +100,7 @@ format do
       end
   end
 
-  def each_nest args={}
+  def each_reference_with_args args={}
     search_result_names.each do |name|
       yield(name, nest_args(args.reverse_merge!(:item=>:content)))
     end
@@ -174,6 +174,13 @@ format :json do
   end
 end
 
+format :rss do
+  def raw_feed_items
+    search_params.merge!(:default_limit => 25) 
+    search_results
+  end
+end
+
 format :html do
 
   view :card_list do |args|
@@ -215,9 +222,7 @@ format :html do
     end
   end
 
-  view :editor do |args|
-    text_area :content, :rows=>5, "data-card-type-code"=>card.type_code
-  end
+  view :editor, :mod=>Html::HtmlFormat
 
   view :no_search_results do |args|
     %{<div class="search-no-results"></div>}