more style improvements
parent
a6a300f675
commit
38e79f206e
|
@ -68,8 +68,9 @@ sub store ($$) { #{{{
|
||||||
push @{$change->{pages}}, { link => '...' } if $is_excess;
|
push @{$change->{pages}}, { link => '...' } if $is_excess;
|
||||||
|
|
||||||
# Take the first line of the commit message as a summary.
|
# Take the first line of the commit message as a summary.
|
||||||
my $m=shift @{$change->{message}};
|
#my $m=shift @{$change->{message}};
|
||||||
$change->{summary}=$m->{line};
|
#$change->{summary}=$m->{line};
|
||||||
|
#delete $change->{message} unless @{$change->{message}};
|
||||||
|
|
||||||
# See if the committer is an openid.
|
# See if the committer is an openid.
|
||||||
my $oiduser=IkiWiki::openiduser($change->{user});
|
my $oiduser=IkiWiki::openiduser($change->{user});
|
||||||
|
@ -85,7 +86,11 @@ sub store ($$) { #{{{
|
||||||
|
|
||||||
# Fill out a template with the change info.
|
# Fill out a template with the change info.
|
||||||
my $template=template("change.tmpl", blind_cache => 1);
|
my $template=template("change.tmpl", blind_cache => 1);
|
||||||
$template->param(%$change);
|
$template->param(
|
||||||
|
%$change,
|
||||||
|
commitdate => displaytime($change->{when}, "%x %x"),
|
||||||
|
wikiname => $config{wikiname},
|
||||||
|
);
|
||||||
$template->param(baseurl => "$config{url}/") if length $config{url};
|
$template->param(baseurl => "$config{url}/") if length $config{url};
|
||||||
IkiWiki::run_hooks(pagetemplate => sub {
|
IkiWiki::run_hooks(pagetemplate => sub {
|
||||||
shift->(page => $page, destpage => $page, template => $template);
|
shift->(page => $page, destpage => $page, template => $template);
|
||||||
|
|
|
@ -1,2 +1,5 @@
|
||||||
|
Recent changes to this wiki:
|
||||||
|
|
||||||
[[recentchanges pages="*" num=100 template=change]]
|
[[recentchanges pages="*" num=100 template=change]]
|
||||||
[[inline pages="recentchanges/change_* and !*/Discussion" show=0]]
|
[[inline pages="recentchanges/change_* and !*/Discussion"
|
||||||
|
template=inlinechange show=0]]
|
||||||
|
|
|
@ -70,27 +70,49 @@ img {
|
||||||
border-style: none;
|
border-style: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Stuff for the RecentChanges table. */
|
div.recentchanges {
|
||||||
tr.changeheader {
|
border-style: solid;
|
||||||
|
border-width: 1px;
|
||||||
|
overflow: auto;
|
||||||
|
width: 100%;
|
||||||
background: #eee;
|
background: #eee;
|
||||||
color: black !important;
|
color: black !important;
|
||||||
}
|
}
|
||||||
tr.changeinfo {
|
.recentchanges .metadata {
|
||||||
background: #eee;
|
padding: 0px 0.5em;
|
||||||
color: black !important;
|
|
||||||
}
|
}
|
||||||
th.changeheader {
|
.recentchanges .changelog {
|
||||||
padding: 1px .3em;
|
|
||||||
}
|
|
||||||
td.changeinfo {
|
|
||||||
padding: 1px .3em;
|
|
||||||
}
|
|
||||||
td.changetime {
|
|
||||||
white-space: nowrap;
|
|
||||||
padding: 1px .3em;
|
|
||||||
}
|
|
||||||
td.changelog {
|
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
|
clear: both;
|
||||||
|
display: block;
|
||||||
|
padding: 1px 2px;
|
||||||
|
background: white !important;
|
||||||
|
color: black !important;
|
||||||
|
}
|
||||||
|
.recentchanges .desc {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.recentchanges .committer {
|
||||||
|
float: left;
|
||||||
|
margin: 0;
|
||||||
|
width: 40%;
|
||||||
|
}
|
||||||
|
.recentchanges .committype {
|
||||||
|
float: left;
|
||||||
|
margin: 0;
|
||||||
|
width: 5%;
|
||||||
|
font-size: small;
|
||||||
|
}
|
||||||
|
.recentchanges .changedate {
|
||||||
|
float: left;
|
||||||
|
margin: 0;
|
||||||
|
width: 35%;
|
||||||
|
font-size: small;
|
||||||
|
}
|
||||||
|
.recentchanges .pagelinks {
|
||||||
|
float: right;
|
||||||
|
margin: 0;
|
||||||
|
width: 60%;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Used for adding a blog page. */
|
/* Used for adding a blog page. */
|
||||||
|
|
|
@ -2,16 +2,17 @@
|
||||||
<TMPL_IF AUTHORURL>
|
<TMPL_IF AUTHORURL>
|
||||||
[[meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
|
[[meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
[[meta title="""<TMPL_VAR SUMMARY>"""]]
|
[[meta title="""update of <TMPL_VAR WIKINAME>'s <TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP>"""]]
|
||||||
<p class=changelog>
|
<div class=changelog>
|
||||||
<TMPL_LOOP NAME="MESSAGE">
|
<TMPL_LOOP NAME="MESSAGE">
|
||||||
<TMPL_IF NAME="LINE">
|
<TMPL_IF NAME="LINE">
|
||||||
<TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
|
<TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
</TMPL_LOOP>
|
</TMPL_LOOP>
|
||||||
</p>
|
</div>
|
||||||
<p>
|
<div class="metadata">
|
||||||
<span class="changeinfo">
|
<span class="desc"><br />Changed pages:</span>
|
||||||
|
<span class="pagelinks">
|
||||||
<TMPL_LOOP NAME="PAGES">
|
<TMPL_LOOP NAME="PAGES">
|
||||||
<TMPL_IF NAME="DIFFURL">
|
<TMPL_IF NAME="DIFFURL">
|
||||||
<a href="<TMPL_VAR NAME="DIFFURL">">
|
<a href="<TMPL_VAR NAME="DIFFURL">">
|
||||||
|
@ -20,5 +21,18 @@
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
<TMPL_VAR LINK>
|
<TMPL_VAR LINK>
|
||||||
</TMPL_LOOP>
|
</TMPL_LOOP>
|
||||||
changed via <TMPL_VAR NAME="COMMITTYPE">
|
</span>
|
||||||
|
<span class="desc"><br />Changed by:</span>
|
||||||
|
<span class="committer">
|
||||||
|
<TMPL_IF NAME="AUTHORURL">
|
||||||
|
<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=USER></a>
|
||||||
|
<TMPL_ELSE>
|
||||||
|
<TMPL_VAR NAME=USER>
|
||||||
|
</TMPL_IF>
|
||||||
|
</span>
|
||||||
|
<span class="desc"><br />Commit type:</span>
|
||||||
|
<span class="committype"><TMPL_VAR COMMITTYPE></span>
|
||||||
|
<span class="desc"><br />Date:</span>
|
||||||
|
<span class="changedate"><TMPL_VAR COMMITDATE></span>
|
||||||
|
</div>
|
||||||
<!-- <TMPL_VAR NAME="REV"> -->
|
<!-- <TMPL_VAR NAME="REV"> -->
|
||||||
|
|
|
@ -1,11 +1,7 @@
|
||||||
<TMPL_IF FIRST>
|
<TMPL_IF FIRST>
|
||||||
<div class="inlinechange">
|
<div class="recentchanges">
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
<TMPL_VAR CONTENT>
|
<TMPL_VAR CONTENT>
|
||||||
<span class="desc"><br />Date:</span>
|
|
||||||
<span class="changedate">
|
|
||||||
<TMPL_VAR CTIME>
|
|
||||||
</span>
|
|
||||||
<TMPL_IF LAST>
|
<TMPL_IF LAST>
|
||||||
</div>
|
</div>
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
|
|
Loading…
Reference in New Issue