Commit Graph

343 Commits (154519e1fce07df65a896b7a9b2311cd9a1dd7de)

Author SHA1 Message Date
Joey Hess 0aad1794ad improve semantic markup
Now the toplevel layout is:

<article>
<section><header><nav></section>
<aside>sidebar</aside>
<section>content</section>
<section>comments</section>
<footer>
</article>

And I managed to preserve all CSS ids and names in their prior structure,
so CSS should not need changed.
2010-05-02 15:41:12 -04:00
Joey Hess d69f6057d1 use html5 semantic markup in page.tmpl
This is a first pass, it avoids needing to change style.css
except where it refers to tag types.

This goes a bit off the rails at the pageheader with its nested header.
Semantically, there should be an article around the whole page
header, content, and footer. Just as there will be an article around a
whole comment or inlined page header, content, and footer.

But that will mean changing the css that currently refers to pageheader to
refer to the enclosing article instead.
2010-05-02 15:09:33 -04:00
Joey Hess b21df5029b Add placeholder text in search form (in html5 mode only). 2010-05-02 13:49:56 -04:00
Joey Hess 0dc6235659 use styled divs instead of center tags
More could be done to modernize this html, but I don't want to diverge
too far from the one in xapian.
2010-05-01 21:14:05 -04:00
Joey Hess a547d26858 html5 option
* Ikiwiki can be configured to generate html5 instead of the default xhtml
  1.0. The html5 output mode is experimental, not yet fully standards
  compliant, and will be subject to rapid change.
2010-05-01 20:49:18 -04:00
Joey Hess 930a60ae1d apply simonrvn patch adding labels for radio buttons
and other minor html improvement
2010-05-01 19:37:27 -04:00
Joey Hess 704263534a apply simonrvn patch to quote attributes 2010-05-01 19:33:24 -04:00
Joey Hess 91c57b03c9 limit feeds for tag pages to including ten posts
With archive=yes, feeds default to including all, but that is expensive
for automatically created tag pages.
2010-05-01 15:32:30 -04:00
Joey Hess a17e6ed463 Minor, seemingly harmless tweaks to misc.tmpl
Whenever the DIV tag structure of page.tmpl has been changed, the DIV
tag structure of misc.tmpl must also change to reflect this, or else
any page which uses misc.tmpl will not look right.  My intent is to
make ease parallel maintenance of these two files by eliminating
trivial/accidental difference between the two, so that duplicated
regions can be more readily identified (perhaps even mechanically).

(cherry-picked from commit 075980f94996e8f67d9632ae95b8bf41fdf09afa, but
without the changes to comments in page.tmpl)
2010-04-26 13:53:39 -04:00
Joey Hess 2cd92fcb22 use meta title 2010-04-22 20:13:47 -04:00
Joey Hess 8cde2365e4 add separate template variable for tag page and sanitize displayed tag name 2010-04-21 19:13:03 -04:00
Joey Hess 54f600af14 Merge remote branch 'davrieb/autotag' into autotag
Conflicts:
	IkiWiki.pm
	IkiWiki/Plugin/tag.pm
2010-04-17 12:50:23 -04:00
Joey Hess c0a2eaf796 calendarmonth.tmpl: The month calendar is now put in a sidebar. 2010-04-15 18:51:50 -04:00
Joey Hess baaa848f6c CSS and templates for sidebar changed to use a class, not an id.
Multiple sidebars should be possible; also, I want to add a sidebar
template.
2010-04-15 15:04:17 -04:00
Joey Hess 4dcea6207d page.tmpl: Add Cache-Control must-revalidate to ensure that users (especially of Firefox) see fresh page content.
Since Firefox version 3, it's done aggressive caching of visited pages, and
does not, by default, check if the cached content is still valid when
reloading or revisiting a page. By default, Firefox seems to not re-contact
the web server at all. Compare with eg, Epiphany and Chromium, which appear
to always check, and get back a 304 when the page is unchanged.

This header makes Firefox do the right thing, at least for html files. It
still over-caches if css, javascript, images, etc, are changed.
2010-03-31 17:52:58 -04:00
Simon McVittie b72757b6ae Add missing </span> to change.tmpl COMMITDATE, fixing well-formedness
This only affects people who don't use either htmltidy or htmlbalance.

