Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / todo / edittemplate_should_support_uuid__44___date_variables.mdwn

diff --git a/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn b/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
index b85f3298b4565e9e99c1b75d729132ccb9c48c9a..6d702fedf1032c9398f80cc526237307e6ee2149 100644 (file)
--- a/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
+++ b/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
@@ -47,10 +47,10 @@ Changes to the structure of `$pagestate{$registering_page}{edittemplate}{$pagesp
 >> better way based on that, maybe global configuration in `$config`.
 >> --[[smcv]]
 
->>> [[!template id=gitbranch branch=smcv/ready/edittemplate
-  browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/edittemplate
+>>> [[!template id=gitbranch branch=smcv/ready/edittemplate2
+  browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/edittemplate2
   author="Jonathon Anderson, [[smcv]]"]]
->>> Here is a version of that branch that I would merge if I could.
+>>> Here is a version of that branch that I [[would merge|users/smcv/ready]] if I could.
 >>> Changes since Jonathon's version:
 >>>
 >>> * only generate a UUID if needed
@@ -70,3 +70,18 @@ Changes to the structure of `$pagestate{$registering_page}{edittemplate}{$pagesp
 >>> timestamp variables/objects, so I left the naming as it was.
 >>>
 >>> --[[smcv]]
+
+>>>> the ready/edittemplate branch looks good to me too. `formatted_time` and
+>>>> `html_time` probably don't hurt, but personally i'd not add either and
+>>>> instead expose displaytime as a directive, for otherwise migrating to
+>>>> html5 would leave old evaluations of displaytime around in the repository.
+>>>> (example template: `\[[!meta date="<TMPL_VAR time>"]]I wrote this post at
+>>>> \[[!displaytime "<TMPL_VAR time>"]]`). --[[chrysn]]
+
+>>>>> That's a very good point; and Joey added `\[[!date "<TMPL_VAR time">]]`,
+>>>>> which does the same thing as your hypothetical `\[[!displaytime]]`,
+>>>>> almost 5 years ago. Branch replaced by `smcv/ready/edittemplate2`
+>>>>> which drops `formatted_time` and `html_time`, and adds a suggestion
+>>>>> to use `\[[!date]]`. --[[smcv]]
+
+>>>>>> [[merged|done]] --[[smcv]]