<video> and x-sendfile
Using <object> and <embed> were forbidden for obvious security reasons. Instiki now permits embedding video via the HTML5 <video> element (Ogg/Theora encoded videos only, with .ogg or .ogv extensions). You can even upload videos with [[foo.ogg:video]] Instiki now support x-sendfile. See the Proxying page for configuring Apache (with the x-sendfile module). Lighttpd should work similarly. Update Rails to latest Edge (hopefully converging on RC2!).
This commit is contained in:
parent
133c21b801
commit
8ea8b6a8f7
45 changed files with 872 additions and 751 deletions
|
@ -35,6 +35,8 @@ class AbstractUrlGenerator
|
|||
file_link(mode, name, text, web.address, known_page, description)
|
||||
when :pic
|
||||
pic_link(mode, name, text, web.address, known_page)
|
||||
when :video
|
||||
video_link(mode, name, text, web.address, known_page)
|
||||
when :delete
|
||||
delete_link(mode, name, web.address, known_page)
|
||||
else
|
||||
|
@ -141,6 +143,31 @@ class UrlGenerator < AbstractUrlGenerator
|
|||
end
|
||||
end
|
||||
|
||||
def video_link(mode, name, text, web_address, known_vid)
|
||||
href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',
|
||||
:id => name
|
||||
case mode
|
||||
when :export
|
||||
if known_vid
|
||||
%{<video src="#{CGI.escape(name)}" controls="controls">#{text}</video>}
|
||||
else
|
||||
text
|
||||
end
|
||||
when :publish
|
||||
if known_vid
|
||||
%{<video src="#{href}" controls="controls">#{text}</video>}
|
||||
else
|
||||
%{<span class="newWikiWord">#{text}</span>}
|
||||
end
|
||||
else
|
||||
if known_vid
|
||||
%{<video src="#{href}" controls="controls">#{text}</video>}
|
||||
else
|
||||
%{<span class="newWikiWord">#{text}<a href="#{href}">?</a></span>}
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def delete_link(mode, name, web_address, known_file)
|
||||
href = @controller.url_for :controller => 'file', :web => web_address,
|
||||
:action => 'delete', :id => name
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue