card 1.15.2 → 1.15.3

data/mod/05_email/set/self/follow_defaults.rb

@@ -1,6 +1,6 @@
 event :update_follow_rules, :after=>:store, :on=>:save, :when=> proc { |c| c.update_all_users } do
   defaults = item_names.map do |item|
-    if ((set_card = Card.fetch item.to_name.left) && set_card.type_code == :set) 
+    if ((set_card = Card.fetch item.to_name.left) && set_card.type_code == :set)
       option_card = Card.fetch(item.to_name.right) || Card[item.to_name.right.to_sym]
       option = if option_card.follow_option?
                  option_card.name
@@ -8,7 +8,7 @@ event :update_follow_rules, :after=>:store, :on=>:save, :when=> proc { |c| c.upd
                  '*always'
                end
       [set_card, option]
-    elsif ((set_card = Card.fetch sug) && set_card.type_code == :set) 
+    elsif ((set_card = Card.fetch sug) && set_card.type_code == :set)
       [set_card, '*always']
     end
   end.compact
@@ -31,14 +31,14 @@ format :html do
   view :edit, :perms=>:update, :tags=>:unknown_ok do |args|
     frame_and_form :update, args do
       [
-        _optional_render( :content_formgroups, args ),
+        _optional_render( :content_formgroup, args ),
         _optional_render( :confirm_update_all, args ),
         _optional_render( :button_formgroup,   args )
       ]
     end
   end
-  
-  
+
+
   view :confirm_update_all do |args|
     wrap args do
       alert 'info' do
@@ -49,7 +49,7 @@ format :html do
       end
     end
   end
-  
+
   def default_edit_args args
     args[:hidden] ||= {}
     args[:hidden].reverse_merge!(
@@ -61,6 +61,6 @@ format :html do
       #{ button_tag 'Submit', :class=>'follow'         }
       #{ button_tag 'Cancel', :class=>'slotter', :type=>'button', :href=>path(:view=>:edit, :id=>card.id)}
     }
-    
+
   end
 end

data/mod/05_email/set/type_plus_right/user/follow.rb

@@ -163,7 +163,7 @@ format :html do
          save_interrupted_action(request.env['REQUEST_URI'])
          title = "Problems with #{card.name}"
          frame args.merge(:panel_class=>"panel panel-warning", :title=>title, :hide=>'menu' ) do
-           "You have to #{ link_to 'sign in', card_url(':signin') }" #" #{to_task}"
+           "Please #{ link_to 'sign in', card_url(':signin') }" #" #{to_task}"
          end
        else
          super(args)

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

@@ -186,7 +186,7 @@ format :html do
             "or #{ link_to 'sign up', card_url('new/:signup') }"
           end
           save_interrupted_action(request.env['REQUEST_URI'])
-          "You have to #{ link_to 'sign in', card_url(':signin') } #{or_signup} #{to_task}"
+          "Please #{ link_to 'sign in', card_url(':signin') } #{or_signup} #{to_task}"
         end
 
         %{<h1>Sorry!</h1>\n<div>#{ message }</div>}

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

@@ -32,12 +32,12 @@ format do
 
   # link to a specific card
   def card_link name_or_card, opts={}
-    text = (opts.delete(:text) || name_or_card).to_name.to_show @context_names
     name = case name_or_card
            when Symbol then Card.fetch( name_or_card, :skip_modules=>true ).cardname
            when Card   then name_or_card.cardname
            else             name_or_card
            end
+    text = (opts.delete(:text) || name).to_name.to_show @context_names
 
     path_opts = opts.delete( :path_opts ) || {}
     path_opts[:name ] = name

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

@@ -1,3 +1,6 @@
+def show_comment_box_in_related?
+  false
+end
 
 format :html do
 
@@ -40,6 +43,7 @@ format :html do
   view :titled, :tags=>:comment do |args|
     wrap args do
       [
+        _optional_render( :menu, args ),
         _render_header( args ),
         wrap_body( :content=>true ) { _render_core args },
         optional_render( :comment_box, args )
@@ -61,9 +65,10 @@ format :html do
 
   view :title do |args|
     title = fancy_title args[:title], args[:title_class]
-    title =  _optional_render( :title_toolbar, args, (show_view?(:toolbar,args.merge(:default_visibility=>:hide)) ? :show : :hide)) ||
+    title =  _optional_render( :title_toolbar, args, (show_view?(:toolbar,args.merge(:default_visibility=>:hide)) || toolbar_pinned? ? :show : :hide)) ||
              _optional_render( :title_link, args.merge( :title_ready=>title ), :hide )       ||
              title
+    #title += " (#{card.type_name})" if Card[:show_cardtype].content == 'true'
     add_name_context
     title
   end
@@ -111,7 +116,7 @@ format :html do
   end
 
   view :closed do |args|
-    frame args.reverse_merge(:content=>true, :body_class=>'closed-content', :toggle_mode=>:close, :optional_toggle=>:show ) do
+    frame args.reverse_merge(:content=>true, :body_class=>'closed-content', :toggle_mode=>:close, :optional_toggle=>:show, :optional_edit_toolbar=>:hide ) do
       _optional_render :closed_content, args
     end
   end
@@ -128,12 +133,6 @@ format :html do
     end
   end
 
-  view :options, :tags=>:unknown_ok do |args|
-    frame args do
-      subformat( current_set_card ).render_content args
-    end
-  end
-
   def current_set_card
     set_name = params[:current_set]
     set_name ||= "#{card.name}+*type" if card.known? && card.type_id==Card::CardtypeID
@@ -143,20 +142,21 @@ format :html do
 
 
   view :related do |args|
-    if rparams = params[:related]
-      rcardname = rparams[:name].to_name.to_absolute_name( card.cardname)
-      rcard = Card.fetch rcardname, :new=>{}
-
-      nest_args = {
-        :view          => ( rparams[:view] || :open ),
+    if rparams = args[:related] || params[:related]
+      rcard = rparams[:card] || begin
+                rcardname = rparams[:name].to_name.to_absolute_name( card.cardname)
+                Card.fetch rcardname, :new=>{}
+              end
+
+      nest_args = ( rparams[:slot] || {} ).deep_symbolize_keys.reverse_merge(
+        :view            => ( rparams[:view] || :open ),
         :optional_toggle => :hide,
-        :optional_help => :show,
-        :optional_menu => :show,
-        :parent => card
-      }
-      nest_args.merge! ( rparams[:slot] || {} ).deep_symbolize_keys
-
-      nest_args[:optional_comment_box] = :show if rparams[:name] == '+discussion' #fixme.  yuck!
+        :optional_help   => :show,
+        :optional_menu   => :show,
+        :optional_close_related_link => :show,
+        :parent          => card
+      )
+      nest_args[:optional_comment_box] = :show if rcard.show_comment_box_in_related?
 
       frame args do
         nest rcard, nest_args
@@ -164,6 +164,8 @@ format :html do
     end
   end
 
+
+
   view :help, :tags=>:unknown_ok do |args|
     text = if args[:help_text]
       args[:help_text]

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

@@ -6,7 +6,7 @@ format :html do
       [
         _optional_render( :name_formgroup,     args ),
         _optional_render( :type_formgroup,     args ),
-        _optional_render( :content_formgroups, args ),
+        _optional_render( :content_formgroup, args ),
         _optional_render( :button_formgroup,   args )
       ]
     end
@@ -66,7 +66,7 @@ format :html do
   view :edit, :perms=>:update, :tags=>:unknown_ok do |args|
     frame_and_form :update, args do
       [
-        _optional_render( :content_formgroups, args ),
+        _optional_render( :content_formgroup, args ),
         _optional_render( :button_formgroup,   args )
       ]
     end
@@ -75,10 +75,13 @@ format :html do
 
   def default_edit_args args
     args[:optional_help] ||= :show
+    args[:optional_edit_toolbar] ||= :show
+    args[:active_toolbar_view] ||= :edit
 
     args[:buttons] ||= %{
       #{ button_tag 'Submit', :class=>'submit-button', :disable_with=>'Submitting', :situation=>'primary' }
-      #{ button_tag 'Cancel', :class=>'cancel-button slotter', :href=>path, :type=>'button' }
+      #{ button_tag 'Cancel', :class=>'cancel-button slotter', 'data-slot-selector'=>args[:cancel_slot_selector],
+       :href=>(args[:cancel_path] || path), :type=>'button' }
     }
   end
 
@@ -102,8 +105,8 @@ format :html do
         <h5>Are you sure you want to rename <em>#{card.name}</em>?</h5>
         #{ %{ <h6>This change will...</h6> } if referers.any? || dependents.any? }
         <ul>
-          #{ %{<li>automatically alter #{ dependents.size } related name(s). } if dependents.any? }
-          #{ %{<li>affect at least #{referers.size} reference(s) to "#{card.name}".} if referers.any? }
+          #{ %{<li>automatically alter #{ dependents.size } related name(s). </li>} if dependents.any? }
+          #{ %{<li>affect at least #{referers.size} reference(s) to "#{card.name}".</li>} if referers.any? }
         </ul>
         #{ %{<p>You may choose to <em>update or ignore</em> the references.</p>} if referers.any? }
       }
@@ -120,10 +123,12 @@ format :html do
       :referers => referers.size,
       :card     => { :update_referencers => false }
     )
