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 @@ SoftKey:Select 1 - {assign var=x value=1} - {foreach $contacts as $row} - {if $row.contact_category == "enterprise"} - - {if $row.contact_name_given != ""} - {$row.contact_name_given} {$row.contact_name_family} - {else} - {$row.contact_organization} - {/if} - {if $row.phone_number != ""} - Dial:{$row.phone_number}# - {else} - Dial:{$row.phone_extension}# - {/if} - - {/if} - {/foreach} +{assign var=x value=1} +{foreach $contacts as $row}{if $row.contact_category == "enterprise"} + +{if $row.contact_name_given != ""} + {$row.contact_name_given} {$row.contact_name_family} +{else} + {$row.contact_organization} +{/if} +{if $row.phone_number != ""} + Dial:{$row.phone_number}# +{else} + Dial:{$row.phone_extension}# +{/if} + +{/if} +{assign var=x value=$x+1} +{/foreach} Exit SoftKey:Exit 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 @@ SoftKey:Select 1 - {assign var=x value=1} - {foreach $contacts as $row} - {if $row.contact_category == "personal"} - - {if $row.contact_name_given != ""} - {$row.contact_name_given} {$row.contact_name_family} - {else} - {$row.contact_organization} - {/if} - {if $row.phone_number != ""} - Dial:{$row.phone_number}# - {else} - Dial:{$row.phone_extension}# - {/if} - - {/if} - {/foreach} +{assign var=x value=1} +{foreach $contacts as $row}{if $row.contact_category == "personal"} + +{if $row.contact_name_given != ""} + {$row.contact_name_given} {$row.contact_name_family} +{else} + {$row.contact_organization} +{/if} +{if $row.phone_number != ""} + Dial:{$row.phone_number}# +{else} + Dial:{$row.phone_extension}# +{/if} + +{/if} +{assign var=x value=$x+1} +{/foreach} Exit SoftKey:Exit 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 @@ SoftKey:Select 1 - {assign var=x value=1} - {foreach $contacts as $row} - {if $row.contact_category == "speed dial"} - - {if $row.contact_name_given != ""} - {$row.contact_name_given} {$row.contact_name_family} - {else} - {$row.contact_organization} - {/if} - {if $row.phone_number != ""} - Dial:{$row.phone_number}# - {else} - Dial:{$row.phone_extension}# - {/if} - - {/if} - {assign var=x value=$x+1} - {/foreach} +{assign var=x value=1} +{foreach $contacts as $row}{if $row.contact_category == "speed dial"} + +{if $row.contact_name_given != ""} + {$row.contact_name_given} {$row.contact_name_family} +{else} + {$row.contact_organization} +{/if} +{if $row.phone_number != ""} + Dial:{$row.phone_number}# +{else} + Dial:{$row.phone_extension}# +{/if} + +{/if} +{assign var=x value=$x+1} +{/foreach} Exit SoftKey:Exit