Commit Graph

9742 Commits (7cae2951248245cb8b4da69d0f28065c394b31a2)

Author SHA1 Message Date
Joey Hess f52f395437 consistently drop NAME= in templates
also add template syntax smoke test
2010-05-05 21:10:40 -04:00
Joey Hess 83b907c35e remove misc.tmpl checking
Turns out that users with a modified page.tmpl need to modify it on
upgrade, at least to add the FORCEBASEURL (so edit preview works),
so there is no point in trying to retain compatability.
2010-05-05 18:46:35 -04:00
Joey Hess 66cc23a591 no more misc.tmpl
* Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
  a single template, page.tmpl.
* misc.tmpl will, however, still be read if a locally modified version
  exists. This is to avoid forcing users to update page.tmpl right now.
2010-05-05 18:22:47 -04:00
Joey Hess 3ebd04a33b add news item for ikiwiki 3.20100504 2010-05-04 20:37:11 -04:00
http://mcfrisk.myopenid.com/ 93f8000d58 solved 2010-05-04 21:17:54 +00:00
http://joey.kitenet.net/ 73ebf2a9f2 2010-05-04 20:56:38 +00:00
Joey Hess ab575a4b69 graphviz: Fix display of preexisting images in preview mode. 2010-05-04 16:54:58 -04:00
Joey Hess ddd7a766e2 response 2010-05-04 16:46:18 -04:00
Joey Hess 74e0c83a95 response 2010-05-04 16:36:22 -04:00
Joey Hess ac2cc8f87d response 2010-05-04 16:22:27 -04:00
http://zwol.livejournal.com/ 35bd43aea3 2010-05-04 17:09:27 +00:00
blipvert 28db9e38f7 2010-05-04 15:47:42 +00:00
blipvert a43bc68eb3 2010-05-04 15:46:40 +00:00
Jon Dowland 4cb9f77570 Merge branch 'master' of git://git.ikiwiki.info 2010-05-04 16:44:31 +01:00
blipvert 821a8aba2f 2010-05-04 15:43:23 +00:00
Jon Dowland 7060a818c1 un-escape escaped chevrons 2010-05-04 16:43:22 +01:00
blipvert bd5c5f1f48 2010-05-04 15:42:21 +00:00
blipvert 48b5b7fecc 2010-05-04 15:41:56 +00:00
Jon Dowland 89e0669692 split two graphviz bugs from one page; undo one of them 2010-05-04 16:39:50 +01:00
http://www.clowersnet.net/~krc/ bde13387da comment on html5 2010-05-04 05:12:14 +00:00
David Riebenbauer d5928778a8 whishlist about two-way conversion. 2010-05-04 02:26:56 +02:00
http://mcfrisk.myopenid.com/ 6c0d2aa456 PERL5LIB setting question 2010-05-03 23:28:27 +00:00
Joey Hess ae75c9bee6 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-05-03 16:03:06 -04:00
Joey Hess 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
Joey Hess 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
raf 4733a1a9cd 2010-05-03 07:28:40 +00:00
raf 0f9c5697f8 2010-05-03 07:27:35 +00:00
raf 7606d3832d 2010-05-03 07:27:05 +00:00
raf 8784c08f6f 2010-05-03 07:25:54 +00:00
Joey Hess 78962ddfe6 add bug 2010-05-02 22:03:28 -04:00
Joey Hess cfca3a7074 response 2010-05-02 18:59:37 -04:00
Joey Hess bb70c15c59 on img and figure 2010-05-02 18:55:21 -04:00
Joey Hess 02a99875ff update 2010-05-02 17:54:30 -04:00
Joey Hess 34076e398c html5 bug closure, and documentation 2010-05-02 17:16:15 -04:00
Joey Hess d37ff8d299 ff also needs footer and nav forced to block 2010-05-02 17:01:28 -04:00
Joey Hess 28dcb52a6c force article and header to display as blocks
iceweasel 3.5.9 does not know to display these as blocks, resulting
in bad displays of blogs
2010-05-02 16:54:31 -04:00
Joey Hess 677d2af18a adapt inlinepage.tmpl to html5
Needed to force tags to display inline, since <nav> is a block element.
2010-05-02 16:36:10 -04:00
Joey Hess 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
Joey Hess cbe0726b63 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-05-02 15:45:48 -04:00
raf 9480dc4427 2010-05-02 19:26:06 +00:00
raf 40aba87965 2010-05-02 19:20:37 +00:00
raf fa26c67b2a 2010-05-02 19:19:33 +00: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 7517d34da9 update 2010-05-02 15:09:15 -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 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
Joey Hess f9e41d19b7 add news item for ikiwiki 3.20100501 2010-05-01 21:42:48 -04:00
Joey Hess 1226269f68 mention html5 2010-05-01 21:00:06 -04:00
Joey Hess 8e4af6a8e2 tidy plugin issue 2010-05-01 20:57:54 -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 ccafb10007 enable hidden attribute 2010-05-01 19:59:16 -04:00
Joey Hess 790a339db1 htmlscrubber: Also allow some other html5 tags: canvas, progress, meter, ruby, rt, rp, details, summary. 2010-05-01 19:28:28 -04:00
Joey Hess f1e2d0af12 more html5 attributes 2010-05-01 19:11:03 -04:00
Joey Hess 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
Joey Hess 0a139aba82 htmlscrubber: Allow the html5 form attributes: placeholder autofocus, min, max, step. 2010-05-01 18:27:53 -04:00
Joey Hess 442bc59a15 htmlscrubber: Allow the placeholder attribute. 2010-05-01 18:14:50 -04:00
Joey Hess 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
Joey Hess 80f2042464 htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup header footer time mark 2010-05-01 16:34:47 -04:00
Joey Hess a034716009 update example tag pages to match autotag.tmpl 2010-05-01 15:35:52 -04:00
Joey Hess 3252df4aa8 comments, branch review, questions 2010-05-01 15:27:32 -04:00
Joey Hess dd75b61d93 response 2010-04-30 14:15:58 -04:00
Jon Dowland 9fb15ec9fe new bug: svn commit failures... 2010-04-30 16:48:19 +01:00
simonraven f7f1dd3a38 more to add on my comment 2010-04-29 16:24:23 +00:00
simonraven d57d2ecca7 YA URI to another mediawiki to git project 2010-04-29 16:18:15 +00:00
http://jmtd.livejournal.com/ 8d7dba2fb2 wl rcs 2010-04-29 15:35:59 +00:00
albertlash ebde1ee2fd 2010-04-29 03:44:52 +00:00
albertlash 0c7d2cf9b2 2010-04-29 03:44:27 +00:00
http://kerravonsen.dreamwidth.org/ a5923e3999 reply 2010-04-29 00:27:03 +00:00
Joey Hess a6e6f604bd TMPL_INCLUDE re-enabled for templates read from the templatedir. (But not in-wiki templates.) 2010-04-28 12:39:13 -04:00
http://kerravonsen.dreamwidth.org/ 67e8edc597 question about TMPL_INCLUDE 2010-04-28 03:22:37 +00:00
Joey Hess 9daf3db277 format 2010-04-27 00:02:49 -04:00
Joey Hess 47dfa3b8b9 add news item for ikiwiki 3.20100427 2010-04-27 00:00:46 -04:00
Joey Hess 3ac2ae1f14 Add page() PageSpec, which is like glob() but matches only pages, not other files. 2010-04-26 18:47:17 -04:00
Joey Hess a6bd053638 remove manual file remove instructions
Since that was written, ikiwiki got fixed to track old rendered files
across --rebuild and remove them.
2010-04-26 16:31:00 -04:00
Joey Hess 06d5a19370 document match_guid 2010-04-26 13:47:40 -04:00
Joey Hess 0689f2dbc5 add blipvert 2010-04-26 13:43:24 -04:00
Joey Hess d4a1d88dbe Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-26 13:41:22 -04:00
http://jmtd.livejournal.com/ d3c994d980 fix indent 2010-04-26 15:29:04 +00:00
http://jmtd.livejournal.com/ 76e8e4ea83 insert table of common namespaces 2010-04-26 15:24:50 +00:00
http://jmtd.livejournal.com/ 60481cad90 move list of namespaces to its own section 2010-04-26 15:19:04 +00:00
http://jmtd.livejournal.com/ 86484c109d table name for querying the mediawiki mysql db 2010-04-26 15:14:08 +00:00
Joey Hess 506075695f typo 2010-04-25 14:16:53 -04:00
http://id.ertugkaramatli.com/ f49b9e7411 added my personal site 2010-04-25 13:25:59 +00:00
Joey Hess 5afda33672 wording 2010-04-24 21:39:03 -04:00
Joey Hess c6a473b8ee update 2010-04-24 20:30:05 -04:00
Joey Hess 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
Joey Hess a95d824cb4 update 2010-04-24 01:39:39 -04:00
Joey Hess c0b2334815 reword, reorg, add example 2010-04-24 01:13:37 -04:00
Joey Hess 39d4bfde6b Merge branch 'master' into templatemove 2010-04-24 00:47:54 -04:00
Joey Hess b28323e76a fix caps 2010-04-24 00:47:46 -04:00
Joey Hess 8a56df576a Merge branch 'master' into templatemove 2010-04-24 00:46:17 -04:00
Joey Hess be3d754320 remove paragraph about old style directives, it's been long enough 2010-04-24 00:45:54 -04:00
Joey Hess a46e178932 add link to templates page 2010-04-24 00:43:45 -04:00
Joey Hess 05517a5426 wording 2010-04-24 00:41:52 -04:00
Joey Hess 1473bf84c5 update re template change 2010-04-23 17:38:37 -04:00
Joey Hess 33b0a69e90 improve attachment example 2010-04-23 17:36:07 -04:00
Joey Hess 9b112cc986 add test case to ensure all templates are documented 2010-04-23 17:23:31 -04:00
Joey Hess 6c64ce0336 update news for template change 2010-04-23 17:01:22 -04:00
Joey Hess e8a23c299e Merge branch 'master' into templatemove 2010-04-23 16:48:53 -04:00
Joey Hess d5c5fef363 update 2010-04-23 16:48:37 -04:00
Joey Hess 7bba522545 Merge branch 'master' into templatemove
Conflicts:
	doc/templates.mdwn
2010-04-23 16:43:44 -04:00
Joey Hess 7e79da7633 template docu reorg
Remove wikitemplates page; fold its contents into templates page.
Update all backlinks. Document new ability to put templates inside srcdir.
2010-04-23 16:14:33 -04:00
Joey Hess d822e37d0e move template documentation to the template directive
allow new templates to be created via the inline that lists them
(cherry picked from commit 83703d2f4a)
2010-04-23 15:33:32 -04:00
Joey Hess 83703d2f4a move template documentation to the template directive
allow new templates to be created via the inline that lists them
2010-04-23 15:32:39 -04:00
Joey Hess 78fd3b35a2 allow template pages to not be under templates/ 2010-04-23 15:02:07 -04:00
Joey Hess 54898d16d4 allow a bare page name to be specified as a template 2010-04-23 14:44:37 -04:00
Joey Hess 796ece2a8a response 2010-04-23 13:30:52 -04:00
privat 53c8bf9ed9 multiple_sidebars in a gitbranch 2010-04-23 17:28:38 +00:00
Jon Dowland 92c927cb92 half-formed thought about accessible profiling 2010-04-23 18:28:20 +01:00
privat 4afe2d1170 add my repository in the list 2010-04-23 17:20:51 +00:00
Jon Dowland f5466ad717 how important is perl 5.10? 2010-04-23 16:29:05 +01:00
Joey Hess 5bc7efab7c switch to PERL5LIB so that use lib inserted for INSTALL_BASE is overridden during build 2010-04-22 23:00:33 -04:00
blipvert a2feb7d477 rename bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn to bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn 2010-04-23 02:40:36 +00:00
blipvert 898fc10955 2010-04-23 02:36:27 +00:00
Joey Hess 4c99904af3 reference my branch for this 2010-04-22 16:29:49 -04:00
Joey Hess 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
http://smcv.pseudorandom.co.uk/ 418670c7e8 map can't currently change sort ordering 2010-04-22 19:28:31 +00:00
http://seph.myopenid.com/ 8eac7c2ad4 2010-04-22 19:15:42 +00:00
Joey Hess 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
Joey Hess 584391aedd clarify 2010-04-22 14:07:45 -04:00
Joey Hess ad296f90c3 add 2010-04-22 13:45:25 -04:00
Joey Hess 1f5d1dff61 update 2010-04-22 00:42:53 -04:00
Joey Hess 170725dc3e update 2010-04-22 00:40:05 -04:00
Joey Hess 3ee571390e Merge branch 'autotag' 2010-04-22 00:34:03 -04:00
Joey Hess 2b175d7c1f improved fix for depends_simple_mixup
Avoid adding the page matched against as an influence for
currently failing pagespec matches, while still adding
any other influences.

