Wiki2Go 1.14.4 → 1.15.0

data/lib/Wiki2Go/Web.rb

@@ -22,14 +22,19 @@ module Wiki2Go
     attr_accessor :script_extension
     # directory containing scripts
     attr_accessor :script_prefix
+    # CGI/Webrick request
+    attr_reader   :request
+    # subdirectory where to find the wiki
+    attr_accessor :subsite
     
     MARKER = "#-#"
 
-    def initialize(server,port,before,verb,web,page,request=nil)
+    def initialize(server,port,subsite,before,verb,web,page,request=nil)
       @name = Web.clean(web)
       @current_page = Web.clean(page)
       @server = server
       @port = port
+      @subsite = Web.clean(subsite)
 
       @verb = verb
       @script_extension = Web.extension_of(verb)
@@ -41,7 +46,7 @@ module Wiki2Go
     end
 
     def clone
-      return Web.new(@server,@port,@script_prefix,@verb,@name,@current_page,@request)
+      return Web.new(@server,@port,@subsite,@script_prefix,@verb,@name,@current_page,@request)
     end
 
     def user
@@ -76,6 +81,10 @@ module Wiki2Go
       else
         url = "http://#{@server}:#{@port}/"
       end
+      if !@subsite.empty? then
+        url += @subsite + '/' 
+      end
+      url
     end
 
     def path
@@ -86,27 +95,27 @@ module Wiki2Go
       end
     end
 
-    def Web.page_url(server,port,url,verb,multiwiki=true)
-      before,verb,web,page = Web.parse_url(url,verb,multiwiki)
+    def Web.page_url(server,port,url,verb,config)
+      before,verb,web,page = Web.parse_url(url,verb,config)
       if !web.nil? && !page.nil? then
-        return Web.new(server,port,before,verb,web,page)
+        return Web.new(server,port,'',before,verb,web,page)
       else
-        return Web.new(server,port,before,verb,"Wiki2go","Frontpage")
+        return Web.new(server,port,'',before,verb,"Wiki2go","Frontpage")
       end
     end
 
-    def Web.from_page_url(url,verb)
+    def Web.from_page_url(url,verb,config)
       uri = URI::parse(url)
-      return Web.page_url(uri.host,uri.port,uri.path,verb)
+      return Web.page_url(uri.host,uri.port,uri.path,verb,config)
     end
 
 
-    def Web.from_request(request,multiwiki)
+    def Web.from_request(request,config)
       server = request.host
       port   = request.port
-      before,verb = Web.parse_scriptpath(request.server_variable['SCRIPT_NAME'])
-      web,page = Web.parse_path(request.path,multiwiki)
-      web = Web.new(server,port,before,verb,web,page,request)
+      before,verb = Web.parse_scriptpath(request.server_variable['SCRIPT_NAME'],config)
+      web,page = Web.parse_path(request.path,config.multi_wiki)
+      web = Web.new(server,port,config.subsite,before,verb,web,page,request)
       return web
     end
 
@@ -135,9 +144,9 @@ module Wiki2Go
 
     private
 
-    def Web.parse_url(path,verb,multiwiki)
+    def Web.parse_url(path,verb,config)
       scriptprefix , webpath = path.split(verb)
-      web, name = parse_path(webpath,multiwiki)
+      web, name = parse_path(webpath,config.multi_wiki)
       return scriptprefix , verb, web, name
     end
 
@@ -159,10 +168,15 @@ module Wiki2Go
       end
     end
 
-    def Web.parse_scriptpath(path)
+    def Web.parse_scriptpath(path,config)
+      if !config.subsite.nil? && !config.subsite.empty? then
+        if path =~ /^#{config.subsite}(.*)$/ then
+          path = $1
+        end
+      end
       if path =~ /\// then
-        path =~ /^(.*)(\/+)([^\/]*)$/
-        return $1,$3
+          path =~ /^(.*)(\/+)([^\/]*)$/
+          return $1,$3
       else
         return "",path
       end

data/lib/Wiki2Go/Wiki2Go.rb

@@ -13,6 +13,7 @@ module Wiki2Go
     end
 
     def view(web)
+      @config.log("Wiki2Go view #{web.inspect}")
       html = @config.redirect_to_html?(web)
       formatter = Wiki2Go::Formatter.new(web,@config.storage,@config,html,@config.editable?(web))
 
