From 116f1dddf595a6a2cbd3c904c6d057fa7a37f311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Hells=C3=A9n?= Date: Tue, 8 Aug 2023 02:24:11 +0200 Subject: [PATCH] Update HTML --- discord_rss_bot/templates/add_webhook.html | 22 ++++++++++------------ discord_rss_bot/templates/base.html | 19 ++++++++----------- discord_rss_bot/templates/blacklist.html | 10 +++++----- discord_rss_bot/templates/feed.html | 12 +++++------- discord_rss_bot/templates/nav.html | 2 +- discord_rss_bot/templates/webhooks.html | 6 ++++++ discord_rss_bot/templates/whitelist.html | 10 +++++----- 7 files changed, 40 insertions(+), 41 deletions(-) diff --git a/discord_rss_bot/templates/add_webhook.html b/discord_rss_bot/templates/add_webhook.html index 26dd800..5aca422 100644 --- a/discord_rss_bot/templates/add_webhook.html +++ b/discord_rss_bot/templates/add_webhook.html @@ -7,30 +7,28 @@
{# Webhook name #}
- +
+ id="webhook_name" />
{# Webhook URL #}
- +
+ id="webhook_url" /> +
+
+ You can append ?thread_id=THREAD_ID to the end + of the URL to send messages to a thread. You can get + the thread ID by right-clicking on the thread and + Copy Thread ID.
{# Submit button #} diff --git a/discord_rss_bot/templates/base.html b/discord_rss_bot/templates/base.html index 680443e..7cde6f1 100644 --- a/discord_rss_bot/templates/base.html +++ b/discord_rss_bot/templates/base.html @@ -1,18 +1,18 @@ - + - - + + + content="Stay updated with the latest news and events with our easy-to-use RSS bot. Never miss a message or announcement again with real-time notifications directly to your Discord server." /> + content="discord, rss, bot, notifications, announcements, updates, real-time, server, messages, news, events, feed." /> - - + crossorigin="anonymous" /> + + discord-rss-bot {% block title %} {% endblock title %} @@ -33,9 +33,6 @@ <a class="text-muted" href="https://github.com/TheLovinator1">TheLovinator</a> </p> <ul class="nav col-md-4 justify-content-end"> - <li class="nav-item"> - <a href="mailto:tlovinator@gmail.com" class="nav-link px-2 text-muted">Email</a> - </li> <li class="nav-item"> <a href="https://github.com/TheLovinator1/discord-rss-bot/issues" class="nav-link px-2 text-muted">Report an issue</a> diff --git a/discord_rss_bot/templates/blacklist.html b/discord_rss_bot/templates/blacklist.html index 33ca828..d4e4838 100644 --- a/discord_rss_bot/templates/blacklist.html +++ b/discord_rss_bot/templates/blacklist.html @@ -35,29 +35,29 @@ type="text" class="form-control bg-dark border-dark text-muted" id="blacklist_title" - value="{%- if blacklist_title -%}{{ blacklist_title }}{%- endif -%}"/> + value="{%- if blacklist_title -%}{{ blacklist_title }}{%- endif -%}" /> <label for="blacklist_summary" class="col-sm-6 col-form-label">Blacklist - Summary</label> <input name="blacklist_summary" type="text" class="form-control bg-dark border-dark text-muted" id="blacklist_summary" - value="{%- if blacklist_summary -%}{{ blacklist_summary }}{%- endif -%}"/> + value="{%- if blacklist_summary -%}{{ blacklist_summary }}{%- endif -%}" /> <label for="blacklist_content" class="col-sm-6 col-form-label">Blacklist - Content</label> <input name="blacklist_content" type="text" class="form-control bg-dark border-dark text-muted" id="blacklist_content" - value="{%- if blacklist_content -%}{{ blacklist_content }}{%- endif -%}"/> + value="{%- if blacklist_content -%}{{ blacklist_content }}{%- endif -%}" /> <label for="blacklist_author" class="col-sm-6 col-form-label">Blacklist - Author</label> <input name="blacklist_author" type="text" class="form-control bg-dark border-dark text-muted" id="blacklist_author" - value="{%- if blacklist_author -%}{{ blacklist_author }}{%- endif -%}"/> + value="{%- if blacklist_author -%}{{ blacklist_author }}{%- endif -%}" /> </div> </div> <!-- Add a hidden feed_url field to the form --> - <input type="hidden" name="feed_url" value="{{ feed.url }}"/> + <input type="hidden" name="feed_url" value="{{ feed.url }}" /> <!-- Submit button --> <div class="d-md-flex"> <button class="btn btn-dark btn-sm">Update blacklist</button> diff --git a/discord_rss_bot/templates/feed.html b/discord_rss_bot/templates/feed.html index 31df0fa..16b6931 100644 --- a/discord_rss_bot/templates/feed.html +++ b/discord_rss_bot/templates/feed.html @@ -18,9 +18,7 @@ <button class="btn btn-danger btn-sm" name="feed_url" value="{{ feed.url }}" - onclick="return confirm('Are you sure you want to delete this feed?')"> - Remove - </button> + onclick="return confirm('Are you sure you want to delete this feed?')">Remove</button> </form> {% if not feed.updates_enabled %} <form action="/unpause" method="post"> @@ -46,18 +44,18 @@ {% endif %} <a class="text-muted" href="/whitelist?feed_url={{ feed.url|encode_url }}">Whitelist</a> - <br/> + <br /> <a class="text-muted" href="/blacklist?feed_url={{ feed.url|encode_url }}">Blacklist</a> - <br/> + <br /> <a class="text-muted" href="/custom?feed_url={{ feed.url|encode_url }}">Customize message {% if not should_send_embed %}(Active){% endif %} </a> - <br/> + <br /> <a class="text-muted" href="/embed?feed_url={{ feed.url|encode_url }}">Customize embed {% if should_send_embed %}(Active){% endif %} </a> - <br/> + <br /> </div> {# HTML is created in main.create_html_for_feed #} <pre> diff --git a/discord_rss_bot/templates/nav.html b/discord_rss_bot/templates/nav.html index 70d969c..e14b57e 100644 --- a/discord_rss_bot/templates/nav.html +++ b/discord_rss_bot/templates/nav.html @@ -25,7 +25,7 @@ <input name="query" class="form-control bg-dark border-dark text-muted" type="search" - placeholder="Search"/> + placeholder="Search" /> </form> {# Donate button #} <ul class="navbar-nav ms-auto"> diff --git a/discord_rss_bot/templates/webhooks.html b/discord_rss_bot/templates/webhooks.html index 15bc626..99df9e5 100644 --- a/discord_rss_bot/templates/webhooks.html +++ b/discord_rss_bot/templates/webhooks.html @@ -42,6 +42,12 @@ id="new_hook" /> </div> <button type="submit" class="btn btn-primary col-sm-1 ">Modify</button> + <div class="form-text"> + You can append ?thread_id=THREAD_ID to the end + of the URL to send messages to a thread. You can get + the thread ID by right-clicking on the thread and + Copy Thread ID. + </div> </div> </form> <form action="/delete_webhook" method="post"> diff --git a/discord_rss_bot/templates/whitelist.html b/discord_rss_bot/templates/whitelist.html index 9f474dc..44e3a76 100644 --- a/discord_rss_bot/templates/whitelist.html +++ b/discord_rss_bot/templates/whitelist.html @@ -35,29 +35,29 @@ type="text" class="form-control bg-dark border-dark text-muted" id="whitelist_title" - value="{%- if whitelist_title -%}{{ whitelist_title }} {%- endif -%}"/> + value="{%- if whitelist_title -%}{{ whitelist_title }} {%- endif -%}" /> <label for="whitelist_summary" class="col-sm-6 col-form-label">Whitelist - Summary</label> <input name="whitelist_summary" type="text" class="form-control bg-dark border-dark text-muted" id="whitelist_summary" - value="{%- if whitelist_summary -%}{{ whitelist_summary }}{%- endif -%}"/> + value="{%- if whitelist_summary -%}{{ whitelist_summary }}{%- endif -%}" /> <label for="whitelist_content" class="col-sm-6 col-form-label">Whitelist - Content</label> <input name="whitelist_content" type="text" class="form-control bg-dark border-dark text-muted" id="whitelist_content" - value="{%- if whitelist_content -%}{{ whitelist_content }}{%- endif -%}"/> + value="{%- if whitelist_content -%}{{ whitelist_content }}{%- endif -%}" /> <label for="whitelist_author" class="col-sm-6 col-form-label">Whitelist - Author</label> <input name="whitelist_author" type="text" class="form-control bg-dark border-dark text-muted" id="whitelist_author" - value="{%- if whitelist_author -%} {{ whitelist_author }} {%- endif -%}"/> + value="{%- if whitelist_author -%} {{ whitelist_author }} {%- endif -%}" /> </div> </div> <!-- Add a hidden feed_url field to the form --> - <input type="hidden" name="feed_url" value="{{ feed.url }}"/> + <input type="hidden" name="feed_url" value="{{ feed.url }}" /> <!-- Submit button --> <div class="d-md-flex"> <button class="btn btn-dark btn-sm">Update whitelist</button>