Bug: http://ikiwiki.info/bugs/templateForRecentChangesMissingCloseSpan/
2010-03-11 18:15:44 +00:00
Joey Hess 21997387d4 optimise whitespace in feed templates 2010-02-14 19:23:09 -05:00
David Riebenbauer 9330b91703 fix typo in autotag.tmpl 2010-02-02 16:29:27 +01:00
David Riebenbauer f35d35abe3 Automatically create tag pages,
if "tag_autocreate=1" is set in the configuration. The pages will be created in
tagbase, if and only if they do not exist in the srcdir yet. Tag pages will be create from
"autotag.tmpl".

At this stage a second refresh is needed for the tag pages to be rendered.

Add autotag.tmpl template.
2010-02-02 14:04:28 +01:00
Joey Hess 73420c24c6 lowercase "or Signin" 2010-01-04 21:00:58 -05:00
Svend Sorensen f2dab9318f Add title span to misc.tmpl
Add title span to misc.tmpl so that the title is styled consistently
with pages that use page.tmpl.
2009-12-30 15:41:43 -05:00
Joey Hess 7dc357a6db typo 2009-11-09 14:42:18 -05:00
Joey Hess 9f0931ce21 localstyle: New plugin, allows overrding the toplevel local.css with one that is closer to a page.
I chose not to have it override style.css, because style.css is not really
intended to be edited; the one from the underlay is intended to be used as
a base that local.css overrides.

I chose to use a plugin rather than changing the default behavior, both
because I didn't want to have to worry about possibly breaking backwards
compatability (though this seems unlikely), and because it seemed cleaner
to not include style template parameters in the main page template code.

I suppose someone might want a way to not override the toplevel
local.css, but instead include it as well as foo/local.css. Probably the
best way to do that would be to have foo/local.css @import ../local.css
(modulo browser compatability issues). Alternatively, edit page.tmpl
to always include the toplevel local.css, or swap out this plugin for
another one.
2009-11-09 13:39:05 -05:00
Joey Hess c29957e017 google: Pass the whole wiki url to google, not just the domain, so that search works correctly for wikis that are located in subdirectories of domains. 2009-10-29 18:05:58 -04:00
Joey Hess e1939185d2 ikiwiki-calendar: New command automates creation of archive pages using the calendar plugin. 2009-10-11 16:52:54 -04:00
Joey Hess e9d20231a0 further otherlanguages list styling 2009-08-15 17:00:16 -04:00
Simon McVittie b1f31ab7cb getsource: in the default template, just say "Source"
All the other actions are single words (apart from RecentChanges), and
are nouns (apart from Edit); saying "Source" is consistent with "History",
for instance.
2009-07-26 17:04:49 +01:00
Will Uther 01e4cb1464 Add getsource plugin 2009-07-26 16:22:56 +01:00
intrigeri 86edd73d16 Merge commit 'upstream/master' into pub/po
Conflicts:

	debian/changelog
	debian/control

Signed-off-by: intrigeri <intrigeri@boum.org>
2009-06-06 14:03:40 +02:00
Joey Hess 5cdee82ef6 comment: Make comment directives no longer use the internal "_comment" form, and document the comment directive syntax.
Rationalle: Comments need to be user-editable so that they can be posted
via git commit etc.

The _comment directive is still supported, for back-compat.
2009-06-02 17:06:46 -04:00
Joey Hess ef003f48f4 Merge branch 'master' into po
Conflicts:
	debian/changelog
2009-05-19 13:07:47 -04:00
Joey Hess 527d178c12 comments: Add link to comment post form to allow user to sign in if they wish to, if the configuration makes signin optional for commenting. 2009-04-23 14:56:10 -04:00
intrigeri 4558457402 Merge commit 'upstream/master' into pub/po
Conflicts:

	debian/changelog
	debian/control
