urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'upstream/master' into prv/po

master
intrigeri 2008-11-11 04:40:24 +01:00
parent 0d8cbfc5e0 8c47f16dcc
commit 3d8d47d785
14 changed files with 99 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/recentchanges.pm
View File

@ -131,7 +131,7 @@ sub store ($$$) { #{{{
do => "recentchanges_link",
page => $_->{page}
).
"\">".
"\" rel=\"nofollow\">".
pagetitle($_->{page}).
"</a>"
}

9
IkiWiki/Plugin/tag.pm
View File

@ -44,6 +44,7 @@ sub tagpage ($) { #{{{
if ($tag !~ m{^\.?/} &&
defined $config{tagbase}) {
$tag="/".$config{tagbase}."/".$tag;
$tag=~y#/#/#s; # squash dups
}
return $tag;
@ -55,13 +56,7 @@ sub taglink ($$$;@) { #{{{
my $tag=shift;
my %opts=@_;
my $link=tagpage($tag);
# Force tag creation links to create the tag under /tagbase,
# if there is a tagbase and this tag used it.
$link="/".$link if $tag ne $link;
return htmllink($page, $destpage, $link, %opts);
return htmllink($page, $destpage, tagpage($tag), %opts);
} #}}}
sub preprocess_tag (@) { #{{{

8
debian/changelog vendored
View File

@ -9,6 +9,10 @@ ikiwiki (2.69) UNRELEASED; urgency=low
later parsing of any directives on the page.
* Fix the link() pagespec to match links that are internally recorded as
absolute.
* Add rel=nofollow to recentchanges_links for the same (weak) reasons it
was earlier added to edit links.
* tag: Normalize tagbase so leading/trailing slashes in it don't break
things.
-- Joey Hess <joeyh@debian.org> Thu, 06 Nov 2008 16:01:00 -0500
@ -42,8 +46,8 @@ ikiwiki (2.68) unstable; urgency=low
* inline: Only the last feed link was put on the page, fix this to include
all feed links. So rss will be included along with atom, and pages with
multiple feeds will get links added for all feeds.
* tag: When tagpage is set, force the links created by tagging to point at
the toplevel tagpage, and not closer subpages. The html links already went
* tag: When tagbase is set, force the links created by tagging to point at
the toplevel tagbase, and not closer subpages. The html links already went
there, but internally the links were not recorded as absolute, which could
cause confusing backlinks etc.
* Add an inject function, that can be used by plugins that want to

5
doc/ikiwiki/markdown.mdwn
View File

@ -4,10 +4,7 @@ is a minimal markup language that resembles plain text as used in
email messages. It is the markup language used by this wiki by default.
For documentation about the markdown syntax, see [[formatting]] and
[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). A
[markdown mode](http://jblevins.org/projects/markdown-mode/) for
emacs can help in editing, as can this
[syntax file](http://plasticboy.com/markdown-vim-mode/) for vim.
[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax).
Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part
of the markdown syntax, and are the only bit of markup that this wiki

6
doc/plugins/contrib/po.mdwn
View File

@ -118,6 +118,10 @@ Any thoughts on this?
>>> accordingly, but I forgot to update this page at the same time.
>>> Hoping it's not too complicated to relocated an existing remote...
>>> (never done that, I'm a Git beginner as well as a Perl
>>> newbie) --[[intrigeri]]a
>>> newbie) --[[intrigeri]]
>>>>
>>>> Just a matter of editing .git/config, thanks for the heads up.
>>>>>
>>>>> Joey, please have a look at my branch, your help would be really
>>>>> welcome for the security research, as I'm almost done with what
>>>>> I am able to do myself in this area. --[[intrigeri]]

10
doc/plugins/format/discussion.mdwn
View File

@ -3,3 +3,13 @@ Is there any way to tell if an htmlize hook have been called from a format direc
I am currently modifying the [[contrib/highlightcode]] plugin by [[sabr]] and I wanted to have a different behavior depending on the fact that the htmlize hook is called from a format directive or not. For instance, this could disable the raw copy of the highlighted code. Since I have enabled the keepextension option, I tried to rely on the page extension to decide whenever I have to create the raw file or not but this does not seems a reliable approach.
One possible solution is to add an optional parameter to the htmlize hook (and thus to htmlize function in IkiWiki.pm) which could tell if this is the format directive that called the function but I am not sure that is a good way to do this.
> It's (probably) not just the format directive that has a potential problem here.
> Imagine a syntax highlighted source code file that contains some other
> directive, such as table or meta. Such a directive calls `htmlize` on the
> parameters passed to it.
>
> There is one way to detect this ATM. If `%IkiWiki::preprocessing` has
> anything in it, then ikiwiki is in the middle of handling a preprocessing
> directive. So you could check that. It's getting into internals, so not
> ideal.. --[[Joey]]

2
doc/robots.txt 100644
View File

@ -0,0 +1,2 @@
User-Agent: *
Disallow: /ikiwiki.cgi

14
doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn 100644
View File

@ -0,0 +1,14 @@
The u32 page is excellent, but I wonder if documenting the procedure here
would be worthwhile. Who knows, the remote site might disappear. But also
there are some variations on the approach that might be useful:
* using a python script and the dom library to extract the page names from
Special:Allpages (such as
<http://www.staff.ncl.ac.uk/jon.dowland/unix/docs/get_pagenames.py>)
* Or, querying the mysql back-end to get the names
* using WWW::MediaWiki for importing/exporting pages from the wiki, instead
of Special::Export
Also, some detail on converting mediawiki transclusion to ikiwiki inlines...
-- [[JonDowland]]

3
doc/tips/emacs_syntax_highlighting.mdwn 100644
View File

@ -0,0 +1,3 @@
A [markdown mode](http://jblevins.org/projects/markdown-mode/) for
emacs can help in editing of ikiwiki
[[ikiwiki/markdown]] files.

33
doc/tips/untrusted_git_push/discussion.mdwn 100644
View File

@ -0,0 +1,33 @@
I've just tried this (commit c1fa07a). Recent changes shows:
<div id="change-c1fa07ad4f165b42c962ba2a310681107f38c4f7" class="metadata">
<span class="desc"><br />Changed pages:</span>
<span class="pagelinks">
<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;h=8bfa3dd7601a09b11ecbd20026849a777dc4b1b9;hp=c6302616f52ec058de5a8f5956fc512149a2f1a3;hb=1ea66c3d3f0a33bc3f04d073457b525a70380c37;f=doc/users/jondowland.mdwn"><img src="/wikiicons/diff.png" alt="diff" /></a><a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjondowland&amp;do=recentchanges_link">users/jondowland</a>
</span>
<span class="desc"><br />Changed by:</span>
<span class="committer">
<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjon&amp;do=recentchanges_link">jon</a>
</span>
<span class="desc"><br />Commit type:</span>
<span class="committype">git</span>
<span class="desc"><br />Date:</span>
<span class="changedate"><span class="relativedate" title="Mon, 10 Nov 2008 18:24:22 -0500">18:24:22 11/10/08</span>
</div>
Note that the user for the commit is 'jon', and the link points at cgi to
create users/jon. I was wondering if that is configurable for users pushing
via git. It would be nice perhaps to specify it in some way, perhaps via a
git-config setting (user.name?). I'm not too familiar with exactly what the
changeset contains. -- [[JonDowland]]
> All ikiwiki can do it look at who git has recorded as the author of
> the change (and it looks at the username part of the email address).
> You can set `user.email` in `.git/config`. --[[Joey]]
> > Ah, excellent. In which case this *should* DTRT... -- [[JonDowland]]

6
doc/tips/vim_syntax_highlighting.mdwn
View File

@ -1,2 +1,4 @@
[[ikiwiki.vim]] is a vim syntax highlighting file for ikiwiki. Installation
instructions are at the top of the file.
[[ikiwiki.vim]] is a vim syntax highlighting file for ikiwiki
[[ikiwiki/markdown]] files.
Installation instructions are at the top of the file.

7
doc/tips/vim_syntax_highlighting/discussion.mdwn
View File

@ -1 +1,8 @@
I'm going to look at merging this with potwiki.vim (a vim-based personal wiki) so that you can follow wiki-links and auto-create pages etc., direct from vim. (I'm writing this incase I don't get around to it) -- [[JonDowland]]
----
Another attempt at the same thing is here:
<http://plasticboy.com/markdown-vim-mode/>
In my tests, [[ikiwiki.vim]] works better than that one, YMMV. --[[Joey]]

12
doc/users/jondowland.mdwn
View File

@ -1,5 +1,13 @@
A new ikiwiki user, looking at ikiwiki both for his personal site but also as a team-documentation management system for a small-sized group of UNIX sysadmins.
I'm looking at ikiwiki both for my personal site but also as a
team-documentation management system for a small-sized group of UNIX
sysadmins.
* My [homepage](http://jmtd.net/) is powered by ikiwiki (replacing my [older homepage](http://alcopop.org/), which was a mess of scripts)
I am giving a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual [Linux conference](http://www.ukuug.org/events/linux2008/) about organising system administrator documentation which will feature IkiWiki.
I gave a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual
[Linux conference](http://www.ukuug.org/events/linux2008/) about organising
system administrator documentation. Roughly a third of this talk was
discussing IkiWiki in some technical detail and suggesting it as a good piece
of software for this task.
* slides at <http://www.staff.ncl.ac.uk/jon.dowland/unix/docs/>.

2
templates/change.tmpl
View File

@ -19,7 +19,7 @@
<span class="desc"><br />Changed by:</span>
<span class="committer">
<TMPL_IF NAME="AUTHORURL">
<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR USER></a>
<a href="<TMPL_VAR AUTHORURL>" rel="nofollow"><TMPL_VAR USER></a>
<TMPL_ELSE>
<TMPL_VAR USER>
</TMPL_IF>