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

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2010-02-05 21:40:24 -06:00
commit 7249c074b0
224 changed files with 32910 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/views/wiki/edit.rhtml
View file

@ -70,6 +70,7 @@ function cleanAuthorName() {
document.forms["editForm"].elements["content"].focus();
<%- if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup) and !@page.categories.include?('S5-slideshow') -%>
setupSVGedit('<%= compute_public_path("editor/svg-editor.html", "svg-edit").split(/\?/)[0] %>');
addS5button('<%= CGI.escapeHTML(@page.name) %>');
<%- end -%>
//--><!]]>

1
app/views/wiki/new.rhtml
View file

@ -32,6 +32,7 @@ function cleanAuthorName() {
}
document.forms["editForm"].elements["content"].focus();
<%- if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup) -%>
setupSVGedit('<%= compute_public_path("editor/svg-editor.html", "svg-edit").split(/\?/)[0] %>');
addS5button('<%= CGI.escapeHTML(@page_name) %>');
<%- end -%>
</script>