Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess
commit
ea48e1c038
|
|
@ -2,7 +2,7 @@ That one has bitten me for some time; here is the minimal testcase. There is
|
|||
also an equivalent (I suppose) problem when using another plugin, but I hope
|
||||
it's enough to track it down for this one.
|
||||
|
||||
$ tar -xj < [bug-dep_order.tar.bz2](http://www.thomas.schwinge.homeip.net/tmp/bug-dep_order.tar.bz2)
|
||||
$ tar -xj < [bug-dep_order.tar.bz2](http://schwinge.homeip.net/~thomas/tmp/bug-dep_order.tar.bz2)
|
||||
$ cd bug-dep_order/
|
||||
$ ./render_locally
|
||||
[...]
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Consider this:
|
||||
|
||||
$ wget http://www.thomas.schwinge.homeip.net/tmp/cutpaste_filter.tar.bz2
|
||||
$ wget http://www.thomas.schwinge.homeip.net/tmp/cutpaste_filter.patch
|
||||
$ wget http://schwinge.homeip.net/~thomas/tmp/cutpaste_filter.tar.bz2
|
||||
$ wget http://schwinge.homeip.net/~thomas/tmp/cutpaste_filter.patch
|
||||
|
||||
$ tar -xj < cutpaste_filter.tar.bz2
|
||||
$ cd cutpaste_filter/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi?
|
||||
|
||||
> Click on "Preferences". There is a logout button there. --liw
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
I'd like the more plugin and RSS to play better together. In the case of the html generation of the main page of a blog, I'd like to get the first paragraph out, but keep RSS as a full feed.
|
||||
|
||||
Maybe there is a different plugin (I also tried toggle)?
|
||||
|
||||
I also note, that at least currently, more seems to break on a few pages, not being parsed at all when aggregated into the front page.
|
||||
|
||||
see also: [[/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields/]]
|
||||
|
|
@ -34,3 +34,12 @@ For Atom, at least, I believe adding `type="xhtml"` to the title element will wo
|
|||
> Update: Ok, I've fixed this for titles, as a special case, but the
|
||||
> underlying problem remains for other fields in rss feeds (such as
|
||||
> author), so I'm leaving this bug report open. --[[Joey]]
|
||||
|
||||
>> I'm curious if there has been any progress on better RSS output?
|
||||
>> I've been prototyping a new blog and getting good RSS out of it
|
||||
>> seems important as the bulk of my current readers use RSS.
|
||||
>> I note, in passing that the "more" plugin doesn't quite do what
|
||||
>> I want either - I'd like to pass a full RSS feed of a post and only
|
||||
>> have "more" apply to the front page of the blog. Is there a way to do that?
|
||||
>> -- [[dtaht]]
|
||||
>>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
Hi folks, I created a simple wiki to keep notes and references for projects, it's worked quite nice so far. I decided to use git as it's what I use daily to manage code, and it's available on all my machines.
|
||||
|
||||
Anyway, I wanted to move all the wiki source stuff into a subfolder so that it stops cluttering up my ~ directory. However, there seems to be a problem with moving wiki.git (I moved wiki, wiki.git and wiki.setup) and I'm not sure where to tell ikiwiki that the git directory has been moved. I changed
|
||||
|
||||
srcdir => '/home/pixel/.notebook/wiki',
|
||||
git_wrapper => '/home/pixel/.notebook/wiki.git/hooks/post-update',
|
||||
|
||||
and that seems to be fine. However when I go to run ikiwiki --setup things go wrong:
|
||||
|
||||
pixel@tosh: [~ (ruby-1.9.2-p0)] ➔ ikiwiki -setup .notebook/wiki.setup
|
||||
successfully generated /home/pixel/public_html/wiki/ikiwiki.cgi
|
||||
successfully generated /home/pixel/.notebook/wiki.git/hooks/post-update
|
||||
fatal: '/home/pixel/wiki.git' does not appear to be a git repository
|
||||
fatal: The remote end hung up unexpectedly
|
||||
'git pull origin' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 193.
|
||||
|
||||
I've gone through wiki.setup and nothing has jumped out as the place to set this, have I missed something?
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://users.itk.ppke.hu/~cstamas/openid/"
|
||||
ip="212.183.140.47"
|
||||
subject="comment 1"
|
||||
date="2010-10-27T22:45:28Z"
|
||||
content="""
|
||||
I think you want to edit
|
||||
|
||||
.git/config
|
||||
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://pixel.dreamwidth.org/"
|
||||
ip="65.29.14.21"
|
||||
subject="comment 2"
|
||||
date="2010-10-28T02:54:15Z"
|
||||
content="""
|
||||
That did it thanks!
|
||||
|
||||
Should I make some sort of edit in the setup page? I've used git for a while and for whatever reason it never occurred to me that this was from git, not from ikiwiki itself.
|
||||
"""]]
|
||||
|
|
@ -3,7 +3,7 @@ has \[[!cut id=foo text="foo"]], and fileB does \[[!absorb pagenames=fileA]],
|
|||
and can then use \[[!paste id=foo]].
|
||||
|
||||
Therefore, I've written an [*absorb* directive /
|
||||
plugin](http://www.thomas.schwinge.homeip.net/tmp/absorb.pm), which is meant to
|
||||
plugin](http://schwinge.homeip.net/~thomas/tmp/absorb.pm), which is meant to
|
||||
absorb pages in order to get hold of their *cut* and *copy* directives'
|
||||
contents. This does work as expected. But it also absorbs page fileA's *meta*
|
||||
values, like a *meta title*, etc. How to avoid / solve this?
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
Someone was just asking for it and I had written these two plugins already some months ago,
|
||||
so I'm now publishing them here.
|
||||
|
||||
[`copyright.pm`](http://www.schwinge.homeip.net/~thomas/tmp/copyright.pm)
|
||||
[`copyright.pm`](http://schwinge.homeip.net/~thomas/tmp/copyright.pm)
|
||||
and
|
||||
[`license.pm`](http://www.schwinge.homeip.net/~thomas/tmp/license.pm)
|
||||
[`license.pm`](http://schwinge.homeip.net/~thomas/tmp/license.pm)
|
||||
|
||||
Usage instructions are found inside the two plugin files.
|
||||
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ There is one argument to this directive.
|
|||
The YAML-format data. This should be enclosed inside triple-quotes to preserve the data correctly.
|
||||
|
||||
If more than one ymlfront directive is given per page, the result is undefined.
|
||||
Likewise, it is inadvisable to try to mix the "---" ymlfront format with the directive form of the data.
|
||||
Likewise, it is inadvisable to try to mix the non-directive ymlfront format with the directive form of the data.
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ This plugin is not neccessarily meant to enable people to write arbitrary
|
|||
wiki pages in the Texinfo format (even though that is possible, of course),
|
||||
but rather to ease collaboration on existing Texinfo documents.
|
||||
|
||||
The plugin is available at <http://www.schwinge.homeip.net/~thomas/tmp/texinfo.pm>.
|
||||
The plugin is available at <http://schwinge.homeip.net/~thomas/tmp/texinfo.pm>.
|
||||
|
||||
It's very basic at the moment, but will be improved over time.
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@ IkiWiki::Plugin::ymlfront - add YAML-format data to a page
|
|||
# activate the plugin
|
||||
add_plugins => [qw{goodstuff ymlfront ....}],
|
||||
|
||||
# configure the plugin
|
||||
ymlfront_delim => [qw(--YAML-- --YAML--)],
|
||||
|
||||
## DESCRIPTION
|
||||
|
||||
This plugin provides a way of adding arbitrary meta-data (data fields) to any
|
||||
|
|
@ -25,23 +28,57 @@ This plugin is meant to be used in conjunction with the [[field]] plugin.
|
|||
|
||||
## DETAILS
|
||||
|
||||
If one is not using the ymlfront directive, the YAML-format data in a page
|
||||
must be placed at the start of the page and delimited by lines containing
|
||||
precisely three dashes. The "normal" content of the page then follows.
|
||||
There are three formats for adding YAML data to a page. These formats
|
||||
should not be mixed - the result is undefined.
|
||||
|
||||
For example:
|
||||
1. ymlfront directive
|
||||
|
||||
---
|
||||
title: Foo does not work
|
||||
Urgency: High
|
||||
Status: Assigned
|
||||
AssignedTo: Fred Nurk
|
||||
Version: 1.2.3
|
||||
---
|
||||
When running on the Sprongle system, the Foo function returns incorrect data.
|
||||
See [[ikiwiki/directive/ymlfront]] for more information.
|
||||
|
||||
What will normally be displayed is everything following the second line of dashes.
|
||||
That will be htmlized using the page-type of the page-file.
|
||||
2. default YAML-compatible delimiter
|
||||
|
||||
By default, the YAML-format data in a page is placed at the start of
|
||||
the page and delimited by lines containing precisely three dashes.
|
||||
This is what YAML itself uses to delimit multiple documents.
|
||||
The "normal" content of the page then follows.
|
||||
|
||||
For example:
|
||||
|
||||
---
|
||||
title: Foo does not work
|
||||
Urgency: High
|
||||
Status: Assigned
|
||||
AssignedTo: Fred Nurk
|
||||
Version: 1.2.3
|
||||
---
|
||||
When running on the Sprongle system, the Foo function returns incorrect data.
|
||||
|
||||
What will normally be displayed is everything following the second line of dashes. That will be htmlized using the page-type of the page-file.
|
||||
|
||||
3. user-defined delimiter
|
||||
|
||||
Instead of using the default "---" delimiter, the user can define,
|
||||
in the configuration file, the **ymlfront_delim** value, which is an
|
||||
array containing two strings. The first string defines the markup for
|
||||
the start of the YAML data, and the second string defines the markip
|
||||
for the end of the YAML data. These two strings can be the same, or
|
||||
they can be different. In this case, the YAML data section is not
|
||||
required to be at the start of the page, but as with the default, it
|
||||
is expected that only one data section will be on the page.
|
||||
|
||||
For example:
|
||||
|
||||
--YAML--
|
||||
title: Foo does not work
|
||||
Urgency: High
|
||||
Status: Assigned
|
||||
AssignedTo: Fred Nurk
|
||||
Version: 1.2.3
|
||||
--YAML--
|
||||
When running on the Sprongle system, the Foo function returns incorrect data.
|
||||
|
||||
What will normally be displayed is everything outside the delimiters,
|
||||
both before and after. That will be htmlized using the page-type of the page-file.
|
||||
|
||||
### Accessing the Data
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ to the [[`meta`_plugin|plugins/meta]].
|
|||
> [[done]], with some changes --[[Joey]]
|
||||
|
||||
Find the most recent version at
|
||||
<http://www.schwinge.homeip.net/~thomas/tmp/meta_forward.patch>.
|
||||
<http://schwinge.homeip.net/~thomas/tmp/meta_forward.patch>.
|
||||
|
||||
I can't use `scrub(...)`, as that will strip out the forwarding HTML command.
|
||||
How to deal with that?
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ in the ikiwiki source code, where emailing is done.
|
|||
OK, so I'll have a look at replacing all email handling with *Email::Send*.
|
||||
|
||||
[[!tag patch]]
|
||||
*<http://www.thomas.schwinge.homeip.net/tmp/ikiwiki-sendmail.patch>*
|
||||
*<http://schwinge.homeip.net/~thomas/tmp/ikiwiki-sendmail.patch>*
|
||||
|
||||
Remaining TODOs:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
[[!meta title="Thomas Schwinge"]]
|
||||
# Thomas Schwinge
|
||||
|
||||
<tschwinge@gnu.org>
|
||||
<http://www.thomas.schwinge.homeip.net/>
|
||||
<thomas@schwinge.name>
|
||||
<http://schwinge.homeip.net/~thomas/>
|
||||
|
||||
I have converted the [GNU Hurd](http://www.gnu.org/software/hurd/)'s previous
|
||||
web pages and previous wiki pages to a *[[ikiwiki]]* system; and all that while
|
||||
|
|
|
|||
Loading…
Reference in New Issue