From 297ed0dfa160f41ca8ea850dbff30bad886f0c63 Mon Sep 17 00:00:00 2001
From: Ilia Rostovtsev <ilia@rostovtsev.io>
Date: Thu, 14 Jan 2021 17:29:31 +0300
Subject: [PATCH 1/2] Improve error message formatting based on mode

---
 web-lib-funcs.pl | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 9bbfd9355..12d1b573e 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -1614,13 +1614,27 @@ elsif ($ENV{'REQUEST_URI'} =~ /json-error=1/) {
 	}
 else {
 	&header($text{'error'}, "");
-	print "<hr>\n";
-	print "<h3 data-fatal-error-text>",($main::whatfailed ? "$main::whatfailed : " : ""),
-		     @_,"</h3>\n";
+	my $hh = $miniserv::page_capture;
+	print "<hr>\n" if ($hh);
+	 if ($hh) {
+		print "<h3 data-fatal-error-text>",($main::whatfailed ? "$main::whatfailed : " : ""),
+			     @_,"</h3>\n";
+		}
+	else {
+		print "<b data-fatal-error-text>$text{'error'}: ",($main::whatfailed ? "$main::whatfailed : " : ""),
+			     @_,"</b><br><br>\n";
+		}
 	if ($gconfig{'error_stack'}) {
 		# Show call stack
-		print "<h3>$text{'error_stack'}</h3>\n";
-		print "<table>\n";
+		print "<style>\n";
+		print "table.config-error-stack caption, table.config-error-stack > tbody > tr:first-child > td > b {color: #151515;font-weight:bold;text-align: left;}\n";
+		print "table.config-error-stack > tbody > tr:first-child > td > b {border-bottom: 1px solid #151515;}\n";
+		print "table.config-error-stack > tbody > tr:first-child > td {height: 25px;vertical-align:top;font-size: 100%;font-family: unset}\n";
+		print "table.config-error-stack {border: 1px dashed #151515}\n";
+		print "table.config-error-stack {margin-left: 12px;}\n" if ($hh);
+		print "table.config-error-stack tr td {padding: 0 10px !important; font-family: monospace; font-size: 90%;}\n";
+		print "</style>\n";
+		print "<table class=\"config-error-stack\"><caption>$text{'error_stack'}</caption>\n";
 		print "<tr> <td><b>$text{'error_file'}</b></td> ",
 		      "<td><b>$text{'error_line'}</b></td> ",
 		      "<td><b>$text{'error_sub'}</b></td> </tr>\n";
@@ -1633,7 +1647,7 @@ else {
 			}
 		print "</table>\n";
 		}
-	print "<hr>\n";
+	print "<hr>\n" if ($hh);
 	if ($ENV{'HTTP_REFERER'} && $main::completed_referers_check) {
 		&footer("javascript:history.back()", $text{'error_previous'});
 		}

From 4771396dbc91fb46403b48dd2baa57c31aa898e5 Mon Sep 17 00:00:00 2001
From: Ilia Rostovtsev <ilia@rostovtsev.io>
Date: Thu, 14 Jan 2021 21:52:47 +0300
Subject: [PATCH 2/2] Fix to add theme upgrades to certain version

---
 bin/update-devel | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/update-devel b/bin/update-devel
index 4250a702b..f36d3c721 100755
--- a/bin/update-devel
+++ b/bin/update-devel
@@ -15,7 +15,7 @@ use Cwd qw(cwd);
 my %opt;
 GetOptions('help|h'      => \$opt{'help'},
            'product|p=s' => \$opt{'product'},
-           'theme|t!'   => \$opt{'theme'});
+           'theme|p:s'   => \$opt{'theme'});
 pod2usage(0) if ($opt{'help'} || !$opt{'product'});
 
 # Get current path
@@ -38,8 +38,9 @@ if ($p =~ /^webmin$|^usermin$/i) {
         $path =~ s/webmin/$p/;
     }
     my $cmd = "cd $path && ./update-from-repo.sh -force";
-    if ($opt{'theme'}) {
-        $cmd = "cd $path/authentic-theme && ./theme-update.sh -force";
+    if (defined($opt{'theme'})) {
+        my $tver = $opt{'theme'} ? " -release:$opt{'theme'}" : "";
+        $cmd = "cd $path/authentic-theme && ./theme-update.sh$tver -force";
     } 
     system($cmd);
 } else {