X-Git-Url: http://git.jankratochvil.net/?p=www.jankratochvil.net.git;a=blobdiff_plain;f=WebConfig.pm;h=2fbf8569649989abaded96fe83d0c143fd59488b;hp=d73ecabb7e9b9a72a90efcfc0586ac8774a36f37;hb=801399787c2807183550863e56d5f171ea7b0d3b;hpb=b4ddfba5b53a40e47285f8851e1ff7bb5419909b

diff --git a/WebConfig.pm b/WebConfig.pm
index d73ecab..2fbf856 100644
--- a/WebConfig.pm
+++ b/WebConfig.pm
@@ -32,20 +32,19 @@ use vars qw(@ISA @EXPORT);
 @EXPORT=qw(%WebConfig);
 
 use My::Web;
-require CGI;
 
 
-my $resume_url="/resume/Resume-JanKratochvil.html.pl/Resume-JanKratochvil.html";
+my $resume_url="/resume/Resume-JanKratochvil.pm/Resume-JanKratochvil.html";
 
+# Only to be used privately by My::Web !
 our %WebConfig=(
 		"admin_mail"=>'web-www.jankratochvil.net@jankratochvil.net',
-		"SendMsg_to"=>'web-www.jankratochvil.net@jankratochvil.net',
-		"cvs_id_author"=>sub {
+		"cvs_id_author_sub"=>sub {
 			my($name)=@_;
 				return My::Web::a_href("http://www.jankratochvil.net/","Jan Kratochvil") if 0
 						|| $name eq "short"
 						|| $name eq "lace";
-				return CGI::escapeHTML($name);
+				return escapeHTML($name);
 			},
 		"viewcvs"=>"http://cvs.jankratochvil.net/viewcvs/www/www.jankratochvil.net/",
 		"title_prefix"=>"Jan Kratochvil",
@@ -53,59 +52,55 @@ our %WebConfig=(
 		"pserver"=>':pserver:pserver:@cvs.jankratochvil.net',
 		"pserver_path"=>"/cvs",
 		"resume_url"=>$resume_url,
-		"web_hostname_sub"=>sub () { return "www.jankratochvil.net"; },	# $My::Web::W->{"r"}->hostname()
-		"mailman_url_sub"  =>sub () { return "http://".&{$My::Web::W->{"web_hostname_sub"}}."/mailman/"; },
-		"pipermail_url_sub"=>sub () { return "http://".&{$My::Web::W->{"web_hostname_sub"}}."/pipermail/"; },
+		"mailman_url"  =>sub { return "http://".$My::Web::W->{"web_hostname"}."/mailman/"; },
+		"pipermail_url"=>sub { return "http://".$My::Web::W->{"web_hostname"}."/pipermail/"; },
 		"heading"=>sub () {
-			print '<table border="0" align="center" style="font-size: larger;">'."\n";
-				print '<col width="20%">'."\n";
-				print '<col width="50%">'."\n";
-				print '<col width="20%">'."\n";
-				print '<tr>'."\n";
-					print '<td>'."\n";
-						print '<table border="1" align="left"'
-								.' style="border-collapse: collapse; border-style: solid; border-width: 2px;">'."\n";
-							print '<tr>'."\n";
-								print '<td style="padding: 5px; font-weight: bold;">'."\n";
-									print My::Web::a_href('http://www.jankratochvil.net/','Jan Kratochvil',
-											"attr"=>'style="text-decoration: inherit; /* revoke underline */;"');
-								print '</td>'."\n";
-							print '</tr>'."\n";
-						print '</table>';
-					print '</td>'."\n";
-					print '<td>'."\n";
-						print '<table border="1" align="center"'
-								.' style="border-collapse: collapse; border-style: solid; border-width: 2px;">'."\n";
-							print '<tr>'."\n";
-								my @sections=(
-										"/project/"=>"Projects",
-										"http://cvs.jankratochvil.net/"=>"CVS",
-#										"/News.html.pl"=>"News",
-										$resume_url=>"Resume",
-										"/Contact.html.pl"=>"Contact",
-										);
-								while (@sections) {
-									my $section_path=shift @sections;
-									my $section_name=shift @sections;
-									print '<td style="padding: 5px;">';
-										print(($My::Web::W->{"section"} || "") eq $section_name ? "<b>$section_name</b>"
-												: My::Web::a_href($section_path,$section_name,
-														"attr"=>'style="text-decoration: inherit; /* revoke underline */;"'));
-									print "</td>\n";
-									}
-							print '</tr>'."\n";
-						print '</table>'."\n";
-					print '</td>'."\n";
-				print '</tr>'."\n";
-			print '</table>'."\n";
-			print My::Web::vskip("1ex") if !$My::Web::W->{"WebConfig::heading_novskip"};
-			},
-		"footing"=>sub () {
-#			print "<h1>footing</h1>\n";
+			my $r="";
+			$r.='<table border="0" style="font-size: larger;" class="margin-center"><tr>'."\n";
+				# Do not: <col width="20%" /><col width="50%" /><col width="20%" />
+				# as the constant are always bad.
+				$r.='<td>'."\n";
+					$r.='<table border="1"'
+							.' style="border-collapse: collapse; border-style: solid; border-width: 2px;">'
+							.'<tr><td style="padding: 5px; font-weight: bold;">'."\n";
+								$r.='Jan Kratochvil';
+#									$r.=My::Web::a_href('http://www.jankratochvil.net/','Jan Kratochvil',
+#											"attr"=>'style="text-decoration: inherit; /* revoke underline */;"');
+					$r.='</td></tr></table>';
+				$r.='</td>'."\n";
+				$r.='<td>'."\n";
+					$r.='<table border="1"'
+							.' style="text-align: center; border-collapse: collapse; border-style: solid; border-width: 2px;">'
+							.'<tr>'."\n";
+						my @sections=(
+								"/project/"=>"Projects",
+								"http://cvs.jankratochvil.net/"=>"CVS",
+#											"/News.pm"=>"News",
+								$resume_url=>"Resume",
+								"/Contact.pm"=>"Contact",
+								);
+						while (@sections) {
+							my $section_path=shift @sections;
+							my $section_name=shift @sections;
+							$r.='<td style="padding: 5px;">';
+								$r.=(($My::Web::W->{"section"} || "") eq $section_name ? "<b>$section_name</b>"
+										: My::Web::a_href($section_path,$section_name,
+												"attr"=>'style="text-decoration: inherit; /* revoke underline */;"'));
+							$r.="</td>\n";
+							}
+					$r.='</tr></table>'."\n";
+				$r.='</td>'."\n";
+			$r.='</tr></table>'."\n";
+			if (!$My::Web::W->{"heading_novskip"}) {
+				$r.="<hr />\n";
+				$r.=My::Web::vskip("6ex");
+				}
+			return $r;
 			},
+		###"footing"=>"<h1>footing</h1>\n",
 		"footing_delimit"=>sub () {
 			return if $My::Web::W->{"no_job"};
-			print <<"HERE";
+			return <<"HERE";
 <table border="0" style="margin: 4ex; padding: 2ex; background: #552222;">
 	<tr><td>
 		<b>A programmer for hire:</b>
@@ -119,6 +114,8 @@ our %WebConfig=(
 </table>
 HERE
 			},
+		"no_job"=>1,
+		"css_inherit"=>1,
 		);
 
 1;