rename todo/merge_tincho-osm_branch.mdwn to todo/merge_tina-osm_branch.mdwn

[git.ikiwiki.info.git] / doc / templates / gitbranch.mdwn

diff --git a/doc/templates/gitbranch.mdwn b/doc/templates/gitbranch.mdwn
index 2df75097f912ba5e2cb785d7a2794745af4324e2..4ea73c91b24c6d6f6b545caf7d9334a22c1c62b4 100644 (file)
--- a/doc/templates/gitbranch.mdwn
+++ b/doc/templates/gitbranch.mdwn
@@ -1,15 +1,11 @@
-<span class="infobox">
+[[!templatebody <<ENDBODY
+<div class="infobox">
 Available in a [[!taglink /git]] repository [[!taglink branch|/branches]].<br />
-Branch: <TMPL_IF browse>
-<a href="<TMPL_VAR browse>"><TMPL_VAR branch></a>
-<TMPL_ELSE>
-<TMPL_VAR branch>
-</TMPL_IF><br />
-<TMPL_IF author>
-Author: <TMPL_VAR author><br />
-<TMPL_IF>
-</span>
-<TMPL_UNLESS branch>
+Branch: <TMPL_IF browse><a href="<TMPL_VAR browse>"></TMPL_IF><TMPL_VAR branch><TMPL_IF browse></a></TMPL_IF><br />
+<TMPL_IF author>Author: <TMPL_VAR author><br /></TMPL_IF>
+</div>
+ENDBODY]]
+
 This template is used to create an infobox for a git branch. It uses
 these parameters:
 
@@ -19,4 +15,3 @@ these parameters:
   (e.g. github/master)</li>
 <li>author - the author of the branch</li>
 </ul>
-</TMPL_UNLESS>