2009-04-20 12:21:18 +02:00
Joey Hess b6eccfd3d3 Add a microblog template that is useful for inlining microblogging posts. 2009-04-11 12:40:15 -04:00
Joey Hess a25d8f992b inline: Add author info to archive display.
This won't change it normally, and is useful if using archive
format to display some aggregated feed titles.
2009-04-10 21:49:43 -04:00
Joey Hess ba46ec5d1e fix format 2009-04-10 18:22:58 -04:00
Joey Hess 98ae0fb92c Add missing permalink support to archivepage and titlepage templates. 2009-04-10 18:02:03 -04:00
intrigeri 055be361f5 page.tmpl: use OTHERLANGUAGES and PERCENTTRANSLATED
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-03-28 11:41:21 +01:00
Joey Hess 825e2b1378 Merge branch 'master' into po
Conflicts:
	debian/control
2009-03-27 15:09:41 -04:00
Joey Hess 10822a22b3 comments: Fix anchor ids to be legal xhtml. Closes: #521339
Well, that was a PITA.

Luckily, this doesn't break guids to comments in rss feeds,
though it does change the links.

I haven't put in a warning about needing to rebuild to get
this fix. It's probably good enough for new comments to get the
fix, without a lot of mass rebuilding.
2009-03-26 16:45:53 -04:00
intrigeri f4a1732b0e Merge commit 'upstream/master' into prv/po 2009-03-09 00:32:10 +01:00
intrigeri ae474d8e14 Merge commit 'upstream/master' into prv/po
Conflicts:

	IkiWiki/Plugin/editpage.pm
	debian/control
	debian/copyright
	doc/todo/need_global_renamepage_hook.mdwn

Signed-off-by: intrigeri <intrigeri@boum.org>
2009-03-08 09:50:27 +01:00
Joey Hess 72dd9a9a04 make wmd comment support comment editing (I think) 2009-03-07 18:54:26 -05:00
Joey Hess 7ca39f49db forgot to add wmd tag here 2009-03-07 18:52:14 -05:00
Joey Hess bea8e0ad61 apply patch to fix googleform xhtml 2009-02-14 02:38:17 -05:00
Svend Sorensen a71690607a Add pageheader div to misc.tmpl
Add pageheader div so that misc.tmpl is consistent with page.tmpl.  ---
templates/misc.tmpl |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
2009-02-05 16:00:25 -05:00
Joey Hess 12eb056b33 Merge branch 'master' into po 2009-01-26 13:05:38 -05:00
Joey Hess 0c287d85bb typo 2009-01-25 22:44:38 -05:00
Joey Hess 9d4f396b13 add reject all marked defer checkbox 2009-01-25 22:25:45 -05:00
Joey Hess 9a5085e512 clean up comment preview
Remove actions from it, and avoid a broken title link.
2009-01-25 18:56:47 -05:00
Joey Hess 731fc9e7a2 comments: Add a moderation web interface. 2009-01-25 18:49:57 -05:00
intrigeri 82197bd0ea Merge commit 'upstream/master' into prv/po 2009-01-13 12:26:43 +01:00
Simon McVittie 79676ca445 comments: if the remove plugin is enabled, append a "Remove comment" link 2009-01-10 11:31:24 +00:00
Joey Hess 81b088866b repolist: New plugin to support the rel=vcs-* microformat.
* repolist: New plugin to support the rel=vcs-* microformat.
* goodstuff: Include repolist by default. (But it does nothing until
  configured with the repository locations.)
2009-01-07 16:07:46 -05:00
intrigeri f58cb48f1f po(formbuilder_setup): use a template to display the warning
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-01-02 12:27:10 +01:00
Simon McVittie 9e5f504e1a rssitem.tmpl: include comments URL (HTML only) 2008-12-21 17:16:24 +00:00
Simon McVittie 3feebe31b6 atomitem.tmpl: include comments URLs (HTML and Atom versions) 2008-12-21 17:16:12 +00:00
Joey Hess 5c669ab226 comment layout change
I saw a layout similar to this on blogger, and I sorta like it

