wagn 1.12.10 → 1.12.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTU0MTc4NzBhYWNkMWM0NDgwZjUwN2Y1M2RjOTkwY2MzZGY3MGJjMQ==
+    OTNmYzI3MDdkNzE0ZmIwODFjZDgzZGJkZDQwMDFhMGM4MjBmZTUwYQ==
   data.tar.gz: !binary |-
-    ZjMxYmFmMTAxMzI3NzE0MWM5MjAyMTU2ZjU3MTM2ZThmMDY4N2EzOQ==
+    YTJkYzkwODU2NDViYTZiNzNhZTc4Y2U5YmEwZWZhY2M3MTk2MThhNg==
 SHA512:
   metadata.gz: !binary |-
-    YjU1N2ZkMjM2ZmZlNDhkODkwNDBjMWY0OTVkMDVlYmIxNDBmZDhkNWY5MzYy
-    YmNiNzc2NDE2ZmVhZDJkMGIxYzQ5ZTJhZTgwMTZjOTg4MmFlYjI2NTQ2ZTk0
-    MDFiMTU0YTQ1NTJiNzBlMGY4MTMwYmM5ZTIwOWFhYmEzODQxMDU=
+    ZWRiZDc5MzgwOTc5ZGY5ZDllOWRiNzM0N2QxNjhiNDQ3ZjVkNmQ2NWI5NWZh
+    MGZhMjNkMzEwNjU5NWVjZWIwN2EyNDczOTI3MTE3YTg0MGExYzlkOTE4Yzdl
+    ZDE2NjY1MjA0YTEwMDNkOTNiYjVkZDRhYjg4ZmI4ZTkxODRkNDg=
   data.tar.gz: !binary |-
-    ZDRkMDdkNjU3ZjZkNGIzMTEyZDU1OTA5ZWRhNDQ4NWVlNTMwYjM4ODAwODc5
-    OTgxN2M2Y2U0MTYwMGFjZWNiMzNiODRjMTE1MzA1MzlmMDJjNzhkNzMwYjZl
-    NmViMmMxZDRlYmU5OThlOWY5OWRmNWE5NzVkZjgwN2NkODc1MGM=
+    OTQ4OGZmYjYyZTFiZDg3MTJkZGNjN2VkMDU1MTBkNjZmNDY5OWU4ZWM0OTIz
+    YjEzMGQxOGI4MzM4NmQxOTI0NDcxM2Y1NzIzOTk2ODhkOTE2NzUzZTJiMGQ0
+    ZGQ0NzE1MWM1YTM3ZTMwMzU2MTFjNWZkZTQyZjNhYjljMmQ2Mzg=

data/Gemfile

@@ -5,32 +5,32 @@ gemspec
 
 gem 'wagn', :path=>File.expand_path( '../', __FILE__ )
 
-gem 'wagn-dev', :path=>File.expand_path( '../../wagn-dev', __FILE__ )
-
-group :mysql do
-  gem "mysql2", "~> 0.3"
-end
+gem 'wagn-dev', :path=>File.expand_path( '../../wagn-dev', __FILE__ ), :group=>:development
+gem "mysql2", "~> 0.3"
 
 
 
-group :profile do
-  gem 'ruby-prof', '~>0.12.1'                  # profiling
-  #gem 'test-unit' #was causing errors after cucumber runs.
-end
 
-group :test do
-  
+group :assets do
   gem 'sass-rails',   "~> 3.1"                 # pretty code; compiles to CSS
   gem 'coffee-rails', "~> 3.1"                 # pretty code; compiles to JS
   gem 'uglifier'                               # makes pretty code ugly again.  compresses js/css for fast loading
 
-  gem 'jquery-rails',  '~> 2.1.4'              # main js framework, along with rails-specific unobtrusive lib
+  gem 'jquery-rails',  '~> 2.3'              # main js framework, along with rails-specific unobtrusive lib
   gem "jquerymobile-rails", "~> 0.2"
   
   gem 'tinymce-rails', '~> 3.4'                # wysiwyg editor
   
   # execjs is necessary for developing coffeescript.  mac users have execjs built-in; don't need this one
   gem 'therubyrhino', :platform=>:ruby         # :ruby is MRI rubies, so if you use a mac ruby ...
+end
+
+
+
+group :test do
+  
+  # execjs is necessary for developing coffeescript.  mac users have execjs built-in; don't need this one
+  gem 'therubyrhino', :platform=>:ruby         # :ruby is MRI rubies, so if you use a mac ruby ...
   
   gem 'rails-dev-tweaks', '~> 0.6'             # dramatic speeds up asset loading, among other tweaks
   gem 'rspec-rails', "~> 2.6"                  # behavior-driven-development suite
