jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整HTML页面代码

This commit is contained in:
sw 2014-10-23 17:29:31 +08:00
parent 06256a5302
commit 6d6b2c6b38
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/views/wiki/diff.html.erb
View File

@ -1,27 +1,33 @@
<div class="contextual">
<%= link_to(l(:label_history), {:action => 'history', :id => @page.title},
:class => 'icon icon-history') %>
<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
</div>
<%= wiki_page_breadcrumb(@page) %>
<h3><%= h(@page.pretty_title) %></h3>
<h3>
<%= h(@page.pretty_title) %>
</h3>
<p>
<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
<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_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
<em>
(<%= @diff.content_from.author ? @diff.content_from.author.name : l(:label_user_anonymous)%>,
<%= format_time(@diff.content_from.updated_on) %>)
</em>
&#8594;
<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show',
<%= l(:label_version) %>
<%= link_to @diff.content_to.version, :action => 'show',
:id => @page.title, :project_id => @page.project,
:version => @diff.content_to.version
%>/<%= @page.content.version %>
<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>
:version => @diff.content_to.version %>
/
<%= @page.content.version %>
<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>
<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>