@@ -90,7 +91,7 @@ module Wiki2Go
       if changed then
         if @config.accept_page?(web,new_content) then
           @config.save(web,new_content)
-          changes = @config.storage.read_changes_in(web.name,20,true)
+          changes = @config.storage.read_changes_in(web.name,20)
           save_rss(web,changes)
           if @config.generate_html then
             if newfile then
@@ -110,14 +111,16 @@ module Wiki2Go
 
     def upload(web,name,content)
       if name.empty? || content.nil? then
-        view(web)
+        html = @config.redirect_to_html?(web)
+        formatter = Wiki2Go::Formatter.new(web,@config.storage,@config,html,@config.editable?(web))
+        return formatter.absolute_url
       else
         @config.storage.store_web_file(web.name,name,content) 
         page = @config.storage.load_page(web.name,web.current_page)
+        web.title = page.name
         text = page.content 
         text += "\n---\n{#{name}}"
-        save(web,text)
-        view(web)
+        return save(web,text)
       end
     end
 
@@ -125,7 +128,7 @@ module Wiki2Go
       html = @config.redirect_to_html?(web)
       formatter = Wiki2Go::Formatter.new(web,@config.storage,@config,html,@config.editable?(web))
 
-      topics = @config.storage.read_changes_in(web.name,20,false) 
+      topics = @config.storage.read_changes_in(web.name,20) 
       template = @config.storage.load_template(web.name,"pagelist.htm")
 
       return formatter.format_pagelist_in_template(template,topics,"","Recent Changes") 
@@ -154,7 +157,7 @@ module Wiki2Go
         end  
       end
       if any_changes then
-        changes = @config.storage.read_changes_in(web.name,20,true)
+        changes = @config.storage.read_changes_in(web.name,20)
         save_rss(web,changes)      
       end
       return changes(web)
@@ -179,10 +182,9 @@ module Wiki2Go
         report << "<li>#{file}</li>\r\n"
         pageweb = @config.static_web(web)
         pageweb.current_page = file
-#        pageweb = Wiki2Go::Web.new(web.server,web.port,web.script_prefix,"view",web.name,file)
         save_html(pageweb)
       end
-      changes = @config.storage.read_changes_in(web.name,20,true)
+      changes = @config.storage.read_changes_in(web.name,20)
       save_rss(web,changes)
       report << "</ul>\r\n"
       return report.join
@@ -190,7 +192,10 @@ module Wiki2Go
 
     def admin(request)
 
-      wikiweb = Wiki2Go::Web.from_request(request,false) 
+      old_config = @config.multi_wiki 
+      @config.multi_wiki = false
+      wikiweb = Wiki2Go::Web.from_request(request,@config) 
+      @config.multi_wiki = old_config
 
       template_name = wikiweb.current_page
       if template_name.nil? || template_name.empty?
@@ -205,22 +210,61 @@ module Wiki2Go
       erb.add_field(:@request,request)
       erb.add_field(:@config,@config)
       erb.add_field(:@web,wikiweb)
-      result = erb.execute master
+      result = erb.execute master,0
 
     end
 
+    def perform(web,request)
+
+      @config.log("Wiki2Go perform #{web.inspect}")
+
+      if @config.allow_dynamic_pages then
+        html = @config.redirect_to_html?(web)
+        formatter = Wiki2Go::Formatter.new(web,@config.storage,@config,html,@config.editable?(web))
+
+        text = @config.storage.load_page(web.name,web.current_page)        
+
+        erb = Web2Go::ERB_Interpreter.new
+        erb.add_field(:@config,@config)
+        erb.add_field(:@web,web)
+        erb.add_field(:@request,request)
+
+        script = text.lines.join
+        output = erb.execute(script,1)
+        text.lines = output.split($/).collect {|line| line + $/ }
+
+        template = @config.storage.load_template(web.name,"view.htm")
+
+        return formatter.format_page_in_template(template,text)
+      else
+        view(web)
+      end 
+    end
+
     private
 
     def save_rss(web,changes)
       rss = generate_rss(web,changes)
       @config.storage.store_web_file(web.name,"rss.xml",rss)