+    args[:optional_edit_toolbar] ||= :show
+    args[:active_toolbar_view] ||= :edit_name
     args[:buttons] = %{
       #{ button_tag 'Rename and Update', :disable_with=>'Renaming', :class=>'renamer-updater', :situation=>'primary' }
       #{ button_tag 'Rename',            :disable_with=>'Renaming', :class=>'renamer'         }
-      #{ button_tag 'Cancel', :class=>'slotter', :type=>'button', :href=>path(:view=>:edit, :id=>card.id)}
+      #{ button_tag 'Cancel', :class=>'slotter',  :type=>'button', :href=>path }
     }
 
   end
@@ -141,10 +146,61 @@ format :html do
 
   def default_edit_type_args args
     args[:variety] = :edit #YUCK!
-    args[:hidden] ||= { :view=>:edit }
+    args[:optional_edit_toolbar] ||= :show
+    args[:active_toolbar_view] ||= :edit_type
+    args[:hidden] ||= { :success=>{:view=>:edit} }
     args[:buttons] = %{
       #{ button_tag 'Submit', :disable_with=>'Submitting', :situation=>'primary' }
       #{ button_tag 'Cancel', :href=>path(:view=>:edit), :type=>'button', :class=>'slotter' }
     }
   end
-end
+
+  view :edit_rules, :tags=>:unknown_ok do |args|
+    frame args do
+      subformat( current_set_card ).render_content args
+    end
+  end
+
+  def default_edit_rules_args args
+    args[:optional_edit_toolbar] ||= :show
+    args[:active_toolbar_view] ||= :edit_rules
+  end
+
+  view :options, {:view=>:edit_rules, :mod=>All::RichHtml::Editing::HtmlFormat} # for backwards compatibility
+
+
+  view :edit_structure do |args|
+    slot_args = {:cancel_slot_selector=>'.card-slot.related-view', :cancel_path=>card.format.path(:view=>:edit), :optional_edit_toolbar=>:hide, :hidden=>{:success=>"REDIRECT: #{card.structure.key}"}}
+    render_related args.merge(:related=>{:card=>card.structure, :view=>:edit, :slot=>slot_args})
+    # frame args do
+    #   nest card.structure, slot_args.merge(:view=>:edit)
+    # end
+  end
+
+  def default_edit_structure_args args
+    args[:optional_edit_toolbar] ||= :show
+    args[:active_toolbar_view] ||= :edit_structure
+  end
+
+  view :edit_nests do |args|
+    #nests = card.fetch(:trait=>:includes)
+    includes = Card::Content.new(card.content, card).find_chunks( Card::Chunk::Include )
+
+    frame args do
+      includes.map do |chunk|
+        if chunk.referee_card
+          nest chunk.referee_card, :view=>:edit_rules, :hide=>'set_label'
+        end
+      end
+      #nest nests, :view=>:content, :items=>{:view=>:edit_rules, :hide=>'set_label'}
+    end
+  end
+
+  def default_edit_nests_args args
+    args[:optional_edit_toolbar] ||= :show
+    args[:active_toolbar_view] ||= :edit_nests
+  end
+end
+
+
+

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