@@ -59,6 +59,8 @@ group :test do
   gem 'win32-process', '~> 0.6', :platforms => ['mingw', 'mswin']
 end
 
+gem 'ruby-prof', '~>0.12.1', :group=>:profile  # profiling
+
 group :debug do
   case RUBY_VERSION
   when /^1\.9\.3-p0/

data/VERSION

@@ -1 +1 @@
-1.12.10
+1.12.11

data/app/assets/javascripts/wagn.js.coffee

@@ -41,6 +41,28 @@ jQuery.fn.extend {
     s.replaceWith v
     v
 
+  slotSuccess: (data) ->
+    if data.redirect
+      window.location=data.redirect
+    else
+      notice = @attr('notify-success')
+      newslot = @setSlotContent data
+        
+      if newslot.jquery # sometimes response is plaintext
+        wagn.initializeEditors newslot
+        if notice?
+          newslot.notify notice
+
+  slotError: (status, result) ->
+    if status == 403 #permission denied
+      @setSlotContent result
+    else
+      @notify result
+      if status == 409 #edit conflict
+        @slot().find('.current_revision_id').val @slot().find('.new-current-revision-id').text()
+      else if status == 449
+        @slot().find('.recaptcha-box').loadCaptcha()
+
   notify: (message) ->
     slot = @slot()
     notice = slot.find '.card-notice'
@@ -112,28 +134,10 @@ $(window).ready ->
   #  dislike the timeout, but without this forms with multiple TinyMCE editors were failing to load properly
 
   $('body').on 'ajax:success', '.slotter', (event, data, c, d) ->
-    if data.redirect
-      window.location=data.redirect
-    else
-      notice = $(this).attr('notify-success')
-      newslot = $(this).setSlotContent data
-        
-      if newslot.jquery # sometimes response is plaintext
-        wagn.initializeEditors newslot
-        if notice?
-          newslot.notify notice
+    $(this).slotSuccess data
 
   $('body').on 'ajax:error', '.slotter', (event, xhr) ->
-    result = xhr.responseText
-    if xhr.status == 403 #permission denied
-      $(this).setSlotContent result
-    else
-      $(this).notify result
-      s = $(this).slot()
-      if xhr.status == 409 #edit conflict
-        s.find('.current_revision_id').val s.find('.new-current-revision-id').text()
-      else if xhr.status == 449
-        s.find('.recaptcha-box').loadCaptcha()
+    $(this).slotError xhr.status, xhr.responseText
 
   $('body').on 'click', 'button.slotter', (event)->
     return false if !$.rails.allowAction $(this)
@@ -141,10 +145,9 @@ $(window).ready ->
 
   $('body').on 'ajax:beforeSend', '.slotter', (event, xhr, opt)->
     return if opt.skip_before_send
-
+    
     unless opt.url.match /home_view/ #avoiding duplication.  could be better test?
       opt.url = wagn.prepUrl opt.url, $(this).slot()
-    
 
     if $(this).is('form')
       if wagn.recaptchaKey and $(this).attr('recaptcha')=='on' and !($(this).find('.recaptcha-box')[0])

data/app/assets/javascripts/wagn_mod.js.coffee

@@ -9,7 +9,6 @@ $.extend wagn,
     '.pointer-list-ul'       : -> pointerContent @find('input'        ).map( -> $(this).val() )
     '.pointer-checkbox-list' : -> pointerContent @find('input:checked').map( -> $(this).val() )
     '.perm-editor'           : -> permissionsContent this # must happen after pointer-list-ul, I think
-    '.wikirate-topic-tree'   : -> pointerContent @find('.jstree-clicked').map( -> $.trim( $(this).text() ) )
   }
 
   editorInitFunctionMap: {
@@ -19,14 +18,6 @@ $.extend wagn,
     '.pointer-list-editor'   : -> @sortable(); wagn.initPointerList @find('input')
     '.file-upload'           : -> @fileupload( add: wagn.chooseFile )#, forceIframeTransport: true )
     '.etherpad-textarea'     : -> $(this).closest('form').find('.edit-submit-button').attr('class', 'etherpad-submit-button')
-    '.wikirate-topic-tree'   : -> $(this).jstree
-       plugins: ["themes","html_data","ui","crrm"],
-       ui:      
-         select_multiple_modifier: 'on'
-         initially_select: $(this).closest('.editor').find('.initial-content').text().split '|'
-         selected_parent_close: false
-       themes: icons: false
-
   }
 
   initPointerList: (input)->
