Merged revisions 4069-4117 from stable branch.

tbrehm

2013-08-21 7b47c0aa0aeee6f059f00008e36cc210ca89ecb9

 interface/web/client/templates/reseller_edit_address.htm

@@ -10,6 +10,12 @@
                <input name="company_name" id="company_name" value="{tmpl_var name='company_name'}" size="30" maxlength="255" type="text" class="textInput" />
            </div>
            <div class="ctrlHolder">
                <label for="gender">{tmpl_var name='gender_txt'}</label>
                <select name="gender" id="gender" class="selectInput">
                    {tmpl_var name='gender'}
                </select>
            </div>
            <div class="ctrlHolder">
                <label for="contact_name">{tmpl_var name='contact_name_txt'}*</label>
                <input name="contact_name" id="contact_name" value="{tmpl_var name='contact_name'}" size="30" maxlength="255" type="text" class="textInput" />
            </div>
@@ -134,6 +140,18 @@
                <label for="notes">{tmpl_var name='notes_txt'}</label>
                <textarea name="notes" id="notes" rows='10' cols='30'>{tmpl_var name='notes'}</textarea>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='locked_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='locked'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='canceled_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='canceled'}
                </div>
            </div>
            {tmpl_var name='required_fields_txt'}
        </fieldset>