be0c2df6db
check that pagesources exists before testing
2010-05-07 13:28:14 -04:00
8cd216d748
fix match_comment
2010-05-07 12:55:34 -04:00
3adb47ec4f
Merge branch 'master' into commentreorg
...
Conflicts:
debian/changelog
2010-05-07 12:42:38 -04:00
1678604fe3
avoid redir loop when going to an internal page that has no permalink
2010-05-07 00:22:05 -04:00
575080d6ef
respect permalinks
2010-05-06 23:28:40 -04:00
ea4967f184
inline: Call indexhtml when inlining internal pages, so their text can be indexed for searching.
2010-05-06 23:20:48 -04:00
121e2ffc2f
Renamed postscan hook to indexhtml, to reflect its changed position.
...
Probably only the search plugin uses it, so this seemed safe.
2010-05-06 23:14:36 -04:00
4c320176c0
simplify formbuilder stylesheet specification
...
Since all forms are wrapped in a template that defines the actual
stylesheets, formbuilder just has to be told to turn on stylesheet mode,
not what file is the style sheet.
2010-05-06 22:27:12 -04:00
d3aaf6e01f
fix pagediff to not display as "preview"
...
I think originally, the page preview header was not displayed,
so diff was hacked in using it.
2010-05-06 22:19:14 -04:00
d9d910f676
moved comments pending moderation
...
* comments: Comments pending moderation are now stored in the srcdir
alongside accepted comments, but with a `._comment_pending` extension.
* This allows easier byhand moderation, as the "_pending" need
only be stripped off and the comment be committed to version control.
* The `comment_pending()` pagespec can be used to match such unmoderated
comments, which makes it easy to add a feed of them, or a counter
indicating how many there are.
* Belatedly added a `comment()` pagespec.
2010-05-06 20:05:53 -04:00
cb2025af45
refactor
2010-05-05 22:41:23 -04:00
1193759568
remove unused indexlink function and template variable
2010-05-05 20:42:56 -04:00
ab575a4b69
graphviz: Fix display of preexisting images in preview mode.
2010-05-04 16:54:58 -04:00
9699f16b51
websetup: Only display Setup button on admins' preferences page.
...
Renamed it from "Wiki Setup" to just "Setup" for good measure.
2010-05-03 13:59:43 -04:00
0fc32c8b2f
allow do=setup to log a user in if necessary
2010-05-03 13:46:52 -04:00
2f22ee85e5
Add ACTIONS variable to page.tmpl, which allows plugins to add arbitrary links to the action bar without modifying the template further.
...
(COMMENTSLINK and DISCUSSIONLINK could be folded into this, but are kept
separate for now to avoid breaking modified templates.)
2010-05-03 12:46:52 -04:00
adf182669d
add a missing space
2010-05-02 22:43:55 -04:00
154732dc42
adapt comment.tmpl to html5
...
Note that I put comment-header in a <header> despite it being
below the comment. Using a <footer> would be confusing given
the class name. Also, the content is semantically closer to
a header than a footer.
2010-05-02 16:12:08 -04:00
932fc0c25f
use a div, not a p .. and in html5, a nav
2010-05-02 14:41:20 -04:00
b21df5029b
Add placeholder text in search form (in html5 mode only).
2010-05-02 13:49:56 -04:00
970373548f
Add parameter to displaytime to specify that it is a pubdate, and in html5 mode, use time tag.
2010-05-02 13:44:13 -04:00
ccafb10007
enable hidden attribute
2010-05-01 19:59:16 -04:00
790a339db1
htmlscrubber: Also allow some other html5 tags: canvas, progress, meter, ruby, rt, rp, details, summary.
2010-05-01 19:28:28 -04:00
f1e2d0af12
more html5 attributes
2010-05-01 19:11:03 -04:00
78cee5140a
add rest of html5 form attributes
...
It's easy to imagine pattern being used to freeze or crash browsers, if
they implement it stupidly. Let's hope not..
2010-05-01 18:44:37 -04:00
80f9a2a087
add figure and figcaption
2010-05-01 18:31:33 -04:00
0a139aba82
htmlscrubber: Allow the html5 form attributes: placeholder autofocus, min, max, step.
2010-05-01 18:27:53 -04:00
442bc59a15
htmlscrubber: Allow the placeholder attribute.
2010-05-01 18:14:50 -04:00
73c8209484
more html5
...
* htmlscrubber: Also allow html5 canvas tags.
* htmlscrubber: Round out html5 video support with the preload
attribute and the source tag.
2010-05-01 17:56:35 -04:00
80f2042464
htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup header footer time mark
2010-05-01 16:34:47 -04:00
0e7a3640ae
template: Fix typo.
2010-04-27 12:10:58 -04:00
7f3047f67c
added match_guid function to meta plugin
...
(cherry picked from commit 8b6fde73669ddf9204acb3d334c3984566f3c59d)
Conflicts:
IkiWiki/Plugin/meta.pm
2010-04-26 13:47:01 -04:00
a1575b0c83
bugfixes
2010-04-24 20:41:35 -04:00
ca9c6cc254
add support for mass dependencies
...
Registered by passing "" as page name to add_depends.
2010-04-24 20:22:20 -04:00
4321b30139
Merge branch 'master' into templatemove
2010-04-24 16:46:30 -04:00
cce3042457
po: fix some uninitalized value warnings when used by websetup
2010-04-24 16:44:45 -04:00
c2656f08f3
template() - return params in list context
...
I forgot CGI::Formbuilder's horrible interface that needs template
parameters instead of a constructed object.
2010-04-24 16:15:47 -04:00
df012e54c7
chomp template values
...
Before the template reorg, this was done by a template filter.
2010-04-24 01:13:58 -04:00
998f47ed13
Merge branch 'master' into templatemove
2010-04-24 00:55:09 -04:00
e90d67d3c9
Moved javascript files under the ikiwiki/ directory, to avoid cluttering the top of the web root. This is another things that requires a wiki rebuild on upgrade to this version.
2010-04-24 00:54:59 -04:00
0e68f76a9a
update
2010-04-23 15:23:34 -04:00
d1cc7e81c8
use template() rather than rolling it by hand
2010-04-23 15:11:25 -04:00
ee8d237f98
improved error message
2010-04-23 14:50:00 -04:00
753bfb17a0
switch to using template_depends
...
It now handles all the details of finding a page template that this used to
need to implement.
2010-04-23 14:45:48 -04:00
d4d7d5ddaf
use same error string as template.pm does
2010-04-23 14:45:02 -04:00
011d88052d
fix logic
2010-04-23 14:00:53 -04:00
abd2339312
look for templates in srcdir and underlays, first
...
This entailed changing template_params; it no longer takes the template
filename as its first parameter.
Add template_depends to api and replace calls to template() with
template_depends() in appropriate places, where a dependency should be
added on the template.
Other plugins don't use template(), so will need further work.
Also, includes are disabled for security. Enabling includes only when using
templates from the templatedir would be nice, but would add a lot of
complexity to the implementation.
2010-04-22 15:55:58 -04:00
23d62f42bd
remove add_templates option
...
Templates are moving into the srcdir, and will also be searched for in
configured underlays, so this is redundant.
2010-04-22 14:35:00 -04:00
3ee571390e
Merge branch 'autotag'
2010-04-22 00:34:03 -04:00
bc6d602609
add influence info for failed metadata matches
...
This is needed so that when a negated pagespec like "!author(foo)"
stops matching, due to the page being changed, ikiwiki knows that
the match was influenced by the page content.
2010-04-22 00:10:13 -04:00
Joey Hess