Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
1b503f3b6d
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
<h2><%=h @document.title %></h2>
|
<h2><%=h @document.title %></h2>
|
||||||
|
|
||||||
<p><em><%=h @document.category.name %><br />
|
<p><em><%#=h @document.category.name %><br />
|
||||||
<%= format_date @document.created_on %></em></p>
|
<%= format_date @document.created_on %></em></p>
|
||||||
<div class="wiki">
|
<div class="wiki">
|
||||||
<%= textilizable @document, :description, :attachments => @document.attachments %>
|
<%= textilizable @document, :description, :attachments => @document.attachments %>
|
||||||
|
|
Loading…
Reference in New Issue