+      save_changes(web,changes)
+    end
+
+    def save_changes(web,changes)
+      if @config.generate_html then
+        html = true
+        formatter = Wiki2Go::Formatter.new(web,@config.storage,@config,html,@config.editable?(web))
+
+        template = @config.storage.load_template(web.name,"pagelist.htm")
+
+        content = formatter.format_pagelist_in_template(template,changes,"","Recent Changes") 
+        @config.storage.save_html(web.name,'recent_changes',content)
+      end
     end
 
     def save_html(web)
       @config.log("Save html for #{web.inspect}")
       if @config.generate_html then
         static_web = @config.static_web(web)
-        @config.log("Save html for static #{static_web.inspect}")
         @config.storage.save_html(static_web.name,static_web.current_page, view_html(static_web))
       end
     end
@@ -231,9 +275,10 @@ module Wiki2Go
       files = @config.storage.search(web.name,pagename)
       files << @config.storage.load_page(web.name,pagename)
       files.each do |file|
-        @config.log("Generating HTML for #{file.title}")
-        pageweb = Wiki2Go::Web.new(web.server,web.port,web.script_prefix,"view",web.name,file.title)
+        pageweb = @config.static_web(web)
+        pageweb.current_page = file.title
         static_web = @config.static_web(pageweb)
+        @config.log("Generating HTML for #{file.title}, web = #{static_web.inspect}")
         @config.storage.save_html(static_web.name,static_web.current_page, view_html_of_page(static_web,file))
       end
     end
@@ -241,7 +286,6 @@ module Wiki2Go
     def view_html_of_page(web,text)
       html = true
       editable = @config.editable?(web)
-      web = @config.static_web(web)
       formatter = Wiki2Go::Formatter.new(web,@config.storage,@config,html,editable)
 
       template = @config.storage.load_template(web.name,"view.htm")
@@ -255,7 +299,7 @@ module Wiki2Go
 
       template = @config.storage.load_template(web.name,"view.htm")
 
-      page = Wiki2Go::Page.new("Report",text,"system",Time.now,"Report")
+      page = Wiki2Go::Page.new("Report",text,"system",Time.now,Time.now,"Report")
       return formatter.format_page_in_template(template,page) 
     end
 

data/lib/Wiki2Go/Wiki2GoConfig.rb

@@ -19,7 +19,10 @@ module Wiki2Go
     attr_accessor :debug
     attr_accessor :multi_wiki
     attr_accessor :site_admin
-
+    attr_accessor :amazon_affiliate
+    attr_accessor :allow_dynamic_pages
+    attr_accessor :subsite
+    
     def initialize(directory=nil)
       directory ||= Dir.getwd
 
@@ -36,6 +39,9 @@ module Wiki2Go
       @debug         = false
       @multi_wiki    = true
       @site_admin    = 'wiki2go@nayima.be'
+      @amazon_affiliate = 'agilesystems-21'
+      @allow_dynamic_pages = false
+      @subsite             = ''
     end  
 
     def storage
@@ -64,11 +70,11 @@ module Wiki2Go
     end
 
     def logfile
-      File.join( @root_directory,'wiki.log')
+      File.join( @root_directory,'logs','wiki.log')
     end
 
     def default_wiki
-      return Wiki2Go::Web.new(@server,@port.to_s,"","view",(@multi_wiki ? @default_web : ''),@default_page)
+      return Wiki2Go::Web.new(@server,@port.to_s,'','','view',(@multi_wiki ? @default_web : ''),@default_page)
     end
 
     def editable?(web)
@@ -82,7 +88,7 @@ module Wiki2Go
     def static_web(web) 
       server = web.server.gsub(/^edit\./,"www.")
       script_prefix = web.script_prefix.gsub(/\/secure/,"")
-      return Wiki2Go::Web.new(server,web.port,script_prefix,web.verb,web.name,web.current_page)
+      return Wiki2Go::Web.new(server,web.port,@subsite,script_prefix,web.verb,web.name,web.current_page)
     end
 
     def accept_page?(web,content)

data/lib/Wiki2Go/Wiki2GoServlet.rb

@@ -26,7 +26,19 @@ module Wiki2Go
       wiki = Wiki2Go::Wiki.new(@config)
 
       res.content_type = 'text/html'
