Changeset 196

Show
Ignore:
Timestamp:
12/31/05 13:18:38 (3 years ago)
Author:
lazyatom
Message:

Added {{title}} syntax to include other wiki pages

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • wiki_engine/branches/JGA-entry_version_back_to_version/app/models/version.rb

    r191 r196  
    11class Version < ActiveRecord::Base 
    22  PAGE_LINK = /\[\[([^\]|]*)[|]?([^\]]*)\]\]/ 
     3  INCLUDE_LINK = /\{\{([^\}]*)\}\}/ 
    34   
    45  belongs_to :book 
  • wiki_engine/branches/JGA-entry_version_back_to_version/lib/redcloth_i2.rb

    r189 r196  
    88    @existing_wiki_pages = existing_wiki_pages 
    99    @rails_helper = rails_helper 
    10     #breakpoint 
    1110  end 
    1211 
     
    2726  end 
    2827 
     28  def refs_insert_wiki_subpages(text) 
     29    text.gsub!(Version::INCLUDE_LINK) do 
     30      title = $1 
     31      page = Page.find_by_title(title) 
     32      create_link = @rails_helper.content_tag("span", title + @rails_helper.link_to("?", @rails_helper.page_url(:page_title => title)), :class => "newWikiWord") 
     33      page ? (RedClothI2.new(page.body, @existing_wiki_pages, @rails_helper).to_html()) : "{<i>#{create_link}.</i>}" 
     34    end 
     35  end 
     36 
    2937  def to_html 
    30     super(:refs_auto_link, :refs_insert_wiki_links, *DEFAULT_RULES) 
     38    super(:refs_insert_wiki_subpages, :refs_auto_link, :refs_insert_wiki_links, *DEFAULT_RULES) 
    3139  end 
    3240