css support
parent
ce48f18a3b
commit
5591d621b9
|
@ -38,6 +38,7 @@ sub cgi_recentchanges ($) { #{{{
|
||||||
indexlink => indexlink(),
|
indexlink => indexlink(),
|
||||||
wikiname => $config{wikiname},
|
wikiname => $config{wikiname},
|
||||||
changelog => [rcs_recentchanges(100)],
|
changelog => [rcs_recentchanges(100)],
|
||||||
|
styleurl => styleurl(),
|
||||||
);
|
);
|
||||||
print $q->header, $template->output;
|
print $q->header, $template->output;
|
||||||
} #}}}
|
} #}}}
|
||||||
|
@ -64,7 +65,8 @@ sub cgi_signin ($$) { #{{{
|
||||||
action => $q->request_uri,
|
action => $q->request_uri,
|
||||||
header => 0,
|
header => 0,
|
||||||
template => (-e "$config{templatedir}/signin.tmpl" ?
|
template => (-e "$config{templatedir}/signin.tmpl" ?
|
||||||
"$config{templatedir}/signin.tmpl" : "")
|
"$config{templatedir}/signin.tmpl" : ""),
|
||||||
|
stylesheet => styleurl(),
|
||||||
);
|
);
|
||||||
|
|
||||||
$form->field(name => "name", required => 0);
|
$form->field(name => "name", required => 0);
|
||||||
|
@ -228,7 +230,8 @@ sub cgi_prefs ($$) { #{{{
|
||||||
params => $q,
|
params => $q,
|
||||||
action => $q->request_uri,
|
action => $q->request_uri,
|
||||||
template => (-e "$config{templatedir}/prefs.tmpl" ?
|
template => (-e "$config{templatedir}/prefs.tmpl" ?
|
||||||
"$config{templatedir}/prefs.tmpl" : "")
|
"$config{templatedir}/prefs.tmpl" : ""),
|
||||||
|
stylesheet => styleurl(),
|
||||||
);
|
);
|
||||||
my @buttons=("Save Preferences", "Logout", "Cancel");
|
my @buttons=("Save Preferences", "Logout", "Cancel");
|
||||||
|
|
||||||
|
@ -323,6 +326,7 @@ sub cgi_editpage ($$) { #{{{
|
||||||
$form->tmpl_param("indexlink", indexlink());
|
$form->tmpl_param("indexlink", indexlink());
|
||||||
$form->tmpl_param("helponformattinglink",
|
$form->tmpl_param("helponformattinglink",
|
||||||
htmllink("", "HelpOnFormatting", 1));
|
htmllink("", "HelpOnFormatting", 1));
|
||||||
|
$form->tmpl_param("styleurl", styleurl());
|
||||||
if (! $form->submitted) {
|
if (! $form->submitted) {
|
||||||
$form->field(name => "rcsinfo", value => rcs_prepedit($file),
|
$form->field(name => "rcsinfo", value => rcs_prepedit($file),
|
||||||
force => 1);
|
force => 1);
|
||||||
|
|
|
@ -227,6 +227,7 @@ sub genpage ($$$) { #{{{
|
||||||
backlinks => [backlinks($page)],
|
backlinks => [backlinks($page)],
|
||||||
discussionlink => htmllink($page, "Discussion", 1, 1),
|
discussionlink => htmllink($page, "Discussion", 1, 1),
|
||||||
mtime => scalar(gmtime($mtime)),
|
mtime => scalar(gmtime($mtime)),
|
||||||
|
styleurl => styleurl($page),
|
||||||
);
|
);
|
||||||
|
|
||||||
return $template->output;
|
return $template->output;
|
||||||
|
|
|
@ -0,0 +1,68 @@
|
||||||
|
#header h1 {
|
||||||
|
margin: 0;
|
||||||
|
padding: 2px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#actions ul {
|
||||||
|
margin: 0;
|
||||||
|
padding: 2px;
|
||||||
|
list-style-type: none;
|
||||||
|
border-bottom: 1px solid #000;
|
||||||
|
}
|
||||||
|
|
||||||
|
#actions li {
|
||||||
|
display: inline;
|
||||||
|
padding: .2em .4em;
|
||||||
|
}
|
||||||
|
|
||||||
|
#content {
|
||||||
|
border-bottom: 1px solid #000;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Used for adding a blog page. */
|
||||||
|
#blogform {
|
||||||
|
padding: 10px 10px;
|
||||||
|
border: 1px solid #aaa;
|
||||||
|
background: #eee;
|
||||||
|
}
|
||||||
|
|
||||||
|
#backlinks {
|
||||||
|
margin: 1em 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#footer {
|
||||||
|
margin: 1em 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#pageinfo {
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Used for invalid form fields. */
|
||||||
|
.fb_invalid {
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Used for required form fields. */
|
||||||
|
.fb_required {
|
||||||
|
fornt-style: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* RSS button. */
|
||||||
|
.rssbutton {
|
||||||
|
background: #ff6600;
|
||||||
|
color: white !important;
|
||||||
|
border-left: 1px solid #cc9966;
|
||||||
|
border-top: 1px solid #ccaa99;
|
||||||
|
border-right: 1px solid #993300;
|
||||||
|
border-bottom: 1px solid #331100;
|
||||||
|
padding: 0px 0.5em 0px 0.5em;
|
||||||
|
font-family: helvetica, arial, sans-serif;
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: small;
|
||||||
|
text-decoration: none;
|
||||||
|
margin-top: 1em;
|
||||||
|
}
|
||||||
|
.rssbutton:hover {
|
||||||
|
background: #ff9900;
|
||||||
|
}
|
|
@ -1,8 +1,8 @@
|
||||||
Add css and prettify. Make RecentChanges use table for
|
Create some nice stylesheets. Make RecentChanges use table for
|
||||||
formatting, and images to indicate web vs svn commits and to link to diffs.
|
formatting, and images to indicate web vs svn commits and to link to diffs.
|
||||||
|
|
||||||
All of this should be doable w/o touching a single line of code, just
|
All of this should be doable w/o touching a single line of code, just
|
||||||
editing the [[templates]] BTW.
|
editing the [[templates]] and/or editing [[style.css]] BTW.
|
||||||
|
|
||||||
## html validation
|
## html validation
|
||||||
|
|
||||||
|
@ -41,6 +41,5 @@ editing the [[templates]] BTW.
|
||||||
markdown enclosing it in other spanning tags in some cases.
|
markdown enclosing it in other spanning tags in some cases.
|
||||||
I've implemented this hack now. :-/ --[[Joey]]
|
I've implemented this hack now. :-/ --[[Joey]]
|
||||||
|
|
||||||
* This page is now valid, although the validator conplains at having to guess the encoding. Should the encoding be forced to utf-8 in the templates?
|
This page is now valid.
|
||||||
|
|
||||||
Test: [validate this page](http://validator.w3.org/check?url=referer)
|
Test: [validate this page](http://validator.w3.org/check?url=referer)
|
||||||
|
|
13
ikiwiki
13
ikiwiki
|
@ -265,6 +265,16 @@ sub cgiurl (@) { #{{{
|
||||||
return $config{cgiurl}."?".join("&", map "$_=$params{$_}", keys %params);
|
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 ($$;$$$) { #{{{
|
sub htmllink ($$;$$$) { #{{{
|
||||||
my $page=shift;
|
my $page=shift;
|
||||||
my $link=shift;
|
my $link=shift;
|
||||||
|
@ -300,7 +310,7 @@ sub htmllink ($$;$$$) { #{{{
|
||||||
$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
|
$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
|
||||||
|
|
||||||
if (! $noimageinline && isinlinableimage($bestlink)) {
|
if (! $noimageinline && isinlinableimage($bestlink)) {
|
||||||
return "<img src=\"$bestlink\" alt=\"$linktext\">";
|
return "<img src=\"$bestlink\" alt=\"$linktext\" />";
|
||||||
}
|
}
|
||||||
return "<a href=\"$bestlink\">$linktext</a>";
|
return "<a href=\"$bestlink\">$linktext</a>";
|
||||||
} #}}}
|
} #}}}
|
||||||
|
@ -395,6 +405,7 @@ sub misctemplate ($$) { #{{{
|
||||||
indexlink => indexlink(),
|
indexlink => indexlink(),
|
||||||
wikiname => $config{wikiname},
|
wikiname => $config{wikiname},
|
||||||
pagebody => $pagebody,
|
pagebody => $pagebody,
|
||||||
|
styleurl => styleurl(),
|
||||||
);
|
);
|
||||||
return $template->output;
|
return $template->output;
|
||||||
}#}}}
|
}#}}}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
<hr />
|
<form action="<TMPL_VAR CGIURL>" method="get">
|
||||||
<form action="<TMPL_VAR CGIURL>" method="GET">
|
<div id="blogform">
|
||||||
<input type="hidden" name="do" value="blog">
|
<input type="hidden" name="do" value="blog" />
|
||||||
<input type="hidden" name="from" value="<TMPL_VAR ROOTPAGE>">
|
<input type="hidden" name="from" value="<TMPL_VAR ROOTPAGE>" />
|
||||||
<input type="hidden" name="subpage" value="1">
|
<input type="hidden" name="subpage" value="1" />
|
||||||
Add a new post titled: <input name=title size=40>
|
Add a new post titled: <input name="title" size="40" />
|
||||||
<input type="submit" value="Edit">
|
<input type="submit" value="Edit" />
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<hr />
|
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
<html>
|
<html>
|
||||||
<head><title><TMPL_VAR FORM-TITLE></title></head>
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
|
<title><TMPL_VAR FORM-TITLE></title>
|
||||||
|
<link rel="stylesheet" href="<TMPL_VAR STYLEURL>" type="text/css" />
|
||||||
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<TMPL_IF NAME="PAGE_CONFLICT">
|
<TMPL_IF NAME="PAGE_CONFLICT">
|
||||||
<p>
|
<p>
|
||||||
|
@ -31,8 +35,12 @@ Optional comment about this change:<br />
|
||||||
<TMPL_VAR FORM-END>
|
<TMPL_VAR FORM-END>
|
||||||
<hr />
|
<hr />
|
||||||
<TMPL_IF NAME="PAGE_PREVIEW">
|
<TMPL_IF NAME="PAGE_PREVIEW">
|
||||||
|
<div id="header">
|
||||||
<h1>Page preview:</h1>
|
<h1>Page preview:</h1>
|
||||||
|
</div>
|
||||||
|
<div id="content">
|
||||||
<TMPL_VAR PAGE_PREVIEW>
|
<TMPL_VAR PAGE_PREVIEW>
|
||||||
|
</div>
|
||||||
<TMPL_ELSE>
|
<TMPL_ELSE>
|
||||||
<TMPL_VAR HELPONFORMATTINGLINK>
|
<TMPL_VAR HELPONFORMATTINGLINK>
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<p>
|
<p>
|
||||||
<TMPL_VAR PAGELINK><br>
|
<TMPL_VAR PAGELINK><br />
|
||||||
<i>(posted <TMPL_VAR CTIME>)</i>
|
<i>(posted <TMPL_VAR CTIME>)</i>
|
||||||
</p>
|
</p>
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
<html>
|
<html>
|
||||||
<head><title><TMPL_VAR TITLE></title></head>
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
|
<title><TMPL_VAR TITLE></title>
|
||||||
|
<link rel="stylesheet" href="<TMPL_VAR STYLEURL>" type="text/css" />
|
||||||
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<h1>
|
<h1>
|
||||||
|
|
|
@ -1,57 +1,66 @@
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
<html>
|
<html>
|
||||||
<head><title><TMPL_VAR TITLE></title></head>
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
|
<title><TMPL_VAR TITLE></title>
|
||||||
|
<link rel="stylesheet" href="<TMPL_VAR STYLEURL>" type="text/css" />
|
||||||
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
|
<div id="header">
|
||||||
<h1>
|
<h1>
|
||||||
<TMPL_LOOP NAME="PARENTLINKS">
|
<TMPL_LOOP NAME="PARENTLINKS">
|
||||||
<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/
|
<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/
|
||||||
</TMPL_LOOP>
|
</TMPL_LOOP>
|
||||||
<TMPL_VAR TITLE>
|
<TMPL_VAR TITLE>
|
||||||
</h1>
|
</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
<p>
|
<div id="actions">
|
||||||
|
<ul>
|
||||||
<TMPL_IF NAME="EDITURL">
|
<TMPL_IF NAME="EDITURL">
|
||||||
<a href="<TMPL_VAR EDITURL>">Edit</a>
|
<li><a href="<TMPL_VAR EDITURL>">Edit</a></li>
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
|
|
||||||
<TMPL_IF NAME="RECENTCHANGESURL">
|
<TMPL_IF NAME="RECENTCHANGESURL">
|
||||||
<a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a>
|
<li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
|
|
||||||
<TMPL_IF NAME="HISTORYURL">
|
<TMPL_IF NAME="HISTORYURL">
|
||||||
<a href="<TMPL_VAR HISTORYURL>">History</a>
|
<li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
|
|
||||||
<TMPL_IF NAME="PREFSURL">
|
<TMPL_IF NAME="PREFSURL">
|
||||||
<a href="<TMPL_VAR PREFSURL>">Preferences</a>
|
<li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
|
|
||||||
<TMPL_VAR DISCUSSIONLINK><br />
|
<li><TMPL_VAR DISCUSSIONLINK><br /></li>
|
||||||
</p>
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
<hr />
|
<div id="content">
|
||||||
<TMPL_VAR CONTENT>
|
<TMPL_VAR CONTENT>
|
||||||
<hr />
|
</div>
|
||||||
|
|
||||||
|
<div id="backlinks">
|
||||||
<TMPL_IF NAME="BACKLINKS">
|
<TMPL_IF NAME="BACKLINKS">
|
||||||
<p>Links:
|
Links:
|
||||||
<TMPL_LOOP NAME="BACKLINKS">
|
<TMPL_LOOP NAME="BACKLINKS">
|
||||||
<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>
|
<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>
|
||||||
</TMPL_LOOP>
|
</TMPL_LOOP>
|
||||||
</p>
|
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
|
</div>
|
||||||
|
|
||||||
<p>
|
<div id="footer">
|
||||||
<i>
|
<span id="pageinfo">
|
||||||
<!-- from <TMPL_VAR NAME=WIKINAME> -->
|
<!-- from <TMPL_VAR NAME=WIKINAME> -->
|
||||||
Last edited <TMPL_VAR NAME=MTIME>
|
Last edited <TMPL_VAR NAME=MTIME>
|
||||||
|
</span>
|
||||||
<TMPL_IF NAME="RSSURL">
|
<TMPL_IF NAME="RSSURL">
|
||||||
; <a type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a>
|
<a class="rssbutton" type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a>
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
</i>
|
</div>
|
||||||
</p>
|
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -1,15 +1,20 @@
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
<html>
|
<html>
|
||||||
<head><title><TMPL_VAR TITLE></title></head>
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
|
<title><TMPL_VAR TITLE></title>
|
||||||
|
<link rel="stylesheet" href="<TMPL_VAR STYLEURL>" type="text/css" />
|
||||||
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
|
<div id="header">
|
||||||
<h1>
|
<h1>
|
||||||
<TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE>
|
<TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE>
|
||||||
</h1>
|
</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
<hr />
|
<div id="content">
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<TMPL_LOOP NAME="CHANGELOG">
|
<TMPL_LOOP NAME="CHANGELOG">
|
||||||
<li> <!-- <TMPL_VAR NAME="REV"> -->
|
<li> <!-- <TMPL_VAR NAME="REV"> -->
|
||||||
|
@ -32,6 +37,7 @@
|
||||||
</li>
|
</li>
|
||||||
</TMPL_LOOP>
|
</TMPL_LOOP>
|
||||||
</ul>
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- from <TMPL_VAR NAME=WIKINAME> -->
|
<!-- from <TMPL_VAR NAME=WIKINAME> -->
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue