Commit e953fb39 authored by yPhil's avatar yPhil
Browse files

All conflicts OK

parent e92b7536
{
"name": "petrolette",
"description": "The news page that doesn't know you",
"version": "v1.5.3",
"version": "v1.5.5",
"private": true,
"license": "GPL-3.0-only",
"HTTP_PORT": 8000,
......
......@@ -1199,13 +1199,13 @@ div.fancybox-caption a.ui-button.ui-corner-all:hover {
padding: 0.3em;
}
.ui-dialog span.messageTitle {
color: var(--color-link-hover);
}
/* .ui-dialog span.messageTitle { */
/* color: var(--color-link-hover); */
/* } */
.ui-dialog span.messageTitleErrorCode {
color: var(--color-link-hover);
}
/* .ui-dialog span.messageTitleErrorCode { */
/* color: var(--color-link-hover); */
/* } */
.ui-state-error {
background-color: var(--color-danger) !important;
......
......@@ -344,7 +344,8 @@ PTL.dialog = {
.attr('class', 'messageTitleErrorCode')
.text(xhr.statusText + ' ('))
.append($('<a>')
.attr('href', 'https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/' + xhr.status)
.attr({'href': 'https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/' + xhr.status,
'class': 'docLink'})
.text(xhr.status))
.append($('<span>').text(') ' + xhr.responseText));
......
......@@ -74,7 +74,7 @@ PTL.tab = {
const feeds = PTL.tab.list();
PTL.prefs.writeConfig('feeds', JSON.stringify(feeds));
PTL.sync.writeSync(JSON.stringify(feeds));
if (isSilent) PTL.util.say(PTL.tr('Tabs and feeds saved'), 'success');
if (!isSilent) PTL.util.say(PTL.tr('Tabs and feeds saved'), 'success');
},
populate: function(feeds) {
......
......@@ -502,9 +502,8 @@
</div>
<div id="beggarDialog" class="flexBox">
<img id="beggarImg" src="https://framagit.org/yphil/assets/-/raw/master/img/petroleuses/Rally-1933.jpg" alt="A woman rider in the Six Days Motorcycle Trial, Germany 1933" />
<span class="imageLegend">A woman rider in the Six Days Motorcycle Trial, Germany 1933</span>
<!-- <span class="huge">🍏</span> -->
<img id="beggarImg" src="https://framagit.org/yphil/assets/-/raw/master/img/petroleuses/UK1938.jpg" alt="UK, 1938" />
<span class="imageLegend">UK, 1938</span>
<p>
<span class="translate"
data-content="Pétrolette is free software. However the development requires">
......
......@@ -94,8 +94,7 @@ router.get('/discover', function(req, res) {
feedrat(req.query.url, function(err, url) {
if (err) {
console.error('err.message: %s (%s)', err.message);
res.status(500).send(err.code);
res.status(500).send(err);
} else if (url) {
res.send(url);
} else {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment