X-Git-Url: https://git.treefish.org/fex.git/blobdiff_plain/7fa382617fbaccc0ce522b2b3adbbee9db5ad227..refs/heads/master:/locale/french/htdocs/FAQ/faq.pl?ds=sidebyside

diff --git a/locale/french/htdocs/FAQ/faq.pl b/locale/french/htdocs/FAQ/faq.pl
index 7770549..ba09ba8 100644
--- a/locale/french/htdocs/FAQ/faq.pl
+++ b/locale/french/htdocs/FAQ/faq.pl
@@ -1,3 +1,4 @@
+use utf8;
 package FAQ;
 
 my ($faq,$var,$env,$q,$a,$c,$s,$t,$n);
@@ -9,11 +10,11 @@ my @sections = qw'Meta User Admin Misc';
 
 print "<style type=text/css><!-- h2,h3 {font-weight:normal} --></style>\n";
 
-print '<h1><a name="top" href="/index.html">F*EX</a> ',
-      " Frequently Asked Questions</h1>\n";
+print '<h1><a name="top" href="/index.html">F*EX</a> ';
+printf "Frequently Asked Questions: %s</h1>\n",ucfirst($faq);
 
 if ($faq ne 'local') {
-  print "<h3>\n";
+  print "<h3>Sections: ";
   foreach $s (@sections,'All') {
     if ($s =~ /$faq/i) {
       print "<b>$s</b>\n";
@@ -24,6 +25,7 @@ if ($faq ne 'local') {
   print "</h3>\n";
 }
 
+print "<p><hr><p>\n";
 print "<table>\n";
 
 foreach my $faq (@faq) {
@@ -40,8 +42,10 @@ foreach my $faq (@faq) {
     };
     ($q,$a) = split /A:\s*/;
     $q =~ s/[\s\n]+$//;
+    $q =~ s/^\s+//;
     $q =~ s! (/\w[\S]+/[\S]+)! <code>$1</code>!g;
     $a =~ s/[\s\n]+$/\n/;
+    $a =~ s/^\s+//;
     while ($a =~ s/^(\s*)\*/$1<ul>\n$1<li>/m) { 
       while ($a =~ s/(<li>.*\n\s*)\*/$1<li>/g) {}
       $a =~ s:(.*\n)(\s*)(<li>[^\n]+\n):$1$2$3$2</ul>\n:s
@@ -53,8 +57,8 @@ foreach my $faq (@faq) {
 #    $a =~ s/^\s*<br>\s*//mg;
     $a =~ s/<([^\s<>\@]+\@[\w.-]+)>/<a href="mailto:$1">&lt;$1><\/a>/g;
     $a =~ s! (/\w[\S]+/[\S]+)! <code>$1</code>!g;
-    $a =~ s!(https?://[\w-]+\.[^\s<>]+)!<a href="$1">[$1]</a>!g or
-    $a =~ s!(https?://[^\s<>]+)!<code>$1</code></a>!g;
+    $a =~ s!(https?://[\w-]+\.[^\s<>()]+)!<a href="$1">[$1]</a>!g or
+    $a =~ s!(https?://[^\s<>()]+)!<code>$1</code></a>!g;
     push @{$Q{$faq}},$q;
     push @{$A{$faq}},$a;
   }
@@ -71,12 +75,18 @@ foreach $s (sections($faq)) {
   $t = $s if $faq eq 'all';
 
   for ($n = 0; $n < scalar(@{$Q{$c}}); $n++) {
-    printf "<tr><th align=left>%s Q%d:<td> <a href=\"#%s%d\">%s</tr>\n",
-           $s,$n+1,$t,$n+1,${Q{$c}[$n]};
+    $q = ${Q{$c}[$n]};
+    $qa = anchor($q);
+    printf '<tr valign=top><th align=left>'.
+           '<a href="#%s%d" style="text-decoration: none">'.
+           '<font color="black">%s&nbsp;Q%d</a>:'.
+           '<td><a href="#%s">%s</a></tr>'."\n",
+           $t,$n+1,$s,$n+1,$qa,$q;
   }
 }
 
 print "</table>\n";
+print "<p><hr><p>\n";
 
 foreach $s (sections($faq)) {
 
@@ -86,14 +96,19 @@ foreach $s (sections($faq)) {
   $t = $s if $faq eq 'all';
 
   for ($n = 0; $n < scalar(@{$Q{$c}}); $n++) {
-    print "<p><hr><p>\n";
+    $q = ${Q{$c}[$n]};
+    $qa = anchor($q);
+    print "<p>\n";
     print "<table>\n";
-    printf "<tr><th><a name=\"%s%d\">%s&nbsp;Q%d:</a><td>%s</tr>\n",
-           $t,$n+1,$s,$n+1,${Q{$c}[$n]};
+    printf "<tr valign=top><th>".
+           "<a name=\"%s%d\">%s&nbsp;Q%d:</a>".
+           "<a name=\"%s\"></a>".
+           "<td><b>%s</b></tr>\n",
+           $t,$n+1,$s,$n+1,$qa,$q;
     printf "<tr valign=top><th>%s&nbsp;A%d:<td>\n%s</tr>\n",
            $s,$n+1,${A{$c}[$n]};
-    print "<tr><th>[<a href=\"#top\">Top</a>]<td></tr>\n";
     print "</table>\n";
+    print "[<a href=\"#top\">&uarr;&nbsp;Questions</a>]\n";
   }
 }
 
@@ -117,3 +132,12 @@ sub pre {
   s/\s+$//;
   return "<pre>$_</pre>\n";
 }
+
+sub anchor {
+  local $_ = shift;
+  s/<.+?>//g;
+  s/\(.+?\)//g;
+  s/\W/_/g;
+  s/_+$//;
+  return $_;
+}