deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

File Upload Links

Browse source 
I like this a little better.
This commit is contained in:
Jacques Distler 2007-10-09 23:56:55 -05:00
parent fbdf4c5dfe
commit 5dd75d4cb0
3 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/url_generator.rb
View file

@ -17,6 +17,7 @@ class AbstractUrlGenerator
else
known_page = web.has_file?(name)
description = web.description(name)
description = CGI.escapeHTML(CGI.unescapeHTML(description)) if description
end
if (text == name)
text = description || text
@ -29,7 +30,7 @@ class AbstractUrlGenerator
when :show
page_link(mode, name, text, web.address, known_page)
when :file
file_link(mode, name, text, web.address, known_page)
file_link(mode, name, text, web.address, known_page, description)
when :pic
pic_link(mode, name, text, web.address, known_page)
else
@ -43,11 +44,11 @@ class UrlGenerator < AbstractUrlGenerator
private
def file_link(mode, name, text, web_address, known_file)
def file_link(mode, name, text, web_address, known_file, description)
case mode
when :export
if known_file
%{<a class="existingWikiWord" title="#{text}" href="#{CGI.escape(name)}.html">#{text}</a>}
%{<a class="existingWikiWord" title="#{description}" href="#{CGI.escape(name)}.html">#{text}</a>}
else
%{<span class="newWikiWord">#{text}</span>}
end
@ -55,7 +56,7 @@ class UrlGenerator < AbstractUrlGenerator
if known_file
href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',
:id => name
%{<a class="existingWikiWord" title="#{text}" href="#{href}">#{text}</a>}
%{<a class="existingWikiWord" title="#{description}" href="#{href}">#{text}</a>}
else
%{<span class="newWikiWord">#{text}</span>}
end
@ -63,7 +64,7 @@ class UrlGenerator < AbstractUrlGenerator
href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',
:id => name
if known_file
%{<a class="existingWikiWord" title="#{text}" href="#{href}">#{text}</a>}
%{<a class="existingWikiWord" title="#{description}" href="#{href}">#{text}</a>}
else
%{<span class="newWikiWord">#{text}<a href="#{href}">?</a></span>}
end