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

Merge branch 'master' of ssh://git.ikiwiki.info

master
Joey Hess 2013-10-02 13:26:42 -04:00
parent 7878e6d2b8 d481a35aec
commit 1b64f369e3
7 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/bugs/osm_plugin_error_TypeError:_mapProjection_is_null.mdwn
View File

@ -1,5 +1,6 @@
[[!template id=gitbranch branch=cbaines/osm-layers-patch author="[[cbaines]]"]]
Using the osm plugin with a simple \[[!osm]] directive does not seem to work, a "TypeError: mapProjection is null" is given. I believe this is because the client side Javascript uses the options.layers, which is always Null. Using the osm plugin with a simple \[[!osm]] directive does not seem to work, a "TypeError: mapProjection is null" is given. I believe this is because the client side Javascript uses the options.layers, which is always Null.
[[!tag patch]] [[!tag patch]]
I have produced a patch for this issue, but beware, while it appears to fix the problem for me, I have little understanding of perl and the existing code base. I have produced a patch for this issue, but beware, while it appears to fix the problem for me, I have little understanding of perl and the existing code base.
<https://github.com/cbaines/ikiwiki/commit/4294b4c24a56c7103c48250dd9d833b42838a472>

20
doc/forum/Template_variables.mdwn 100644
View File

@ -0,0 +1,20 @@
Hi,
I am very confused with the template variables. I cannot find any documentation of which ones are available, where are they set, etc.
I see that in the default templates, there are things like this (rssitem.tmpl):
<TMPL_IF AUTHOR>
<title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
<TMPL_ELSE>
<title><TMPL_VAR TITLE></title>
</TMPL_IF>
But I don't get this in my RSS, and I don't know how to add those variables, except for mentions of some plugins that are not yet merged.
I also see that the 'author' data is one of the fields that can be set with the meta directive, but I understand that meta is processed after the templates, so it cannot be the source; right?
Any help appreciated!
PS: what I am tring to do now is to add a proper author field to my feeds, but I also want to understand how to use the templating system.

11
doc/forum/Template_variables/comment_1_6a2ab9450dbfb8c4ef78e7af2a1b51eb._comment 100644
View File

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="http://tincho.org/"
nickname="tincho"
subject="Update"
date="2013-10-02T05:40:59Z"
content="""
well, it seems that if I do set up the author and authorurl meta variables in the index.mdwn, I get the author in the ATOM feed file. I don't know why, if it is because the feed creation is invoked from that page or if it is automagically taken from the main page.
At the same time, the rss feed does not get the author, even if the default template should have included it for each item in the feed.
"""]]

1
doc/git.mdwn
View File

@ -78,6 +78,7 @@ think about merging them. This is recommended. :-)
* anderbubble `git://civilfritz.net/ikiwiki.git` * anderbubble `git://civilfritz.net/ikiwiki.git`
* frioux `git://github.com/frioux/ikiwiki` * frioux `git://github.com/frioux/ikiwiki`
* llipavsky `git://github.com/llipavsky/ikiwiki` * llipavsky `git://github.com/llipavsky/ikiwiki`
* [[cbaines]] `git://github.com/cbaines/ikiwiki.git`
## branches ## branches

8
doc/plugins/osm/discussion.mdwn
View File

@ -6,12 +6,20 @@ At the moment I'd prefer not running cgi and one of the advantages of a wiki com
This is a minor issue but I'd be interested if you think it's possible to prerender waypoint maps. I.e maps that center on a specific waypoint whilst having all waypoints of that map visible. This is a minor issue but I'd be interested if you think it's possible to prerender waypoint maps. I.e maps that center on a specific waypoint whilst having all waypoints of that map visible.
> I think it would be possible, but it would require a patch. I do think however that this is the way it works: all waypoints are shown, and the only difference is that the map is centered. --[[anarcat]]
### Configure all osm tags to use same icon? ### Configure all osm tags to use same icon?
Setting the default `osm_tag_default_icon` does not seem to work? All tagged waypoint pages now want their own unique icon and display broken image if not present. Populating the tag folder with identical icons gets a bit much when there are a lot of tags. Setting the default `osm_tag_default_icon` does not seem to work? All tagged waypoint pages now want their own unique icon and display broken image if not present. Populating the tag folder with identical icons gets a bit much when there are a lot of tags.
> That looks like a bug. Please file it as such in [[bugs]]. --[[anarcat]]
### \[Wishlist\] Setting unigue icon for "active waypoint" ### \[Wishlist\] Setting unigue icon for "active waypoint"
For usability it would be great if it was possible to display the active waypoint with a different icon. So that clicking a waypoint map symbol takes you to a map with lots of waypoints but the waypoint from the sources page is centered (as per current behaviour) **and** has a different icon. For usability it would be great if it was possible to display the active waypoint with a different icon. So that clicking a waypoint map symbol takes you to a map with lots of waypoints but the waypoint from the sources page is centered (as per current behaviour) **and** has a different icon.
> This *would* indeed be awesome. --[[anarcat]]
*PS. The osm plugin is amazing!* *PS. The osm plugin is amazing!*
> Thanks! --[[anarcat]]

2
doc/sandbox.mdwn
View File

@ -82,3 +82,5 @@ opopopo
This **SandBox** is also a [[blog]]! This **SandBox** is also a [[blog]]!
[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
Testy test!

4
doc/users/cbaines.mdwn 100644
View File

@ -0,0 +1,4 @@
About Me
========
From the UK, interested in Ikiwiki and OpenStreetMap.