From 960b06536e98f1af2b6ea9a4098668aa5da5fc19 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Wed, 21 Nov 2018 15:13:19 -0700
Subject: [PATCH] Sub-templates go first in the file so they get loaded in time

---
 infolog/templates/test/entry_test.xet | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/infolog/templates/test/entry_test.xet b/infolog/templates/test/entry_test.xet
index 7cd3408b7d..ac6452ac0d 100644
--- a/infolog/templates/test/entry_test.xet
+++ b/infolog/templates/test/entry_test.xet
@@ -9,9 +9,21 @@ Tracker:
 	gender (selectbox with Male/Female)
 
 Include it into the normal edit template with:
-	<template id="infolog.entry_test" group="test"/>
+	<template id="infolog.entry_test"/>
 -->
 <overlay>
+	<template id="infolog.entry_test.Thorsby.locality">
+		<vbox>
+			<description value="THORSBY"/>
+			<contact-account value="info_modifier" id="info_modifier_fn" options="n_fn" label="Modifier full name:"/>
+		</vbox>
+	</template>
+	<template id="infolog.entry_test.Kaiserslautern.locality">
+		<vbox>
+			<description value="KAISERSLAUTERN"/>
+			<contact-account value="info_modifier" id="info_modifier_fn" options="n_fn" label="Modifier full name:"/>
+		</vbox>
+	</template>
 	<template id="infolog.entry_test" lang="" group="0" version="1.9">
 		<vbox>
 		<!-- These are all the same -->
@@ -35,7 +47,6 @@ Include it into the normal edit template with:
 		<infolog-value id="is_tracker_male" value="info_id" field="#tracker/#gender" label="Tracker gender cf:"/>
 		<tracker-value id="#tracker" field="#gender" compare="Male" class="bill_11m" label="Tracker gender is Male:"/>
 		<tracker-value id="#tracker" field="#gender" compare="Female" class="bill_11f" label="Tracker gender is Female:"/>
-		<contact-account value="info_modifier" id="info_modifier_fn" options="n_fn" label="Modifier full name:"/>
 		<hrule/>
 
 		<description value="A whole template based on modifier's town (Thorsby or Kaiserslautern)"/>
@@ -43,10 +54,4 @@ Include it into the normal edit template with:
 
 		</vbox>
 	</template>
-	<template id="infolog.entry_test.Thorsby.locality">
-		<description value="THORSBY"/>
-	</template>
-	<template id="infolog.entry_test.Kaiserslautern.locality">
-		<description value="KAISERSLAUTERN"/>
-	</template>
 </overlay>