Merge branch 'wip'

* no real conflicts, just an additional function for script.py
This commit is contained in:
Phil Morrell 2022-04-17 18:10:17 +01:00
commit c61f0ce372
Signed by: emorrp1
GPG Key ID: DBCA65091F248E6C
4 changed files with 1436 additions and 1548 deletions

2941
list.html

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,11 @@
/* Theming taken from https://github.com/vector-im/riot-web/blob/cf5cf02529f95a094d88051c12fdb87a03d87335/src/skins/vector/css/themes/_base.scss */
tbody {
margin-left: 2em;
}
tr {
margin-left: 2em;
}
body {
color: #454545;
background-color: #ffffff;
@ -81,6 +88,9 @@ table#timeline {
table#timeline tr {
vertical-align: top;
}
tr {
margin-left: 2em;
}
td.rightAlign {
text-align: right;
min-width: 120px;

View File

@ -4,6 +4,11 @@
from mako.template import Template
import json
def mxc2url(mxc):
serverName = mxc.split('/')[2]
mediaId = mxc.split('/')[3]
return "https://matrix.org/_matrix/media/v3/download/" + serverName + "/" + mediaId
def render(spaces, template):
appTemplate = Template(filename=template)
print(appTemplate.render(s=spaces))

View File

@ -1,3 +1,9 @@
<%!
def mxc2url(mxc):
serverName = mxc.split('/')[2]
mediaId = mxc.split('/')[3]
return "https://matrix.org/_matrix/media/v3/download/" + serverName + "/" + mediaId
%>
<!DOCTYPE html>
<html>
<head>
@ -5,29 +11,33 @@
</head>
<body>
<%def name="render(space)">
<table id="roomList">
<table>
<tbody>
% for room in space:
<tr>
% if 'avatar_url' in room:
<td><img class="avatar roomAvatar" src=${mxc2url(room['avatar_url'])}></td>
% endif
% if 'room_type' in room and room['room_type'] == "m.space":
<td> Subspace: ${room['name']} <td>
${render(room['children_state'])}
<td><div> Subspace: ${room['name']} </div></td>
</tr>
<tr><td>${render(room['children_state'])}</td></tr>
% else:
% if 'room_id' in room:
<td>
<a href="https://view.matrix.org/room/${room['room_id']}">
<td><a href="https://view.matrix.org/room/${room['room_id']}">
% if 'name' in room:
<div> ${room['name']} </td>
<div> ${room['name']} </div>
% endif
</a>
</td>
</a> </td>
% endif
</tr>
% endif
</tr>
% endfor
</tbody>
</table>
</%def>
${render(s)}