X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e41dd1e24e345c974fe4a070088f0d09d1b6ddac..5591d621b90855beeb5460f0ac11279d19835699:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 62a9767b9..7a16be3ca 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -255,7 +255,7 @@ sub pagetitle ($) { #{{{
 sub titlepage ($) { #{{{
 	my $title=shift;
 	$title=~y/ /_/;
-	$title=~s/([^-A-Za-z0-9_:+\/])/"__".ord($1)."__"/eg;
+	$title=~s/([^-A-Za-z0-9_:+\/.])/"__".ord($1)."__"/eg;
 	return $title;
 } #}}}
 
@@ -265,6 +265,16 @@ sub cgiurl (@) { #{{{
 	return $config{cgiurl}."?".join("&", map "$_=$params{$_}", keys %params);
 } #}}}
 
+sub styleurl (;$) { #{{{
+	my $page=shift;
+
+	return "$config{url}/style.css" if ! defined $page;
+	
+	$page=~s/[^\/]+$//;
+	$page=~s/[^\/]+\//..\//g;
+	return $page."style.css";
+} #}}}
+
 sub htmllink ($$;$$$) { #{{{
 	my $page=shift;
 	my $link=shift;
@@ -300,7 +310,7 @@ sub htmllink ($$;$$$) { #{{{
 	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
 	
 	if (! $noimageinline && isinlinableimage($bestlink)) {
-		return "<img src=\"$bestlink\" alt=\"$linktext\">";
+		return "<img src=\"$bestlink\" alt=\"$linktext\" />";
 	}
 	return "<a href=\"$bestlink\">$linktext</a>";
 } #}}}
@@ -395,6 +405,7 @@ sub misctemplate ($$) { #{{{
 		indexlink => indexlink(),
 		wikiname => $config{wikiname},
 		pagebody => $pagebody,
+		styleurl => styleurl(),
 	);
 	return $template->output;
 }#}}}