This avoids bloating depends_simple with lots of bogus influences when
matching eg, "!link(done)". It's only necessary for the page being tested
to be an influence of that if the page matches.
2010-04-22 00:18:20 -04:00
Joey Hess c98414e192 added a test case for this bug
Further analysis suggests fixing this might not be as dreadful as I first
thought!
2010-04-21 23:08:54 -04:00
Joey Hess 13325317a3 backlink influence data seems ok 2010-04-21 22:04:03 -04:00
Joey Hess 17a89d3d19 update 2010-04-21 21:57:12 -04:00
Joey Hess 09ff797682 more wrongness 2010-04-21 21:55:12 -04:00
Joey Hess 8cf6b7abf8 link fix 2010-04-21 21:42:18 -04:00
Joey Hess 6c5f315970 argh. head exploding. 2010-04-21 21:38:58 -04:00
Joey Hess 557912c723 my autotag branch seems ready 2010-04-21 20:47:18 -04:00
Joey Hess d048e9c64a turn on tag_autocreate by default if tagbase is set 2010-04-21 20:39:20 -04:00
Joey Hess 20052f8882 Merge branch 'master' into autotag
Conflicts:
	IkiWiki/Plugin/tag.pm
2010-04-21 20:19:06 -04:00
Joey Hess 129cd00bdb remove broken ./tag support
The commit that added the (working) support for using /tag to override
tagbase also tried to make ./tag work. Problem is, tags are links,
and ./foo is not a valid link (though I think there's a wishlist about it).

So, using ./tag really resulted in tag creation links that led to a
"bad page name" error. And even if the tag were created in the right place,
the link didn't go to it.
2010-04-21 20:15:11 -04:00
Joey Hess 789e68a8b1 Merge branch 'master' into autotag
Conflicts:
	IkiWiki/Plugin/tag.pm
2010-04-21 19:47:38 -04:00
Joey Hess 1336a3270b response 2010-04-21 16:36:58 -04:00
Joey Hess f03d3d8567 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-21 16:34:50 -04:00
Joey Hess 463ba55dce note re includes 2010-04-21 16:33:03 -04:00
http://smcv.pseudorandom.co.uk/ ffe9fd8eb1 suppressing auto-creation can be quite counter-intuitive 2010-04-21 20:30:14 +00:00
http://smcv.pseudorandom.co.uk/ b21db41978 elide an older patch that's no longer under discussion 2010-04-21 20:23:19 +00:00
Joey Hess 760b840e8f update 2010-04-21 16:19:16 -04:00
Joey Hess e9551afc5f Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-21 16:14:23 -04:00
Joey Hess 6a30b45e75 update 2010-04-21 16:07:23 -04:00
Joey Hess 9951060f62 Merge branch 'master' into autotag 2010-04-21 15:53:59 -04:00
Joey Hess e3ea28f8c7 update, tag deletion bug 2010-04-21 15:53:44 -04:00
http://hendry.iki.fi/ 86e73e42e8 2010-04-21 19:48:31 +00:00
Joey Hess 204c0a63f3 document tag_autocreate 2010-04-21 15:22:52 -04:00
http://hendry.iki.fi/ 9ed523d762 2010-04-21 19:21:38 +00:00
Joey Hess 9fa5f71034 update; my branch is (partially) debugged now 2010-04-21 15:18:11 -04:00