-      res.body = wiki.view(wikiweb)
+      if @config.allow_dynamic_pages && wikiweb.current_page =~ /\.rbl$/i then
+         res.body = wiki.perform(wikiweb,req)
+      else
+        res.body = wiki.view(wikiweb)
+      end
+      true
+    end
+
+    def perform_perform(req,res,wikiweb)
+      wiki = Wiki2Go::Wiki.new(@config)
+
+      res.content_type = 'text/html'
+      res.body = wiki.perform(wikiweb,req)
       true
     end
 
@@ -139,15 +151,17 @@ module Wiki2Go
       uploaded_file = req.uploaded_file('FILE')
       wiki = Wiki2Go::Wiki.new(@config)
 
+      redirect_to = wiki.upload(wikiweb,uploaded_file.filename,uploaded_file.content) 
+      res.redirect_to = redirect_to
       res.content_type = "text/html"
-      res.body = wiki.upload(wikiweb,uploaded_file.filename,uploaded_file.content)
+      res.body = "Redirect to #{redirect_to}"
       true
     end
 
     private
 
     def execute_command(req,res)
-      wikiweb = Wiki2Go::Web.from_request(req,@config.multi_wiki)
+      wikiweb = Wiki2Go::Web.from_request(req,@config)
       @config.log("WIKI Web = #{wikiweb.inspect}")
       command = wikiweb.verb
       if command =~ /^([^\.]+)\./ then
@@ -175,7 +189,7 @@ module Wiki2Go
         author = cookie.value unless cookie.nil?
 
         if !author.nil? && author.length > 0 then #  !wikiweb.secure &&
-          wikiweb.alias = author
+          wikiweb.alias = author[0]
         end
 
         result = self.send(method,req,res,wikiweb)

data/lib/Wiki2Go/WikiFormatter.rb

@@ -30,6 +30,8 @@ module Wiki2Go
 
   class Formatter
 
+    attr_reader :config
+
     def initialize(web,storage,config,generate_html,editable)
       @web = web
       @storage = storage
@@ -40,6 +42,7 @@ module Wiki2Go
       @post_line = ""
       @generate_html = generate_html
       @editable      = editable
+      @absolute_urls = false
     end
 
     public
@@ -75,6 +78,7 @@ module Wiki2Go
       result = format_page_content(content)
       emit_bullets
       result += @pre_line
+      @pre_line = ''
       return format_empty_lines(result)
     end
 
@@ -93,6 +97,10 @@ module Wiki2Go
 
     def generate_rss(template,changes)
 
+      # RSS must contain absolute URLs because some feedreaders don't honor the relative
+      #  URLs to the content of the <link> tag
+      @absolute_urls = true
+      
       template_after_items = <<-END_OF_AFTER_ITEMS_XML
       </channel>
       </rss>
@@ -103,7 +111,7 @@ module Wiki2Go
       changes.each do |page| 
         items = items + <<-END_OF_ITEMS
         <item>
-        <title>#{page.name}</title>
+        <title>#{CGI::escapeHTML(page.name)}</title>
         <author>#{page.alias}</author>
         <pubDate>#{page.lastmodified.strftime("%d %B %Y %H:%M GMT")}</pubDate>
         <link>#{absolute_url_of_topic(page.title)}</link>
@@ -183,13 +191,27 @@ module Wiki2Go
     end
 
     def changes_url
-      return join(@web.script_prefix,'changes'+@web.script_extension,@web.name)
+      if @generate_html then 
+        return join(@web.name,'recent_changes.html') 
+      else
+        return join(@web.script_prefix,'changes'+@web.script_extension,@web.name)
+      end
     end
 
     def changes_link(desc)
       return "<a href=\"#{changes_url}\">#{desc}</a>"
     end
 
+     def view_url(subwiki,page)
+      if @generate_html then 
+        return join(subwiki,page + ".html") 
+      else
+        return join(@web.script_prefix,"view" + @web.script_extension,subwiki,page)
+      end
+    end
+
+    
+
     def view_link(subwiki,page,name)
       if subwiki == @web.name then
         return "<a href=\"#{view_url(subwiki,page)}\">#{name}</a>"
@@ -198,6 +220,19 @@ module Wiki2Go
       end
     end
 
+    def perform_link(subwiki,page,name)
+      if @storage.exists(File.join(subwiki,page)) then
+        url = join(@web.script_prefix,"view" + @web.script_extension,subwiki,page)
+        if subwiki == @web.name then
+          return "<a href=\"#{url}\">#{name}</a>"
+        else
+          return "<a href=\"#{url}\">#{subwiki}:#{name}</a>"
+        end
+      else 
+        return edit_link(subwiki,page,name)
+      end
+    end
+    
     def view_version_link(subwiki,page,name,parameters=nil)
       return "<a href=\"#{view_version_url(subwiki,page)+query_string(parameters)}\">#{name}</a>"
     end
