[gentoo-commits] proj/linux-patches:genpatches-misc commit in: web/, scripts/, web/content/

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: web/, scripts/, web/content/

[Mike Pagano]

commit:     0b27bd3a16618c0e4ac55dc02b15d961115ef7cd
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 23:19:10 2021 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 23:19:10 2021 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=0b27bd3a

Update genpatches site generation

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 scripts/gpdoweb           |  2 +-
 web/content/about.html    |  3 ++-
 web/gentoo_sources_web.pm |  3 ++-
 web/makesite.pl           | 34 +++++++++++++++++++++++-----------
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/scripts/gpdoweb b/scripts/gpdoweb
index 4cfd951..feb2240 100755
--- a/scripts/gpdoweb
+++ b/scripts/gpdoweb
@@ -4,7 +4,7 @@
 
 # calling make site
 cd ${WEB_LOCAL}
-./makesite.pl
+./makesite.pl ${USERNAME}
 if [ $? -eq 0 ]; then
     exit 1
 fi

diff --git a/web/content/about.html b/web/content/about.html
index 6959cc1..3b0afde 100644
--- a/web/content/about.html
+++ b/web/content/about.html
@@ -1,8 +1,9 @@
 <div class="container">
 <div class="row">
 	<div id="content" class="col-md-12">
-		<h1>What is genpatches?<br/><br/>
+		<h1>What is genpatches?<br/>
 	  <small>A brief description of the package, and details about our patching and release policy.</small></h1>
+		<br/>
 
 		<div class="newsitem-content">
 		<p>genpatches is a patchset applied to many of Gentoo's Linux kernel packages. It

diff --git a/web/gentoo_sources_web.pm b/web/gentoo_sources_web.pm
index b0923db..a6b419a 100644
--- a/web/gentoo_sources_web.pm
+++ b/web/gentoo_sources_web.pm
@@ -113,10 +113,11 @@ sub html_header {
 
 sub html_footer {
 	local *FD = shift;
+	my $USERNAME = shift;
 	my $date = `date`;
 	my $user = `whoami`;
 
-	print FD '<hr /><div align="right"><h4>Automatically generated: '.$date.' by '.$user.'</h4></div>';
+	print FD '<hr /><div align="right"><h4>Automatically generated: '.$date.' by '.$USERNAME.'</h4></div>';
 	print FD '</body>';
 	print FD '</html>';
 }

diff --git a/web/makesite.pl b/web/makesite.pl
index 0bb3cc2..328d64c 100755
--- a/web/makesite.pl
+++ b/web/makesite.pl
@@ -17,6 +17,8 @@ use Sort::Versions;
 # print out arguments for easier debugging
 print "makesite.pl called with arguments: @ARGV \n";
 
+$USERNAME = shift;
+
 if (!precheck()) {
 	exit 0;
 }
@@ -44,7 +46,7 @@ sub make_index_page {
 	open(FD, '> '.$output_path.'/index.html');
 	html_header *FD;
 	include_content *FD, 'sitemap';
-	html_footer *FD;
+	html_footer *FD,$USERNAME;
 	close(FD);
 }
 
@@ -54,7 +56,7 @@ sub make_about_page {
 	open(FD, '> '.$output_path.'/about.html');
 	html_header *FD;
 	include_content *FD, 'about';
-	html_footer *FD;
+	html_footer *FD,$USERNAME;
 	close(FD);
 }
 
@@ -63,11 +65,14 @@ sub make_faq_page {
 	print ">> Making FAQ page\n";
 	open(FD, '> '.$output_path.'/faq.html');
 	html_header *FD;
+	print FD '<div class="container"><div class="row"><div id="content" class="col-md-12">';
 	print FD '<h1>Frequently Asked Questions</h1>';
+  print FD '<div class="newsitem-content">';
 	opendir(DIR, 'content/faq');
 	include_faq *FD, $_ foreach grep { -f "content/faq/$_" } sort readdir DIR;
 	closedir(DIR);
-	html_footer *FD;
+  print FD '</div></div></div>';
+	html_footer *FD,$USERNAME;
 	close(FD);
 }
 
@@ -76,8 +81,12 @@ sub make_bugs_page {
 	print ">> Making bugs page\n";
 	open(FD, '> '.$output_path.'/bugs.html');
 	html_header *FD;
+	print FD '<div class="container"><div class="row"><div id="content" class="col-md-12">';
+	print FD '<h1>Kernel Troubleshooting</h1>';
+  print FD '<div class="newsitem-content">';
 	include_content *FD, 'bugs';
-	html_footer *FD;
+  print FD '</div></div></div>';
+	html_footer *FD,$USERNAME;
 	close(FD);
 }
 
@@ -87,7 +96,7 @@ sub make_issues_page {
 	open(FD, '> '.$output_path.'/issues.html');
 	html_header *FD;
 	generate_issues_index(FD);
-	html_footer *FD;
+	html_footer *FD,$USERNAME;
 	close(FD);
 	
 	generate_issues_current();
@@ -146,7 +155,7 @@ sub generate_issues_current {
 	}
 	closedir(DIR);
 	
-	html_footer *FD;
+	html_footer *FD,$USERNAME;
 	close(FD);
 }
 
@@ -172,7 +181,7 @@ sub generate_issues_resolved {
 	}
 	closedir(DIR);
 	
-	html_footer *FD;
+	html_footer *FD,$USERNAME;
 	close(FD);
 }
 
@@ -212,7 +221,7 @@ sub make_kernels_page {
 	}
 
 	print FD '</table>';
-	html_footer *FD;
+	html_footer *FD,$USERNAME;
 	close(FD);
 }
 
@@ -287,7 +296,9 @@ sub make_releases_index {
 
 	open(INDEX, '> '.$webscript_path.'/output/releases.html');
 	html_header(INDEX, 'genpatches Releases');
+	print INDEX '<div class="container"><div class="row"><div id="content" class="col-md-12">';
 	print INDEX '<h1>genpatches Releases</h1>';
+  print INDEX '<div class="newsitem-content">';
 
 	foreach $kernel (sort keys %kernels) {
 		print("kernel: $kernel\n");
@@ -301,11 +312,12 @@ sub make_releases_index {
 		foreach (grep { /^$kernel-/ } sort mysort @infopages) {
 			include_generated(FILE, $_);
 		}
-		html_footer(FILE);
+  	print FD '</div></div></div>';
+		html_footer(FILE,$USERNAME);
 		close(FILE);
 	}
 
-	html_footer(INDEX);
+	html_footer(INDEX,$USERNAME);
 	close (INDEX);
 	closedir(DIR);
 
@@ -338,7 +350,7 @@ sub generate_patchlist {
 		print PATCHLIST '</tr>';
 	}
 	print PATCHLIST '</table>';
-	html_footer(PATCHLIST);
+	html_footer(PATCHLIST,$USERNAME);
 	close(PATCHLIST);
 }