/[pub]/suikawiki/script/wiki.cgi

Diff of /suikawiki/script/wiki.cgi

Parent Directory | Revision Log | View Patch Patch

-revision 1.9 by wakaba,
Sun Mar 24 00:55:15 2002 UTC
+revision 1.13 by wakaba,
Tue Apr  2 00:28:14 2002 UTC
 Line 75 
 my $preview_color = '#FFCCCC';
  ##############################
  # 全ページのスタイル
  my $style = <<'EOD';
+ @import '/s/simpledoc';
  pre, dl, ul, ol, p, blockquote { line-height:120%; }
+ a.wiki .mark    {vertical-align: sub, color: GrayText}
  a { text-decoration: none; }
  a:link { color: #0000FF; background-color: #FFFFFF; }
  a:visited { color: #9900CC; background-color: #FFFFFF; }
-Line 578 
 sub inline {
+Line 580 
 sub inline {
  # ページのタイトルからページの内容を得る
  sub get_page {
      my $page_name = shift;
-     return $database{$page_name};
+     return $database{$page_name} || $database{'[['.$page_name.']]'};
  }
  # ページの内容を与える
-Line 615 
 sub set_page {
+Line 617 
 sub set_page {
  sub print_header {
      my $title = shift;
      print <<"EOD";
- Content-type: text/html
+ Content-type: text/html; charset=${charset}
  <html><head>
  <title>$title</title>
-Line 645 
 EOD
+Line 647 
 EOD
  <a href="$thisurl?mycmd=list">一覧</a> |
  $editlink
  <a href="$thisurl?mycmd=search">単語検索</a> |
- <a href="$thisurl?mycmd=read;mypage=$whatsnew">最終更新</a>
+ <a href="$thisurl?mycmd=read;mypage=$whatsnew">最近の更新</a>
   ]
  </p>
  EOD
-Line 654 
 EOD
+Line 656 
 EOD
  # ページのフッタを出力
  sub print_footer {
      print <<"EOD";
- <address>
+ <div class="navigation">
- <a href="http://www.hyuki.com/yukiwiki/">YukiWiki</a> 1.6.6 Copyright (C) 2000,2001 by <a href="http://www.hyuki.com/">Hiroshi Yuki.</a>
- + <a href="$modifierlink">$modifier</a> ${version}.
  [<a href="/" title="このサーバーの首頁">/</a>
  <a href="/map" title="このサーバーの案内">地図</a>
  <a href="/search/" title="このサーバーの検索">検索</a>]
- </address>
+ </div>
- </body></html>
  EOD
+   print <<'EOH';
+ <div class="update">
+ <a href="http://www.hyuki.com/yukiwiki/">YukiWiki</a> 1.6.6 Copyright (C) 2000,2001 by <a href="http://www.hyuki.com/">Hiroshi Yuki.</a> ${version}
+ + <a href="$modifierlink">$modifier</a>.
+ <a href="/gate/cvs/wakaba/wiki/" title="CVS Repository">
+ $Revision$ $Date$
+ </a>
+ </div>
+ </body></html>
+ EOH
  }
  # URLやページの名前からリンクを作る
-Line 679 
 sub make_link {
+Line 688 
 sub make_link {
      } elsif ($name =~ /^mailto:(.*)/) {
          my $address = $1;
          return qq|&lt;<a href="$name">$address</a>&gt;|;
-     } elsif ($name =~ /^urn:[0-9A-Za-z_:-]+/) {
+     } elsif ($name =~ m#^urn:[0-9A-Za-z_:;/.-]+#) {
          return qq|&lt;<a href="/uri-res/N2L?${name}">$name</a>&gt;|;
      } else {
        my $name2 = $name; $name2 =~ tr/\x20/-/;
-Line 691 
 sub make_link {
+Line 700 
 sub make_link {
          return qq|<a href="$thisurl?mycmd=read;mypage=$percent_name" class="wiki">$name</a>|;
        } else {
          my $percent_name = &encode_percent($name2);
-         return qq|<a href="$thisurl?mycmd=edit;mypage=$percent_name" class="wiki newpage">$name?</a>|;
+         return qq|<a href="$thisurl?mycmd=edit;mypage=$percent_name" class="wiki newpage">$name<span class="mark">?</span></a>|;
        }
      }
  }
-Line 720 
 sub convert_html {
+Line 729 
 sub convert_html {
      my (@txt) = split(/\n/, $txt);
      foreach (@txt) {
          chomp;
-         if (/^\*\*(.*)/) {
+         if (/^\*\*\*\*\*(.*)/) {
+             push(@result, splice(@saved), '<h6>' . &inline($1) . '</h6>');
+         } elsif (/^\*\*\*\*(.*)/) {
+             push(@result, splice(@saved), '<h5>' . &inline($1) . '</h5>');
+         } elsif (/^\*\*\*(.*)/) {
+             push(@result, splice(@saved), '<h4>' . &inline($1) . '</h4>');
+         } elsif (/^\*\*(.*)/) {
              push(@result, splice(@saved), '<h3>' . &inline($1) . '</h3>');
          } elsif (/^\*(.*)/) {
              push(@result, splice(@saved), '<h2>' . &inline($1) . '</h2>');
-Line 729 
 sub convert_html {
+Line 744 
 sub convert_html {
          } elsif (/^(-{1,3})(.*)/) {
              &back_push('ul', length($1));
              push(@result, '<li>' . &inline($2) . '</li>');
+         } elsif (/^(={1,3})(.*)/) {
+             &back_push('ol', length($1));
+             push(@result, '<li>' . &inline($2) . '</li>');
          } elsif (/^:([^:]+):(.*)/) {
              &back_push('dl', 1);
              push(@result, '<dt>' . &inline($1) . '</dt>', '<dd>' . &inline($2) . '</dd>');
-Line 741 
 sub convert_html {
+Line 759 
 sub convert_html {
              push(@result, "<p>");
          } elsif (/^(\s+.*)$/) {
              &back_push('pre', 1);
-             push(@result, &escape($1)); # Not &inline, but &escape
+             #push(@result, &escape($1)); # Not &inline, but &escape
+             push(@result, &inline($1)); # Not &inline, but &escape
          } else {
              push(@result, &inline($_));
          }
-Line 767 
 sub back_push {
+Line 786 
 sub back_push {
  }
  # 編集可能ページか？
- sub is_editable {
+ sub is_editable {return 1;
+ ## TODO: ...
      my ($pagename) = @_;
      foreach (@uneditable) {
          if ($pagename eq $_) {
-Line 780 
 sub is_editable {
+Line 800 
 sub is_editable {
      return 0;
  }
- # Validな名前か？
+ # Validな名前か?
  sub is_valid_name {
      my ($pagename) = @_;
      if ($pagename =~ /^$WikiName$/) {

 Legend:



Removed from v.1.9
 


changed lines


 
Added in v.1.13
 Legend:



Removed from v.1.9
 


changed lines


 
Added in v.1.13
-Removed from v.1.9
+Added in v.1.13

admin@suikawiki.org	ViewVC Help
Powered by ViewVC 1.1.24