sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-13 09:30:40 +00:00
Code Issues Projects Releases Wiki Activity

Fix link issues

Browse Source
This commit is contained in:
Patrick Jentsch
2023-03-22 12:06:33 +01:00
parent 622d32fa45
commit 57813b4bc2
8 changed files with 127 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
app/templates/users/profile.html.j2 → app/templates/users/user.html.j2
View File

@ -1,6 +1,7 @@
{% extends "base.html.j2" %}
{% import "materialize/wtf.html.j2" as wtf %}
{% block page_content %}
<div class="container">
<div class="row">
@ -10,9 +11,8 @@
<div class="row">
<div class="col s1"></div>
<div class="col s3">
<br>
<br>
<img src="{{ url_for('.profile_avatar', user_id=user_id) }}" alt="user-image" class="circle responsive-img">
<p>&nbsp;</p>
<img src="{{ url_for('.user_avatar', user_id=user.id) }}" alt="user-image" class="circle responsive-img">
</div>
<div class="col s1"></div>
<div class="col s7">
@ -27,16 +27,18 @@
{% else %}
<span class="chip white-text" style="background-color: #f44336;">Private Profile</span>
{% endif %}
{% if user.has_profile_privacy_setting('SHOW_MEMBER_SINCE') %}
<span class="chip">Member since: {{ user.member_since.strftime('%Y-%m-%d') }}</span>
{% endif %}
{% if user.has_profile_privacy_setting('SHOW_LAST_SEEN') %}
<span class="chip">Last seen: {{ user.last_seen.strftime('%Y-%m-%d') }}</span>
{% endif %}
</div>
<div class="col 12">
{% if user.show_last_seen %}
<div class="chip">Last seen: {{ last_seen }}</div>
{% endif %}
{% if user.location %}
<p><span class="material-icons" style="margin-right:20px; margin-top:20px;">location_on</span><i>{{ user.location }}</i></p>
<p>&nbsp;</p>
<p><i class="material-icons left">location_on</i>{{ user.location }}</p>
{% endif %}
<p></p>
<br>
{% if user.about_me %}
<blockquote>
<h5>About me</h5>
@ -59,7 +61,7 @@
<td>{{ user.full_name }} </td>
</tr>
{% endif %}
{% if user.show_email %}
{% if user.has_profile_privacy_setting('SHOW_EMAIL') %}
<tr>
<td><span class="material-icons">email</span></td>
<td>{{ user.email }}</td>
@ -78,18 +80,17 @@
</tr>
{% endif %}
</table>
<br>
{% if user.show_member_since %}
<p><i>Member since: {{ member_since }}</i></p>
{% endif %}
<p></p>
<br>
{% if current_user.hashid == user.id %}
<a class="waves-effect waves-light btn-small" href="{{ url_for('settings.settings') }}">Edit profile</a>
{% endif %}
<p>&nbsp;</p>
</div>
</div>
</div>
{% if current_user == user %}
<div class="card-action">
<p class="right-align">
<a class="btn waves-effect waves-light" href="{{ url_for('settings.settings') }}">Edit profile</a>
</p>
</div>
{% endif %}
</div>
</div>
</div>
@ -119,8 +120,22 @@
{{ super() }}
<script>
let followedCorpusList = new FollowedCorpusList(document.querySelector('.followed-corpus-list'));
followedCorpusList.add({{ followed_corpora|tojson }});
followedCorpusList.add(
[
{% for corpus in user.followed_corpora %}
{{ corpus.to_json_serializeable()|tojson }}
{% if not loop.last %},{% endif %}
{% endfor %}
]
);
let publicCorpusList = new PublicCorpusList(document.querySelector('.public-corpus-list'));
publicCorpusList.add({{ own_public_corpora|tojson }});
publicCorpusList.add(
[
{% for corpus in user.corpora if corpus.is_public %}
{{ corpus.to_json_serializeable()|tojson }}
{% if not loop.last %},{% endif %}
{% endfor %}
]
);
</script>
{% endblock scripts %}