jason/ja.son-williams.ca
jason/ja.son-williams.ca
1
0
Fork 0
Code Issues 23 Pull Requests Projects 1 Wiki Activity

New functionality to change feed dates to relative dates (e.g. 1 day ago) where the feed items are available on page load. Contributes to #50.

Browse Source
This commit is contained in:
Jason Williams 2020-10-31 18:13:53 -07:00
parent 623d54f307
commit 8eab9fe605
4 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
www/themes/jason-williamsca/assets/javascript/feedlayout.js → www/themes/jason-williamsca/assets/javascript/feed.js
View File

@ -1,8 +1,14 @@
(function($) {
"use strict"; // Start of use strict
const min = 60;
const hour = min * 60;
const day = hour * 24;
const month = day * 30;
const ninemonth = month * 9;
// If the feed is loaded immediadely on page load (i.e. we're not using ajax), reset the layout on each image load
$('.masonry img').each(function() {
$('.feeditem img').each(function() {
$(this).one('load', () => {
$('.masonry').masonry()
})
@ -45,8 +51,8 @@
})
})
// If there's tag data set once the page is loaded, create a tag cloud
$(function() {
// If there's tag data set once the page is loaded, create a tag cloud
if(typeof tagData !== 'undefined') {
var cloudWords = []
@ -60,5 +66,22 @@
delay: 2
})
}
// Loop through each feeditem (assuming they're loaded when the page loads) and set the friendlytime
var nowts = Math.floor(new Date().getTime() / 1000)
$('.feeditem').each(function() {
var elapsed = nowts - $(this).attr('data-timestamp')
var friendlytime = false
if (elapsed < min) friendlytime = elapsed + ' seconds'
else if (elapsed < hour) friendlytime = Math.floor(elapsed/min) + ' minutes'
else if (elapsed < day) friendlytime = Math.floor(elapsed/hour) + ' hours'
else if (elapsed < month) friendlytime = Math.floor(elapsed/day) + ' days'
else if (elapsed < ninemonth) friendlytime = Math.floor(elapsed/month) + ' months'
if (friendlytime && friendlytime.startsWith('1 ')) friendlytime = friendlytime.slice(0, -1)
if (friendlytime) $(this).find('.friendlytime').html(friendlytime)
})
})
})(jQuery); // End of use strict

3
www/themes/jason-williamsca/pages/feed.htm
View File

@ -20,8 +20,7 @@ function onStart()
else $this['channelfilter'] = explode(',', $this->param('channel'));
$this->addJs('https://cdnjs.cloudflare.com/ajax/libs/jqcloud/1.0.3/jqcloud.min.js');
$this->addJs('assets/javascript/feedlayout.js');
//$this->addCss('https://cdnjs.cloudflare.com/ajax/libs/jqcloud/1.0.3/jqcloud.min.css');
$this->addJs('assets/javascript/feed.js');
}
?>
==

36
www/themes/jason-williamsca/pages/welcome.htm
View File

@ -8,25 +8,25 @@ maxItems = 5
renderPartial = "feed/template"
==
<?php
function onStart()
{
$this->addJs('assets/javascript/feedlayout.js');
function onStart()
{
$this->addJs('assets/javascript/feed.js');
}
?>
==
<div class="row">
<div class="col-lg-5 order-lg-2">
<h1>Welcome</h1>
<p>Welcome to Ja.son-Williams.ca, the little home on the web of – perhaps unsurprisingly – Jason Williams.</p>
<p>Jay is a human male originally from <a href="https://en.wikipedia.org/wiki/Swansea">Swansea, UK</a> but last spotted in <a href="https://en.wikipedia.org/wiki/Calgary">Calgary, Canada</a>. By day he's a mild-mannered bank employee and by night he's... uh... asleep, mostly.</p>
<p>He doesn't keep very much stuff here, but to browse around please make a selection from the menu at the top right of the page.</p>
<h2>Available Everywhere</h2>
{% partial 'social' %}
</div>
<div class="col-lg-7 order-lg-1">
<h1>Feed</h1>
{% partial 'feed/placeholder' feeditemclass='col-sm-12 col-md-6' %}
<a class="btn btn-outline-primary d-none show-onfeedloaded" href="/feed" role="button">View More...</a>
</div>
<div class="row">
<div class="col-lg-5 order-lg-2">
<h1>Welcome</h1>
<p>Welcome to Ja.son-Williams.ca, the little home on the web of – perhaps unsurprisingly – Jason Williams.</p>
<p>Jay is a human male originally from <a href="https://en.wikipedia.org/wiki/Swansea">Swansea, UK</a> but last spotted in <a href="https://en.wikipedia.org/wiki/Calgary">Calgary, Canada</a>. By day he's a mild-mannered bank employee and by night he's... uh... asleep, mostly.</p>
<p>He doesn't keep very much stuff here, but to browse around please make a selection from the menu at the top right of the page.</p>
<h2>Available Everywhere</h2>
{% partial 'social' %}
</div>
<div class="col-lg-7 order-lg-1">
<h1>Feed</h1>
{% partial 'feed/placeholder' feeditemclass='col-sm-12 col-md-6' %}
<a class="btn btn-outline-primary d-none show-onfeedloaded" href="/feed" role="button">View More...</a>
</div>
</div>

8
www/themes/jason-williamsca/partials/feed/template.htm
View File

@ -1,8 +1,8 @@
==
{% if feeditemclass is empty %}
{% set feeditemclass = 'masonry-item' %}
{% set feeditemclass = 'feeditem masonry-item' %}
{% else %}
{% set feeditemclass = 'masonry-item ' ~ feeditemclass %}
{% set feeditemclass = 'feeditem masonry-item ' ~ feeditemclass %}
{% endif %}
{% if posts is empty %}
@ -10,7 +10,7 @@
{% endif %}
{% for post in posts %}
<div class="{{ feeditemclass }}">
<div class="{{ feeditemclass }}" data-timestamp="{{ post.timestamp }}">
<div class="card">
{% if post.extra.img %}
<img class="card-img-top" src="{{ post.extra.img }}">
@ -32,7 +32,7 @@
<p class="card-text">{{ post.extra.address }}</p>
{% endif %}
<div class="feedcard-footer">
<p class="float-right feedcard-itemtype">{{ post.friendlytime }} <i class="{{ post.channel.icon }}" style="color: {{ post.channel.colour }};"></i></p>
<p class="float-right feedcard-itemtype"><span class="friendlytime">{{ post.friendlytime }}</span> <i class="{{ post.channel.icon }}" style="color: {{ post.channel.colour }};"></i></p>
{% if post.channel.slug == 'twitter' and post.extra.opuser %}
<p class="float-left feedcard-attribution"><i class="fas fa-retweet"></i> <a href="https://twitter.com/{{ post.extra.opuser }}">{{ post.extra.opname }}</a> <img src="{{ post.extra.opimg }}"></p>
{% endif %}