Merge pull request #2371 from riking/nojs-layout

Tweak the no-js layout
This commit is contained in:
Jeff Atwood 2014-05-20 17:13:51 -07:00
commit 0ea11fbb81
2 changed files with 21 additions and 11 deletions

View file

@ -3,22 +3,32 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title><%= @topic_view.topic.title %></title>
<%= crawlable_meta_data(title: @topic_view.title,
description: @topic_view.summary,
image: @topic_view.image_url) %>
</head>
<body>
<% @topic_view.posts.each do |post| %>
<% if post.user %>
<div>
#<%=post.post_number%> <%= t 'by'%>: <b><%= post.user.name %></b>, <%= post.created_at.to_formatted_s(:long_ordinal) %>
<div class='creator'>
<b><%= post.user.username_lower %></b> <%= "(#{post.user.name})" if SiteSetting.display_name_on_posts %> at <%= post.created_at.to_formatted_s(:long_ordinal) %> — #<%= post.post_number %>
</div>
<div>
<%= post.cooked.html_safe %>
<div class='post'>
<% if post.hidden %>
<%= t('flagging.user_must_edit').html_safe %>
<% else %>
<%= post.cooked.html_safe %>
<% end %>
</div>
<hr/>
<% end %>
<% end %>
<% if @topic_view.next_page %>
<p>
<%= link_to(t('next_page').html_safe, @topic_view.next_page_path ) %>
</p>
<% end %>
<p>
<% if @topic_view.prev_page %>
<%= link_to t(:prev_page), @topic_view.prev_page_path, rel: 'prev' %>
<% end %>
<% if @topic_view.next_page %>
<b><%= link_to t(:next_page), @topic_view.next_page_path, rel: 'next' %></b>
<% end %>
</p>
</body>

View file

@ -6,7 +6,7 @@
<% @topic_view.posts.each do |post| %>
<% if post.user %>
<div class='creator'>
#<%=post.post_number%> <%= t 'by'%>: <b><%= post.user.name %></b>, <%= post.created_at.to_formatted_s(:long_ordinal) %>
<b><%= post.user.username_lower %></b> <%= "(#{post.user.name})" if SiteSetting.display_name_on_posts %> at <%= post.created_at.to_formatted_s(:long_ordinal) %> — #<%= post.post_number %>
</div>
<div class='post'>
<% if post.hidden %>
@ -25,7 +25,7 @@
<%= link_to t(:prev_page), @topic_view.prev_page_path, rel: 'prev' %>
<% end %>
<% if @topic_view.next_page %>
<b><%= link_to t(:next_page), @topic_view.next_page_path, rel: 'next' %></b>
<b><%= link_to t(:next_page), @topic_view.next_page_path, rel: 'next' %></b>
<% end %>
</p>