summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-04 06:07:32 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-04 06:07:32 +0000
commite059c9eff94ab37598d740cc5777e591216368a1 (patch)
treefa79af3dcac9f6f4cbf7c20f4d7fbc0f275502b6
parentd3f032c4d00a7cc4f9f52bbd1f98dd4e8bf9457b (diff)
* 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.
-rw-r--r--IkiWiki/Rcs/svn.pm1
-rw-r--r--basewiki/style.css9
-rw-r--r--basewiki/wikiicons/diff.pngbin0 -> 219 bytes
-rw-r--r--debian/changelog5
-rw-r--r--doc/ikiwiki.setup2
-rw-r--r--doc/todo/html.mdwn7
-rw-r--r--doc/usage.mdwn2
-rw-r--r--templates/recentchanges.tmpl53
8 files changed, 55 insertions, 24 deletions
diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 199a02ee1..be4106a02 100644
--- 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 8d51685fb..c7988b7b7 100644
--- 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
index 000000000..0b98d79ac
--- /dev/null
+++ b/basewiki/wikiicons/diff.png
Binary files differ
diff --git a/debian/changelog b/debian/changelog
index 08e2142d1..40247ffab 100644
--- 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 c516da1b9..9713d553b 100644
--- 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&amp;r1=[[r1]]&amp;r2=[[r2]]",
svnrepo => "/svn/wiki",
svnpath => "trunk",
diff --git a/doc/todo/html.mdwn b/doc/todo/html.mdwn
index 51f669a13..a99f87c8a 100644
--- 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 7bf50e5f7..7bc9e5314 100644
--- 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&amp;r1=\[[r1]]&amp;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 e7d7e10dd..1ea2f8a45 100644
--- 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> -->