@@ -1,9 +1,9 @@
-format :html do 
+format :html do
   def edit_slot args={}
     #note: @mode should already be :edit here...
     if args[:structure] || card.structure
       # multi-card editing
-    
+
       if args[:core_edit] #need better name!
         _render_core args
       else
@@ -13,7 +13,7 @@ format :html do
     else
       # single-card edit mode
       field = content_field form, args
-    
+
       if [ args[:optional_type_formgroup], args[:optional_name_formgroup] ].member? :show
         # display content field in formgroup for consistency with other fields
         formgroup '', field, :editor=>:content
@@ -22,13 +22,13 @@ format :html do
       end
     end
   end
-  
-  
+
+
   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)
   end
 
@@ -54,40 +54,40 @@ format :html do
       when String ;  [ card_path(action)     , nil             ] #deprecated
       else        ;  raise Card::Error, "unsupported card_form action class: #{action.class}"
       end
-    
+
     klasses = Array.wrap( html[:class] )
     klasses << 'card-form slotter'
     klasses << 'autosave' if action == :update
     html[:class] = klasses.join ' '
-  
+
     html[:recaptcha] ||= 'on' if card.recaptcha_on?
     html.delete :recaptcha if html[:recaptcha] == :off
-  
+
     { :url=>url, :remote=>true, :html=>html }
   end
 
   def editor_wrap type=nil
