From e059c9eff94ab37598d740cc5777e591216368a1 Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 4 Jul 2006 06:07:32 +0000 Subject: [PATCH 1/1] * 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. --- IkiWiki/Rcs/svn.pm | 1 - basewiki/style.css | 9 ++++++ basewiki/wikiicons/diff.png | Bin 0 -> 219 bytes debian/changelog | 5 +++- doc/ikiwiki.setup | 2 +- doc/todo/html.mdwn | 7 ++--- doc/usage.mdwn | 2 +- templates/recentchanges.tmpl | 53 ++++++++++++++++++++++++----------- 8 files changed, 55 insertions(+), 24 deletions(-) create mode 100644 basewiki/wikiicons/diff.png 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 0000000000000000000000000000000000000000..0b98d79ace182dced94e8774feeede3b2f5280d8 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngj!VDyXGEe0LDa8Pv5ZC`eFn#)e28R3Z{;uA3 zXy&2+P2E!h!(wy|j2Y5^!VG^--uVEe7)yfuf*Bm1-ADs*lDyqrxH2w$2?KJXJzX3_ zDsCkwBzQ9`DrlTbc;KOzkdR=Wosf`W%+77l(5hu+#pN&~apT5~ts6IfWNMolth`)< zQ;Sh@q49DJE=I|2<@6{?ElvG|6-=k}&9*T~ZOIa4zP^f;hoSkQ)VE*Znn^%w7(8A5 KT-G@yGywq7@=0a@ literal 0 HcmV?d00001 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 Mon, 3 Jul 2006 23:33:57 -0400 + -- Joey Hess 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&r1=[[r1]]&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&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 e7d7e10dd..1ea2f8a45 100644 --- a/templates/recentchanges.tmpl +++ b/templates/recentchanges.tmpl @@ -18,28 +18,49 @@
-
    +
    + + + + + + + + -
  • +
    •  + + + + + + + + + + + - +
    usertimechanges
    - - (">diff) + "> + diff + + + + -
    - - changed by : - - - -
    -     -     -     - +
    + + + +
    +     +     +     +
-- 2.44.0