@@ -284,41 +275,6 @@ $(window).ready ->
     $(firstShade).trigger 'click'
     
 
-  #wikirate mod
-  $('body').on 'mouseenter', '#wikirate-nav > a', ->
-    ul = $(this).find 'ul'
-    if ul[0]
-      ul.css 'display', 'inline-block'
-    else
-      link = $(this)
-      $.ajax link.attr('href'), {
-        data : { view: 'navdrop', layout: 'none', index: $('#wikirate-nav > a').index(link) },
-#        type : 'POST',
-        success: (data) ->
-          #alert 'success!'
-          wagn.d = data
-          link.prepend $(data).menu()
-      }
-  
-  $('body').on 'mouseleave', '#wikirate-nav ul', ->
-    $(this).hide()
-      
-#  $('body').on 'change', '.TYPE-claim .card-editor fieldset.RIGHT-source_type', ->
-#    f = $(this).closest 'form' 
-#    val = $(this).find('input:checked').val()
-#    
-#    new_field      = f.find 'fieldset.RIGHT-source_link'
-#    existing_field = f.find 'fieldset.RIGHT-source'
-#    
-#    if val == 'existing'
-#      existing_field.show()
-#      new_field.hide()
-#    else
-#      existing_field.hide()
-#      new_field.show()
-#
-#  $('.TYPE-claim .card-editor fieldset.RIGHT-source_type').trigger 'change'
-
   # following not in use??
   
   $('body').on 'change', '.go-to-selected select', ->

data/app/controllers/card_controller.rb

@@ -45,7 +45,6 @@ class CardController < WagnController
     show
   end
 
-
   def watch
     watchers = card.fetch :trait=>:watchers, :new=>{}
     watchers = watchers.refresh

data/app/controllers/wagn_controller.rb

@@ -69,7 +69,6 @@ class WagnController < ActionController::Base
         
     target = case target
       when '*previous'     ;  previous_location #could do as *previous
-      when '_self  '       ;  card #could do as _self
       when /^(http|\/)/    ;  target
       when /^TEXT:\s*(.+)/ ;  $1
       else                 ;  Card.fetch target.to_name.to_absolute(card.cardname), :new=>{}
@@ -103,7 +102,7 @@ class WagnController < ActionController::Base
 
   def show view = nil, status = 200
     format = request.parameters[:format]
-    format = :file if params[:explicit_file] or !FORMATS.split('|').member? format #unknown format
+    format = :file if params[:explicit_file] or !Card::Format.registered.member? format #unknown format
 
     opts = ( params[:slot] || {} ).deep_symbolize_keys
     opts[:view] = view || params[:view]      

data/config/routes.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-FORMATS = 'html|json|xml|rss|kml|css|txt|text|csv' unless defined? FORMATS #should be set by formats
 
 Rails.application.routes.draw do
 

data/features/hello_wagn.feature

@@ -14,11 +14,13 @@ Feature: Reading and Creating a card
     Then I should see "Home"
     And I should see "Joe User"
     And I should see "Sign out"
-    Then In the main card header I should see a link with class "ui-icon-circle-triangle-s"
-    Then In the main card header I click "close Home"
-    Then In the main card header I should see a link with class "ui-icon-circle-triangle-e"
-    Then In the main card header I click "open Home"
-    Then In the main card header I should see a link with class "ui-icon-circle-triangle-s"
+    
+# all of the following assume the toggle shows up on the main card by default, which it no longer does
+#    Then In the main card header I should see a link with class "ui-icon-circle-triangle-s"
+#    Then In the main card header I click "close Home"
+#    Then In the main card header I should see a link with class "ui-icon-circle-triangle-e"
+#    Then In the main card header I click "open Home"
+#    Then In the main card header I should see a link with class "ui-icon-circle-triangle-s"
 
   Scenario: Create a Card
     Given I log in as Joe User

data/lib/card/exceptions.rb

@@ -14,9 +14,14 @@ module Card::Exceptions
     end
   end
   
-#  class Cancel < Exception
+  class Abort < Exception
+    attr_reader :status
+    def initialize status=:failure, msg=''
+      @status = status
+      super msg
+    end
 #    def backtrace
 #      ["\n( card action gently canceled )\n"]
 #    end
-#  end
+  end
 end

data/lib/card/format.rb

@@ -8,15 +8,20 @@ class Card
     INCLUSION_MODES  = { :closed=>:closed, :closed_content=>:closed, :edit=>:edit,
       :layout=>:layout, :new=>:edit, :normal=>:normal, :template=>:template } #should be set in views
     
