mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
synced 2025-06-13 17:40:40 +00:00
Merge branch 'development' into public-corpora
This commit is contained in:
Patrick Jentsch
@ -29,7 +29,8 @@
|
||||
<ul class="dropdown-content" id="nav-more-dropdown">
|
||||
<li><a href="{{ url_for('main.user_manual') }}"><i class="material-icons left">help</i>Manual</a></li>
|
||||
{% if current_user.is_authenticated %}
|
||||
<li><a href="{{ url_for('settings.settings') }}"><i class="material-icons left">settings</i>Settings</a></li>
|
||||
<li><a href="{{ url_for('settings.settings') }}"><i class="material-icons left">settings</i>General settings</a></li>
|
||||
<li><a href="{{ url_for('profile.edit_profile', user_id=current_user.id) }}"><i class="material-icons left">contact_page</i>Profile settings</a></li>
|
||||
<li class="divider" tabindex="-1"></li>
|
||||
<li><a href="{{ url_for('auth.logout') }}">Log out</a></li>
|
||||
{% else %}
|
||||
|
||||
@ -24,6 +24,7 @@
|
||||
'js/RessourceLists/JobList.js',
|
||||
'js/RessourceLists/JobInputList.js',
|
||||
'js/RessourceLists/JobResultList.js',
|
||||
'js/RessourceLists/PublicCorporaList.js',
|
||||
'js/RessourceLists/SpacyNLPPipelineModelList.js',
|
||||
'js/RessourceLists/TesseractOCRPipelineModelList.js',
|
||||
'js/RessourceLists/UserList.js'
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="background primary-color"></div>
|
||||
<div class="row">
|
||||
<div class="col s2">
|
||||
<a href="{{ url_for('profile.profile') }}">
|
||||
<a href="{{ url_for('profile.profile', user_id=current_user.id) }}">
|
||||
<i class="material-icons" style="color:white; font-size:3em; margin-top: 25px; margin-left:-15px;">account_circle</i></div>
|
||||
</a>
|
||||
<div class="col s10">
|
||||
@ -14,12 +14,13 @@
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<li><a href="{{ url_for('main.index') }}">nopaque</a></li>
|
||||
{# <li><a href="{{ url_for('main.index') }}">nopaque</a></li> #}
|
||||
<li><a href="{{ url_for('main.news') }}"><i class="material-icons left">email</i>News</a></li>
|
||||
<li><a href="{{ url_for('main.user_manual') }}"><i class="material-icons">help</i>Manual</a></li>
|
||||
<li><a href="{{ url_for('main.dashboard') }}"><i class="material-icons">dashboard</i>Dashboard</a></li>
|
||||
<li><a href="{{ url_for('main.dashboard', _anchor='corpora') }}" style="padding-left: 47px;"><i class="nopaque-icons">I</i>My Corpora</a></li>
|
||||
<li><a href="{{ url_for('main.dashboard', _anchor='jobs') }}" style="padding-left: 47px;"><i class="nopaque-icons">J</i>My Jobs</a></li>
|
||||
<li><a href="{{ url_for('main.dashboard', _anchor='social') }}" style="padding-left: 47px;"><i class="material-icons">groups</i>Social</a></li>
|
||||
<li><a href="{{ url_for('contributions.contributions') }}"><i class="material-icons">new_label</i>Contribute</a></li>
|
||||
<li><div class="divider"></div></li>
|
||||
<li><a class="subheader">Processes & Services</a></li>
|
||||
|
||||
@ -42,6 +42,25 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col s12" id="social">
|
||||
<h3>Social</h3>
|
||||
<div class="col s6">
|
||||
<div class="card">
|
||||
<div class="card-content">
|
||||
<span class="card-title">Other users and groups</span>
|
||||
<p>Find other users and follow them to see their corpora and groups.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col s6">
|
||||
<div class="card">
|
||||
<div class="card-content">
|
||||
<span class="card-title">Public corpora</span>
|
||||
<p>Find public corpora</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock page_content %}
|
||||
|
||||
@ -5,20 +5,33 @@
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col s12">
|
||||
<h1 id="title">{{ title }}</h1>
|
||||
</div>
|
||||
<h1 id="title">{{ title }}</h1>
|
||||
</div>
|
||||
|
||||
<div class="col s12">
|
||||
<form method="POST">
|
||||
{{ edit_profile_settings_form.hidden_tag() }}
|
||||
<div class="card">
|
||||
<div class="card">
|
||||
<form method="POST" enctype="multipart/form-data">
|
||||
<div class="card-content">
|
||||
{{ edit_profile_settings_form.hidden_tag() }}
|
||||
<div class="row">
|
||||
<div class="col s1"></div>
|
||||
<div class="col s3">
|
||||
<img src="{{ url_for('static', filename='images/user_avatar.png') }}" alt="user-image" class="circle responsive-img">
|
||||
{{wtf.render_field(edit_profile_settings_form.user_avatar, accept='image/*', class='file-path validate')}}
|
||||
<div class="col s5">
|
||||
<div class="row">
|
||||
<div class="col s1"></div>
|
||||
<div class="col s10">
|
||||
{% if current_user.avatar %}
|
||||
<img src="{{ url_for('profile.avatar_download', user_id=user.id, avatar_id=current_user.avatar.id) }}" alt="user-image" class="circle responsive-img">
|
||||
{% else %}
|
||||
<img src="{{ url_for('static', filename='images/user_avatar.png') }}" alt="user-image" class="circle responsive-img">
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="col s1"></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col s12">
|
||||
{{wtf.render_field(edit_profile_settings_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder="Choose an image file")}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col s1"></div>
|
||||
<div class="col s7">
|
||||
{{ wtf.render_field(edit_profile_settings_form.username, material_icon='person') }}
|
||||
{{ wtf.render_field(edit_profile_settings_form.email, material_icon='email') }}
|
||||
@ -35,8 +48,8 @@
|
||||
{{ wtf.render_field(edit_profile_settings_form.submit, material_icon='send') }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -9,27 +9,26 @@
|
||||
<div class="card-content">
|
||||
<div class="row">
|
||||
<div class="col s1"></div>
|
||||
<div class="col s3">
|
||||
{% if about_me %}
|
||||
<img src="{{ user_image }}" alt="user-image" class="circle responsive-img" style="margin-top:50px;">
|
||||
<div class="col s4">
|
||||
{% if user.avatar %}
|
||||
<img src="{{ url_for('profile.avatar_download', user_id=user.id, avatar_id=user.avatar.id) }}" alt="user-image" class="circle responsive-img">
|
||||
{% else %}
|
||||
<img src="{{ user_image }}" alt="user-image" class="circle responsive-img">
|
||||
<img src="{{ url_for('static', filename='images/user_avatar.png') }}" alt="user-image" class="circle responsive-img">
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="col s1"></div>
|
||||
<div class="col s7">
|
||||
<h3>{{ user_name }}</h3>
|
||||
<div class="chip">Last seen: {{ last_seen }}</div>
|
||||
{% if location %}
|
||||
<p><span class="material-icons" style="margin-right:20px; margin-top:20px;">location_on</span><i>{{ location }}</i></p>
|
||||
<h3>{{ user.username }}</h3>
|
||||
<div class="chip">Last seen: {{ user.last_seen.strftime('%Y-%m-%d %H:%M') }}</div>
|
||||
{% if user.location %}
|
||||
<p><span class="material-icons" style="margin-right:20px; margin-top:20px;">location_on</span><i>{{ user.location }}</i></p>
|
||||
{% endif %}
|
||||
<p></p>
|
||||
<br>
|
||||
{% if about_me%}
|
||||
{% if user.about_me%}
|
||||
<div class="card">
|
||||
<div class="card-content">
|
||||
<span class="card-title">About me</span>
|
||||
<p>{{ about_me }}</p>
|
||||
<p>{{ user.about_me }}</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
@ -39,36 +38,38 @@
|
||||
<div class="col s1"></div>
|
||||
<div class="col s6">
|
||||
<table>
|
||||
{% if full_name %}
|
||||
{% if user.full_name %}
|
||||
<tr>
|
||||
<td><span class="material-icons">person</span></td>
|
||||
<td>{{ full_name }} </td>
|
||||
<td>{{ user.full_name }} </td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if email %}
|
||||
{% if user.email %}
|
||||
<tr>
|
||||
<td><span class="material-icons">email</span></td>
|
||||
<td>{{ email }}</td>
|
||||
<td>{{ user.email }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if website %}
|
||||
{% if user.website %}
|
||||
<tr>
|
||||
<td><span class="material-icons">laptop</span></td>
|
||||
<td><a href="{{ website }}">{{ website }}</a></td>
|
||||
<td><a href="{{ user.website }}">{{ user.website }}</a></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if organization %}
|
||||
{% if user.organization %}
|
||||
<tr>
|
||||
<td><span class="material-icons">business</span></td>
|
||||
<td>{{ organization }}</td>
|
||||
<td>{{ user.organization }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
</table>
|
||||
<br>
|
||||
<p><i>Member since: {{ member_since }}</i></p>
|
||||
<p><i>Member since: {{ user.member_since.strftime('%Y-%m-%d') }}</i></p>
|
||||
<p></p>
|
||||
<br>
|
||||
<a class="waves-effect waves-light btn-small" href="{{ url_for('settings.settings') }}">Edit profile</a>
|
||||
{% if current_user.is_authenticated and current_user.id == user.id %}
|
||||
<a class="waves-effect waves-light btn-small" href="{{ url_for('profile.edit_profile', user_id=user.id) }}">Edit profile</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -77,9 +78,20 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col s6">
|
||||
|
||||
<div class="card">
|
||||
<div class="card-content">
|
||||
<h4>Groups</h4>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col s6">
|
||||
<div class="card">
|
||||
<div class="card-content">
|
||||
<h4>Public corpora</h4>
|
||||
<div class="public-corpora-list" data-user-id="{{ user.hashid }}"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{% endblock page_content %}
|
||||
|
||||
@ -27,7 +27,13 @@
|
||||
<div class="card">
|
||||
<div class="card-content">
|
||||
<span class="card-title">Privacy settings</span>
|
||||
{{ wtf.render_field(edit_privacy_settings_form.public_profile) }}
|
||||
<br>
|
||||
{{ wtf.render_field(edit_privacy_settings_form.private_profile) }}
|
||||
<br>
|
||||
{{ wtf.render_field(edit_privacy_settings_form.private_email) }}
|
||||
<br>
|
||||
{{ wtf.render_field(edit_privacy_settings_form.only_username) }}
|
||||
<br>
|
||||
</div>
|
||||
<div class="card-action">
|
||||
<div class="right-align">
|
||||
|
||||
Reference in New Issue
Block a user