-    content_tag( :div, :class=>"editor#{ " #{type}-editor" if type }" ) { yield }
+    content_tag( :div, :class=>"editor#{ " #{type}-editor" if type }" ) { yield.html_safe }
   end
 
   def formgroup title, content, opts={}
-    help_text = 
+    help_text =
       case opts[:help]
       when String ; _render_help :help_class=>'help-block', :help_text=> opts[:help]
       when true   ; _render_help :help_class=>'help-block'
       else        ; nil
       end
-      
+
     div_args = { :class=>['form-group', opts[:class]].compact*' ' }
     div_args[:card_id  ] = card.id     if card.real?
-    div_args[:card_name] = h card.name if card.name.present? 
-      
+    div_args[:card_name] = h card.name if card.name.present?
+
     wrap_with :div, div_args do
       %{
         <label>#{ title }</label>
         <div>
           #{ editor_wrap( opts[:editor] ) { content } }
-          #{ help_text }            
+          #{ help_text }
         </div>
       }
     end
@@ -107,8 +107,8 @@ format :html do
     end
     result
   end
-  
-  
+
+
   # FIELDSET VIEWS
 
   view :name_formgroup do |args|
@@ -129,7 +129,7 @@ format :html do
     %{<div class="form-group"><div>#{ args[:buttons] }</div></div>}
   end
 
-  view :content_formgroups do |args|
+  view :content_formgroup do |args|
     raw %{
       <fieldset class="card-editor editor">
         #{ edit_slot args }
@@ -169,7 +169,7 @@ format :html do
       #hidden_field_tag 'card[last_action_id_before_edit]', card.last_action_id, :class=>'current_revision_id'
     end
     %{
-      #{ revision_tracking 
+      #{ revision_tracking
        }
       #{ _render_editor options }
     }
@@ -184,13 +184,13 @@ format :html do
 
   view :edit_in_form, :perms=>:update, :tags=>:unknown_ok do |args|
     eform = form_for_multi
-    
+
     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?
-  
+
     formgroup fancy_title( args[:title] ), content, opts
   end
 
@@ -201,7 +201,7 @@ format :html do
   end
 
   # form helpers
-  
+
   FIELD_HELPERS = %w{hidden_field color_field date_field datetime_field datetime_local_field
     email_field month_field number_field password_field phone_field
     range_field search_field telephone_field text_area text_field time_field
@@ -213,13 +213,13 @@ format :html do
       form.send(method_name, name, options)
     end
   end
-  
+
   def check_box method, options={}, checked_value = "1", unchecked_value = "0"
     form.check_box method, options, checked_value, unchecked_value
   end
-  
+
   def radio_button method, tag_value, options = {}
     form.radio_button method, tag_value, options
   end
-  
+
 end