Commit Graph

41 Commits (7532eff2b7a929de62e470a430d09d9c4a7d6b88)

Author SHA1 Message Date
Joey Hess ef003f48f4 Merge branch 'master' into po
Conflicts:
	debian/changelog
2009-05-19 13:07:47 -04:00
Joey Hess 2c74f09bb8 relativedate: Deal with clock skew.
If the server has a clock running a bit ahead of the web browsing client,
relativedate could cause somewhat confusing displays like "3 seconds from now"
for just posted things.

As a hack, avoid displaying times in the future if they're less than a
small slip forward. I chose 30 minutes because both client and server could
be wrong in different directions, while it's still close enough that "just
now" is not horribly wrong.
2009-04-23 13:39:42 -04:00
intrigeri 5c2f6cb893 Merge commit 'upstream/master' into prv/po 2009-01-01 13:34:00 +01:00
Joey Hess c1fa208f25 remove top-level directive page from basewiki 2008-12-24 16:29:31 -05:00
intrigeri 17bab92c31 added symlink to pagespec/po in basewiki to fix the build
else basewiki_brokenlinks.t fails.

Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-07 22:53:53 +01:00
Joey Hess ee1ccfa863 use relativedate as the css class for dates that should display relative 2008-10-20 19:22:22 -04:00
Joey Hess 002be0c87a partial support for calling onload once the DOM is ready
This adds support for gecko and newer versions of opera
to call onload once the DOM is ready, rather than waiting for
all images in the page to load. Makes relativedate behave
somewhat better.

Dealing with this means jumping into the browser
incompatability waters that I prefer to avoid.
Full solutions for most of the major browsers are listed here:
http://dean.edwards.name/weblog/2006/06/again/

However, no *license* is listed there, so I can't use that code. Also, the more
involved code appears to have various issues (such as the inline IE code not
working via https). So I only added the simple call to a hook needed
for gecko/opera.

It seems that the only standards-compliant way to do this is using the
`defer` attribute to a `script` tag, using an external script that will be
loaded once the DOM is ready, and can call onload. However, that has
browser compatability issues of its own, since not all browsers honor
`defer`.

Perhaps I should really just be using one of the javascript frameworks, that
include code to solve this for the major browsers. But something about them
still puts me off, and this issue is minor enough that I'm willing to live
with incomplete support for now.
2008-10-19 15:45:29 -04:00
Joey Hess 18806fa6b0 allow ikiwiki.js to be loaded twice w/o clobbering previous hooks
Clearly it's suboptimal for it to be loaded twice, but this is a quick fix
at least.
2008-10-18 12:47:08 -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
Joey Hess 79b376f991 Add an underlay for javascript, and add ikiwiki.js containing some utility code.
* Add an underlay for javascript, and add ikiwiki.js containing some utility
  code.
* toggle: Stop embedding the full toggle code on each page using it, and
  move it to toggle.js in the javascript underlay.
2008-10-17 20:28:18 -04:00
Joey Hess e1bca54a59 replace subdir link with link to the one page from it we want 2008-09-12 16:22:22 -04:00
Joey Hess 0187c2ba0d Removed old redirecton pages from basewiki (helponformatting, markdown, openid, pagespec, preprocessordirective, subpage, wikilink). 2008-09-12 16:15:20 -04:00
Joey Hess e9468fd5eb Removed the obsolete blog page from the basewiki. ikiwiki/blog still remains, but is now deprecated too. 2008-09-11 20:15:25 -04:00
Joey Hess 135628f6d4 move inline docs to ikiwiki/directive/inline
ikiwiki/blog will be going away
2008-09-11 19:39:35 -04:00
Joey Hess 9921a4a8a1 Move the directive documentation into its own underlay, separate from basewiki, since it's sorta large compared to the rest of basewiki. 2008-09-11 18:41:26 -04:00
Joey Hess 0d945d6476 add robots directive to all directive pages
Since they'll be in an underlay, robots shouldn't index them, as with other
underlay pages.
2008-09-11 18:30:20 -04:00
Joey Hess 5e4767a594 misc minor changes 2008-09-11 18:29:07 -04:00
Joey Hess eb92d09360 squash redundant text
A lot of text was copies from templates to directive/template.
Remove most of it and have each page link to the other.
2008-09-11 18:23:32 -04:00
Joey Hess 15c768c1c0 reword after reorg
There was a duplicated paragraph, an example on the wrong page, and some
rewording needed after will's reorg.
2008-09-11 18:14:26 -04:00
Joey Hess 251247f79f removed demos that accompny examples
This is sorta unfortunate, but I don't want turning the plugin on the cause
php to be forked unnecessarily. And moving them back to the plugin page
doesn't make sense in this case.
2008-09-11 18:09:20 -04:00
Joey Hess 701720198f move demo back to plugin page 2008-09-11 18:00:25 -04:00
Joey Hess d48e55c3d9 move back demo and add example 2008-09-11 17:53:21 -04:00
Joey Hess aa37d64d6a move demo back to plugin and add example 2008-09-11 17:51:27 -04:00
Joey Hess bb9e397c08 move example 2008-09-11 17:41:33 -04:00
Joey Hess 5409da80df move example back 2008-09-11 17:31:26 -04:00
Joey Hess 1b55d78794 move example back to plugin 2008-09-11 17:29:08 -04:00
Joey Hess c3d77f9ce9 reorg from will's changes
The info about the cron job was lost (!), as was a paragraph about what
pages the calendar links to.