The dash avoids parens sitting next to each other in some cases.
2008-12-21 01:04:19 -05:00
Joey Hess f8cc87e8ee remove signin icons, use title 2008-12-20 18:46:56 -05:00
Joey Hess b7531acb59 tweak author display
Put the icon after the name, mostly because it scans better on
non-graphical browsers where the alt text is displayed. And because the
name is really the more important part.
2008-12-20 18:36:16 -05:00
Simon McVittie f94665800c comment.tmpl: make anon/OpenID/signed-in icons independent of smileys 2008-12-20 17:39:55 +00:00
Simon McVittie 045cbb2a14 comments_display: display (?) for anon users, {x} for OpenIDs and {*} for local logins
This is a mockup of Joey's idea; to do it properly, the icons should
move to the basewiki or to a comments underlay, and {x} should be
replaced with an OpenID logo (if one with clear licensing even exists).
2008-12-20 17:34:55 +00:00
Simon McVittie 9e889c39ed comments: Rename COMMENTURL to ADDCOMMENTURL to avoid confusion with COMMENTAUTHORURL
Also refactor page.tmpl to use if/else rather than unless/if.
2008-12-20 17:34:55 +00:00
Joey Hess fb8161b845 simplify and compact the comment edit form
Mostly to make it more visually similar to the page edit form.

I'm a bit uncertian about the placement of the page type selector,
and about removing the "Page type". May rethink that.
2008-12-19 14:29:54 -05:00
Joey Hess d0f2ac685b remove 'signed in as foo'
I think users should know who they're signed in as; the edit pages don't
say so there's no reason to here. Also, the user id was not displayed
pretty.
2008-12-19 14:21:48 -05:00
Joey Hess 091c7fd25b add link from comment subject to its permalink 2008-12-19 14:20:07 -05:00
Joey Hess 29cb9027f4 fiddle with comment css classes 2008-12-19 14:14:20 -05:00
Joey Hess 79a787a466 rename comments_form to editcomment 2008-12-19 14:07:22 -05:00
Joey Hess ddabb010b2 rename comments_display to comment 2008-12-19 14:03:26 -05:00
Joey Hess f7fc062a12 replace discussion links on pages with comments link
The thinking here is that having both a Discussion page and comments for
the same page is redundant, and certianly not what you want if you enable
comments for a page. At first I considered making configurable via pagespec
what pages got discussion links. But that would mean testing a new pagespec
for every page, and a redundant config setting to keep in sync. So intead,
take a lead from my previous change to make inlined pages have a comments
link, and change the discussion link at the top of regular pages to link to
their comments.

(Implementation is a bit optimised to avoid redundant pagespec checking.)
2008-12-19 13:55:41 -05:00
Joey Hess 7521dd6c75 jump to comment after posting
Jumping to the just posted comment was the imputus, but I killed a number
of birds here.

Added a INLINEPAGE template variable, which can be used to add anchors to
any inline template.

To keep that sufficiently general, it is the full page name, so the
comment anchors and links changed form.

Got rid of the FIXMEd hardcoded html anchor div.

More importantly, the anchor is now to the very top of the comment, not the
text below. So you can see the title, and how it attributes you.

