From dfdb746a76231bfb4c8066328bf99cd54f83783c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 3 Mar 2021 19:18:43 +0300
Subject: [PATCH] add word wrap for git stdout/stderr pre elements
---
js/PrefHelpers.js | 13 +++++++------
themes/compact.css | 4 ++++
themes/compact_night.css | 4 ++++
themes/light.css | 4 ++++
themes/light/tt-rss.less | 4 ++++
themes/night.css | 4 ++++
themes/night_blue.css | 4 ++++
7 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index 5658ce9b0..e6a37c6e8 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -401,8 +401,9 @@ const Helpers = {
container.innerHTML = `
<li>
<h3 style="margin-top: 0">${plugin}</h3>
- ${reply.stderr ? `<pre class="small text-error">${reply.stderr}</pre>` : ''}
- ${reply.stdour ? `<pre class="small text-success">${reply.stdout}</pre>` : ''}
+ <div class='text-error'>${reply.result}</div>
+ ${reply.stderr ? `<pre class="small text-error pre-wrap">${reply.stderr}</pre>` : ''}
+ ${reply.stdour ? `<pre class="small text-success pre-wrap">${reply.stdout}</pre>` : ''}
<p class="small">
${App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", reply.git_status)}
</p>
@@ -502,8 +503,8 @@ const Helpers = {
container.innerHTML +=
`
<li><h3 style="margin-top: 0">${p.plugin}</h3>
- ${p.rv.e ? `<pre class="small text-error">${p.rv.e}</pre>` : ''}
- ${p.rv.o ? `<pre class="small text-success">${p.rv.o}</pre>` : ''}
+ ${p.rv.e ? `<pre class="small text-error pre-wrap">${p.rv.e}</pre>` : ''}
+ ${p.rv.o ? `<pre class="small text-success pre-wrap">${p.rv.o}</pre>` : ''}
<p class="small">
${p.rv.s ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.s) :
App.FormFields.icon("check") + " " + __("Update done.")}
@@ -551,8 +552,8 @@ const Helpers = {
container.innerHTML +=
`
<li><h3 style="margin-top: 0">${p.plugin}</h3>
- ${p.rv.e ? `<pre class="small text-error">${p.rv.e}</pre>` : ''}
- ${p.rv.o ? `<pre class="small text-success">${p.rv.o}</pre>` : ''}
+ ${p.rv.e ? `<pre class="small text-error pre-wrap">${p.rv.e}</pre>` : ''}
+ ${p.rv.o ? `<pre class="small text-success pre-wrap">${p.rv.o}</pre>` : ''}
<p class="small">
${p.rv.s ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.s) :
App.FormFields.icon("check") + " " + __("Ready to update")}
diff --git a/themes/compact.css b/themes/compact.css
index 19a04c7f8..230aab7da 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -1034,6 +1034,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left {
float: left;
}
+body.ttrss_main .pre-wrap,
+body.ttrss_utility .pre-wrap {
+ white-space: pre-wrap;
+}
body.ttrss_main .text-error,
body.ttrss_utility .text-error {
color: #b94a48;
diff --git a/themes/compact_night.css b/themes/compact_night.css
index af94c9c7d..12737d903 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -1034,6 +1034,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left {
float: left;
}
+body.ttrss_main .pre-wrap,
+body.ttrss_utility .pre-wrap {
+ white-space: pre-wrap;
+}
body.ttrss_main .text-error,
body.ttrss_utility .text-error {
color: #b94a48;
diff --git a/themes/light.css b/themes/light.css
index 075b949fe..f8da03ca0 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -1034,6 +1034,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left {
float: left;
}
+body.ttrss_main .pre-wrap,
+body.ttrss_utility .pre-wrap {
+ white-space: pre-wrap;
+}
body.ttrss_main .text-error,
body.ttrss_utility .text-error {
color: #b94a48;
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index a4cf2f098..9044afb24 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -1229,6 +1229,10 @@ body.ttrss_main, body.ttrss_utility {
float : left;
}
+ .pre-wrap {
+ white-space : pre-wrap;
+ }
+
.text-error {
color: #b94a48;
}
diff --git a/themes/night.css b/themes/night.css
index 52748567e..b30c260f6 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -1035,6 +1035,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left {
float: left;
}
+body.ttrss_main .pre-wrap,
+body.ttrss_utility .pre-wrap {
+ white-space: pre-wrap;
+}
body.ttrss_main .text-error,
body.ttrss_utility .text-error {
color: #b94a48;
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 4e4e68a54..46f1aa124 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -1035,6 +1035,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left {
float: left;
}
+body.ttrss_main .pre-wrap,
+body.ttrss_utility .pre-wrap {
+ white-space: pre-wrap;
+}
body.ttrss_main .text-error,
body.ttrss_utility .text-error {
color: #b94a48;
--
GitLab