-    cattr_accessor :ajax_call, :perms, :denial_views, :subset_views, :error_codes, :view_tags, :aliases
+    cattr_accessor :ajax_call, :perms, :denial_views, :subset_views, :error_codes, :view_tags, :aliases, :registered
     [ :perms, :denial_views, :subset_views, :error_codes, :view_tags, :aliases ].each { |acc| self.send "#{acc}=", {} }
     @@max_char_count = 200 #should come from Wagn.config
     @@max_depth      = 20 # ditto
-
+    
     attr_reader :card, :root, :parent, :vars
     attr_accessor :form, :error_status, :inclusion_opts
   
     class << self
+      @@registered = []
+
+      def register format
+        @@registered << format.to_s
+      end
 
       def get_format format
         fkey = @@aliases[ format ] || format
@@ -493,7 +498,7 @@ class Card
       content = params[cardname.to_s.gsub(/\+/,'_')]
 
       # CLEANME This is a hack to get it so plus cards re-populate on failed signups
-      if p = params['cards'] and card_params = p[cardname.s]
+      if p = params['cards'] and card_params = p[cardname.to_s]
         content = card_params['content']
       end
       content if content.present?  # why is this necessary? - efm  

data/lib/card/query/card_spec.rb

@@ -255,11 +255,12 @@ class Card::Query
     def and val
       subcondition val
     end
+    alias :all :and
   
     def or val
       subcondition val, :conj=>:or
     end
-
+    alias :any :or
     
     #~~~~~~ SPECIAL
 

data/lib/card/set.rb

@@ -56,6 +56,7 @@ module Card::Set
 
       define_method event do
         run_callbacks event do
+#          Rails.logger.info "calling event: #{event} for #{self}"
           send final_method
         end
       end

data/lib/wagn/all.rb

@@ -1,10 +1,10 @@
 require 'rails/all'
 
 if Rails.env.development?
-  begin
+  if $LOAD_PATH.find { |path| File.exists? "#{path}/wagn/dev.rb" } 
     require 'wagn/dev'
-  rescue
-    Rails.logger.info "WARNING: the gem wagn-dev is strongly recommended when running wagn in development mode!"
+  else
+    puts "WARNING: the gem wagn-dev is strongly recommended when running wagn in development mode but is not found"
   end
 end
 
@@ -20,6 +20,6 @@ require 'paperclip'
 # require 'xmlscan'
 # require 'rubyzip'
 require 'coderay'
-require 'sass'
+#require 'sass'
 
 require 'wagn/application'

data/mods/core/formats/html_format.rb

@@ -2,363 +2,375 @@
 
 require_dependency 'card/diff'
 
-class Card::HtmlFormat < Card::Format
-  include Card::Diff
+class Card
+  Format.register :html
+  class HtmlFormat < Format
+    include Diff
   
-  attr_accessor  :options_need_save, :start_time, :skip_autosave
+    attr_accessor  :options_need_save, :start_time, :skip_autosave
 
-  # builtin layouts allow for rescue / testing
-  LAYOUTS = Wagn::Loader.load_layouts.merge 'none' => '{{_main}}'
+    # builtin layouts allow for rescue / testing
+    LAYOUTS = Wagn::Loader.load_layouts.merge 'none' => '{{_main}}'
 
-  INCLUSION_DEFAULTS = {
-    :layout => { :view => :core },
-    :normal => { :view => :content }
-  }
+    INCLUSION_DEFAULTS = {
+      :layout => { :view => :core },
+      :normal => { :view => :content }
+    }
   
-  def get_inclusion_defaults
-    INCLUSION_DEFAULTS[@mode] || {}
-  end
+    def get_inclusion_defaults
+      INCLUSION_DEFAULTS[@mode] || {}
+    end
   
-  def default_item_view
-    :closed
-  end
+    def default_item_view
+      :closed
+    end
 
-  def view_for_unknown view, args
-    case
-    when focal? && ok?( :create )   ;  :new
-    when commentable?( view, args ) ;  view
-    else                               super
+    def view_for_unknown view, args
+      case
+      when focal? && ok?( :create )   ;  :new
+      when commentable?( view, args ) ;  view
+      else                               super
+      end
     end
-  end
 
-  def commentable? view, args
-    self.class.tagged view, :comment      and 
-    show_view? :comment_box, args, :hide and #developer or wagneer has overridden default
-    ok? :comment
-  end
+    def commentable? view, args
+      self.class.tagged view, :comment      and 
+      show_view? :comment_box, args, :hide and #developer or wagneer has overridden default
+      ok? :comment
+    end
 
