diff --git a/app/static/images/user_avatar.png b/app/static/images/user_avatar.png
index 01dfaa60ee378b82d15034d459111dafee0738dd..360c0ec022f59ff725f09d4061e90e2409c69449 100644
Binary files a/app/static/images/user_avatar.png and b/app/static/images/user_avatar.png differ
diff --git a/app/templates/admin/admin.html.j2 b/app/templates/admin/admin.html.j2
index 8f580c001a6f0755e5080424f3ef13764b1fe2ef..f944bbe9145f8afbd06a31aa2acfcd8e9d277f04 100644
--- a/app/templates/admin/admin.html.j2
+++ b/app/templates/admin/admin.html.j2
@@ -12,7 +12,14 @@
<a href="{{ url_for('.users') }}" style="position: absolute; width: 100%; height: 100%;"></a>
<div class="card-content">
<span class="card-title"><i class="material-icons left">group</i>Users</span>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, </p>
+ <p>Edit the individual user accounts. You have the following options:</p>
+ <ul>
+ <li>- View, edit and delete user accounts</li>
+ <li>- View, edit and delete user corpora</li>
+ <li>- View, edit and delete user jobs</li>
+ <li>- View, edit and delete user added Tesseract models</li>
+ <li>- View, edit and delete user added SpaCy models</li>
+ </ul>
</div>
</div>
</div>
@@ -22,7 +29,12 @@
<a href="{{ url_for('.corpora') }}" style="position: absolute; width: 100%; height: 100%;"></a>
<div class="card-content">
<span class="card-title"><i class="nopaque-icons left">I</i>Corpora</span>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, </p>
+ <p>Edit all Corpora. You have the following options:</p>
+ <ul>
+ <li>- View, edit and delete corpora</li>
+ <li>- View, edit and delete corpus jobs</li>
+ <li>- Edit corpus follower roles and the public status of the corpus</li>
+ </ul>
</div>
</div>
</div>
diff --git a/app/templates/admin/user_settings.html.j2 b/app/templates/admin/user_settings.html.j2
index 48391a71cc293a42a42dc0f7b05740b06679baaf..fb022564b9cfc357c1ffea3f8d050a7f03e98ef6 100644
--- a/app/templates/admin/user_settings.html.j2
+++ b/app/templates/admin/user_settings.html.j2
@@ -5,10 +5,7 @@
<div class="col s12 l4">
<h4>Administrator Settings</h4>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam
- nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
- sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
- Stet clita kasd gubergren, no sea tak</p>
+ <p>Here the Confirmation Status of the user can be set manually and a special role can be assigned.</p>
</div>
<div class="col s12 l8">
<br>
diff --git a/app/templates/corpora/analyse_corpus.reader.html.j2 b/app/templates/corpora/analyse_corpus.reader.html.j2
index 99cdf56ea7bd957ea51438b412bc0e9d0e4509f1..a4ca22fb7b20f8666ed4387575d652cf57e1f9c3 100644
--- a/app/templates/corpora/analyse_corpus.reader.html.j2
+++ b/app/templates/corpora/analyse_corpus.reader.html.j2
@@ -6,7 +6,7 @@
<div class="row">
<div class="col s12 m9 l10">
<div class="row">
- <div class="input-field col s4 m3 l2">
+ <div class="input-field col s4 m3">
<i class="material-icons prefix">format_list_numbered</i>
<select class="corpus-analysis-action" name="per-page">
<option value="500" selected>500</option>
@@ -15,7 +15,7 @@
</select>
<label>Tokens per page</label>
</div>
- <div class="input-field col s4 m3 l2">
+ <div class="input-field col s4 m3">
<i class="material-icons prefix">format_shapes</i>
<select name="text-style">
<option value="0">Plain text</option>
@@ -24,7 +24,7 @@
</select>
<label>Text style</label>
</div>
- <div class="input-field col s4 m3 l2">
+ <div class="input-field col s4 m3">
<i class="material-icons prefix">format_quote</i>
<select name="token-representation">
<option value="lemma">lemma</option>
diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2
index a064190ff1da00e0f2d1569926793768e1aa6209..85257b9be63bec268e5ed7534a47e7a353548e1f 100644
--- a/app/templates/corpora/corpus.html.j2
+++ b/app/templates/corpora/corpus.html.j2
@@ -9,7 +9,7 @@
<div class="col s12">
<h1 id="title"><span class="corpus-title"></span></h1>
</div>
- <div class="col s12 l8">
+ <div class="col s12 l7">
<div class="card service-color-border border-darken" data-service="corpus-analysis" style="border-top: 10px solid">
<div class="card-content">
<span class="chip corpus-status corpus-status-color corpus-status-text white-text"></span>
@@ -52,7 +52,7 @@
</div>
</div>
- <div class="col s12 l4">
+ <div class="col s12 l5">
<div class="card">
<div class="card-content">
<span class="card-title">Actions</span>
@@ -145,9 +145,12 @@
<div class="modal-content">
<h4>Invite a nopaque user by username</h4>
<p>
- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+ Add other nopaque users as followers to your corpus. You can also add multiple
+ users at the same time. Added users get the role of "viewer"
+ by default, so they are only allowed to analyze files within nopaque, but not
+ to download or edit them. You can customize the roles later below.
</p>
- <h5>HIER RECHTLICHEN HINWEIS EINFÃœGEN</h5>
+ <p><b>Please make sure that the invited users are legally allowed to view the included corpus files.</b></p>
<div class="row">
<div class="col s10">
<div class="chips no-autoinit" id="invite-user-modal-search"></div>
diff --git a/app/templates/users/settings/settings.html.j2 b/app/templates/users/settings/settings.html.j2
index 3f028e7a7048181e452a47f26e3ccb1f7105a4ca..4e52344a396c6bb483f3870c3f254f390b149df8 100644
--- a/app/templates/users/settings/settings.html.j2
+++ b/app/templates/users/settings/settings.html.j2
@@ -10,10 +10,9 @@
<div class="col s12 l4">
<h4>Profile Settings</h4>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam
- nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
- sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
- Stet clita kasd gubergren, no sea tak</p>
+ <p>You can edit your public profile here and share it with other nopaque users.
+ Tell others about your (scientific) background so they can relate and network with you.
+ You can also set what should not be visible.</p>
</div>
<div class="col s12 l8">
<br>
@@ -117,10 +116,8 @@
<div class="col s12 l4">
<h4>General Settings</h4>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam
- nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
- sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
- Stet clita kasd gubergren, no sea tak</p>
+ <p>Make general changes to your profile here. You can change your password,
+ username or email address, delete your profile and customize your notifications.</p>
</div>
<div class="col s12 l8">
<br>
diff --git a/app/templates/users/user.html.j2 b/app/templates/users/user.html.j2
index 68648a30cb95aa193a71a906dde1417317f111eb..25e1e442c3f7feac1e4da5b8dc5b5f3dc6b89f53 100644
--- a/app/templates/users/user.html.j2
+++ b/app/templates/users/user.html.j2
@@ -12,6 +12,7 @@
<div class="col s1"></div>
<div class="col s3">
<p> </p>
+ <br>
<img src="{{ url_for('.user_avatar', user_id=user.id) }}" alt="user-image" class="circle responsive-img">
</div>
<div class="col s1"></div>
@@ -39,12 +40,6 @@
<p> </p>
<p><i class="material-icons left">location_on</i>{{ user.location }}</p>
{% endif %}
- {% if user.about_me %}
- <blockquote>
- <h5>About me</h5>
- <p>{{ user.about_me }}</p>
- </blockquote>
- {% endif %}
</div>
</div>
</div>
@@ -54,6 +49,14 @@
<div class="row">
<div class="col s1"></div>
<div class="col s8">
+ {% if user.about_me %}
+ <blockquote>
+ <h5>About me</h5>
+ <p>{{ user.about_me }}</p>
+ </blockquote>
+ {% endif %}
+ <p></p>
+ <br>
<table>
{% if user.full_name %}
<tr>