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-05-26 01:28:03 -05:00
parent e3cbef7dcd 4b73f1a1ae
commit 4774d7c8a1
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/wiki/locked.rhtml
View file

@ -1,4 +1,4 @@
<%- @title = "#{@page.plain_name} is locked" -%> <%- @title = "#{@page.plain_name} is locked".html_safe -%>
<p> <p>
<%= link_to_page(h(@page.locked_by.purify)) %> <%= link_to_page(h(@page.locked_by.purify)) %>

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

@ -1,5 +1,5 @@
<%- <%-
@title = "Creating #{CGI.escapeHTML(WikiWords.separate(@page_name))}" @title = "Creating #{WikiWords.separate(@page_name).escapeHTML}".html_safe
@content_width = 720 @content_width = 720
@hide_navigation = true @hide_navigation = true
-%> -%>

2
app/views/wiki/search.rhtml
View file

@ -1,4 +1,4 @@
<%- @title = "Search results for \"#{h @query}\"" -%> <%- @title = "Search results for \"#{h @query}\"".html_safe -%>
<%- unless @title_results.empty? -%> <%- unless @title_results.empty? -%>
<h2><%= @title_results.length %> page(s) containing search string in the page name:</h2> <h2><%= @title_results.length %> page(s) containing search string in the page name:</h2>