@@ -239,16 +274,13 @@ module Wiki2Go
 
     end
 
-    def view_url(subwiki,page)
-      if @generate_html then 
-        return join(subwiki,page + ".html") 
-      else
-        return join(@web.script_prefix,"view" + @web.script_extension,subwiki,page)
-      end
-    end
 
     def resource_url(name)
-      File.join('html',@web.name,name)
+      if @absolute_urls then
+        File.join(@web.base_url,'html',@web.name,name)
+      else
+        File.join('html',@web.name,name)
+      end
     end
 
     def encode_mail_to(addr) 
@@ -261,7 +293,7 @@ module Wiki2Go
     end
 
     alias :encodeMailTo :encode_mail_to
-    
+
     private
 
     def evaluate(erb,current)
@@ -286,7 +318,7 @@ module Wiki2Go
       end
       result
     end
-    
+
     def format_page_content(content)
       if content.length == 0 then
         return ''
@@ -296,6 +328,9 @@ module Wiki2Go
       elsif content =~ /^(.*)(<pre>(.*)<\/pre>)(.*)$/im then
         before,match,after = $1,$2,$4
         return append(format_page_content(before),match,format_page_content(after))
+      elsif content =~ /^(.*)\{\{\!(.*)\!\}\}(.*)$/im then
+        before,match,after = $1,$2,$3
+        return append(format_page_content(before),match,format_page_content(after))
       else
         result = ''
         lines = content.split($/)
@@ -351,16 +386,22 @@ module Wiki2Go
     end     
 
     def format_wiki_markup(line)
-      if line =~ /^(.*)<(\S.*)\>(.*)$/ then
+      if line =~ /^(.*)\{\!(.*)\!\}(.*)$/im then
+        before,match,after = $1,$2,$3
+        return append(format_wiki_markup(before),match,format_wiki_markup(after))
+      elsif line =~ /^(.*)<(\S.*)\>(.*)$/ then
         before,match,after = $1,$2,$3
         line =  append(format_wiki_markup(before),escape_url_markers(format_tag(match)),format_wiki_markup(after))
+      elsif line =~ /^(.*)\{\%([^\}]*)\%\}(.*)$/ then
+        before,match,after = $1,$2,$3
+        line = append(format_wiki_markup(before),escape_url_markers(format_dynamic_link(match)),format_wiki_markup(after))
       elsif line =~ /^(.*)\{([^\}]*)\}(.*)$/ then
         before,match,after = $1,$2,$3
         line = append(format_wiki_markup(before),escape_url_markers(format_forced_link(match)),format_wiki_markup(after))
       elsif line =~ /^(.*)\%([^\%]*)\%(.*)$/ then
         before,match,after = $1,$2,$3
         line = append(format_wiki_markup(before),escape_url_markers(format_forced_link(match)),format_wiki_markup(after))