-  def get_layout_content(args)
-    Account.as_bot do
-      case
-        when (params[:layout] || args[:layout]) ;  layout_from_name args
-        when card                               ;  layout_from_card
-        else                                    ;  LAYOUTS['default']
+    def get_layout_content(args)
+      Account.as_bot do
+        case
+          when (params[:layout] || args[:layout]) ;  layout_from_name args
+          when card                               ;  layout_from_card
+          else                                    ;  LAYOUTS['default']
+        end
       end
     end
-  end
 
-  def layout_from_name args
-    lname = (params[:layout] || args[:layout]).to_s
-    lcard = Card.fetch(lname, :skip_virtual=>true, :skip_modules=>true)
-    case
-      when lcard && lcard.ok?(:read)         ; lcard.content
-      when hardcoded_layout = LAYOUTS[lname] ; hardcoded_layout
-      else  ; "<h1>Unknown layout: #{lname}</h1>Built-in Layouts: #{LAYOUTS.keys.join(', ')}"
+    def layout_from_name args
+      lname = (params[:layout] || args[:layout]).to_s
+      lcard = Card.fetch(lname, :skip_virtual=>true, :skip_modules=>true)
+      case
+        when lcard && lcard.ok?(:read)         ; lcard.content
+        when hardcoded_layout = LAYOUTS[lname] ; hardcoded_layout
+        else  ; "<h1>Unknown layout: #{lname}</h1>Built-in Layouts: #{LAYOUTS.keys.join(', ')}"
+      end
     end
-  end
 
-  def layout_from_card
-    return unless rule_card = (card.rule_card(:layout) or Card.default_rule_card(:layout))
-    #return unless rule_card.is_a?(Card::Set::Type::Pointer) and  # type check throwing lots of warnings under cucumber: rule_card.type_id == Card::PointerID        and
-    return unless rule_card.type_id == Card::PointerID        and
-        layout_name=rule_card.item_names.first                and
-        !layout_name.nil?                                     and
-        lo_card = Card.fetch( layout_name, :skip_virtual => true, :skip_modules=>true ) and
-        lo_card.ok?(:read)
-    lo_card.content
-  end
+    def layout_from_card
+      return unless rule_card = (card.rule_card(:layout) or Card.default_rule_card(:layout))
+      #return unless rule_card.is_a?(Card::Set::Type::Pointer) and  # type check throwing lots of warnings under cucumber: rule_card.type_id == Card::PointerID        and
+      return unless rule_card.type_id == Card::PointerID        and
+          layout_name=rule_card.item_names.first                and
+          !layout_name.nil?                                     and
+          lo_card = Card.fetch( layout_name, :skip_virtual => true, :skip_modules=>true ) and
+          lo_card.ok?(:read)
+      lo_card.content
+    end
 
-  def slot_options args
-    @@slot_option_keys ||= Card::Chunk::Include.options.reject { |k| k == :view }.unshift :home_view
-    options_hash = {}
+    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
+      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
+      @@slot_option_keys.inject(options_hash) do |hash, opt|
+        hash[opt] = args[opt] if args[opt].present?
+        hash
+      end
     
-    JSON( options_hash )
-  end
+      JSON( options_hash )
+    end
 
-  def wrap args = {}
-    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
+    def wrap args = {}
+      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>}
+      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>}
 
