diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2022-07-04 09:53:26 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-07-04 09:53:26 +0200 |
| commit | 509c8cae6381ec46af7c8303eb92fda6ce496a4a (patch) | |
| tree | 653f7f44df842f9d7135decd89467879a0098c50 /app/layout | |
| parent | 57d571230eeb2d3ede57e640b640f17c7a2298a2 (diff) | |
Dynamic OPML (#4407)
* Dynamic OPML draft
#fix https://github.com/FreshRSS/FreshRSS/issues/4191
* Export dynamic OPML
http://opml.org/spec2.opml#1629043127000
* Restart with simpler approach
* Minor revert
* Export dynamic OPML also for single feeds
* Special category type for importing dynamic OPML
* Parameter for excludeMutedFeeds
* Details
* More draft
* i18n
* Fix update
* Draft manual import working
* Working manual refresh
* Draft automatic update
* Working Web refresh + fixes
* Import/export dynamic OPML settings
* Annoying numerous lines in SQL logs
* Fix minor JavaScript error
* Fix auto adding new columns
* Add require
* Add missing 🗲
* Missing space
* Disable adding new feeds to dynamic categories
* Link from import
* i18n typo
* Improve theme icon function
* Fix pink-dark
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/aside_feed.phtml | 4 | ||||
| -rw-r--r-- | app/layout/header.phtml | 2 | ||||
| -rw-r--r-- | app/layout/layout.phtml | 7 | ||||
| -rw-r--r-- | app/layout/simple.phtml | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index e02af8727..ebaaeaa15 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -89,7 +89,9 @@ <div class="tree-folder-title"> <a class="dropdown-toggle" href="#"><?= _i($c_show ? 'up' : 'down') ?></a> <a class="title<?= $cat->hasFeedsWithError() ? ' error' : '' ?>" data-unread="<?= - format_number($cat->nbNotRead()) ?>" href="<?= _url('index', $actual_view, 'get', 'c_' . $cat->id()) . $state_filter_manual ?>"><?= $cat->name() ?></a> + format_number($cat->nbNotRead()) ?>" href="<?= _url('index', $actual_view, 'get', 'c_' . $cat->id()) . $state_filter_manual ?>"><?= + $cat->name() + ?><?php if ($cat->kind() == FreshRSS_Category::KIND_DYNAMIC_OPML) { echo _i('opml-dyn'); } ?></a> </div> <ul class="tree-folder-items<?= $c_show ? ' active' : '' ?>"> diff --git a/app/layout/header.phtml b/app/layout/header.phtml index 21df02788..3abcfa999 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -2,7 +2,7 @@ <div class="item title"> <a href="<?= _url('index', 'index') ?>"> <?php if (FreshRSS_Context::$system_conf->logo_html == '') { ?> - <img class="logo" src="<?= _i('FreshRSS-logo', true) ?>" alt="FreshRSS" /> + <img class="logo" src="<?= _i('FreshRSS-logo', FreshRSS_Themes::ICON_URL) ?>" alt="FreshRSS" /> <?php } else { echo FreshRSS_Context::$system_conf->logo_html; diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index 7e3ffd34a..9965f5850 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -34,11 +34,18 @@ if (_t('gen.dir') === 'rtl') { if ($this->rss_title != '') { $url_rss = $url_base; $url_rss['a'] = 'rss'; + unset($url_rss['params']['rid']); if (FreshRSS_Context::$user_conf->since_hours_posts_per_rss) { $url_rss['params']['hours'] = FreshRSS_Context::$user_conf->since_hours_posts_per_rss; } ?> <link rel="alternate" type="application/rss+xml" title="<?= $this->rss_title ?>" href="<?= Minz_Url::display($url_rss) ?>" /> +<?php } if (FreshRSS_Context::isAll() || FreshRSS_Context::isCategory() || FreshRSS_Context::isFeed()) { + $opml_rss = $url_base; + $opml_rss['a'] = 'opml'; + unset($opml_rss['params']['rid']); +?> + <link rel="outline" type="text/x-opml" title="OPML" href="<?= Minz_Url::display($opml_rss) ?>" /> <?php } if (FreshRSS_Context::$system_conf->allow_robots) { ?> <meta name="description" content="<?= htmlspecialchars(FreshRSS_Context::$name . ' | ' . FreshRSS_Context::$description, ENT_COMPAT, 'UTF-8') ?>" /> <?php } else { ?> diff --git a/app/layout/simple.phtml b/app/layout/simple.phtml index cd17273cd..8a2ee14bb 100644 --- a/app/layout/simple.phtml +++ b/app/layout/simple.phtml @@ -31,7 +31,7 @@ <div class="item title"> <a href="<?= _url('index', 'index') ?>"> <?php if (FreshRSS_Context::$system_conf->logo_html == '') { ?> - <img class="logo" src="<?= _i('FreshRSS-logo', true) ?>" alt="FreshRSS" /> + <img class="logo" src="<?= _i('FreshRSS-logo', FreshRSS_Themes::ICON_URL) ?>" alt="FreshRSS" /> <?php } else { echo FreshRSS_Context::$system_conf->logo_html; |