Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New settings for disable comments and social #2304

Merged
merged 10 commits into from
Feb 9, 2024
Merged

New settings for disable comments and social #2304

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eec0b6a
new settings options for disabling comments and social
FherStk Dec 27, 2023
3c86cdf
Merge branch 'DMOJ:master' into option_for_disable_comments
FherStk Dec 27, 2023
a528dd5
disable-{social | comments} --> enable-{social | comments}
FherStk Jan 1, 2024
9f2f5fa
Fixes for 2304#discussion_r1439114231
FherStk Jan 2, 2024
b4dde9b
Merge branch 'DMOJ:master' into option_for_disable_comments
FherStk Jan 2, 2024
4786390
new settings options for disabling comments and social
FherStk Dec 27, 2023
e1146b9
Merge branch 'option_for_disable_comments' of https://github.com/Fher…
FherStk Jan 2, 2024
3602358
Merge branch 'DMOJ:master' into option_for_disable_comments
FherStk Feb 6, 2024
635572a
new settings options for disabling comments and social
FherStk Dec 27, 2023
09dc460
Merge branch 'option_for_disable_comments' of https://github.com/Fher…
Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dmoj/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@
FONTAWESOME_CSS = '//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css'
DMOJ_CANONICAL = ''

DMOJ_DISABLE_COMMENTS = False
FherStk marked this conversation as resolved.
Show resolved Hide resolved
DMOJ_DISABLE_SOCIAL = False

# Application definition

INSTALLED_APPS = ()
Expand Down
2 changes: 2 additions & 0 deletions judge/views/blog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ def get_context_data(self, **kwargs):
self.object.summary or self.object.content, 'blog')
context['meta_description'] = metadata[0]
context['og_image'] = self.object.og_image or metadata[1]
context['disable_comments'] = settings.DMOJ_DISABLE_COMMENTS
context['disable_social'] = settings.DMOJ_DISABLE_SOCIAL

return context

Expand Down
2 changes: 2 additions & 0 deletions judge/views/contests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,8 @@ def get_context_data(self, **kwargs):
problem_count=Count('id'),
),
)
context['disable_comments'] = settings.DMOJ_DISABLE_COMMENTS
context['disable_social'] = settings.DMOJ_DISABLE_SOCIAL
return context


Expand Down
2 changes: 2 additions & 0 deletions judge/views/problem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ def get_context_data(self, **kwargs):
raise Http404()
context['solution'] = solution
context['has_solved_problem'] = self.object.id in self.get_completed_problems()
context['disable_comments'] = settings.DMOJ_DISABLE_COMMENTS
return context

def get_comment_page(self):
Expand Down Expand Up @@ -201,6 +202,7 @@ def get_context_data(self, **kwargs):
context['description'], 'problem')
context['meta_description'] = self.object.summary or metadata[0]
context['og_image'] = self.object.og_image or metadata[1]
context['disable_comments'] = settings.DMOJ_DISABLE_COMMENTS

context['vote_perm'] = self.object.vote_permission_for_user(user)
if context['vote_perm'].can_vote():
Expand Down
18 changes: 12 additions & 6 deletions templates/blog/content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,18 @@
{% endcache %}
</div>
</div>
<hr>
<span class="social">
{{ post_to_facebook(request, post, '<i class="fa fa-facebook-official"></i>') }}
{{ post_to_twitter(request, SITE_NAME + ':', post, '<i class="fa fa-twitter"></i>') }}
</span>
{% include "comments/list.html" %}

{% if not disable_social %}
<hr>
<span class="social">
{{ post_to_facebook(request, contest, '<i class="fa fa-facebook-official"></i>') }}
{{ post_to_twitter(request, SITE_NAME + ':', contest, '<i class="fa fa-twitter"></i>') }}
</span>
{% endif %}

{% if not disable_comments %}
{% include "comments/list.html" %}
{% endif %}
{% endblock %}

{% block bodyend %}
Expand Down
16 changes: 10 additions & 6 deletions templates/contest/contest.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,17 @@ <h2 style="margin-bottom: 0.2em"><i class="fa fa-fw fa-question-circle"></i>{{ _
</div>
{% endif %}

<hr>
<span class="social">
{{ post_to_facebook(request, contest, '<i class="fa fa-facebook-official"></i>') }}
{{ post_to_twitter(request, SITE_NAME + ':', contest, '<i class="fa fa-twitter"></i>') }}
</span>
{% if not disable_social %}
<hr>
<span class="social">
{{ post_to_facebook(request, contest, '<i class="fa fa-facebook-official"></i>') }}
{{ post_to_twitter(request, SITE_NAME + ':', contest, '<i class="fa fa-twitter"></i>') }}
</span>
{% endif %}

{% include "comments/list.html" %}
{% if not disable_comments %}
{% include "comments/list.html" %}
{% endif %}
{% endblock %}

{% block description_end %}{% endblock %}
Expand Down
9 changes: 6 additions & 3 deletions templates/problem/editorial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,12 @@
{% endif %}
{% endwith %}
{{ solution.content|markdown('solution', MATH_ENGINE)|reference|str|safe }}
</div>
<hr>
{% include "comments/list.html" %}
</div>

{% if not disable_comments %}
Xyene marked this conversation as resolved.
Show resolved Hide resolved
<hr>
{% include "comments/list.html" %}
{% endif %}
{% endblock %}

{% block bodyend %}
Expand Down
2 changes: 1 addition & 1 deletion templates/problem/problem.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ <h2><i class="fa fa-question-circle"></i> {{ _('Clarifications') }}</h2>
<p class="no-comments-message">{{ _('No clarifications have been made at this time.') }}</p>
{% endif %}
</div>
{% else %}
{% elif not disable_comments %}
{% include "comments/list.html" %}
{% endif %}
{% endblock %}
Expand Down
Loading