Skip to content

Commit

Permalink
UX: Cleanup crawler styles, improve schema.org markup (#7668)
Browse files Browse the repository at this point in the history 
* Cleaning up crawler styles, improving some schema.org markup

* Cleaning up crawler styles, improving some schema.org markup

* additional styling

* add space for pagination
  • Loading branch information
@awesomerobot @SamSaffron
awesomerobot authored and SamSaffron committed Jun 3, 2019
1 parent 984516f commit 98336de
Show file tree
Hide file tree
Showing 5 changed files with 148 additions and 61 deletions.
109 changes: 98 additions & 11 deletions app/assets/stylesheets/common/base/crawler_layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,115 @@ body.crawler {
z-index: z("max");
background-color: #fff;
padding: 10px;
box-shadow: shadow("header");
box-shadow: none;
border-bottom: 1px solid $primary-low-mid;
box-sizing: border-box;
}
div.topic-list div[itemprop="itemListElement"] {
padding: 10px 0;
border-bottom: 1px solid #e9e9e9;
.page-links a {
padding: 0 4px;
}
}

div#main-outlet {
div.post {
word-break: break-word;
img {
max-width: 100%;
height: auto;
}
}
}
footer nav {
margin: 50px 0;

.raw-topic-link {
display: block;
font-weight: bold;
margin-bottom: 0.25em;
}

.topic-list {
margin-bottom: 1em;
}
}

.crawler-topic-title {
margin-top: 0.5em;
}

.crawler-post {
margin-top: 1em;
margin-bottom: 2em;
padding-top: 1.5em;
border-top: 1px solid $primary-low;
}

.crawler-post-meta {
margin-bottom: 1em;
.creator {
word-break: break-all;
a {
padding: 15px;
font-weight: bold;
}
@include breakpoint(tablet) {
display: inline-block;
margin-bottom: 0.25em;
}
}
}

.crawler-post-infos {
color: $primary-high;
display: inline-block;
@include breakpoint(tablet, min-width) {
float: right;
}
[itemprop="position"] {
float: left;
margin-right: 0.5em;
}
}

#breadcrumbs {
margin-bottom: 0.5em;
font-size: $font-up-1;
> div {
margin-bottom: 0.15em;
}
.badge-category-bg {
background-color: $secondary-high;
}
.category-title {
color: $primary;
}
}

.crawler-tags-list {
span {
display: block;
margin-bottom: 0.15em;
}
}

.crawler-linkback-list {
margin-top: 1em;
a {
display: block;
padding: 0.5em 0;
border-top: 1px solid $primary-low;
}
}

footer {
margin-top: 3em;
border-top: 1px solid $primary-low-mid;
}

.crawler-nav {
margin: 1em 0;
ul {
margin: 0;
list-style-type: none;
}
li {
display: inline-block;
}
a {
display: inline-block;
padding: 0.5em 1em 0.5em 0;
}
}
19 changes: 0 additions & 19 deletions app/assets/stylesheets/desktop/topic-post.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -892,22 +892,3 @@ span.highlighted {
}
}
}

.crawler-post {
.post-time {
float: right;
}
.post-likes {
float: right;
}
margin-top: 5px;
}

#breadcrumbs {
.badge-category-bg {
background-color: $secondary-high;
}
.category-title {
color: $primary;
}
}
12 changes: 7 additions & 5 deletions app/views/layouts/crawler.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@
</div>
<footer class="container wrap">
<nav class='crawler-nav' itemscope itemtype='http://schema.org/SiteNavigationElement'>
<a href='<%= path "/" %>'><%= t 'home_title' %></a>
<%= link_to t('js.filters.categories.title'), path("/categories") %>
<%= link_to t('guidelines_topic.title'), path("/guidelines") %>
<%= link_to t('tos_topic.title'), path("/tos") %>
<%= link_to t('privacy_topic.title'), path("/privacy") %>
<ul>
<li itemprop="name"><a href='<%= path "/" %>' itemprop="url"><%= t 'home_title' %> </a></li>
<li itemprop="name"><a href='<%= path "/categories" %>' itemprop="url"><%= t 'js.filters.categories.title' %> </a></li>
<li itemprop="name"><a href='<%= path "/guidelines" %>' itemprop="url"><%= t 'guidelines_topic.title' %> </a></li>
<li itemprop="name"><a href='<%= path "/tos" %>' itemprop="url"><%= t 'tos_topic.title' %> </a></li>
<li itemprop="name"><a href='<%= path "/privacy" %>' itemprop="url"><%= t 'privacy_topic.title' %> </a></li>
</ul>
</nav>
<p class='powered-by-link'><%= t 'powered_by_html' %></p>
</footer>
Expand Down
67 changes: 42 additions & 25 deletions app/views/topics/show.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h1>
<h1 class="crawler-topic-title">
<%= render_topic_title(@topic_view.topic) %>
</h1>

