From: Joey Hess Date: Mon, 17 Feb 2014 16:24:54 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Tag: debian/3.20140227~30 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d81d20e52cf34c2238b452dd2f4a2f5bd1410467?hp=00016e0006d1cc32769855cb60ea7cf279ed7ec0 Merge branch 'master' of ssh://git.ikiwiki.info --- diff --git a/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn b/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn index 7c7c016cb..6fc1bf585 100644 --- a/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn +++ b/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn @@ -30,3 +30,41 @@ A simple fix would be to ship those icons with ikiwiki and serve them locally, b > legal stuff involved. (from a practical point of view, things are not that > strict, as `apt-file find facebook.png` and `apt-file find flickr.png` > reveal.) --[[chrysn]] + +>> The fundamental problem here is that we want to balance these +>> somewhat incompatible goals: +>> +>> * show users a provider icon that they'll recognise at a glance +>> * don't infringe copyright +>> * don't distribute non-DFSG-licensed things in the source package +>> * don't let miscellaneous OpenID providers track our users +>> +>> A "quick hack" version of removing these would be to have an option to +>> disable the friendly JavaScript OpenID selector and go back to a simple +>> input box. I might implement that option anyway - on websites mainly used +>> by technologists, the OpenID selector is a bit of a waste of time. +>> +>>> Not done yet. -s +>> +>> One way to have recognisable icons would be to ship DFSG imitations of +>> the "real" logos in the underlay. Between gnome-online-accounts and +>> Empathy, we can probably find most of them (mostly or perhaps all done by +>> Jakub Steiner). +>> +>>> [[!template id=gitbranch branch=smcv/ready/openid author="[[smcv]]"]] +>>> [[!tag patch]] +>>> Here's a git branch. I deleted the shut-down ClaimID and MyOpenID providers, +>>> used icons from GNOME Online Accounts and Wordpress where available, and +>>> drew my own for the rest. +>>> [See it in use here](http://blueview.hosted.pseudorandom.co.uk/ikiwiki.cgi?do=prefs) +>>> -s +>> +>> If people want the "real" logos, we could have some code to make IkiWiki +>> download the favicons into transient underlay (which I think is +>> higher-priority?), or into a higher-priority underlay if necessary, +>> during the wiki build, so they'll be served from the wiki's own server. +>> +>>> Not done yet. I'm not sure whether I'm going to bother, but I'd review +>>> someone else's implementation. -s +>> +>> --[[smcv]] diff --git a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn index 2b56bd70b..2eaa29d02 100644 --- a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn +++ b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn @@ -1,4 +1,4 @@ -as in title, how to align text to the right? +As in title, how to align text to the right? > Add to your local.css a class that aligns text to the right: @@ -13,3 +13,16 @@ as in title, how to align text to the right? > [[templates/note]] template does something similar. --[[Joey]] >> Thanks! + +----- +> Doing this myself and noted that [[ikiwiki/markdown]] down does not allow the enclosure of block level elements directly; and thus we cannot switch the `span` suggested above for `div` in changing block level elements (not if you wish to include markdown, anyway). For example, I want to create a paragraph (with markdown text) which is right aligned, and so add the following + +>> +>> This is my text with [a markdown link](/) +>> + +> The *correct* thing to do here is create a template (as indicated above) **but** a workaround I found useful was to over-ride the `inline` nature of the `span` element, as follows + +>> .align_right { display: block ; text-align: right ; } + +> you may also like to remove the padding and margins since they will be provided by the enclosing block. -- fergus diff --git a/doc/todo/bitcoin_URI_scheme.mdwn b/doc/todo/bitcoin_URI_scheme.mdwn new file mode 100644 index 000000000..a0f3e1153 --- /dev/null +++ b/doc/todo/bitcoin_URI_scheme.mdwn @@ -0,0 +1,16 @@ +This is a tiny feature request: + +add the bitcoin URI scheme [1] to ikiwiki. + +This can be done by adding '"bitcoin",' to Ikiwiki/Plugin/htmlscrubber.pm + +- "aim", "callto", "cvs", "ed2k", "feed", "fish", "gg", +to ++ "aim", "bitcoin", "callto", "cvs", "ed2k", "feed", "fish", "gg", + +thanks + +flowolf +[1]: http://en.wikipedia.org/wiki/URI_scheme + +> I agree and this was important enough to fire up the ol' wayback machine, set the dial to one year ago today, and fix it then, in version 3.20130212. [[done]]. As a bonus, in this new hardforked casuality chain, someone sent me half a bitcoin using this feature. --[[Joey]]