Generalized: &a_href_cz -> &a_href_cc

[www.jankratochvil.net.git] / WebConfig.pm

diff --git a/WebConfig.pm b/WebConfig.pm
index 81d3fa2..2fbf856 100644 (file)
--- a/WebConfig.pm
+++ b/WebConfig.pm
@@ -32,7 +32,6 @@ use vars qw(@ISA @EXPORT);
 @EXPORT=qw(%WebConfig);
 
 use My::Web;
-require CGI;
 
 
 my $resume_url="/resume/Resume-JanKratochvil.pm/Resume-JanKratochvil.html";
@@ -45,7 +44,7 @@ our %WebConfig=(
                                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,48 +52,45 @@ our %WebConfig=(
                "pserver"=>':pserver:pserver:@cvs.jankratochvil.net',
                "pserver_path"=>"/cvs",
                "resume_url"=>$resume_url,
-               "web_hostname"=>sub { return "www.jankratochvil.net"; },        # $My::Web::W->{"r"}->hostname()
                "mailman_url"  =>sub { return "http://".$My::Web::W->{"web_hostname"}."/mailman/"; },
                "pipermail_url"=>sub { return "http://".$My::Web::W->{"web_hostname"}."/pipermail/"; },
                "heading"=>sub () {
                        my $r="";
-                       $r.='<table border="0" width="100%"><tr><td align="center">'."\n";
-                               $r.='<table border="0" style="font-size: larger;"><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.='<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",
+                                       $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";
-                       $r.='</td></tr></table>'."\n";
+                                                               $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");
@@ -119,6 +115,7 @@ our %WebConfig=(
 HERE
                        },
                "no_job"=>1,
+               "css_inherit"=>1,
                );
 
 1;