wagn 1.14.4 → 1.14.5

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

@@ -0,0 +1,60 @@
+format :html do
+  
+  view :toggle do |args|
+    verb, adjective, direction = ( args[:toggle_mode] == :close ? %w{ open open e } : %w{ close closed s } )
+    
+    view_link '', adjective, :title => "#{verb} #{card.name}",
+      :class => "#{verb}-icon ui-icon ui-icon-circle-triangle-#{direction} toggler slotter nodblclick"
+  end
+    
+
+  view :header do |args|
+    %{
+      <h1 class="card-header">
+        #{ _optional_render :toggle, args, :hide }
+        #{ _optional_render :title, args }
+        #{ _optional_render :menu, args }
+      </h1>
+    }
+  end
+  
+  view :menu, :tags=>:unknown_ok do |args|
+    return _render_template_closer if args[:menu_hack] == :template_closer
+    disc_tagname = Card.fetch(:discussion, :skip_modules=>true).cardname
+    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,
+      :linkname     => card.cardname.url_key,
+      :type         => card.type_name,
+      :structure    => card.structure && card.template.ok?(:update) && card.template.name,
+      :discuss      => disc_card && disc_card.ok?( disc_card.new_card? ? :comment : :read ),
+      :piecenames   => card.junction? && card.cardname.piece_names[0..-2].map { |n| { :item=>n.to_s } },
+      :related_sets => card.related_sets.map { |name,label| { :text=>label, :path_opts=>{ :current_set => name } } }
+    }
+    if card.real?
+      @menu_vars.merge!({
+        :edit      => card.ok?(:update),
+        :account   => card.account && card.ok?(:update),
+        :watch     => Auth.signed_in? && render_watch,
+        :creator   => card.creator.name,
+        :updater   => card.updater.name,
+        :delete    => card.ok?(:delete) && link_to( 'delete', :action=>:delete,
+          :class => 'slotter standard-delete', :remote => true, :'data-confirm' => "Are you sure you want to delete #{card.name}?"
+        )
+      })
+    end
+
+    json = html_escape_except_quotes JSON( @menu_vars )
+    %{<span class="card-menu-link" data-menu-vars='#{json}'>#{_render_menu_link}</span>}
+  end
+
+  view :menu_link do |args|
+    '<a class="ui-icon ui-icon-gear"></a>'
+  end
+  
+
+  
+end

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

@@ -162,7 +162,7 @@ format :html do
       = "##{rev_nr}"
     .title
       .actor
-        = link_to act.actor.name, wagn_url( act.actor )
+        = link_to act.actor.name, wagn_url( act.actor.cardname.url_key )
       .time.timeago
         = time_ago_in_words(act.acted_at)
         ago
@@ -284,13 +284,13 @@ format :html do
     else
       toggled_view = :act_expanded
     end
-    link_to '', path(args.merge(:view=>toggled_view)), 
+    link_to '', args.merge(:view=>toggled_view), 
               :class=>"slotter revision-#{args[:act_id]} #{ args[:act_view]==:expanded ? "arrow-down" : "arrow-right"}", 
               :remote=>true
   end
   
   def show_or_hide_changes_link hide_diff, args
-    "| " +  link_to_view( (hide_diff ? "Show" : "Hide") + " changes", :act_expanded, 
+    "| " +  view_link( (hide_diff ? "Show" : "Hide") + " changes", :act_expanded, 
       :path_opts=>args.merge(:hide_diff=>!hide_diff), 
       :class=>'slotter', :remote=>true )
   end

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

@@ -0,0 +1,101 @@
+
+
+format do
+
+  # link is called by web_link, card_link, and view_link
+  # (and is overridden in other formats)
+  def link_to text, href, opts={}
+    if text and href != text
+      "#{text}[#{href}]"
+    else
+      href
+    end
+  end
+
+  # link to a specific url or path
+  def web_link href, opts={}
+    text = opts.delete(:text) || href
+    new_class = case href
+      when /^https?:/                      ; 'external-link'
+      when /^mailto:/                      ; 'email-link'
+      when /^([a-zA-Z][\-+\.a-zA-Z\d]*):/  ; $1 + '-link'
+      when /^\//
+        href = internal_url href[1..-1]    ; 'internal-link'
+      else
+        return card_link href, options
+      end
+    add_class opts, new_class        
+    link_to text, href, opts
+  end
+
+  # link to a specific card
+  def card_link name, opts={}
+    text = (opts.delete(:text) || name).to_name.to_show @context_names
+    
+    path_opts = opts.delete( :path_opts ) || {}
+    path_opts[:name ] = name
+    path_opts[:known] = opts[:known].nil? ? Card.known?(name) : opts.delete(:known) 
+    add_class opts, ( path_opts[:known] ? 'known-card' : 'wanted-card' )
+    link_to text, path_opts, opts
+  end
+
+
+  # link to a specific view (defaults to current card)
+  # this is generally used for ajax calls
+  def view_link text, view, opts={}
+    path_opts = opts.delete( :path_opts ) || {}
+    path_opts[:view] = view unless view == :home
+    opts[:remote] = true
+    opts[:rel] = 'nofollow'
+    
+    link_to text, path_opts, opts
+  end
+
+  def path opts={}
+    name = opts.delete(:name) || card.name
+    base = opts[:action] ? "card/#{ opts.delete :action }/" : ''
+    
+    opts[:no_id] = true if [:new, :create].member? opts[:action]
+    #generalize. dislike hardcoding views/actions here
+    
+    linkname = name.to_name.url_key
+    unless name.empty? || opts.delete(:no_id)
+      base += ( opts[:id] ? "~#{ opts.delete :id }" : linkname )
+    end
+    
+    opts[:card] = {}
+    opts[:card][:name] = name if opts.delete(:known)==false && name.present? && name.to_s != linkname
+    
+    if type = opts.delete(:type) and Card.known?( type )
+      opts[:card][:type] = type
+    end
+    opts.delete(:card) if opts[:card].empty?
+    
+    query = opts.empty? ? '' : "?#{opts.to_param}"
+    internal_url( base + query )
+  end
+
+  def internal_url relative_path
+    wagn_path relative_path
+  end
+  
+end
+
+format :html do
+  
+  
+  def link_to text, href, opts={}
+    if Hash===href
+      href = path href
+    end
+
+    [:remote, :method].each do |key|
+      if val = opts.delete(key)
+        opts["data-#{key}"] = val
+      end
+    end
+    
+    content_tag :a, raw(text), opts.merge(:href=>href)
+  end
+  
+end

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

@@ -56,7 +56,7 @@ format :html do
   end
 
   view :title_link do |args|
-    link_to_page (args[:title_ready] || showname(args[:title]) ), card.name
+    card_link card.cardname, :text=>( args[:title_ready] || showname(args[:title]) )
   end
 
   view :open, :tags=>:comment do |args|
@@ -69,25 +69,7 @@ format :html do
     end
   end
 
-  view :toggle do |args|
-    verb, adjective, direction = ( args[:toggle_mode] == :close ? %w{ open open e } : %w{ close closed s } )
-    
-    link_to '', path( :view=>adjective ), 
-      :remote => true,
-      :title => "#{verb} #{card.name}",
-      :class => "#{verb}-icon ui-icon ui-icon-circle-triangle-#{direction} toggler slotter nodblclick"
-  end
-    
-
-  view :header do |args|
-    %{
-      <h1 class="card-header">
-        #{ _optional_render :toggle, args, :hide }
-        #{ _optional_render :title, args }
-        #{ _optional_render :menu, args }
-      </h1>
-    }
-  end
+  
   
 =begin  
   view :anchor, :perms=>:none, :tags=>:unknown_ok do |args|
@@ -95,47 +77,10 @@ format :html do
   end
 =end  
 
-  view :menu, :tags=>:unknown_ok do |args|
-    return _render_template_closer if args[:menu_hack] == :template_closer
-    disc_tagname = Card.fetch(:discussion, :skip_modules=>true).cardname
-    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,
-      :linkname     => card.cardname.url_key,
-      :type         => card.type_name,
-      :structure    => card.structure && card.template.ok?(:update) && card.template.name,
-      :discuss      => disc_card && disc_card.ok?( disc_card.new_card? ? :comment : :read ),
-      :piecenames   => card.junction? && card.cardname.piece_names[0..-2].map { |n| { :item=>n.to_s } },
-      :related_sets => card.related_sets.map { |name,label| { :text=>label, :path_opts=>{ :current_set => name } } }
-    }
-    if card.real?
-      @menu_vars.merge!({
-        :edit      => card.ok?(:update),
-        :account   => card.account && card.ok?(:update),
-        :watch     => Auth.signed_in? && render_watch,
-        :creator   => card.creator.name,
-        :updater   => card.updater.name,
-        :delete    => card.ok?(:delete) && link_to( 'delete', path(:action=>:delete),
-          :class => 'slotter standard-delete', :remote => true, :'data-confirm' => "Are you sure you want to delete #{card.name}?"
-        )
-      })
-    end
-
-    json = html_escape_except_quotes JSON( @menu_vars )
-    %{<span class="card-menu-link" data-menu-vars='#{json}'>#{_render_menu_link}</span>}
-  end
-
-  view :menu_link do |args|
-    '<a class="ui-icon ui-icon-gear"></a>'
-  end
-
   view :type do |args|
     klasses = ['cardtype']
     klass = args[:type_class] and klasses << klass
-    link_to_page card.type_name, nil, :class=>klasses
+    card_link card.type_card.name, :class=>klasses
   end
 
   view :closed do |args|
@@ -145,227 +90,17 @@ format :html do
   end
 
 
-  ###---( TOP_LEVEL (used by menu) NEW / EDIT VIEWS )
-
-  view :new, :perms=>:create, :tags=>:unknown_ok do |args|
-    frame_and_form :create, args, 'main-success'=>'REDIRECT' do
-      [
-        _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
-
-    
-    # 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
-      hidden[:card][:type_id] ||= card.type_id
-      args[:optional_type_fieldset] = :hide
-    end
-
-
-    cancel = if main?
-      { :class=>'redirecter', :href=>Card.path_setting('/*previous') }
-    else
-      { :class=>'slotter',    :href=>path( :view=>:missing         ) }
-    end
-    
-    args[:buttons] ||= %{
-      #{ button_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
-      [
-        _optional_render( :content_fieldsets, args ),
-        _optional_render( :button_fieldset,   args )
-      ]
-    end
-  end
-
-  def default_edit_args args
-    args[:optional_help] = :show
-    
-    args[:buttons] = %{
-      #{ button_tag 'Submit', :class=>'submit-button', :disable_with=>'Submitting' }
-      #{ 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
+  view :change do |args|
+    args[:optional_title_link] = :show
     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
-
-  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] = %{
-      #{ button_tag 'Rename and Update', :disable_with=>'Renaming', :class=>'renamer-updater' }
-      #{ button_tag 'Rename',            :disable_with=>'Renaming', :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 )
+        _optional_render( :title, args       ),
+        _optional_render( :menu, args, :hide ),
+        _optional_render( :last_action, args )
       ]
     end
   end
 
-  def default_edit_type_args args
-    args[:variety] = :edit #YUCK!
-    args[:hidden] ||= { :view=>:edit }
-    args[:buttons] = %{
-      #{ button_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  # should this be moved into ok_view?
-    new_args = { :view=>:new, 'card[name]'=>card.name }
-    new_args['card[type]'] = args[:type] if args[:type]
-
-    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
-  end
-
-  view :closed_missing, :perms=>:none do |args|
-    %{<span class="faint"> #{ showname } </span>}
-  end
-
-
-
-  
-# FIELDSET VIEWS
-
-  view :name_fieldset do |args|
-    fieldset 'name', raw( name_field form ), :editor=>'name', :help=>args[:help]
-  end
-
-  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 :button_fieldset do |args|
-    %{
-      <fieldset>
-        <div class="button-area">
-          #{ args[:buttons] }
-        </div>
-      </fieldset>
-    }
-  end
-  
-  view :content_fieldsets do |args|
-    raw %{
-      <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|
-    eform = form_for_multi
-    content = content_field eform, args.merge( :nested=>true )
-    opts = { :editor=>'content', :help=>true, :attribs =>
-      { :class=> "card-editor RIGHT-#{ card.cardname.tag_name.safe_key }" }
-    }
-    if card.new_card?
-      content += raw( "\n #{ eform.hidden_field :type_id }" )
-    else
-      opts[:attribs].merge! :card_id=>card.id, :card_name=>(h card.name)
-    end
-    
-    fieldset fancy_title( args[:title] ), content, opts
-  end
-
-
-
   view :options, :tags=>:unknown_ok do |args|
     current_set = Card.fetch( params[:current_set] || card.related_sets[0][0] )
 
@@ -394,7 +129,7 @@ format :html do
       end
     end
   end
-
+  
   view :help, :tags=>:unknown_ok do |args|
     text = if args[:help_text]
       args[:help_text]
@@ -410,56 +145,6 @@ format :html do
     %{<div class="instruction">#{raw text}</div>} if text
   end
 
-  view :message, :perms=>:none, :tags=>:unknown_ok do |args|
-    frame args do
-      params[:message]
-    end
-  end
-
-  view :conflict, :error_code=>409 do |args|
-    # FIXME: hack to get the conflicted update as a proper act for the diff view
-    card.current_act.save
-    action = card.actions.last  # the unsaved action with the new changes
-    action.card_act_id = card.current_act.id
-    action.draft = true
-    action.save
-    card.store_changes  # deletes action if there are no changes 
-
-    # as a consequence card.current_act.actions can be empty when both users made exactly the same changes
-    # but an act is always supposed to have at least one action, so we have to delete the act to avoid bad things
-    card.current_act.reload
-    if card.current_act.actions.empty?
-      card.current_act.delete
-      card.current_act = nil
-    end
-
-    wrap args.merge( :slot_class=>'error-view' ) do  #ENGLISH below
-      %{<strong>Conflict!</strong><span class="new-current-revision-id">#{card.last_action_id}</span>
-        <div>#{ link_to_page card.last_action.act.actor.name } has also been making changes.</div>
-        <div>Please examine below, resolve above, and re-submit.</div>
-        #{ wrap do |args| 
-            if card.current_act
-              _render_act_expanded :act=>card.current_act, :current_rev_nr => 0 
-            else
-              "No difference between your changes and #{card.last_action.act.actor.name}'s version."
-            end 
-          end
-         } 
-      }
-    end
-  end
-
-  view :change do |args|
-    args[:optional_title_link] = :show
-    wrap args do
-      [
-        _optional_render( :title, args       ),
-        _optional_render( :menu, args, :hide ),
-        _optional_render( :last_action, args )
-      ]
-    end
-  end
-  
   
   view :last_action do |args|
     action_type = case ( action = card.last_act.action_on(card.id) and action.action_type )
@@ -477,77 +162,14 @@ format :html do
       </span> 
     }
   end
-          
-  view :errors, :perms=>:none do |args|
-    if card.errors.any?
-      title = %{ Problems #{%{ with #{card.name} } unless card.name.blank?} }
-      frame args.merge( :title=>title ) do
-        card.errors.map do |attrib, msg|
-          msg = "#{attrib.to_s.upcase}: #{msg}" unless attrib == :abort
-          %{ <div class="card-error-msg">#{msg}</div> }
-        end
-      end
-    end
-  end
-
-  view :not_found do |args| #ug.  bad name.
-    sign_in_or_up_links = if !Auth.signed_in?
-      %{<div>
-        #{link_to "Sign in", wagn_path(':signin') } or
-        #{link_to 'Sign up', wagn_path('account/signup') } to create it.
-       </div>}
-    end
-    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}
-      }
-    end
-  end
-
-  view :denial do |args|
-    to_task = if task = args[:denied_task]
-      %{to #{task} this.}
-    else
-      'to do that.'
-    end
-
-    if !focal?
-      %{<span class="denied"><!-- Sorry, you don't have permission #{to_task} --></span>}
-    else
-      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."
-        when Auth.signed_in?
-          "You need permission #{to_task}"
-        else
-          or_signup = if Card.new(:type_id=>Card::SignupID).ok? :create
-            "or #{ link_to 'sign up', wagn_url('account/signup') }"
-          end
-          save_interrupted_action(request.env['REQUEST_URI'])
-          "You have to #{ link_to 'sign in', wagn_url(':signin') } #{or_signup} #{to_task}"
-        end
-
-        %{<h1>Sorry!</h1>\n<div>#{ message }</div>}
-      end
-    end
-  end
+  
 
+  
+  private
 
-  view :server_error do |args|
-    %{
-    <body>
-      <div class="dialog">
-        <h1>Wagn Hitch :(</h1>
-        <p>Server Error. Yuck, sorry about that.</p>
-        <p><a href="http://www.wagn.org/new/Support_Ticket">Add a support ticket</a>
-            to tell us more and follow the fix.</p>
-      </div>
-    </body>
-    }
+  def fancy_title title=nil
+    raw %{<span class="card-title">#{ showname(title).to_name.parts.join %{<span class="joint">+</span>} }</span>}
   end
-
 end