lkva/NDOJ
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix organization contest bug and add Bookmarks on dropdown list (#113)

Browse source
This commit is contained in:
Phuoc Anh Kha Le 2024-05-29 14:22:58 -05:00 • committed by GitHub
parent c6acfa5e05
commit 796a670cd7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 212 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

3
templates/base.html
View file

@ -204,6 +204,9 @@
<div class="dropdown-item">{{ _('Stats') }}</div>
</a>
{% endif %}
<a href="{{ url('user_bookmark') }}">
<div class="dropdown-item">{{ _('Bookmarks') }}</div>
</a>
<a href="{{ url('user_edit_profile') }}">
<div class="dropdown-item">{{ _('Edit profile') }}</div>
</a>

8
templates/contest/list.html
View file

@ -175,7 +175,7 @@
<div class="list-contest">
<div class="info-contest">
<div class="contest-title"> {{ _('Contests') }} </div>
{{ contest_head(contest) }}
{{ contest_head(contest, organization) }}
</div>
<div class="info-contest">
<div class="contest-title"> {{ _('Time') }} </div>
@ -217,7 +217,7 @@
<div class="list-contest">
<div class="info-contest">
<div class="contest-title"> {{ _('Contests') }} </div>
{{ contest_head(contest) }}
{{ contest_head(contest, organization) }}
</div>
<div class="info-contest">
<div class="contest-title"> {{ _('Time') }} </div>
@ -254,7 +254,7 @@
<div class="list-contest">
<div class="info-contest">
<div class="contest-title"> {{ _('Contests') }} </div>
{{ contest_head(contest) }}
{{ contest_head(contest, organization) }}
</div>
<div class="info-contest">
<div class="contest-title"> {{ _('Time') }} </div>
@ -288,7 +288,7 @@
<div class="list-contest">
<div class="info-contest">
<div class="contest-title"> {{ _('Contests') }} </div>
{{ contest_head(contest) }}
{{ contest_head(contest, organization) }}
</div>
<div class="info-contest">
<div class="contest-title"> {{ _('Time') }} </div>

6
templates/contest/macros.html
View file

@ -1,4 +1,4 @@
{% macro contest_head(contest) %}
{% macro contest_head(contest, organization=None) %}
<a href="{{ url('contest_view', contest.key) }}" class="contest-list-title" style="margin-right: 5px;">
{{contest.name}}
</a>
@ -8,7 +8,7 @@
<i class="fa fa-eye-slash"></i> {{ _('hidden') }}
</span>
{% endif %}
{% if contest.is_editable %}
{% if organization and contest.is_editable %}
<span class="contest-tag contest-tag-edit">
<a href="{{ url('organization_contest_edit', organization.id, organization.slug, contest.key) }}" class="white">
<i class="fa fa-edit"></i> {{ _('Edit') }}
@ -20,7 +20,7 @@
<i class="fa fa-lock"></i> {{ _('private') }}
</span>
{% endif %}
{% if not hide_contest_orgs %}
{% if not organization %}
{% if contest.is_organization_private %}
{% for org in contest.organizations.all() %}
{% include "organization/tag.html" %}

2
templates/user/user-tabs.html
View file

@ -8,7 +8,7 @@
{{ make_tab('impersonate', 'fa-eye', url('impersonate-start', user.user.id), _('Impersonate')) }}
{% endif %}
{% if user.user == request.user %}
{{ make_tab('bookmark', 'fa-bookmark', url('user_bookmark'), _('Bookmark')) }}
{{ make_tab('bookmark', 'fa-bookmark', url('user_bookmark'), _('Bookmarks')) }}
{{ make_tab('edit', 'fa-edit', url('user_edit_profile'), _('Edit profile')) }}
{% else %}
{% if perms.auth.change_user %}