From cd0e9cadbaff89c9a9d88c677cd3e7d72347fe54 Mon Sep 17 00:00:00 2001
From: zzuutt <zzuutt34@free.fr>
Date: Tue, 29 Apr 2014 15:36:05 +0200
Subject: [PATCH 1/2] Update address.html

add the field 'company'
---
 templates/frontOffice/default/address.html | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/templates/frontOffice/default/address.html b/templates/frontOffice/default/address.html
index 9baf8c3e5..ea4622177 100644
--- a/templates/frontOffice/default/address.html
+++ b/templates/frontOffice/default/address.html
@@ -105,6 +105,19 @@
                         <!--/.form-group-->
                     {/form_field}
 
+                    {form_field form=$form field="company"}
+                      <div class="form-group group-company{if $error} has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
+                          <div class="control-input">
+                            <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder company"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                            {if $error }
+                              <span class="help-block">{$message}</span>
+                              {assign var="error_focus" value="true"}
+                            {/if}
+                          </div>
+                      </div><!--/.form-group-->
+                    {/form_field}
+
                     {form_field form=$form field="address1"}
                         <div class="form-group group-address1 {if $error}has-error{/if}">
                             <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
@@ -239,4 +252,4 @@
     </article>
 
     </div><!-- /.layout -->
-{/block}
\ No newline at end of file
+{/block}

From ee43b71fdc2305b4b786a81bb65651ded9784a68 Mon Sep 17 00:00:00 2001
From: zzuutt <zzuutt@users.noreply.github.com>
Date: Tue, 29 Apr 2014 16:29:20 +0200
Subject: [PATCH 2/2] Update address.html

---
 templates/frontOffice/default/address.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/frontOffice/default/address.html b/templates/frontOffice/default/address.html
index ea4622177..a9820d312 100644
--- a/templates/frontOffice/default/address.html
+++ b/templates/frontOffice/default/address.html
@@ -58,7 +58,7 @@
 
                     {form_field form=$form field="title"}
                         <div class="form-group group-title{if $error} has-error{/if}">
-                            <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
+                            <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
                             <div class="control-input">
                                 <select name="{$name}" id="{$label_attr.for}" class="form-control"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     <option value="">-- {intl l="Select Title"} --</option>
@@ -107,7 +107,7 @@
 
                     {form_field form=$form field="company"}
                       <div class="form-group group-company{if $error} has-error{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
                           <div class="control-input">
                             <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder company"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                             {if $error }
@@ -180,7 +180,7 @@
 
                     {form_field form=$form field="country"}
                         <div class="form-group group-country {if $error}has-error{/if}">
-                            <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
+                            <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
                             <div class="control-input">
                                 <select name="{$name}" id="{$label_attr.for}" class="form-control"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     <option value="">-- {intl l="Select Country"} --</option>