sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-12-25 02:44:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development

Browse Source
This commit is contained in:
Patrick Jentsch 2022-12-22 13:58:00 +01:00
commit 320811279c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models.py
View File

@ -548,9 +548,9 @@ class User(HashidMixin, UserMixin, db.Model):
'email': self.email,
'last_seen': (
None if self.last_seen is None
else f'{self.last_seen.isoformat()}Z'
else self.last_seen.strftime('%Y-%m-%d %H:%M')
),
'member_since': f'{self.member_since.isoformat()}Z',
'member_since': self.member_since.strftime('%Y-%m-%d'),
'username': self.username,
'full_name': self.full_name,
'about_me': self.about_me,

12
app/templates/main/news.html.j2
View File

@ -197,13 +197,16 @@
}
function mastodonStatusToHtml(status) {
let date = new Date(status.created_at).toLocaleString('en-US')
return htmlString = `
<div class="row">
<div class="col s11">
<div class="card white-text" style="background-color:#5D50E7; border-radius:10px;">
<div class="card-content">
<span class="card-title">New Actitvity on Mastodon</span>
${status.content}
<p><i>Published on ${date}</i></p>
<br>
<p>${status.content}</p>
</div>
</div>
</div>
@ -213,10 +216,10 @@
`.trim();
}
function bisBlogsEntryToHtml(entry) {
let date = new Date(entry.published).toLocaleString('en-US')
let bisBlogHTMLElement = document.createElement('div');
bisBlogHTMLElement.classList.add('row');
bisBlogHTMLElement.innerHTML = `
<div class="row">
<div class="col s1">
<img src="https://blogs.uni-bielefeld.de/blog/uniintern/resource/themabilder/unilogo-square.svg" alt="Bielefeld University Blogs" class="responsive-img hide-on-small-only" style="width:70%; margin-top:40px;">
</div>
@ -224,11 +227,12 @@
<div class="card" style="background-color: #A5BDCC; border-radius:10px;">
<div class="card-content">
<span class="card-title">${entry.title['#text']}</span>
${entry.content['#text']}
<p><i>Published on ${date}</i></p>
<br>
<p>${entry.content['#text']}</p>
</div>
</div>
</div>
</div>
`.trim();
let bisBlogImages = bisBlogHTMLElement.querySelectorAll('img');
bisBlogImages.forEach((img) => {