.

diff --git a/src/articleviewer-ng/webengine/articlehtmlwebenginewriter.h b/src/articleviewer-ng/webengine/articlehtmlwebenginewriter.h --- a/src/articleviewer-ng/webengine/articlehtmlwebenginewriter.h +++ b/src/articleviewer-ng/webengine/articlehtmlwebenginewriter.h @@ -21,6 +21,7 @@ #define ARTICLEHTMLWEBENGINEWRITER_H #include +#include #include "akregator_export.h" namespace Akregator { class ArticleViewerWebEngine; @@ -36,6 +37,7 @@ void reset(); void queue(const QString &str); void flush(); + void setBaseUrl(const QUrl &url); Q_SIGNALS: void finished(); @@ -48,6 +50,7 @@ } mState; QString mHtml; + QUrl mBaseUrl; ArticleViewerWebEngine *mWebView = nullptr; }; } diff --git a/src/articleviewer-ng/webengine/articlehtmlwebenginewriter.cpp b/src/articleviewer-ng/webengine/articlehtmlwebenginewriter.cpp --- a/src/articleviewer-ng/webengine/articlehtmlwebenginewriter.cpp +++ b/src/articleviewer-ng/webengine/articlehtmlwebenginewriter.cpp @@ -26,6 +26,7 @@ ArticleHtmlWebEngineWriter::ArticleHtmlWebEngineWriter(ArticleViewerWebEngine *view, QObject *parent) : QObject(parent) , mState(Ended) + , mBaseUrl(QStringLiteral("file:///")) , mWebView(view) { } @@ -46,12 +47,17 @@ mState = Begun; } +void ArticleHtmlWebEngineWriter::setBaseUrl(const QUrl &url) +{ + mBaseUrl = url; +} + void ArticleHtmlWebEngineWriter::end() { if (mState != Begun) { qCWarning(AKREGATOR_LOG) << "Called on non-begun or queued session!"; } - mWebView->setHtml(mHtml, QUrl(QStringLiteral("file:///"))); + mWebView->setHtml(mHtml, mBaseUrl); mWebView->show(); mHtml.clear(); diff --git a/src/articleviewerwidget.cpp b/src/articleviewerwidget.cpp --- a/src/articleviewerwidget.cpp +++ b/src/articleviewerwidget.cpp @@ -193,6 +193,9 @@ return; } + const QUrl xmlUrl = QUrl(article.feed()->xmlUrl()); + qCDebug(AKREGATOR_LOG) << "showing Article - xmlUrl:" << xmlUrl; + m_articleHtmlWriter->setBaseUrl(xmlUrl); m_viewMode = NormalView; disconnectFromNode(m_node); m_article = article; diff --git a/src/formatter/html/5.2/combinedview.html b/src/formatter/html/5.2/combinedview.html --- a/src/formatter/html/5.2/combinedview.html +++ b/src/formatter/html/5.2/combinedview.html @@ -91,9 +91,6 @@ } } - - - {% if articles %} diff --git a/src/formatter/html/5.2/defaultnormalvisitfeed.html b/src/formatter/html/5.2/defaultnormalvisitfeed.html --- a/src/formatter/html/5.2/defaultnormalvisitfeed.html +++ b/src/formatter/html/5.2/defaultnormalvisitfeed.html @@ -77,7 +77,6 @@ } . -

diff --git a/src/formatter/html/5.2/defaultnormalvisitfolder.html b/src/formatter/html/5.2/defaultnormalvisitfolder.html --- a/src/formatter/html/5.2/defaultnormalvisitfolder.html +++ b/src/formatter/html/5.2/defaultnormalvisitfolder.html @@ -78,7 +78,6 @@ . -

diff --git a/src/formatter/html/5.2/normalview.html b/src/formatter/html/5.2/normalview.html --- a/src/formatter/html/5.2/normalview.html +++ b/src/formatter/html/5.2/normalview.html @@ -76,9 +76,7 @@ } } - . - {% if articles %}