wagn 1.12.9 → 1.12.10

data/mods/standard/sets/all/admin.rb

@@ -1,28 +1,28 @@
 view :setup, :tags=>:unknown_ok do |args|
   account = User.new( ( params[:card] && params[:card][:account_args] ) || {} )
-  frame_args = {
+  args.merge!( {
     :title=>'Welcome, Wagneer!',
-    :show_help=>true,
+    :optional_help=>:show,
     :optional_menu=>:never, 
-    :help_text=>'To get started, set up an account.'
-  }
+    :help_text=>'To get started, set up an account.',
+    :buttons => submit_tag( 'Create' ),
+    :hidden => { 
+      :success => "REDIRECT: #{ Card.path_setting '/' }",
+      'card[type_id]' => Card.default_accounted_type_id
+    }
+  } )
     
-  wrap_frame :setup, frame_args do
-    form_for :card do |f|
-      @form = f
-      %{
-        #{ _render_name_editor :help=>'usually first and last name' }
-        #{ hidden_field_tag 'card[type_id]', Card.default_accounted_type_id }
-        #{ _render_account_detail :account=>account, :setup=>true }
-        <fieldset><div class="button-area">#{ submit_tag 'Create' }</div></fieldset>
-        #{ render_error }
-      }
-    end
+  frame_and_form 'admin/setup', args, :recaptcha=>:off do
+    %{
+      #{ _render_name_fieldset :help=>'usually first and last name' }
+      #{ _render_account_detail :account=>account, :setup=>true }
+      #{ _optional_render :button_fieldset, args}
+    }
   end
 end
 
 view :show_cache do |args|
-  wrap_frame :show_cache, args do 
+  frame args do 
     key = card.key
     cache_card = Card.fetch(key)
     db_card = Card.find_by_key(key)

data/mods/standard/sets/all/all_css.rb

@@ -6,9 +6,9 @@ format :css do
     { :view => :content }
   end
 
-  view :show do |args|
+  def show args
     view = args[:view] || :content
-    render view
+    render view, args
   end
   
   view :content do |args|

data/mods/standard/sets/all/base.rb

@@ -1,10 +1,12 @@
 # -*- encoding : utf-8 -*-
 
-view :show, :perms=>:none  do |args|
-  render( ( args[:view] || :core ), args )
+format do
+  def show args
+    view = args[:view] || :core
+    render view, args
+  end
 end
 
-
 # NAME VIEWS
                                                                               
 view :name,     :perms=>:none  do |args|  card.name                    end
@@ -108,6 +110,7 @@ view :too_slow, :perms=>:none do |args|
 end
 
 
+#none of the below belongs here!!
 
 
 view :template_rule, :tags=>:unknown_ok do |args|
@@ -135,3 +138,5 @@ view :template_rule, :tags=>:unknown_ok do |args|
     subformat( Card.fetch(set_name) ).render_template_link args
   end
 end
+
+

data/mods/standard/sets/all/follow.rb

@@ -3,7 +3,7 @@ format :html do
   watch_perms = lambda { |r| Account.logged_in? && !r.card.new_card? }
   view :watch, :tags=>[:unknown_ok, :no_wrap_comments], :denial=>:blank, :perms=>watch_perms do |args|
     
-    wrap :watch, args do
+    wrap args do
       if card.watching_type?
         watching_type_cards
       else
@@ -38,7 +38,7 @@ end
 
 event :notify_followers, :after=>:extend do
   begin
-    return false if Card.record_timestamps==false || ENV['WAGN_MIGRATION']
+    return false if Card.record_timestamps==false or Wagn.config.send_emails==false
     # userstamps and timestamps are turned off in cases like updating read_rules that are automated and
     # generally not of enough interest to warrant notification
   

data/mods/standard/sets/all/history.rb

@@ -5,7 +5,7 @@ format :html do
   view :history do |args|
     load_revisions
     if @revision
-      wrap_frame :history, args.merge(:content=>true, :subheader=>_render_revision_subheader ) do
+      frame args.merge(:content=>true, :subheader=>_render_revision_subheader ) do
         _render_diff
       end
     end

data/mods/standard/sets/all/json.rb

@@ -21,8 +21,9 @@ format :json do
     params[:max_depth] || 1
   end
 