Avoid changing the permalink of pages that are not really comments, but
happen to contain the _comment directive. I think that behavior was a bug,
though not a likely one to occur since _comment should only really be used
on comment pages.
2008-12-18 20:58:16 -05:00
Joey Hess cd7ac8f72a add Comments link when displaying a page inline
This link will supplant the usual Discussion link for pages
that have comments enabled.
2008-12-17 19:38:02 -05:00
Simon McVittie c038734986 comments_display.tmpl: use less nice formatting to avoid whitespace in output 2008-12-11 21:14:05 +00:00
Simon McVittie 370c1b87c9 comments_display.tmpl: preferentially use confirmed username, but fall back to claimed author if unauthenticated
This still isn't quite right (it displays the IP address twice if the user
doesn't specify a name).
2008-12-11 21:14:05 +00:00
Simon McVittie f29a607025 comments_form.tmpl: show labels for name, website 2008-12-11 21:14:05 +00:00
Simon McVittie a5889912b3 comments: Optionally allow anonymous commenters to set their name/URL.
Also provide a way for the comment template to pick up the verified
username/IP.
2008-12-11 21:14:05 +00:00
Simon McVittie 44a7d77a30 comments: rename main field to "editcontent" consistent with editpage
This has the side-effect that Ikiwiki's default style.css gives the text
box 100% width.
2008-12-11 21:14:05 +00:00
Simon McVittie edb69335f2 comments: instead of hard-coding mdwn, allow any supported page format 2008-12-11 21:14:05 +00:00
Simon McVittie 9af0f04df3 comments: Save comments as a file with one big [[!comment]] directive.
This delays all comment formatting until the last possible time, allows
us to set metadata without worrying that commenters may be able to evade
it, and means that changes to how a comment is saved can be handled
gracefully. It also gives us somewhere to put the commenter's username
or IP address for later reference.
2008-12-11 21:14:05 +00:00
Simon McVittie 24bfc3fdc5 comments: record the time at which each comment was posted 2008-12-11 21:14:04 +00:00
Simon McVittie 8ead8ac857 Remove comments_embed.tmpl (no longer needed) 2008-12-11 21:14:04 +00:00
Simon McVittie 1c1437995c page.tmpl: optionally include "add comment" link 2008-12-11 21:14:04 +00:00
Simon McVittie 8776c76e32 comments_comment.tmpl: allow permalink, anchor to be passed in 2008-12-11 21:14:04 +00:00
Simon McVittie 3a46e7c7f1 comments_embed.tmpl: include the inlined comments if present 2008-12-11 21:14:03 +00:00
Simon McVittie 0df983c5a7 Add comments to page.tmpl 2008-12-11 21:14:03 +00:00
Simon McVittie 249ea2ed75 comments: remove allowhtml option, just switch it on all the time
Now that posts are individually sanitized, that should be safe.
2008-12-11 21:14:03 +00:00
Simon McVittie 3d4aa065d6 postcomment: Rename plugin to comments, use *._comment files
The PageSpec is still called "postcomment" since that's what it means.
2008-12-11 21:14:02 +00:00
Simon McVittie 3c9ccb406b Rename smcvpostcomment plugin to postcomment to propose for inclusion 2008-12-11 21:14:02 +00:00
Simon McVittie 2857b301e7 smcvpostcomment_*.tmpl: make class names match template names
Also put "posting comments disabled" in [], and change "Page preview"
to "Comment preview".
2008-12-11 21:14:02 +00:00
Simon McVittie d18adfb1ad smcvpostcomment: indicate in form whether HTML and directives are allowed 2008-12-11 21:14:02 +00:00
Simon McVittie 7be3a15244 Use a link rather than a button for "post comments" 2008-12-11 21:14:01 +00:00
Simon McVittie f77f7a02a6 Add initial version of a postcomment plugin (temporarily namespaced as smcvpostcomment) 2008-12-11 21:14:01 +00:00
Joey Hess e307eeda3d html escaping complication
Can't escape things to entities if the template then escapes the entities.
(aggregate doesn't have this problem.)
2008-11-18 02:48:24 -05:00
Joey Hess f0e58faefa Add rel=nofollow to recentchanges_links for the same (weak) reasons it was earlier added to edit links. 2008-11-10 18:05:30 -05:00
Joey Hess 2b569f99d9 fix relativedate timezone inclusion
The machine parseable date needs to include a timezone.

Also, simplified the interface for date display.
2008-10-19 19:21:44 -04:00
Joey Hess 3f922abff4 remove old dup div 2008-10-18 19:11:57 -04:00
Joey Hess 35c56622ea tweak recentchanges permalink code
Need to handle the case where url is not set.
2008-10-17 21:54:42 -04:00
Joey Hess fdb5da46b0 Patch for anchor-based change permalinks in recent changes feed
from JasonBlevins
2008-10-17 21:49:55 -04:00
Joey Hess 02ec92c6cb make relativedate work for the dates on the recentchanges page
Having a always current relative date on recentchanges is very, very nice.
2008-10-17 21:21:07 -04:00
Joey Hess 7390a7a072 relativedate: New javascript-alicious plugin that makes all dates display relative, in a very nice way, if I say so myself. 2008-10-17 20:47:32 -04:00