From 93ed392c90143b921d33b0ca2a654ea21814840b Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Sat, 28 Nov 2015 18:39:38 -0700
Subject: [PATCH] Improve the white space handling in the 7940 directory.xml
 files.

---
 .../cisco/7940/directory-enterprise.xml       | 34 +++++++++---------
 .../cisco/7940/directory-personal.xml         | 34 +++++++++---------
 .../cisco/7940/directory-speed_dial.xml       | 35 +++++++++----------
 3 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/resources/templates/provision/cisco/7940/directory-enterprise.xml b/resources/templates/provision/cisco/7940/directory-enterprise.xml
index 7b84648f36..4c145c770d 100644
--- a/resources/templates/provision/cisco/7940/directory-enterprise.xml
+++ b/resources/templates/provision/cisco/7940/directory-enterprise.xml
@@ -6,23 +6,23 @@
 		<URL>SoftKey:Select</URL>
 		<Position>1</Position>
 	</SoftKeyItem>
-	{assign var=x value=1}
-	{foreach $contacts as $row}
-		{if $row.contact_category == "enterprise"}
-		<MenuItem>
-			{if $row.contact_name_given != ""}
-			<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-			{else}
-			<Name>{$row.contact_organization}</Name>
-			{/if}
-			{if $row.phone_number != ""}
-			<URL>Dial:{$row.phone_number}#</URL>
-			{else}
-			<URL>Dial:{$row.phone_extension}#</URL>
-			{/if}
-		</MenuItem>
-		{/if}
-	{/foreach}
+{assign var=x value=1}
+{foreach $contacts as $row}{if $row.contact_category == "enterprise"}
+<MenuItem>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_organization}</Name>
+{/if}
+{if $row.phone_number != ""}
+	<URL>Dial:{$row.phone_number}#</URL>
+{else}
+	<URL>Dial:{$row.phone_extension}#</URL>
+{/if}
+</MenuItem>
+{/if}
+{assign var=x value=$x+1}
+{/foreach}
 	<SoftKeyItem>
 		<Name>Exit</Name>
 		<URL>SoftKey:Exit</URL>
diff --git a/resources/templates/provision/cisco/7940/directory-personal.xml b/resources/templates/provision/cisco/7940/directory-personal.xml
index 9d774ab56a..5bbde47349 100644
--- a/resources/templates/provision/cisco/7940/directory-personal.xml
+++ b/resources/templates/provision/cisco/7940/directory-personal.xml
@@ -6,23 +6,23 @@
 		<URL>SoftKey:Select</URL>
 		<Position>1</Position>
 	</SoftKeyItem>
-	{assign var=x value=1}
-	{foreach $contacts as $row}
-		{if $row.contact_category == "personal"}
-		<MenuItem>
-			{if $row.contact_name_given != ""}
-			<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-			{else}
-			<Name>{$row.contact_organization}</Name>
-			{/if}
-			{if $row.phone_number != ""}
-			<URL>Dial:{$row.phone_number}#</URL>
-			{else}
-			<URL>Dial:{$row.phone_extension}#</URL>
-			{/if}
-		</MenuItem>
-		{/if}
-	{/foreach}
+{assign var=x value=1}
+{foreach $contacts as $row}{if $row.contact_category == "personal"}
+<MenuItem>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_organization}</Name>
+{/if}
+{if $row.phone_number != ""}
+	<URL>Dial:{$row.phone_number}#</URL>
+{else}
+	<URL>Dial:{$row.phone_extension}#</URL>
+{/if}
+</MenuItem>
+{/if}
+{assign var=x value=$x+1}
+{/foreach}
 	<SoftKeyItem>
 		<Name>Exit</Name>
 		<URL>SoftKey:Exit</URL>
diff --git a/resources/templates/provision/cisco/7940/directory-speed_dial.xml b/resources/templates/provision/cisco/7940/directory-speed_dial.xml
index f100c38cd6..ab7714c740 100644
--- a/resources/templates/provision/cisco/7940/directory-speed_dial.xml
+++ b/resources/templates/provision/cisco/7940/directory-speed_dial.xml
@@ -6,24 +6,23 @@
 		<URL>SoftKey:Select</URL>
 		<Position>1</Position>
 	</SoftKeyItem>
-	{assign var=x value=1}
-	{foreach $contacts as $row}
-		{if $row.contact_category == "speed dial"}
-		<MenuItem>
-			{if $row.contact_name_given != ""}
-			<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-			{else}
-			<Name>{$row.contact_organization}</Name>
-			{/if}
-			{if $row.phone_number != ""}
-			<URL>Dial:{$row.phone_number}#</URL>
-			{else}
-			<URL>Dial:{$row.phone_extension}#</URL>
-			{/if}
-		</MenuItem>
-		{/if}
-	{assign var=x value=$x+1}
-	{/foreach}
+{assign var=x value=1}
+{foreach $contacts as $row}{if $row.contact_category == "speed dial"}
+<MenuItem>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_organization}</Name>
+{/if}
+{if $row.phone_number != ""}
+	<URL>Dial:{$row.phone_number}#</URL>
+{else}
+	<URL>Dial:{$row.phone_extension}#</URL>
+{/if}
+</MenuItem>
+{/if}
+{assign var=x value=$x+1}
+{/foreach}
 	<SoftKeyItem>
 		<Name>Exit</Name>
 		<URL>SoftKey:Exit</URL>