-  view :show do |args|
-    raw = render( ( args[:view] || :atom ), args )
+  def show args
+    view = args[:view] || :atom 
+    raw = render view, args
     case
     when String === raw  ;  raw
     when params[:pretty] ;  JSON.pretty_generate raw

data/mods/standard/sets/all/kml.rb

@@ -3,8 +3,9 @@ require_dependency 'active_support/builder' unless defined?(Builder)
 
 format :kml do
 
-  view :show do |args|
-    render( args[:view] || :search)
+  def show args
+    view = args[:view] || :search
+    render view, args
   end
 
   # FIXME: integrate this with common XML features when it is added

data/mods/standard/sets/all/rich_html.rb

@@ -1,11 +1,8 @@
 # -*- encoding : utf-8 -*-
-def clean_html?
-  true
-end
 
 format :html do
-
-  view :show do |args|
+  
+  def show args
     @main_view = args[:view] || args[:home_view]
 
     if ajax_call?
@@ -22,33 +19,33 @@ format :html do
   end
 
   view :content do |args|
-    wrap :content, args.merge(:slot_class=>'card-content') do
-      menu = optional_render :menu, args, :hide
-      %{#{ menu }#{ _render_core args }}
+    wrap args.merge(:slot_class=>'card-content') do
+      [
+        _optional_render( :menu, args, :hide ),
+        _render_core( args )
+      ]
     end
   end
 
   view :titled, :tags=>:comment do |args|
-    wrap :titled, args do
-      %{
-        #{ _render_header args.merge( :optional_menu=>:hide ) }
-        #{ wrap_body( :content=>true ) { _render_core args } }
-        #{ optional_render :comment_box, args }
-      }
+    wrap args do   
+      [
+        _render_header( args.merge :optional_menu=>:hide ),
+        wrap_body( :content=>true ) { _render_core args },
+        optional_render( :comment_box, args )
+      ]
     end
   end
-  
+
   view :labeled do |args|
-    wrap :labeled, args do
-      %{
-        #{ _optional_render :menu, args }
-        <label>#{ _render_title args }</label>
-        #{
-          wrap_body :body_class=>'closed-content', :content=>true do
-            _render_closed_content args
-          end
-        }
-      }
+    wrap args do
+      [
+        _optional_render( :menu, args ),
+        "<label>#{ _render_title args }</label>",
+        wrap_body( :body_class=>'closed-content', :content=>true ) do
+          _render_closed_content args
+        end
+      ]
     end
   end
 
@@ -58,17 +55,17 @@ format :html do
     add_name_context
     title
   end
-  
+
   view :title_link do |args|
     link_to_page (args[:title_ready] || showname(args[:title]) ), card.name
   end
 
   view :open, :tags=>:comment do |args|
-    wrap_frame :open, args.merge(:content=>true, :optional_toggle=>:show) do
-      %{
-        #{ _render_open_content args }
-        #{ optional_render :comment_box, args }
-      }
+    frame args.merge(:content=>true, :optional_toggle=>:show) do
+      [
+        _render_open_content( args ),
+        optional_render( :comment_box, args )
+      ]
     end
   end
 
@@ -86,7 +83,7 @@ format :html do
     %{
       <h1 class="card-header">
         #{ _optional_render :toggle, args, :hide }
-        #{ _render_title args }
+        #{ _optional_render :title, args }
         #{ _optional_render :menu, args }
       </h1>
     }
@@ -97,7 +94,7 @@ format :html do
     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,
       :type         => card.type_name,
@@ -118,7 +115,7 @@ format :html do
         )
       })
     end
