felixfoertsch/tildes
1
0
Fork 0
mirror of https://gitlab.com/tildes/tildes.git synced 2026-04-17 14:59:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Say "Ignore this post" in topic actions menu

Browse Source 
This should be a little more clear about what the Ignore function does
(as opposed to thinking that it might ignore the user that posted the
topic, one of the topic's tags, etc.).

Not a huge fan of this implementation, but it seems to work okay.
This commit is contained in:
Deimos
2020-01-22 18:04:40 -07:00
parent e7025cd442
commit 2434e06e93
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tildes/tildes/templates/macros/buttons.jinja2
View File

@@ -1,7 +1,7 @@
{# Copyright (c) 2019 Tildes contributors <code@tildes.net> #}
{# SPDX-License-Identifier: AGPL-3.0-or-later #}
{% macro post_action_toggle_button(name, subject, is_toggled) %}
{% macro post_action_toggle_button(name, subject, is_toggled, trigger_name=None) %}
{% if subject is comment %}
{% set type_name = "comment" %}
{% elif subject is topic %}
@@ -9,12 +9,21 @@
{% endif %}
{% set route_name = "ic_" + type_name + "_" + name %}
{# If not specified, set the trigger_name from the one in the request (if any) #}
{% set trigger_name = trigger_name or request.params.get("ic-trigger-name") %}
{% if name == "bookmark" %}
{% set normal_label = "Bookmark" %}
{% set toggled_label = "Unbookmark" %}
{% elif name == "ignore" %}
{% set normal_label = "Ignore" %}
{% set toggled_label = "Unignore" %}
{% if trigger_name and trigger_name.startswith("topic-actions-") %}
{# For the topic actions menu, say "(Un)ignore this post" for clarity" #}
{% set normal_label = "Ignore this post" %}
{% set toggled_label = "Unignore this post" %}
{% endif %}
{% elif name == "lock" %}
{% set normal_label = "Lock" %}
{% set toggled_label = "Unlock" %}
@@ -39,12 +48,14 @@
<li>
{% if not is_toggled %}
<button class="btn-post-action"
{% if trigger_name %}name="{{ trigger_name }}"{% endif %}
data-ic-put-to="{{ _post_action_toggle_button_url(route_name, subject) }}"
data-ic-replace-target="true"
{% if normal_confirm %}data-ic-confirm="{{ normal_confirm }}"{% endif %}
>{{ normal_label }}</button>
{% else %}
<button class="btn-post-action btn-post-action-used"
{% if trigger_name %}name="{{ trigger_name }}"{% endif %}
data-ic-delete-from="{{ _post_action_toggle_button_url(route_name, subject) }}"
data-ic-replace-target="true"
{% if toggled_confirm %}data-ic-confirm="{{ toggled_confirm }}"{% endif %}

2
tildes/tildes/templates/macros/topics.jinja2
View File

@@ -205,7 +205,7 @@
{% endif %}
{% if request.has_permission("ignore", topic) %}
{{ post_action_toggle_button("ignore", topic, is_toggled=topic.user_ignored) }}
{{ post_action_toggle_button("ignore", topic, is_toggled=topic.user_ignored, trigger_name="topic-actions-ignore") }}
{% endif %}
</ul>
</div>