-      elsif line =~ /^(.*)((http|ftp|gopher|news|https)\:(\w|\/|\.|_|-|\?|\=|&|;|\~|#|,)+)(.*)$/ then
+      elsif line =~ /^(.*)((http|ftp|gopher|news|https)\:\/\/(\w|\/|\.|_|-|\?|\=|&|;|\~|#|,)+)(.*)$/ then
         before,match,after = $1,$2,$5
         line = append(format_wiki_markup(before),escape_url_markers(external_link(match)),format_wiki_markup(after))
       elsif line =~ /^(.*)mailto\:([a-zA-Z0-9\-\_\.]+@[a-zA-Z0-9\-\_\.]+)(.*)$/ then
@@ -397,7 +438,7 @@ module Wiki2Go
       line = line.gsub(/\{\{/,"&openingbrace;")
       line = line.gsub(/\}\}/,"&closingbrace;")
     end
-    
+
     def escape_url_markers(line)
       line = line.gsub(/%/ ,'&percent;')
       line = line.gsub(/\{/,'&openingbrace;')
@@ -418,7 +459,7 @@ module Wiki2Go
       return line
     end
 
-    
+
     def format_brackets(line)
       line = line.gsub(/</,"&lt\;") ;
       line = line.gsub(/>/,"&gt\;") ;
@@ -440,7 +481,6 @@ module Wiki2Go
       line = line.gsub(/\*([^\*]+)\*/,"<STRONG>\\1<\/STRONG>")
       line = line.gsub(/\b_([^_]*)_/,"<EM>\\1<\/EM>")
       line = line.gsub(/^---+/,"<hr>")
-#      line = line.gsub(/^\s*$/,"\n<p>")
       return line
     end
 
@@ -489,12 +529,16 @@ module Wiki2Go
     end      
 
     def format_forced_link(link)
-       if ! link.gsub!(/^([^%@]+)@(http[^%]+)$/) { labelLink($1,$2) } then
-         link.gsub!(/^(([^\%@]+)@)?(([^\%:]+):)?([^%]+)$/) { mega_link($2,$4,$5,@web.name) }
-       end
-       link
+      if ! link.gsub!(/^([^%@]+)@(http[^%]+)$/) { labelLink($1,$2) } then
+        link.gsub!(/^(([^\%@]+)@)?(([^\%:]+):)?([^%]+)$/) { mega_link($2,$4,$5,@web.name) }
+      end
+      link
     end
-    
+
+    def format_dynamic_link(link)
+      return link.gsub(/^(([^\%@]+)@)?(([^\%:]+):)?([^%]+)$/) { dynamic_link($2,$4,$5,@web.name) }
+    end
+
     def labelLink(label,url)
       return redirect_link(label,url)
     end
@@ -509,6 +553,12 @@ module Wiki2Go
       internalSubwikiNamedLink(subwiki,page,name)
     end
 
+    def dynamic_link(name,subwiki,page,default_wiki)
+      name = page if name.nil? || name.empty?
+      subwiki = default_wiki if subwiki.nil? || subwiki.empty?
+      perform_link(subwiki,page+'.rbl',name)
+    end
+
     def internalSubwikiNamedLink(subwiki,page,name)
       if subwiki == "xpnl" then
         return "<a href=\"http://www.xpnl.org/Wiki/#{page}\" target=\"_blank\">xpnl:#{page}</a>"
@@ -522,10 +572,10 @@ module Wiki2Go
         return "<a href=\"http://wiki2go.nayima.be/Wiki2Go/#{page}.html\" target=\"_blank\">wiki2go:#{page}</a>"
       elsif subwiki =~ /^isbn$/i then
         name = "ISBN " + page if page == name
-        return "<a href=\"http://www.amazon.co.uk/exec/obidos/ASIN/#{page}/agilesystems-21\" target=\"_blank\">#{name}</a>"
+        return "<a href=\"http://www.amazon.co.uk/exec/obidos/ASIN/#{page}/#{@config.amazon_affiliate}\" target=\"_blank\">#{name}</a>"
       elsif page =~ /^isbn(.+)$/i then
         name = "ISBN " + $1 if page == name
-        return "<a href=\"http://www.amazon.co.uk/exec/obidos/ASIN/#{$1}/agilesystems-21\" target=\"_blank\">#{name}</a>"
+        return "<a href=\"http://www.amazon.co.uk/exec/obidos/ASIN/#{$1}/#{@config.amazon_affiliate}\" target=\"_blank\">#{name}</a>"
       elsif page =~ /\./ then
         return resource_link(subwiki,page,name)
       elsif @storage.exists(File.join(subwiki,page)) then
@@ -542,14 +592,20 @@ module Wiki2Go
         if page == name || url?(name) then
           alt_label = filename
         end
-        image_link = "<img src=\"html/#{subwiki}/#{page}\" border=0 alt=\"#{alt_label}\" >"
+        image_link = "<img src=\"#{resource_url(page)}\" border=0 alt=\"#{alt_label}\" >"
         if url?(name) then
           return redirect_link(image_link,name)
         else
           return image_link
         end
+      elsif page =~ /^(.*)\.rbl$/i then
+        page_name = $1
+        if page == name then
+          name = page_name
+        end
+        return perform_link(subwiki,page,name)
       else
-        return "<a href=\"html/#{subwiki}/#{page}\" target=\"_blank\">#{name}</a>"
+        return "<a href=\"#{resource_url(page)}\" target=\"_blank\">#{name}</a>"
       end
     end