The CSS docs seems to fit better in the plugin page than the directive
page, moved it back.
2008-09-11 17:21:14 -04:00
Joey Hess b85ea3f37d add more note about cron job 2008-09-11 17:18:42 -04:00
Joey Hess 01485d9074 move demo back to plugin page
We don't want expensive demos in the directives pages. Add an example of
its use instead.

Also, some minor rewording.
2008-09-11 17:17:10 -04:00
Joey Hess f50d0d05fe mention the cron job 2008-09-11 17:14:21 -04:00
William Uther 4f0ac7fe59 add underlay files for listdirectives
As was noted, 'listdirectives' didn't include the underlay files that make
it really worthwhile.  I've just gone through all the plugin
documentation, modified it to remove installation information and renamed
the files to match the directives rather than the plugins.  This can now
serve as useful underlay.

I've only gone through plugins in the 'plugins' dir.  I did not go through
the 'contrib' dir.
2008-09-11 17:05:19 -04:00
Joey Hess d6fd1f1cc8 rename preprocessordirective to directive
Reasons include:
- easier to type
- might want postprocessor directives again sometime, and listdirectives
  can then use the directive/* files for either
- that it's done as a preprocessor step is an internal detail (and not a
  very accurate one, really :-)
2008-08-25 14:19:39 -04:00
Joey Hess 260d752ee5 add to basewiki 2008-07-02 18:20:54 -04:00
Joey Hess e4119f048c The search interface now allows searching for a page by title ("title:foo"), as well as for pages that contain a given link ("link:bar"). 2008-06-04 14:13:21 -04:00
martin f. krafft 0cac528b03 Add robots noindex,follow to redirection pages
It makes no sense to have robots index these pages, so inform them that
they should not. We still tell them to follow the links, obviously.

Signed-off-by: martin f. krafft <madduck@madduck.net>
2008-03-11 15:44:37 -04:00
Joey Hess f92505d78b Merge branch 'master' into prefix-directives 2008-02-05 15:59:42 -05:00
Joey Hess d72753e100 updates 2008-01-29 01:03:44 -05:00
Josh Triplett 1b03a06c8c Add new preprocessor directive syntax¸ using a '!' prefix.
Add a prefix_directives option to the setup file to turn this syntax
on; currently defaults to false, for backward compatibility.  Support
optional '!' prefix even with prefix_directives off, and use that in
the underlay to support either setting of prefix_directives.  Add NEWS
entry with migration information.
2008-01-27 16:14:38 -08:00
Joey Hess 2fbca21390 updates 2007-12-08 16:19:39 -05:00
Joey Hess 7960031135 MAJOR basewiki reorg
Including redir pages for the moved basewiki pages. These will be removed in
a future release.
2007-12-08 15:59:08 -05:00
joey 9c5f4761d8 * Support for looking in multiple directories for underlay files.
* Plugins can add new directories to the search path with the add_underlay
  function.
* Split out smiley underlay files into a separate underlay, so if the plugin
  isn't used, the wiki isn't bloated with all those files.
2007-08-28 01:59:01 +00:00