diff --git a/frontends/bringrss_flask/static/css/bringrss.css b/frontends/bringrss_flask/static/css/bringrss.css index 29923e0..3ead5bf 100644 --- a/frontends/bringrss_flask/static/css/bringrss.css +++ b/frontends/bringrss_flask/static/css/bringrss.css @@ -13,3 +13,8 @@ p:last-child { margin-bottom: 0; } + +.navigation_link:hover +{ + background-color: var(--color_secondary); +} diff --git a/frontends/bringrss_flask/static/css/common.css b/frontends/bringrss_flask/static/css/common.css index 7dc7bca..a1376a0 100644 --- a/frontends/bringrss_flask/static/css/common.css +++ b/frontends/bringrss_flask/static/css/common.css @@ -29,7 +29,7 @@ getComputedStyle(document.documentElement).getPropertyValue("--narrow").trim() = html { - height: 100vh; + min-height: 100vh; box-sizing: border-box; color: var(--color_text_normal); } @@ -48,7 +48,7 @@ body "content_body" 1fr /1fr; - min-height: 100%; + min-height: 100vh; margin: 0; padding: 8px; grid-row-gap: 8px; diff --git a/frontends/bringrss_flask/templates/feed_settings.html b/frontends/bringrss_flask/templates/feed_settings.html index a0c10ad..1ad914f 100644 --- a/frontends/bringrss_flask/templates/feed_settings.html +++ b/frontends/bringrss_flask/templates/feed_settings.html @@ -53,16 +53,11 @@ h1:first-child width: 3em; text-align: right; } -.group -{ - border: 1px solid var(--color_highlight); - border-radius: 4px; - padding: 4px; -} #filters_group h2:first-child, .group h2:first-child { margin-top: 0; + margin-bottom: 0; } #filters .filter @@ -124,111 +119,112 @@ h1:first-child + - {% set autorefresh_group_hidden = '' if feed.rss_url else 'hidden' %} -
- {% set checked = 'checked' if feed.autorefresh_interval > 0 else '' %} - - - - + {% set autorefresh_group_hidden = '' if feed.rss_url else 'hidden' %} +
+ {% set checked = 'checked' if feed.autorefresh_interval > 0 else '' %} + + + + - {% set autorefresh_interval_hidden = '' if checked else 'hidden' %} -

- {% set interval = feed.autorefresh_interval|abs %} - {% set hours = (interval / 3600)|int %} - {% set minutes = ((interval % 3600) / 60)|int %} - Refresh every - hours, - minutes - -

-

Note: autorefresh is not inherited from parent to child. When you manually click the refresh button on a parent, its children will also be refreshed, but if the parent is refreshed automatically, the children will wait for their own autorefresh.

+ {% set autorefresh_interval_hidden = '' if checked else 'hidden' %} +

+ {% set interval = feed.autorefresh_interval|abs %} + {% set hours = (interval / 3600)|int %} + {% set minutes = ((interval % 3600) / 60)|int %} + Refresh every + hours, + minutes + +

+

Note: autorefresh is not inherited from parent to child. When you manually click the refresh button on a parent, its children will also be refreshed, but if the parent is refreshed automatically, the children will wait for their own autorefresh.

- {% if feed.last_refresh %} -

Last refresh: {{feed.last_refresh|timestamp_to_8601_local}}

- {% endif %} + {% if feed.last_refresh %} +

Last refresh: {{feed.last_refresh|timestamp_to_8601_local}}

+ {% endif %} - {% if feed.next_refresh < INF %} -

Next refresh: {{feed.next_refresh|timestamp_to_8601_local}}

- {% endif %} + {% if feed.next_refresh < INF %} +

Next refresh: {{feed.next_refresh|timestamp_to_8601_local}}

+ {% endif %} - {% if feed.last_refresh_error %} -

The last refresh attempt at {{feed.last_refresh_attempt|timestamp_to_8601_local}} encountered the following error:

-
-                {{-feed.last_refresh_error|trim-}}
-            
- {% endif %} -
+ {% if feed.last_refresh_error %} +

The last refresh attempt at {{feed.last_refresh_attempt|timestamp_to_8601_local}} encountered the following error:

+
+            {{-feed.last_refresh_error|trim-}}
+        
+ {% endif %} +
-
- {% set checked = 'checked' if feed.refresh_with_others else '' %} - - - - -

If disabled, this feed will only be refreshed when you click its own refresh button, or when its autorefresh timer is ready.

-
+
+ {% set checked = 'checked' if feed.refresh_with_others else '' %} + + + + +

If disabled, this feed will only be refreshed when you click its own refresh button, or when its autorefresh timer is ready.

+
-
- {% set checked = 'checked' if feed.isolate_guids else '' %} - - - - -

When feeds are refreshed, the system uses GUIDs and other news attributes to detect which items are new and which are duplicates from the previous refresh.

-

If the feed is isolated, the GUIDs will only be used to search for duplicates within this feed. If the feed is not isolated, the GUIDs will be used to search for duplicates among all news in the database.

-

If you have two feeds that may produce the same items (e.g. two newspaper category feeds, and a news article belongs to both categories), this setting will control whether the news item appears in both feeds or just the one that got it first.

-
+
+ {% set checked = 'checked' if feed.isolate_guids else '' %} + + + + +

When feeds are refreshed, the system uses GUIDs and other news attributes to detect which items are new and which are duplicates from the previous refresh.

+

If the feed is isolated, the GUIDs will only be used to search for duplicates within this feed. If the feed is not isolated, the GUIDs will be used to search for duplicates among all news in the database.

+

If you have two feeds that may produce the same items (e.g. two newspaper category feeds, and a news article belongs to both categories), this setting will control whether the news item appears in both feeds or just the one that got it first.

+
-
-

Filters

-

Filters will execute in the order they are listed here:

-
-
- {% for filt in feed_filters %} -
- {{filt.display_name}} - Edit - -
- {% endfor %} -
- - -
- - {% set http_headers_hidden = '' if feed.rss_url else 'hidden' %} -
-

If you need to define additional HTTP headers which will be sent on every refresh request for this feed, you can add them below. Write one header per line like Key: value, e.g. Host: example.com

- - -
- -
+
+

Filters

+

Filters will execute in the order they are listed here:

+
+
+ {% for filt in feed_filters %} +
+ {{filt.display_name}} + Edit + data-prompt="Remove this filter?" + data-onclick="return remove_filter_form(event);" + >Remove +
+ {% endfor %}
+ + +
+ + {% set http_headers_hidden = '' if feed.rss_url else 'hidden' %} +
+

HTTP Headers

+

If you need to define additional HTTP headers which will be sent on every refresh request for this feed, you can add them below. Write one header per line like Key: value, e.g. Host: example.com

+ + +
+ +
+
diff --git a/frontends/bringrss_flask/templates/filters.html b/frontends/bringrss_flask/templates/filters.html index 868b7d7..df90028 100644 --- a/frontends/bringrss_flask/templates/filters.html +++ b/frontends/bringrss_flask/templates/filters.html @@ -15,6 +15,10 @@ diff --git a/frontends/bringrss_flask/templates/header.html b/frontends/bringrss_flask/templates/header.html index f7f4aa3..609d4e7 100644 --- a/frontends/bringrss_flask/templates/header.html +++ b/frontends/bringrss_flask/templates/header.html @@ -1,8 +1,8 @@ {% macro make_header(site, request) %}