调整HTML页面代码
This commit is contained in:
parent
06256a5302
commit
6d6b2c6b38
|
@ -1,27 +1,33 @@
|
||||||
<div class="contextual">
|
<div class="contextual">
|
||||||
<%= link_to(l(:label_history), {:action => 'history', :id => @page.title},
|
<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
|
||||||
:class => 'icon icon-history') %>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%= wiki_page_breadcrumb(@page) %>
|
<%= wiki_page_breadcrumb(@page) %>
|
||||||
|
|
||||||
<h3><%= h(@page.pretty_title) %></h3>
|
<h3>
|
||||||
|
<%= h(@page.pretty_title) %>
|
||||||
|
</h3>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
|
<%= l(:label_version) %>
|
||||||
<em>(<%= @diff.content_from.author ?
|
<%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
|
||||||
@diff.content_from.author.name : l(:label_user_anonymous)
|
<em>
|
||||||
%>, <%= format_time(@diff.content_from.updated_on) %>)</em>
|
(<%= @diff.content_from.author ? @diff.content_from.author.name : l(:label_user_anonymous)%>,
|
||||||
|
<%= format_time(@diff.content_from.updated_on) %>)
|
||||||
|
</em>
|
||||||
→
|
→
|
||||||
<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show',
|
<%= l(:label_version) %>
|
||||||
:id => @page.title, :project_id => @page.project,
|
<%= link_to @diff.content_to.version, :action => 'show',
|
||||||
:version => @diff.content_to.version
|
:id => @page.title, :project_id => @page.project,
|
||||||
%>/<%= @page.content.version %>
|
:version => @diff.content_to.version %>
|
||||||
<em>(<%= @diff.content_to.author ?
|
/
|
||||||
link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous)
|
<%= @page.content.version %>
|
||||||
%>, <%= format_time(@diff.content_to.updated_on) %>)</em>
|
<em>
|
||||||
|
(<%= @diff.content_to.author ? link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous)%>,
|
||||||
|
<%= format_time(@diff.content_to.updated_on) %>)
|
||||||
|
</em>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div class="text-diff" style=" width: 100%;word-break: break-all;word-wrap: break-word;">
|
<div class="text-diff" style=" width: 100%;word-break: break-all;word-wrap: break-word;">
|
||||||
<%= simple_format_without_paragraph @diff.to_html %>
|
<%= simple_format_without_paragraph @diff.to_html %>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue