Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nopaque
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SFB 1288 - INF
nopaque
Commits
dcdb71ac
Commit
dcdb71ac
authored
2 years ago
by
Patrick Jentsch
Browse files
Options
Downloads
Patches
Plain Diff
Remove more UI leftovers from community update
parent
23cdfb14
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/main/routes.py
+14
-9
14 additions, 9 deletions
app/main/routes.py
app/templates/corpora/public_corpus.html.j2
+1
-1
1 addition, 1 deletion
app/templates/corpora/public_corpus.html.j2
app/templates/main/dashboard.html.j2
+4
-4
4 additions, 4 deletions
app/templates/main/dashboard.html.j2
with
19 additions
and
14 deletions
app/main/routes.py
+
14
−
9
View file @
dcdb71ac
...
...
@@ -27,15 +27,20 @@ def faq():
@bp.route
(
'
/dashboard
'
)
@login_required
def
dashboard
():
users
=
[
u
.
to_json_serializeable
(
filter_by_privacy_settings
=
True
)
for
u
in
User
.
query
.
filter
(
User
.
is_public
==
True
,
User
.
id
!=
current_user
.
id
).
all
()
]
corpora
=
[
c
.
to_json_serializeable
()
for
c
in
Corpus
.
query
.
filter
(
Corpus
.
is_public
==
True
,
Corpus
.
user
!=
current_user
).
all
()
]
return
render_template
(
'
main/dashboard.html.j2
'
,
title
=
'
Dashboard
'
,
users
=
users
,
corpora
=
corpora
)
# users = [
# u.to_json_serializeable(filter_by_privacy_settings=True) for u
# in User.query.filter(User.is_public == True, User.id != current_user.id).all()
# ]
# corpora = [
# c.to_json_serializeable() for c
# in Corpus.query.filter(Corpus.is_public == True, Corpus.user != current_user).all()
# ]
return
render_template
(
'
main/dashboard.html.j2
'
,
title
=
'
Dashboard
'
,
# users=users,
# corpora=corpora
)
@bp.route
(
'
/dashboard2
'
)
...
...
This diff is collapsed.
Click to expand it.
app/templates/corpora/public_corpus.html.j2
+
1
−
1
View file @
dcdb71ac
...
...
@@ -14,7 +14,7 @@
<a class="action-button btn waves-effect waves-light" data-action="unfollow-request"><i class="material-icons left">add</i>Unfollow Corpus</a>
{% endif %}
{% if corpus.status.name in ['BUILT', 'STARTING_ANALYSIS_SESSION', 'RUNNING_ANALYSIS_SESSION', 'CANCELING_ANALYSIS_SESSION'] and current_user.is_following_corpus(corpus) %}
<a class="btn waves-effect waves-light" href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}">Analy
s
e</a>
<a class="btn waves-effect waves-light" href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}">Analy
z
e</a>
{% endif %}
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
app/templates/main/dashboard.html.j2
+
4
−
4
View file @
dcdb71ac
...
...
@@ -42,7 +42,7 @@
</div>
</div>
</div>
<div class="col s12" id="social">
{#
<div class="col s12" id="social">
<h3>Social</h3>
<div class="card">
<div class="card-content">
...
...
@@ -58,7 +58,7 @@
<div class="public-corpus-list no-autoinit"></div>
</div>
</div>
</div>
</div>
#}
</div>
</div>
{% endblock page_content %}
...
...
@@ -116,11 +116,11 @@
{% block scripts %}
{{ super() }}
<script>
{#
<script>
let userList = new UserList(document.querySelector('.user-list'));
userList.add({{ users|tojson }});
let publicCorpusList = new PublicCorpusList(document.querySelector('.public-corpus-list'));
publicCorpusList.add({{ corpora|tojson }});
</script>
</script>
#}
{% endblock scripts %}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment