more minor css changes

This commit is contained in:
Alex Schroeder
2004-03-09 02:00:23 +00:00
parent 330e079f3e
commit 1fc9ca4844
2 changed files with 23 additions and 14 deletions

View File

@@ -1020,7 +1020,7 @@ OddMuse:test, and foo
PlanetMath:ZipfsLaw, and foo
<a class="inter" href="http://planetmath.org/encyclopedia/ZipfsLaw.html"><span class="site">PlanetMath</span>:<span class="page">ZipfsLaw</span></a>, and foo
[OddMuse:test]
<a class="inter number" href="http://www.emacswiki.org/cgi-bin/oddmuse.pl?test"><span title="http://www.oddmuse.org/">[1]</span></a>
<a class="inter number" href="http://www.emacswiki.org/cgi-bin/oddmuse.pl?test"><span>[1]</span></a>
Foo::Bar
Foo::Bar
!WikiLink
@@ -1074,11 +1074,11 @@ http://www.emacswiki.org#
http://www.emacswiki.org%
<a class="url" href="http://www.emacswiki.org">http://www.emacswiki.org</a>%
[http://www.emacswiki.org]
<a class="url number" href="http://www.emacswiki.org"><span title="http://www.emacswiki.org/">[1]</span></a>
<a class="url number" href="http://www.emacswiki.org"><span>[1]</span></a>
[http://www.emacswiki.org] and [http://www.emacswiki.org]
<a class="url number" href="http://www.emacswiki.org"><span title="http://www.emacswiki.org/">[1]</span></a> and <a class="url number" href="http://www.emacswiki.org"><span title="http://www.emacswiki.org/">[2]</span></a>
<a class="url number" href="http://www.emacswiki.org"><span>[1]</span></a> and <a class="url number" href="http://www.emacswiki.org"><span>[2]</span></a>
[http://www.emacswiki.org],
<a class="url number" href="http://www.emacswiki.org"><span title="http://www.emacswiki.org/">[1]</span></a>,
<a class="url number" href="http://www.emacswiki.org"><span>[1]</span></a>,
[http://www.emacswiki.org and a label]
<a class="url" href="http://www.emacswiki.org">[and a label]</a>
[file://home/foo/tutorial.pdf local link]
@@ -1126,7 +1126,7 @@ image inline: <img class="upload" src="http://localhost/test-wrapper.pl/download
traditional local link: HomePage, OtherPage
traditional local link: <a class="local" href="http://localhost/test-wrapper.pl/HomePage">HomePage</a>, OtherPage<a class="edit" title="Click to create this page" href="http://localhost/test-wrapper.pl?action=edit;id=OtherPage">?</a>
traditional local link with extra brackets: [HomePage], [OtherPage]
traditional local link with extra brackets: <a class="local number" href="http://localhost/test-wrapper.pl/HomePage"><span title="HomePage">[1]</span></a>, [OtherPage<a class="edit" title="Click to create this page" href="http://localhost/test-wrapper.pl?action=edit;id=OtherPage">?</a>]
traditional local link with extra brackets: <a class="local number" title="HomePage" href="http://localhost/test-wrapper.pl/HomePage"><span>[1]</span></a>, [OtherPage<a class="edit" title="Click to create this page" href="http://localhost/test-wrapper.pl?action=edit;id=OtherPage">?</a>]
traditional local link with other text: [HomePage homepage], [OtherPage other page]
traditional local link with other text: [<a class="local" href="http://localhost/test-wrapper.pl/HomePage">HomePage</a> homepage], [OtherPage<a class="edit" title="Click to create this page" href="http://localhost/test-wrapper.pl?action=edit;id=OtherPage">?</a> other page]
free link: [[home page]], [[other page]]
@@ -1138,13 +1138,13 @@ free link with other text: [[home page|da homepage]], [[other page|da other home
URL: http://www.oddmuse.org/
URL: <a class="url" href="http://www.oddmuse.org/">http://www.oddmuse.org/</a>
URL in brackets: [http://www.oddmuse.org/]
URL in brackets: <a class="url number" href="http://www.oddmuse.org/"><span title="http://www.oddmuse.org/">[1]</span></a>
URL in brackets: <a class="url number" href="http://www.oddmuse.org/"><span>[1]</span></a>
URL in brackets with other text: [http://www.oddmuse.org/ oddmuse]
URL in brackets with other text: <a class="url" href="http://www.oddmuse.org/">[oddmuse]</a>
URL abbreviation: Oddmuse:Link_Pattern
URL abbreviation: <a class="inter" href="http://www.emacswiki.org/cgi-bin/oddmuse.pl?Link_Pattern"><span class="site">Oddmuse</span>:<span class="page">Link_Pattern</span></a>
URL abbreviation with extra brackets: [Oddmuse:Link_Pattern]
URL abbreviation with extra brackets: <a class="inter number" href="http://www.emacswiki.org/cgi-bin/oddmuse.pl?Link_Pattern"><span title="http://www.emacswiki.org/cgi-bin/oddmuse.pl?Link_Pattern">[1]</span></a>
URL abbreviation with extra brackets: <a class="inter number" href="http://www.emacswiki.org/cgi-bin/oddmuse.pl?Link_Pattern"><span>[1]</span></a>
URL abbreviation with other text: [Oddmuse:Link_Pattern link patterns]
URL abbreviation with other text: <a class="inter" href="http://www.emacswiki.org/cgi-bin/oddmuse.pl?Link_Pattern">[link patterns]</a>
EOT
@@ -1159,7 +1159,7 @@ close(F);
traditional local link: HomePage, OtherPage
traditional local link: <a class="local" href="http://localhost/test-wrapper.pl/HomePage">HomePage</a>, OtherPage<a class="edit" title="Click to create this page" href="http://localhost/test-wrapper.pl?action=edit;id=OtherPage">?</a>
traditional local link with extra brackets: [HomePage], [OtherPage]
traditional local link with extra brackets: <a class="local number" href="http://localhost/test-wrapper.pl/HomePage"><span title="HomePage">[1]</span></a>, [OtherPage<a class="edit" title="Click to create this page" href="http://localhost/test-wrapper.pl?action=edit;id=OtherPage">?</a>]
traditional local link with extra brackets: <a class="local number" title="HomePage" href="http://localhost/test-wrapper.pl/HomePage"><span>[1]</span></a>, [OtherPage<a class="edit" title="Click to create this page" href="http://localhost/test-wrapper.pl?action=edit;id=OtherPage">?</a>]
traditional local link with other text: [HomePage homepage], [OtherPage other page]
traditional local link with other text: <a class="local" href="http://localhost/test-wrapper.pl/HomePage">homepage</a>, [OtherPage<a class="edit" title="Click to create this page" href="http://localhost/test-wrapper.pl?action=edit;id=OtherPage">?</a> other page]
free link: [[home page]], [[other page]]
@@ -1171,13 +1171,13 @@ free link with other text: [home page<a class="edit" title="Click to create this
URL: http://www.oddmuse.org/
URL: <a class="url" href="http://www.oddmuse.org/">http://www.oddmuse.org/</a>
URL in brackets: [http://www.oddmuse.org/]
URL in brackets: <a class="url number" href="http://www.oddmuse.org/"><span title="http://www.oddmuse.org/">[1]</span></a>
URL in brackets: <a class="url number" href="http://www.oddmuse.org/"><span>[1]</span></a>
URL in brackets with other text: [http://www.oddmuse.org/ oddmuse]
URL in brackets with other text: <a class="url" href="http://www.oddmuse.org/">[oddmuse]</a>
URL abbreviation: Oddmuse:Link_Pattern
URL abbreviation: <a class="inter" href="http://www.emacswiki.org/cgi-bin/oddmuse.pl?Link_Pattern"><span class="site">Oddmuse</span>:<span class="page">Link_Pattern</span></a>
URL abbreviation with extra brackets: [Oddmuse:Link_Pattern]
URL abbreviation with extra brackets: <a class="inter number" href="http://www.emacswiki.org/cgi-bin/oddmuse.pl?Link_Pattern"><span title="http://www.emacswiki.org/cgi-bin/oddmuse.pl?Link_Pattern">[1]</span></a>
URL abbreviation with extra brackets: <a class="inter number" href="http://www.emacswiki.org/cgi-bin/oddmuse.pl?Link_Pattern"><span>[1]</span></a>
URL abbreviation with other text: [Oddmuse:Link_Pattern link patterns]
URL abbreviation with other text: <a class="inter" href="http://www.emacswiki.org/cgi-bin/oddmuse.pl?Link_Pattern">[link patterns]</a>
EOT

17
wiki.pl
View File

@@ -314,7 +314,7 @@ sub InitVariables { # Init global session variables for mod_perl!
}
}
$WikiDescription = $q->p($q->a({-href=>'http://www.oddmuse.org/'}, 'Oddmuse'))
. $q->p('$Id: wiki.pl,v 1.348 2004/03/09 01:11:52 as Exp $');
. $q->p('$Id: wiki.pl,v 1.349 2004/03/09 02:00:23 as Exp $');
$WikiDescription .= $ModulesDescription if $ModulesDescription;
}
@@ -874,7 +874,7 @@ sub GetInterLink {
} elsif (!$url) {
return $id;
} elsif ($bracket && !$text) {
$text = $q->span({-title=>$url}, '[' . ++$FootnoteNumber . ']');
$text = $q->span('[' . ++$FootnoteNumber . ']');
$class .= ' number';
} elsif (!$text) {
$text = $q->span({-class=>'site'}, $site) . ':' . $q->span({-class=>'page'}, $page);
@@ -901,7 +901,7 @@ sub GetUrl {
# Only do remote file:// links. No file:///c|/windows.
return $url;
} elsif ($bracket && !$text) {
$text = $q->span({-title=>$url}, '[' . ++$FootnoteNumber . ']');
$text = $q->span('[' . ++$FootnoteNumber . ']');
$class .= ' number';
} elsif (!$text) {
$text = $url;
@@ -921,7 +921,9 @@ sub GetPageOrEditLink { # use GetPageLink and GetEditLink if you know the result
$id = FreeToNormal($id);
my ($class, $exists, $title) = ResolveId($id);
if (!$text && $exists && $bracket) {
$text = $q->span({-title=>$id}, '[' . ++$FootnoteNumber . ']'); # s/_/ /g happens further down!
$text = $q->span('[' . ++$FootnoteNumber . ']'); # s/_/ /g happens further down!
$title = $id; # override title from ResolveId!
$title =~ s/_/ /g if $free;
$class .= ' number';
}
if ($exists) { # don't show brackets if the page is local/anchor/near.
@@ -1954,6 +1956,13 @@ div.sister p { margin-top:0; }
div.sister img { border:none; }
div.near { background-color:#EFE; }
div.near p { margin-top:0; }
\@media print {
body { font:12pt "Courrier" sans-serif; }
a:link, a:visited { color:#000; text-decoration:none; font-style:oblique; }
a.edit, div.footer, span.gotobar, a.number span { display:none; }
a[class="url number"]:after, a[class="inter number"]:after { content:"[" attr(href) "]"; }
a[class="local number"]:after { content:"[" attr(title) "]"; }
}
-->
EOT
}