031da9c134
po: guard against reimportation
...
If po is imported twice, bad things happen. Guard against that.
I'm not sure what causes the double import; I saw it when websetup did a
wiki rebuild. Carp failed to show a backtrace for the second call to
import.
2010-05-13 16:28:09 -04:00
bc0aa4d40e
Use xhtml friendly pubdate setting.
2010-05-08 19:45:02 -04:00
c3e9215e1f
moved non-openid signin form into same page as openid selector; show/hide as buttons are pressed
2010-05-08 15:57:39 -04:00
d0c17a4a46
calendar: Display year name in title of month calendar.
...
Also, fix relative month calculations.
2010-05-08 13:51:05 -04:00
fd817f9ac3
calendar: nextchange calculation bugfix
...
If a page had multiple calendars, the last one won and set nextchange.
That's wrong; the calendar that needs to next update soonest should win.
2010-05-08 12:52:19 -04:00
0f778849c6
calendar: Allow negative month to be specified. -1 is last month, etc. (And also negaitve years.)
2010-05-08 12:45:21 -04:00
937b24e0cf
Merge branch 'master' into commentreorg
2010-05-07 22:30:42 -04:00
b8dcaf91d0
scale display form to match openid size
2010-05-07 21:48:50 -04:00
8f6cfbfade
Removed the openidsignup option.
2010-05-07 21:33:27 -04:00
1e75389a85
bugfix
...
Always load IkiWiki::CGI so its cgi_signin is present, so we replace it.
2010-05-07 21:28:59 -04:00
dc0d48459c
bugfix
2010-05-07 21:27:02 -04:00
c1e365abdc
remove loginlabel, not used
2010-05-07 21:20:21 -04:00
f8c2a67b3c
pretty openid login
...
* openid: Incorporated a fancy openid-selector signin form.
(http://code.google.com/p/openid-selector/ )
* openid: Use "openid_identifier" as the form field, as required
by OpenID Authentication v2.0 spec.
2010-05-07 20:14:25 -04:00
378c647768
patch hidden field setting code
...
Fixes http://code.google.com/p/openid-selector/issues/detail?id=11#c3
2010-05-07 19:10:50 -04:00
2ee820dedd
avoid linking directly to ikiwiki.cgi?do=signin
...
Instead, add a custom do=commentsignin, that calls cgi_signin.
This allows a plugin to inject a custom cgi_signin, that uses a different
do= parameter, and have it be used consitently. (This was the only
place to hardcode a link to do=signin.)
2010-05-07 17:11:23 -04:00
b50b549cab
fix comment matching pagespecs
...
test isinternal first, because match_glob with internal => 1 also returns
non-internal pages that match. This order should also be faster.
Remove test to see if pagesources is set. isinternal will not succeed if it
is not.
2010-05-07 14:02:30 -04:00
fe8f4a7781
better wording
2010-05-07 13:55:08 -04:00
2dfdadf10c
bugfix
2010-05-07 13:47:29 -04:00
8d3c89f0c7
bugfixes
2010-05-07 13:44:24 -04:00
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
Joey Hess