Expand All @@ -22,37 +22,38 @@
<% if SiteSetting.tagging_enabled %>
<% @tags = @topic_view.topic.tags %>
<% if @tags.present? %>
<div class='tags-list' itemscope itemtype='http://schema.org/ItemList'>
<% @tags.each do |tag| %>
<div itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>
<meta itemprop='url' content='<%= "#{Discourse.base_url}/tags/#{tag.name}" %>'>
<a href='<%= "#{Discourse.base_url}/tags/#{tag.name}" %>' itemprop='item'>
<span itemprop='name'><%= tag.name -%></span>
<div class='crawler-tags-list' itemscope itemtype='http://schema.org/DiscussionForumPosting'>
<% @tags.each_with_index do |tag, i| %>
<div itemprop='keywords'>
<a href='<%= "#{Discourse.base_url}/tags/#{tag.name}" %>' rel="tag">
<span itemprop='headline'><%= tag.name -%></span>
</a>
</div>
<% end %>
</div>
<% end %>
<% end %>
<%= server_plugin_outlet "topic_header" %>
<%- if include_crawler_content? %>
<% @topic_view.posts.each do |post| %>
<div itemscope itemtype='http://schema.org/DiscussionForumPosting' class='topic-body crawler-post'>
<% if (u = post.user) %>
<div class='creator'>
<span>
<a href='<%= Discourse.base_uri %>/u/<%= u.username %>'><b itemprop='author'><%= u.username %></b></a>
<div class='crawler-post-meta'>
<span class="creator" itemprop="author" itemscope itemtype="http://schema.org/Person">
<a itemprop="url" href='<%= Discourse.base_uri %>/u/<%= u.username %>'><span itemprop='name'><%= u.username %></span></a>
<%= "(#{u.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names? && !u.name.blank?) %>
<%
who_username = post.custom_fields["action_code_who"] || ""
if post.action_code
%>
<%= t("js.action_codes.#{post.action_code}", when: "", who: who_username).html_safe %>
<% end %>
</span>

<span class="crawler-post-infos">
<% if post.updated_at > post.created_at %>
<meta itemprop='datePublished' content='<%= post.created_at.to_formatted_s(:iso8601) %>'>
<time itemprop='dateModified' datetime='<%= post.updated_at.to_formatted_s(:iso8601) %>' class='post-time'>
Expand All @@ -63,26 +64,42 @@
<%= l post.created_at, format: :long %>
</time>
<% end %>
</span>
<span itemprop='position'>#<%= post.post_number %></span>
</span>
</div>
<div class='post' itemprop='articleBody'>
<%= post.hidden ? t('flagging.user_must_edit').html_safe : post.cooked.html_safe %>
</div>
<meta itemprop='interactionCount' content='UserLikes:<%= post.like_count %>'>
<meta itemprop='interactionCount' content='UserComments:<%= post.reply_count %>'>

<meta itemprop='headline' content='<%= @topic_view.title %>'>
<div class='clearfix'>
<span class='post-likes'><%= post.like_count > 0 ? t('post.has_likes', count: post.like_count) : '' %></span>
</div>
<% if @topic_view.link_counts[post.id] && @topic_view.link_counts[post.id].length > 0 %>
<% @topic_view.link_counts[post.id].each do |link| %>
<% if link[:reflection] && link[:title].present? %>
<a href="<%=link[:url]%>"><%=link[:title]%></a>
<hr>
<% end %>
<% end %>
<% end %>

<div itemprop="interactionStatistic" itemscope itemtype="http://schema.org/InteractionCounter">
<meta itemprop="interactionType" content="http://schema.org/LikeAction"/>
<meta itemprop="userInteractionCount" content="<%= post.like_count %>" />
<span class='post-likes'><%= post.like_count > 0 ? t('post.has_likes', count: post.like_count) : '' %></span>
</div>

<div itemprop="interactionStatistic" itemscope itemtype="http://schema.org/InteractionCounter">
<meta itemprop="interactionType" content="http://schema.org/CommentAction"/>
<meta itemprop="userInteractionCount" content="<%= post.reply_count %>" />
</div>

<% if @topic_view.link_counts[post.id] && @topic_view.link_counts[post.id].length > 0 %>
<div class='crawler-linkback-list' itemscope itemtype='http://schema.org/ItemList'>
<% @topic_view.link_counts[post.id].each_with_index do |link, i| %>
<% if link[:reflection] && link[:title].present? %>
<div itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>
<a href="<%=link[:url]%>" itemprop='item'>
<meta itemprop='url' content='<%=link[:url]%>'>
<meta itemprop='position' content='<%= i+1 %>'>
<span itemprop='name'><%=link[:title]%></span>
</a>
</div>
<% end %>
<% end %>
</div>
<% end %>
<% end %>
</div>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion config/locales/server.en.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ en:
topics: "Topics"
posts: "posts"
loading: "Loading"
powered_by_html: 'Powered by <a href="https://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled'
powered_by_html: 'Powered by <a rel="nofollow" href="https://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled'

This comment has been minimized.

Sign in to view

Copy link
@SamSaffron

SamSaffron Jun 3, 2019

Member

I am rolling this back for now, we can discuss if it makes sense to add this on dev etc.
log_in: "Log In"
submit: "Submit"
purge_reason: "Automatically deleted as abandoned, deactivated account"
Expand Down

0 comments on commit 98336de

Please sign in to comment.