-    
+
     json = html_escape_except_quotes JSON( @menu_vars )
     %{<span class="card-menu-link" data-menu-vars='#{json}'>#{_render_menu_link}</span>}
   end
@@ -130,72 +127,168 @@ format :html do
 
   view :type do |args|
     klasses = ['cardtype']
-    klasses << 'default-type' if card.type_id==Card.default_type_id ? " default-type" : ''
+    klass = args[:type_class] and klasses << klass
     link_to_page card.type_name, nil, :class=>klasses
   end
 
   view :closed do |args|
-    wrap_frame :closed, args.merge(:content=>true, :body_class=>'closed-content', :toggle_mode=>:close, :optional_toggle=>:show ) do
+    frame args.merge(:content=>true, :body_class=>'closed-content', :toggle_mode=>:close, :optional_toggle=>:show ) do
       _optional_render :closed_content, args
     end
   end
 
 
+  ###---( TOP_LEVEL (used by menu) NEW / EDIT VIEWS )
+
   view :new, :perms=>:create, :tags=>:unknown_ok do |args|
-    name_ready = !card.cardname.blank? && !Card.exists?( card.cardname )
-    prompt_for_name = !name_ready && !card.rule_card( :autoname )
+    frame_and_form :create, args, 'main-success'=>'REDIRECT' do |form|
+      [
+        _optional_render( :name_fieldset,     args ),
+        _optional_render( :type_fieldset,     args ),
+        _optional_render( :content_fieldsets, args ),
+        _optional_render( :button_fieldset,   args )
+      ]
+    end  
+  end
+  
+
+  def default_new_args args    
+    hidden = args[:hidden] ||= {}
+    hidden[:success] ||= card.rule(:thanks) || '_self'
+    hidden[:card   ] ||={}
+    
+    args[:optional_help] = :show
+
+    # name field / title
+    if !params[:name_prompt] and !card.cardname.blank?
+      # name is ready and will show up in title
+      hidden[:card][:name] ||= card.name
+    else
+      # name is not ready; need generic title
+      args[:title] ||= "New #{ card.type_name unless card.type_id == Card.default_type_id }" #fixme - overrides nest args
+      unless card.rule_card :autoname
+        # prompt for name
+        hidden[:name_prompt] = true unless hidden.has_key? :name_prompt
+        args[:optional_name_fieldset] ||= :show
+      end
+    end
+    args[:optional_name_fieldset] ||= :hide
 
-    hidden = args[:hidden] || { :success=> card.rule(:thanks) || '_self' }
-    if name_ready
-      hidden['card[name]'] = card.name
+    
+    # type field
+    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
+      )
+      args[:optional_type_fieldset] = :show
     else
-      args[:title] ||= "New #{ card.type_name unless card.type_id == Card.default_type_id }"
+      hidden[:card][:type_id] ||= card.type_id
+      args[:optional_type_fieldset] = :hide
     end
 
-    prompt_for_type = (
-      !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
-    ) 
 
     cancel = if main?
       { :class=>'redirecter', :href=>Card.path_setting('/*previous') }
-    else        
+    else
       { :class=>'slotter',    :href=>path( :view=>:missing         ) }
     end
     