-    if params[:debug] == 'slot' && !tagged( @current_view, :no_wrap_comments )
-      name = h card.name
-      space = '  ' * @depth
-      %{<!--\n\n#{ space }BEGIN SLOT: #{ name }\n\n-->#{ div }<!--\n\n#{space}END SLOT: #{ name }\n\n-->}
-    else
-      div
+      if params[:debug] == 'slot' && !tagged( @current_view, :no_wrap_comments )
+        name = h card.name
+        space = '  ' * @depth
+        %{<!--\n\n#{ space }BEGIN SLOT: #{ name }\n\n-->#{ div }<!--\n\n#{space}END SLOT: #{ name }\n\n-->}
+      else
+        div
+      end
     end
-  end
   
-  def wrap_body args={}
-    css_classes = [ 'card-body' ]
-    css_classes << args[:body_class]                  if args[:body_class]
-    css_classes += [ 'card-content', card.safe_set_keys ] if args[:content]
-    content_tag :div, :class=>css_classes.compact*' ' do
-      yield args
+    def wrap_body args={}
+      css_classes = [ 'card-body' ]
+      css_classes << args[:body_class]                  if args[:body_class]
+      css_classes += [ 'card-content', card.safe_set_keys ] if args[:content]
+      content_tag :div, :class=>css_classes.compact*' ' do
+        yield args
+      end
     end
-  end
     
-  def frame args={}
-    wrap args.merge(:slot_class=>'card-frame') do
-      %{
-        #{ _render_header args }
-        #{ %{ <div class="card-subheader">#{ args[:subheader] }</div> } if args[:subheader] }
-        #{ _optional_render :help, args, :hide }
-        #{ wrap_body args do output( yield args ) end }
-      }
+    def frame args={}
+      wrap args.merge(:slot_class=>'card-frame') do
+        %{
+          #{ _render_header args }
+          #{ %{ <div class="card-subheader">#{ args[:subheader] }</div> } if args[:subheader] }
+          #{ _optional_render :help, args, :hide }
+          #{ wrap_body args do output( yield args ) end }
+        }
+      end
     end
-  end
   
-  def frame_and_form action, args={}, form_opts={}
-    form_opts[:hidden] = args.delete(:hidden)
-    frame args do
-      card_form action, form_opts do
-        output( yield args )
+    def frame_and_form action, args={}, form_opts={}
+      form_opts[:hidden] = args.delete(:hidden)
+      frame args do
+        card_form action, form_opts do
+          output( yield args )
+        end
       end
     end
-  end
   
-  def output content
-    case content
-    when String; content
-    when Array ; content.compact.join "\n"
-    end
-  end  
+    def output content
+      case content
+      when String; content
+      when Array ; content.compact.join "\n"
+      end
+    end  
 
 
-  def wrap_main(content)
-    return content if params[:layout]=='none'
-    %{#{
-    if flash[:notice]
-      %{<div class="flash-notice">#{ flash[:notice] }</div>}
+    def wrap_main(content)
+      return content if params[:layout]=='none'
+      %{#{
+      if flash[:notice]
+        %{<div class="flash-notice">#{ flash[:notice] }</div>}
+      end
+      }<div id="main">#{content}</div>}
     end
-    }<div id="main">#{content}</div>}
-  end
 
   
-  def html_escape_except_quotes s
-    # to be used inside single quotes (makes for readable json attributes)
-    s.to_s.gsub(/&/, "&amp;").gsub(/\'/, "&apos;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
-  end
+    def html_escape_except_quotes s
+      # to be used inside single quotes (makes for readable json attributes)
+      s.to_s.gsub(/&/, "&amp;").gsub(/\'/, "&apos;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
+    end
 
 
-  def edit_slot args={}
-    if args[:structure] || card.structure
-      # multi-card edit mode
-      _render_raw(args).scan( /\{\{\s*\+[^\}]*\}\}/ ).map do |inc| #fixme - wrong place for regexp!
-        process_content( inc ).strip
-      end.join
-#        raw _render_core(args)
-    else
-      # single-card edit mode
-      field = content_field form, args
+    def edit_slot args={}
+      #note: @mode should already be :edit here...
+      if args[:structure] || card.structure
+        # multi-card editing
       
-      if [ args[:optional_type_fieldset], args[:optional_name_fieldset] ].member? :show
-        # display content field in fieldset for consistency with other fields
-        fieldset '', field, :editor=>:content
+        if args[:core_edit] #need better name!
+          _render_core args
+        else
+          process_relative_tags args
+        end
+
       else
-        editor_wrap( :content ) { field }
+        # single-card edit mode
+        field = content_field form, args
+      
+        if [ args[:optional_type_fieldset], args[:optional_name_fieldset] ].member? :show
+          # display content field in fieldset for consistency with other fields
+          fieldset '', field, :editor=>:content
+        else
+          editor_wrap( :content ) { field }
+        end
       end
     end
-  end
+  
+    def process_relative_tags args
+      _render_raw(args).scan( /\{\{\s*\+[^\}]*\}\}/ ).map do |inc| #fixme - wrong place for regexp!
+        process_content( inc ).strip
+      end.join    
+    end
   
   
 
-  #### --------------------  additional helpers ---------------- ###
-
-  def rendering_error exception, view
-    %{
-      <span class="render-error">
-        error rendering
-        #{
-          if Account.always_ok?
-            %{
-              #{ link_to_page error_cardname, nil, :class=>'render-error-link' }
-              <div class="render-error-message errors-view" style="display:none">
-                <h3>Error message (visible to admin only)</h3>
-                <p><strong>#{ exception.message }</strong></p>
-                <div>
-                  #{exception.backtrace * "<br>\n"}
+    #### --------------------  additional helpers ---------------- ###
+
+    def rendering_error exception, view
+      %{
+        <span class="render-error">
+          error rendering
+          #{
+            if Account.always_ok?
+              %{
+                #{ link_to_page error_cardname, nil, :class=>'render-error-link' }
+                <div class="render-error-message errors-view" style="display:none">
+                  <h3>Error message (visible to admin only)</h3>
+                  <p><strong>#{ exception.message }</strong></p>
+                  <div>
+                    #{exception.backtrace * "<br>\n"}
+                  </div>
                 </div>
-              </div>
-            }
-          else
-            error_cardname
-          end
-        }
-        (#{view} view)
-      </span>
-    }
-  end
+              }
+            else
+              error_cardname
+            end
+          }
+          (#{view} view)
+        </span>
+      }
+    end
   
-  def unknown_view view
-    "<strong>unknown view: <em>#{view}</em></strong>"
-  end
+    def unknown_view view
+      "<strong>unknown view: <em>#{view}</em></strong>"
+    end
   
-  def unsupported_view view
-    "<strong>view <em>#{view}</em> not supported for <em>#{error_cardname}</em></strong>"
-  end
-
-  def final_link href, opts={}
-    text = opts[:text] || href
-    %{<a class="#{opts[:class]}" href="#{href}">#{text}</a>}
-  end
-
-  def link_to_view text, view, opts={}
-    path_opts = view==:home ? {} : { :view=>view }
-    if p = opts.delete( :path_opts )
-      path_opts.merge! p
+    def unsupported_view view
+      "<strong>view <em>#{view}</em> not supported for <em>#{error_cardname}</em></strong>"
     end
-    opts[:remote] = true
-    opts[:rel] = 'nofollow'
-    link_to text, path( path_opts ), opts
-  end
 
-  def name_field form=nil, options={}
-    form ||= self.form
-    form.text_field( :name, {
-      :value=>card.name, #needed because otherwise gets wrong value if there are updates
-      :autocomplete=>'off'
-    }.merge(options))
-  end
+    def final_link href, opts={}
+      text = opts[:text] || href
+      %{<a class="#{opts[:class]}" href="#{href}">#{text}</a>}
+    end
 
-  def type_field args={}
-    typelist = Account.createable_types
-    current_type = unless args.delete :no_current_type
-        unless card.new_card? || typelist.include?( card.type_name )
-          # current type should be an option on existing cards, regardless of create perms
-          typelist = (typelist << card.type_name).sort
-        end
-        Card[ card ? card.type_id : Card.default_type_id ].name
+    def link_to_view text, view, opts={}
+      path_opts = view==:home ? {} : { :view=>view }
+      if p = opts.delete( :path_opts )
+        path_opts.merge! p
       end
+      opts[:remote] = true
+      opts[:rel] = 'nofollow'
+      link_to text, path( path_opts ), opts
+    end
 
-    options = options_from_collection_for_select typelist, :to_s, :to_s, current_type
-    template.select_tag 'card[type]', options, args
-  end
-
-  def content_field form, options={}
-    @form = form
-    @nested = options[:nested]
-    revision_tracking = if card && !card.new_card? && !options[:skip_rev_id]
-      form.hidden_field :current_revision_id, :class=>'current_revision_id'
+    def name_field form=nil, options={}
+      form ||= self.form
+      form.text_field( :name, {
+        :value=>card.name, #needed because otherwise gets wrong value if there are updates
+        :autocomplete=>'off'
+      }.merge(options))
     end
-    %{
-      #{ revision_tracking }
-      #{ _render_editor options }
-    }
-  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[cards][#{card.relative_name}]", card, template, {}, block)
-  end
+    def type_field args={}
+      typelist = Account.createable_types
+      current_type = unless args.delete :no_current_type
+          unless card.new_card? || typelist.include?( card.type_name )
+            # current type should be an option on existing cards, regardless of create perms
+            typelist = (typelist << card.type_name).sort
+          end
+          Card[ card ? card.type_id : Card.default_type_id ].name
+        end
 
-  def form
-    @form ||= form_for_multi
-  end
+      options = options_from_collection_for_select typelist, :to_s, :to_s, current_type
+      template.select_tag 'card[type]', options, args
+    end
 
-  def card_form action, opts={}
-    hidden_args = opts.delete :hidden
-    form_for card, card_form_opts(action, opts) do |form|
+    def content_field form, options={}
       @form = form
+      @nested = options[:nested]
+      revision_tracking = if card && !card.new_card? && !options[:skip_rev_id]
+        form.hidden_field :current_revision_id, :class=>'current_revision_id'
+      end
       %{
-        #{ hidden_tags hidden_args if hidden_args }
-        #{ yield form }
+        #{ revision_tracking }
+        #{ _render_editor options }
       }
     end
-  end
 
-  def card_form_opts action, html={}
-    url, action = case action
-      when Symbol ;  [ path(:action=>action) , action          ]
-      when Hash   ;  [ path(action)          , action[:action] ]
-      when String ;  [ wagn_path(action)     , nil             ] #deprecated
-      else        ;  raise Wagn::Error, "unsupported card_form action class: #{action.class}"
+    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[cards][#{card.relative_name}]", card, template, {}, block)
+    end
+
+    def form
+      @form ||= form_for_multi
+    end
+
+    def card_form action, opts={}
+      hidden_args = opts.delete :hidden
+      form_for card, card_form_opts(action, opts) do |form|
+        @form = form
+        %{
+          #{ hidden_tags hidden_args if hidden_args }
+          #{ yield form }
+        }
       end
+    end
+
+    def card_form_opts action, html={}
+      url, action = case action
+        when Symbol ;  [ path(:action=>action) , action          ]
+        when Hash   ;  [ path(action)          , action[:action] ]
+        when String ;  [ wagn_path(action)     , nil             ] #deprecated
+        else        ;  raise Wagn::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 ' '
+      klasses = Array.wrap( html[:class] )
+      klasses << 'card-form slotter'
+      klasses << 'autosave' if action == :update
+      html[:class] = klasses.join ' '
     
-    html[:recaptcha] ||= 'on' if Wagn::Env[:recaptcha_on] && Card.toggle( card.rule(:captcha) )
-    html.delete :recaptcha if html[:recaptcha] == :off
+      html[:recaptcha] ||= 'on' if Wagn::Env[:recaptcha_on] && Card.toggle( card.rule(:captcha) )
+      html.delete :recaptcha if html[:recaptcha] == :off
     
-    { :url=>url, :remote=>true, :html=>html }
-  end
+      { :url=>url, :remote=>true, :html=>html }
+    end
 
-  def editor_wrap type=nil
-    content_tag( :div, :class=>"editor#{ " #{type}-editor" if type }" ) { yield }
-  end
+    def editor_wrap type=nil
+      content_tag( :div, :class=>"editor#{ " #{type}-editor" if type }" ) { yield }
+    end
 
-  def fieldset title, content, opts={}
-    if attribs = opts[:attribs]
-      attrib_string = attribs.keys.map do |key| 
-        %{#{key}="#{attribs[key]}"}
-      end * ' '
-    end
-    help_text = case opts[:help]
-      when String ; _render_help :help_text=> opts[:help]
-      when true   ; _render_help
-      else        ; nil
-    end
-    %{
-      <fieldset #{ attrib_string }>
-        <legend>
-          <h2>#{ title }</h2>
-          #{ help_text }
-        </legend>
-        #{ editor_wrap( opts[:editor] ) { content } }
-      </fieldset>
-    }
-  end
+    def fieldset title, content, opts={}
+      if attribs = opts[:attribs]
+        attrib_string = attribs.keys.map do |key| 
+          %{#{key}="#{attribs[key]}"}
+        end * ' '
+      end
+      help_text = case opts[:help]
+        when String ; _render_help :help_text=> opts[:help]
+        when true   ; _render_help
+        else        ; nil
+      end
+      %{
+        <fieldset #{ attrib_string }>
+          <legend>
+            <h2>#{ title }</h2>
+            #{ help_text }
+          </legend>
+          #{ editor_wrap( opts[:editor] ) { content } }
+        </fieldset>
+      }
+    end
   
-  def hidden_tags hash, base=nil
-    # convert hash into a collection of hidden tags
-    result = ''
-    hash ||= {}
-    hash.each do |key, val|
-      result += if Hash === val
-        hidden_tags val, key
-      else
-        name = base ? "#{base}[#{key}]" : key
-        hidden_field_tag name, val
+    def hidden_tags hash, base=nil
+      # convert hash into a collection of hidden tags
+      result = ''
+      hash ||= {}
+      hash.each do |key, val|
+        result += if Hash === val
+          hidden_tags val, key
+        else
+          name = base ? "#{base}[#{key}]" : key
+          hidden_field_tag name, val
+        end
       end
+      result
     end
-    result
-  end
 
-  def main?
-    if ajax_call?
-      @depth == 0 && params[:is_main]
-    else
-      @depth == 1 && @mainline
+    def main?
+      if ajax_call?
+        @depth == 0 && params[:is_main]
+      else
+        @depth == 1 && @mainline
+      end
     end
-  end
 
-  private
+    private
 
-  def fancy_title title=nil
-    raw %{<span class="card-title">#{ showname(title).to_name.parts.join %{<span class="joint">+</span>} }</span>}
+    def fancy_title title=nil
+      raw %{<span class="card-title">#{ showname(title).to_name.parts.join %{<span class="joint">+</span>} }</span>}
+    end
   end
-
 end