* Make RecentChanges use a table and some CSS, should be much more readable.

  No code changes involved.
* Encode & in diffurl in examples, to conform to pedantic rules.

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 199a02ee1ec4e3b1e3aec0ff2b8ffaa100a29088..be4106a02d143704f1e9bf2496e1e0b56dcf43b2 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -126,7 +126,6 @@ sub rcs_recentchanges ($) { #{{{
                foreach my $msgline (split(/\n/, $logentry->{msg})) {
                        push @message, { line => escapeHTML($msgline) };
                }
-               unshift @message, { line => "\n" } if @message > 1;
 
                my $committype="web";
                if (defined $message[0] &&

diff --git a/basewiki/style.css b/basewiki/style.css
index 8d51685fb7a97a7a2583e6a69320f7242ec251d3..c7988b7b7aa95d0c74b2da8db758c90783834cde 100644 (file)
--- a/basewiki/style.css
+++ b/basewiki/style.css
@@ -30,6 +30,15 @@
        width: 100%;
 }      
 
+/* Stuff for the RecentChanges table. */
+.changeheader {
+       background: #eee;
+       color: black !important;
+}
+.changetime {
+       white-space: nowrap;
+}
+
 /* Used for adding a blog page. */
 #blogform {
        padding: 10px 10px;

diff --git a/basewiki/wikiicons/diff.png b/basewiki/wikiicons/diff.png
new file mode 100644 (file)
index 0000000..0b98d79
Binary files /dev/null and b/basewiki/wikiicons/diff.png differ

diff --git a/debian/changelog b/debian/changelog
index 08e2142d16f3ae9b2e6d1d39b271ce71442bb81c..40247ffabc957e6dd746e853d988203e42b4b1b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,8 +42,11 @@ ikiwiki (1.8) UNRELEASED; urgency=low
     is a savings of 2 pointless fork/execs per link calculation, which
     results in ~25% speedup of ikiwiki building its own doc wiki, and
     about 35% speedup displaying RecentChanges!
+  * Make RecentChanges use a table and some CSS, should be much more readable.
+    No code changes involved.
+  * Encode & in diffurl in examples, to conform to pedantic rules. 
 
- -- Joey Hess <joeyh@debian.org>  Mon,  3 Jul 2006 23:33:57 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue,  4 Jul 2006 01:42:28 -0400
 
 ikiwiki (1.7) unstable; urgency=low
 

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index c516da1b90c5f996325f4c0081d8cadad88a3b99..9713d553b68f8d451eca29d90440379ac61983b3 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -21,7 +21,7 @@ use IkiWiki::Setup::Standard {
        # Subversion stuff.
        rcs => "svn",
        #historyurl => "http://svn.myhost/trunk/[[file]]",
-       #diffurl => "http://svn.someurl/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
+       #diffurl => "http://svn.someurl/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
        svnrepo => "/svn/wiki",
        svnpath => "trunk",
 

diff --git a/doc/todo/html.mdwn b/doc/todo/html.mdwn
index 51f669a13c7d086fefd0d5c922ddf92a1d39e230..a99f87c8a78744e13efdeadbd27b6e50cd1a265b 100644 (file)
--- a/doc/todo/html.mdwn
+++ b/doc/todo/html.mdwn
@@ -1,5 +1,4 @@
-Create some nice stylesheets. Make RecentChanges use table for
-formatting, and images to indicate web vs svn commits and to link to diffs.
+Create some nice(r) stylesheets.
 
-All of this should be doable w/o touching a single line of code, just
-editing the [[templates]] and/or editing [[style.css]] BTW.
+Should be doable w/o touching a single line of code, just
+editing the [[templates]] and/or editing [[style.css]].

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 7bf50e5f7e07e45a4ae9e34e2e1da3b3a0b7bc98..7bc9e53144c50b097631a6c50e3d4bf6f6e202ac 100644 (file)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -158,7 +158,7 @@ These options configure the wiki.
 
   Specifies the email address that ikiwiki should use for sending email.
 
-* --diffurl http://url/trunk/\[[file]]?root=wiki&r1=\[[r1]]&r2=\[[r2]]
+* --diffurl http://url/trunk/\[[file]]?root=wiki&r1=\[[r1]]&r2=\[[r2]]
 
   Specifies the url to link to for a diff of changes to a page. In the url,
   "\[[file]]" is replaced with the file to browse, "\[[r1]]" is the old

diff --git a/templates/recentchanges.tmpl b/templates/recentchanges.tmpl
index e7d7e10dd9b8a3bb7902307f906ff0de9fb82b9e..1ea2f8a451334985a46ae2be6c673d1647569378 100644 (file)
--- a/templates/recentchanges.tmpl
+++ b/templates/recentchanges.tmpl
@@ -18,28 +18,49 @@
 </div>
 
 <div id="content">
-<ul>
+<br />
+<table border="1" frame="border" rules="groups">
+<thead>
+       <tr class="changeheader">
+               <th align="left">user</th>
+               <th align="left">time</th>
+               <th align="left">changes</th>
+       </tr>
+</thead>
 <TMPL_LOOP NAME="CHANGELOG">
-       <li> <!-- <TMPL_VAR NAME="REV"> -->
+<tbody>
+       <!-- <TMPL_VAR NAME="REV"> -->
+       <!-- <TMPL_VAR NAME="COMMITTYPE"> -->
+       <tr class="changeheader">
+               <td><TMPL_VAR NAME="USER"></td>
+               <td class="changetime"><TMPL_VAR NAME="WHEN"></td>
+               <td>
                <TMPL_LOOP NAME="PAGES">
-                       <TMPL_VAR NAME="LINK">
                        <TMPL_IF NAME="DIFFURL">
-                               (<a href="<TMPL_VAR NAME="DIFFURL">">diff</a>)
+                               <a href="<TMPL_VAR NAME="DIFFURL">">
+                               <img alt="diff" src="wikiicons/diff.png" style="border-style: none" />
+                               </a>
+                               <TMPL_VAR NAME="LINK">
+                       <TMPL_ELSE>
+                               <TMPL_VAR NAME="LINK">
                        </TMPL_IF>
                </TMPL_LOOP>
-               <br />
-               <!-- <TMPL_VAR NAME="COMMITTYPE"> -->
-               changed <TMPL_VAR NAME="WHEN"> by <TMPL_VAR NAME="USER">:
-               <i>
-               <TMPL_LOOP NAME="MESSAGE">
-                       <TMPL_IF NAME="LINE">
-                               <TMPL_VAR NAME="LINE"><br />
-                       </TMPL_IF>
-               </TMPL_LOOP>
-               </i>
-       </li>
+               </td>
+       </tr>
+       <tr>
+               <td colspan="3">
+                       <i>
+                       <TMPL_LOOP NAME="MESSAGE">
+                               <TMPL_IF NAME="LINE">
+                                       <TMPL_VAR NAME="LINE"><br />
+                               </TMPL_IF>
+                       </TMPL_LOOP>
+                       </i>
+               </td>
+       </tr>
+</tbody>
 </TMPL_LOOP>
-</ul>
+</table>
 </div>
 
 <!-- from <TMPL_VAR NAME=WIKINAME> -->