Edit 404 page, fix tags page

This commit is contained in:
lostinlight 2018-03-22 04:41:55 +03:00
parent 5bcde1d091
commit ac5fb2492b
9 changed files with 31 additions and 25 deletions

View File

@ -34,6 +34,7 @@ theChronicles: The Chronicles
primary: your primary source of news primary: your primary source of news
subscribe: Subscribe via RSS subscribe: Subscribe via RSS
submit: Submit news submit: Submit news
tags: Tags
wanted: WANTED wanted: WANTED
featured: FEATURED featured: FEATURED
news: IN THE NEWS news: IN THE NEWS

View File

@ -1,8 +1,9 @@
--- ---
layout: layout layout: layout
--- ---
<div class="card error__card"> <div class="error__page">
<h1 class="">404</h1> <h1 class="">404</h1>
<h2>This isn't the page you're looking for.</h2> <h2>This isn't the page you're looking for.</h2>
<h4><a href="/">Go back?</a></h4> <h4><a href="/">Go back?</a></h4>

View File

@ -1,7 +1,8 @@
<% posts.forEach(function(item) { %> <% posts.forEach(function(item) { %>
<li class="tags__item"> <li class="tags__item">
<span class="tag__date"><%= item.date.format(config.date_format) %></span> <span class="tag__date"><%= item.date.format(config.date_format).split('-').join('.') %></span>
<a href="<%- config.root %><%- item.path %>" class="title"> <a href="<%- config.root %><%- item.path %>" class="title">
<%- item.title || "Untitled" %> <%- item.title || "Untitled" %>
</a> </a>

View File

@ -14,6 +14,7 @@ layout: layout
<ul class="links"> <ul class="links">
<li><a href="<%= config.url%>/atom.xml"><%- __('subscribe') %></a></li> <li><a href="<%= config.url%>/atom.xml"><%- __('subscribe') %></a></li>
<li><a href="https://gitlab.com/fediverse/fediverse.gitlab.io/merge_requests"><%- __('submit') %></a></li> <li><a href="https://gitlab.com/fediverse/fediverse.gitlab.io/merge_requests"><%- __('submit') %></a></li>
<li><a href="/tags"><%- __('tags') %></a></li>
</ul> </ul>
<% page.posts.each(function(post) { %> <% page.posts.each(function(post) { %>

View File

@ -1,5 +1,6 @@
<% <%
var title = ''; let title = '';
if (page.category) title = page.category; if (page.category) title = page.category;
if (page.tag) title = "#" + page.tag; if (page.tag) title = "#" + page.tag;
if (page.archive) { if (page.archive) {
@ -8,28 +9,20 @@
} }
%> %>
<header class="intro-header" style="background-image: url('<%= config.root %><%= page.banner || config.banner %>')"> <div class="contents">
<h1>Tags</h1>
</header>
<div class="container-wrapper">
<div class="tags__cloud"> <div class="tags__cloud">
<% site.tags.map(function(tag){ %> <% site.tags.map(function(tag) { %>
<a href="/tags/<%= tag.name %>" <% if (page.path === "tags/" + tag.name + "/index.html") { %> class="tag--current" <% } %> ><%= tag.name %></a> #<a href="/tags/<%= tag.name %>" <% if (page.path === "tags/" + tag.name + "/index.html") { %> class="tag--current" <% } %> ><%= tag.name %></a>
<% }) %> <% }) %>
</div> </div>
<div class="one-tag-list"> <div class="one-tag-list">
<span class="tag__text"><%= title %></span> <span class="tag__text"><%= title %></span>
<% const groupObj = _.groupBy(page.posts.toArray(), function(p) {return -p.date.format('YYYY')}) %>
<% var groupObj = _.groupBy(page.posts.toArray(), function(p){return -p.date.format('YYYY')}) %> <% for (let year in groupObj){ %>
<% for (var year in groupObj){ %>
<h3 class="tags__year"><%- -year %></h3> <h3 class="tags__year"><%- -year %></h3>
<ul class="tags__list"> <ul class="tags__list">
<%- partial('_partial/taglist', {posts: groupObj[year]}) %> <%- partial('_partial/taglist', {posts: groupObj[year]}) %>
</ul> </ul>
<% } %> <% } %>
</div> </div>
</div> </div>

View File

@ -1,23 +1,22 @@
--- ---
layout: layout layout: layout
--- ---
<div class="container-wrapper"> <div class="contents">
<div class="tags__cloud"> <div class="tags__cloud">
<% site.tags.map(function(tag) { %> <% site.tags.map(function(tag) { %>
<a href="/tags/<%= tag.name %>"><%= tag.name %></a> #<a href="/tags/<%= tag.name %>"><%= tag.name %></a>
<% }) %> <% }) %>
</div> </div>
<div class="one-tag-list"> <div class="one-tag-list">
<% var groupObj = _.groupBy(site.posts.toArray(), function(p){return -p.date.format('YYYY')}) %> <% const groupObj = _.groupBy(site.posts.toArray(), function(p){return -p.date.format('YYYY')}) %>
<% for (var year in groupObj){ %>
<% for (let year in groupObj){ %>
<h3 class="tags__year"><%- -year %></h3> <h3 class="tags__year"><%- -year %></h3>
<ul class="tags__list"> <ul class="tags__list">
<%- partial('_partial/taglist', {posts: groupObj[year]}) %> <%- partial('_partial/taglist', {posts: _.sortBy(groupObj[year], 'date').reverse()}) %>
</ul> </ul>
<% } %> <% } %>
</div> </div>
</div> </div>

View File

@ -10,6 +10,7 @@
@import "modules/footer"; @import "modules/footer";
@import "modules/index"; @import "modules/index";
@import "modules/404"; @import "modules/404";
@import "modules/tags";
@import "modules/heroheader"; @import "modules/heroheader";
@import "modules/buttons"; @import "modules/buttons";
@import "modules/network"; @import "modules/network";

View File

@ -1,4 +1,5 @@
.error__card { .error__page {
text-align: center; text-align: center;
padding-top: 4em;
} }

View File

@ -0,0 +1,8 @@
.tags__cloud {
margin: 5em 0 2em;
}
.tag__date {
margin-right: 1em;
}