-    wrap_frame :new, args.merge(:show_help=>true) do
-      card_form :create, 'card-form', 'main-success'=>'REDIRECT' do |form|
-        @form = form
-        %{
-          #{ hidden_tags hidden.merge( args[:hidden] || {} ) }
-          #{ _render_name_editor if prompt_for_name }
-          #{ prompt_for_type ? _render_type_menu : form.hidden_field( :type_id ) }                
-          <div class="card-editor editor">
-            #{ edit_slot args.merge( :label => prompt_for_name || prompt_for_type ) }
-          </div>
-          <fieldset>
-            <div class="button-area">
-              #{ submit_tag 'Submit', :class=>'create-submit-button', :disable_with=>'Submitting' }
-              #{ button_tag 'Cancel', :type=>'button', :class=>"create-cancel-button #{cancel[:class]}", :href=>cancel[:href] }
-            </div>
-          </fieldset>                
-        }
-      end
+    args[:buttons] ||= %{
+      #{ submit_tag 'Submit', :class=>'create-submit-button', :disable_with=>'Submitting' }
+      #{ 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 |form|
+      [
+        _optional_render( :content_fieldsets, args ),
+        _optional_render( :button_fieldset,   args )
+      ]
     end
   end
 
+  def default_edit_args args
+    args[:optional_help] = :show
+    
+    args[:buttons] = %{
+      #{ submit_tag 'Submit', :class=>'submit-button' }
+      #{ 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
+      [
+        _render_name_fieldset( args ),
+        _optional_render( :confirm_rename, args ),
+        _optional_render( :button_fieldset, args )
+      ]
+    end
+  end
+  
+  view :confirm_rename do |args|
+    referers = args[:referers]
+    dependents = card.dependents
+    wrap args do
+      %{
+        <h1>Are you sure you want to rename <em>#{card.name}</em>?</h1>
+        #{ %{ <h2>This change will...</h2> } 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? }
+        </ul>
+        #{ %{<p>You may choose to <em>update or ignore</em> the references.</p>} if referers.any? }
+      }
+    end
+  end
 
-  view :editor do |args|
-    form.text_area :content, :rows=>3, :class=>'tinymce-textarea card-content', :id=>unique_id
+  def default_edit_name_args args
+    referers = args[:referers] = card.extended_referencers  
+    args[:hidden] ||= {}
+    args[:hidden].reverse_merge!(
+      :success  => '_self',
+      :old_name => card.name,
+      :referers => referers.size,
+      :card     => { :update_referencers => false }
+    )
+    args[:buttons] = %{
+      #{ submit_tag 'Rename and Update', :class=>'renamer-updater' }
+      #{ submit_tag 'Rename', :class=>'renamer' }
+      #{ button_tag 'Cancel', :class=>'slotter', :type=>'button', :href=>path(:view=>:edit, :id=>card.id)}
+    }
+    
   end
 
+
+  view :edit_type, :perms=>:update do |args|
+    frame_and_form :update, args do
+    #'main-success'=>'REDIRECT: _self', # adding this back in would make main cards redirect on cardtype changes
+      [
+        _render_type_fieldset( args ),
+        optional_render( :button_fieldset, args )
+      ]
+    end
+  end
+
+  def default_edit_type_args args
+    args[:variety] = :edit #YUCK!
+    args[:hidden] ||= { :view=>:edit }
+    args[:buttons] = %{
+      #{ submit_tag 'Submit', :disable_with=>'Submitting' }
+      #{ button_tag 'Cancel', :href=>path(:view=>:edit), :type=>'button', :class=>'slotter' }      
+    }    
+  end
+  
+
   view :missing do |args|
     return '' unless card.ok? :create  #this should be moved into ok_view
     new_args = { :view=>:new, 'card[name]'=>card.name }
     new_args['card[type]'] = args[:type] if args[:type]
 
-    wrap :missing, args do
+    wrap args do
       link_to raw("Add #{ fancy_title args[:title] }"), path(new_args),
         :class=>"slotter missing-#{ args[:denied_view] || args[:home_view]}", :remote=>true
     end
@@ -205,101 +298,55 @@ format :html do
     %{<span class="faint"> #{ showname } </span>}
   end
 
-###---(  EDIT VIEWS )
-  view :edit, :perms=>:update, :tags=>:unknown_ok do |args|
-    wrap_frame :edit, args.merge(:show_help=>true) do
-      card_form :update, 'card-form autosave' do |f|
-        @form= f
-        %{
-          #{ hidden_tags(( args[:hidden] || {} )) }
-          <div class="card-editor">
-            #{ edit_slot args }
-          </div>
-          <fieldset>
-            <div class="button-area">
-              #{ submit_tag 'Submit', :class=>'submit-button' }
-              #{ button_tag 'Cancel', :class=>'cancel-button slotter', :href=>path, :type=>'button' }
-            </div>
-          </fieldset>
-        }
-      end
-    end
-  end
 
-  view :name_editor do |args|
-    fieldset 'name', raw( name_field form ), :editor=>'name', :help=>args[:help]
-  end
 
-  view :edit_name, :perms=>:update do |args|
-    card.update_referencers = false
-    referers = card.extended_referencers
-    dependents = card.dependents
   
-    wrap_frame :edit_name, args do
-      card_form( path(:action=>:update, :id=>card.id), 'card-name-form card-editor', 'main-success'=>'REDIRECT' ) do |f|
-        @form = f
-        %{  
-          #{ _render_name_editor}  
-          #{ f.hidden_field :update_referencers, :class=>'update_referencers'   }
-          #{ hidden_field_tag :success, '_self'  }
-          #{ hidden_field_tag :old_name, card.name }
-          #{ hidden_field_tag :referers, referers.size }
-          <div class="confirm-rename hidden">
-            <h1>Are you sure you want to rename <em>#{card.name}</em>?</h1>
-            #{ %{ <h2>This change will...</h2> } 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? }
-            </ul>
-            #{ %{<p>You may choose to <em>ignore or update</em> the references.</p>} if referers.any? }  
-          </div>
-          <fieldset>
-            <div class="button-area">
-              #{ submit_tag 'Rename and Update', :class=>'renamer-updater hidden' }
-              #{ submit_tag 'Rename', :class=>'renamer' }
-              #{ button_tag 'Cancel', :class=>'edit-name-cancel-button slotter', :type=>'button', :href=>path(:view=>:edit, :id=>card.id)}
-            </div>
-          </fieldset>
-        }
-      end
-    end
+# FIELDSET VIEWS
+
+  view :name_fieldset do |args|
+    fieldset 'name', raw( name_field form ), :editor=>'name', :help=>args[:help]
   end
 
-  view :type_menu do |args|
-    field = if args[:variety] == :edit
+  view :type_fieldset do |args|
+    field = if args[:variety] == :edit #FIXME dislike this api -ef
       type_field :class=>'type-field edit-type-field'
     else
       type_field :class=>"type-field live-type-field", :href=>path(:view=>:new), 'data-remote'=>true
     end
     fieldset 'type', field, :editor => 'type', :attribs => { :class=>'type-fieldset'}
   end
-
-  view :edit_type, :perms=>:update do |args|
-    wrap_frame :edit_type, args do
-      card_form( :update, 'card-edit-type-form card-editor' ) do |f|
-        #'main-success'=>'REDIRECT: _self', # adding this back in would make main cards redirect on cardtype changes
-        %{ 
-          #{ hidden_field_tag :view, :edit }
-          #{if card.type_id == Card::CardtypeID and !Card.search(:type_id=>card.id).empty? #ENGLISH
-            %{<div>Sorry, you can't make this card anything other than a Cardtype so long as there are <strong>#{ card.name }</strong> cards.</div>}
-          else
-            _render_type_menu :variety=>:edit #FIXME dislike this api -ef
-          end}
-          <fieldset>
-            <div class="button-area">              
-              #{ submit_tag 'Submit', :disable_with=>'Submitting' }
-              #{ button_tag 'Cancel', :href=>path(:view=>:edit), :type=>'button', :class=>'edit-type-cancel-button slotter' }
-            </div>
-          </fieldset>
-        }
-      end
-    end
+  
+  
+  view :button_fieldset do |args|
+    %{
+      <fieldset>
+        <div class="button-area">
+          #{ args[:buttons] }
+        </div>
+      </fieldset>
+    }
+  end
+  
+  view :content_fieldsets do |args|
+    %{
+      <div class="card-editor editor">
+        #{ edit_slot args }
+      </div>
+    }
+  end
+  
+# FIELD VIEWS
+  
+  view :editor do |args|
+    form.text_area :content, :rows=>3, :class=>'tinymce-textarea card-content', :id=>unique_id
   end
 
-  view :edit_in_form, :perms=>:update, :tags=>:unknown_ok do |args|
+
+
+  view :edit_in_form, :perms=>:update, :tags=>:unknown_ok do |args| #fixme.  why is this a view??
     eform = form_for_multi
     content = content_field eform, args.merge( :nested=>true )
-    opts = { :editor=>'content', :help=>true, :attribs => 
+    opts = { :editor=>'content', :help=>true, :attribs =>
       { :class=> "card-editor RIGHT-#{ card.cardname.tag_name.safe_key }" }
     }
     if card.new_card?
@@ -314,10 +361,10 @@ format :html do
   view :options, :tags=>:unknown_ok do |args|
     current_set = Card.fetch( params[:current_set] || card.related_sets[0][0] )
 
-    wrap_frame :options, args do
+    frame args do
       %{
         #{ subformat( current_set ).render_content }
-        #{ 
+        #{
           if card.accountable? && !card.account
             %{
               <div class="new-account-link">
@@ -330,18 +377,23 @@ format :html do
       }
     end
   end
-  
-  
+
+
   view :related do |args|
     if rparams = params[:related]
       rcardname = rparams[:name].to_name.to_absolute_name( card.cardname)
       rcard = Card.fetch rcardname, :new=>{}
-      rview = rparams[:view] || :titled        
-      show = 'menu,help'
-      show += ',comment_box' if rparams[:name] == '+discussion' #fixme.  yuck!
 
-      wrap_frame :related, args do
-        process_inclusion rcard, :view=>rview, :show=>show
+      nest_args = {
+        :view          => ( rparams[:view] || :titled ),
+        :optional_help => :show,
+        :optional_menu => :show
+      }
+      
+      nest_args[:optional_comment_box] = :show if rparams[:name] == '+discussion' #fixme.  yuck!
+
+      frame args do
+        process_inclusion rcard, nest_args
       end
     end
   end
@@ -352,7 +404,7 @@ format :html do
     else
       setting = card.new_card? ? :add_help : :help
       setting = [ :add_help, { :fallback => :help } ] if setting == :add_help
-      
+
       if help_card = card.rule_card( *setting ) and help_card.ok? :read
         with_inclusion_mode :normal do
           _final_core args.merge( :structure=>help_card.name )
@@ -364,7 +416,7 @@ format :html do
 
   view :conflict, :error_code=>409 do |args|
     load_revisions
-    wrap :errors do |args|
+    wrap args.merge( :slot_class=>'error-view' ) do
       %{<strong>Conflict!</strong><span class="new-current-revision-id">#{@revision.id}</span>
         <div>#{ link_to_page @revision.creator.name } has also been making changes.</div>
         <div>Please examine below, resolve above, and re-submit.</div>
@@ -373,7 +425,7 @@ format :html do
   end
 
   view :change do |args|
-    wrap :change, args do
+    wrap args do
       %{
         #{ link_to_page card.name, nil, :class=>'change-card' }
         #{ _optional_render :menu, args, :hide }
@@ -387,7 +439,7 @@ format :html do
               when rev.created_at.to_s;  link_to('edited', path(:view=>:history), :class=>'last-edited', :rel=>'nofollow')
               else; 'updated'
             end} #{
-       
+
              time_ago_in_words card.updated_at } ago by #{ #ENGLISH
              link_to_page card.updater.name, nil, :class=>'last-editor'}
            </span>}
@@ -400,7 +452,7 @@ format :html do
   view :errors, :perms=>:none do |args|
     #Rails.logger.debug "errors #{args.inspect}, #{card.inspect}, #{caller[0..3]*", "}"
     if card.errors.any?
-      wrap :errors, args do
+      wrap args do
         %{ <h2>Problems #{%{ with <em>#{card.name}</em>} unless card.name.blank?}</h2> } +
         card.errors.map { |attrib, msg| "<div>#{attrib.to_s.upcase}: #{msg}</div>" } * ''
       end
@@ -414,8 +466,7 @@ format :html do
         #{link_to 'Sign Up', :controller=>'account', :action=>'signup'} to create it.
        </div>}
     end
-  
-    wrap_frame :notfound, args.merge(:title=>'Not Found', :optional_menu=>:never) do
+    frame args.merge(:title=>'Not Found', :optional_menu=>:never) do
       %{
         <h2>Could not find #{card.name.present? ? "<em>#{card.name}</em>" : 'that'}.</h2>
         #{sign_in_or_up_links}
@@ -429,11 +480,11 @@ format :html do
     else
       'to do that.'
     end
-    
+
     if !focal?
       %{<span class="denied"><!-- Sorry, you don't have permission #{to_task} --></span>}
     else
-      wrap_frame :denial, args do #ENGLISH below
+      frame args do #ENGLISH below
         message = case
         when task != :read && Wagn.config.read_only
           "We are currently in read-only mode.  Please try again later."
@@ -441,11 +492,11 @@ format :html do
           "You need permission #{to_task}"
         else
           or_signup = if Card.new(:type_id=>Card::AccountRequestID).ok? :create
-            "or #{ link_to 'sign up', wagn_url('account/signup') }"                    
+            "or #{ link_to 'sign up', wagn_url('new/:account_request') }"
           end
           "You have to #{ link_to 'sign in', wagn_url('account/signin') } #{or_signup} #{to_task}"
         end
-        
+
         %{<h1>Sorry!</h1>\n<div>#{ message }</div>}
       end
     end