more style improvements

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index fb9841ffdfe00e7c639090713c1c5aa0f15575a3..bdd386c7bf3001ac4f0785d8c204e838c2bc6bad 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -68,8 +68,9 @@ sub store ($$) { #{{{
        push @{$change->{pages}}, { link => '...' } if $is_excess;
 
        # Take the first line of the commit message as a summary.
        push @{$change->{pages}}, { link => '...' } if $is_excess;
 
        # Take the first line of the commit message as a summary.

-       my $m=shift @{$change->{message}};
-       $change->{summary}=$m->{line};
+       #my $m=shift @{$change->{message}};
+       #$change->{summary}=$m->{line};
+       #delete $change->{message} unless @{$change->{message}};

 
        # See if the committer is an openid.
        my $oiduser=IkiWiki::openiduser($change->{user});
 
        # See if the committer is an openid.
        my $oiduser=IkiWiki::openiduser($change->{user});


@@ -85,7 +86,11 @@ sub store ($$) { #{{{
 
        # Fill out a template with the change info.
        my $template=template("change.tmpl", blind_cache => 1);
 
        # Fill out a template with the change info.
        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};
        IkiWiki::run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page, template => $template);
        $template->param(baseurl => "$config{url}/") if length $config{url};
        IkiWiki::run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page, template => $template);

diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn
index b2c7f5d07b8672a60aff8f66d97d322073f308b2..4e9ee91ec99d553060b33bb0ae24a92c12a82559 100644 (file)
--- a/doc/recentchanges.mdwn
+++ b/doc/recentchanges.mdwn
@@ -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]]

diff --git a/doc/style.css b/doc/style.css
index 0fa15d2b1a10a26254ecab2141a8954e31675bc4..026d2c8817d6f35fd1ad76a6e4b3c9551292efbd 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -70,27 +70,49 @@ img {
        border-style: none;
 }
 
        border-style: none;
 }
 

-/* Stuff for the RecentChanges table. */
-tr.changeheader {
+div.recentchanges {
+       border-style: solid;
+       border-width: 1px;
+       overflow: auto;
+       width: 100%;

        background: #eee;
        color: black !important;
 }
        background: #eee;
        color: black !important;
 }

-tr.changeinfo {
-       background: #eee;
+.recentchanges .metadata {
+       padding: 0px 0.5em;
+}
+.recentchanges .changelog {
+       font-style: italic;
+       clear: both;
+       display: block;
+       padding: 1px 2px;
+       background: white !important;

        color: black !important;
 }
        color: black !important;
 }

-th.changeheader {
-       padding: 1px .3em;
+.recentchanges .desc {
+       display: none;
+}
+.recentchanges .committer {
+       float: left;
+       margin: 0;
+       width: 40%;

 }
 }

-td.changeinfo {
-       padding: 1px .3em;
+.recentchanges .committype {
+       float: left;
+       margin: 0;
+       width: 5%;
+       font-size: small;

 }
 }

-td.changetime {
-       white-space: nowrap;
-       padding: 1px .3em;
+.recentchanges .changedate {
+       float: left;
+       margin: 0;
+       width: 35%;
+       font-size: small;

 }
 }

-td.changelog {
-       font-style: italic;
+.recentchanges .pagelinks {
+       float: right;
+       margin: 0;
+       width: 60%;

 }
 
 /* Used for adding a blog page. */
 }
 
 /* Used for adding a blog page. */

diff --git a/templates/change.tmpl b/templates/change.tmpl
index f02b5eb194b7f4c586933e3f787c9fac162cb3c5..6df36525040190da80493535be4b613bcd27f613 100644 (file)
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -2,16 +2,17 @@
 <TMPL_IF AUTHORURL>
 [[meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
 </TMPL_IF>
 <TMPL_IF AUTHORURL>
 [[meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
 </TMPL_IF>

-[[meta title="""<TMPL_VAR SUMMARY>"""]]
-<p class=changelog>
+[[meta title="""update of <TMPL_VAR WIKINAME>'s <TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP>"""]]
+<div class=changelog>

 <TMPL_LOOP NAME="MESSAGE">
        <TMPL_IF NAME="LINE">
                <TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
        </TMPL_IF>
 </TMPL_LOOP>
 <TMPL_LOOP NAME="MESSAGE">
        <TMPL_IF NAME="LINE">
                <TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
        </TMPL_IF>
 </TMPL_LOOP>

-</p>
-<p>
-<span class="changeinfo">
+</div>
+<div class="metadata">
+<span class="desc"><br />Changed pages:</span>
+<span class="pagelinks">

 <TMPL_LOOP NAME="PAGES">
        <TMPL_IF NAME="DIFFURL">
                <a href="<TMPL_VAR NAME="DIFFURL">">
 <TMPL_LOOP NAME="PAGES">
        <TMPL_IF NAME="DIFFURL">
                <a href="<TMPL_VAR NAME="DIFFURL">">


@@ -20,5 +21,18 @@
        </TMPL_IF>
        <TMPL_VAR LINK>
 </TMPL_LOOP>
        </TMPL_IF>
        <TMPL_VAR LINK>
 </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"> -->

diff --git a/templates/inlinechange.tmpl b/templates/inlinechange.tmpl
index 669911184e4ee8827cd9908bcca9d81973a9e13f..340a157d1c6cfe4579db649ce1be292b603ac703 100644 (file)
--- a/templates/inlinechange.tmpl
+++ b/templates/inlinechange.tmpl
@@ -1,11 +1,7 @@
 <TMPL_IF FIRST>
 <TMPL_IF FIRST>

-<div class="inlinechange">
+<div class="recentchanges">

 </TMPL_IF>
 <TMPL_VAR CONTENT>
 </TMPL_IF>
 <TMPL_VAR CONTENT>

-<span class="desc"><br />Date:</span>
-<span class="changedate">
-<TMPL_VAR CTIME>
-</span>

 <TMPL_IF LAST>
 </div>
 </TMPL_IF>
 <TMPL_IF LAST>
 </div>
 </TMPL_IF>