Merge branch 'master' of https://github.com/redmatrix/hubzilla

1 files changed, 25 insertions, 62 deletions

diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 26da4ebc9..1951025f5 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -21,32 +21,19 @@
 <div id="profile-edit-links-end"></div>
 
 {{if $is_default}}
-<p class="section-content-info-wrapper">{{$default}}</p>
+<div class="section-content-info-wrapper">{{$default}}</div>
 {{/if}}
 
 
 <div id="profile-edit-wrapper" >
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-<div id="profile-edit-profile-name-wrapper" class="form-group field">
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" ><span class="required">*</span>&nbsp;{{$lbl_profname}} </label>
-<input type="text" class="form-control" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" />
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" class="form-group field" >
-<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
-<input type="text" class="form-control" size="32" name="name" id="profile-edit-name" value="{{$name}}" />
-</div>
-<div id="profile-edit-name-end"></div>
+{{include file="field_input.tpl" field=$profile_name}}
 
+{{include file="field_input.tpl" field=$name}}
 
 {{if $fields.pdesc}}
-<div id="profile-edit-pdesc-wrapper" class="form-group field" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
-<input type="text" class="form-control" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
+{{include file="field_input.tpl" field=$pdesc}}
 {{/if}}
 
 {{if $fields.gender}}
@@ -62,74 +49,44 @@
 {{/if}}
 
 {{if $fields.dob}}
-<div id="profile-edit-dob-wrapper" class="form-group field" >
-<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
-<div id="profile-edit-dob" >
-{{$dob}} {{$age}}
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
+{{$dob}}
 {{/if}}
 
-{{$hide_friends}}
+{{include file="field_checkbox.tpl" field=$hide_friends}}
 
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+<div class="form-group" >
+<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
 </div>
-<div class="profile-edit-submit-end"></div>
+<div class="clear"></div>
 
 {{if $fields.address}}
-<div id="profile-edit-address-wrapper" class="form-group field" >
-<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
-<input type="text" class="form-control" size="32" name="address" id="profile-edit-address" value="{{$address}}" />
-</div>
-<div id="profile-edit-address-end"></div>
+{{include file="field_input.tpl" field=$address}}
 {{/if}}
 
 {{if $fields.locality}}
-<div id="profile-edit-locality-wrapper" class="form-group field" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
-<input type="text" class="form-control" size="32" name="locality" id="profile-edit-locality" value="{{$locality}}" />
-</div>
-<div id="profile-edit-locality-end"></div>
+{{include file="field_input.tpl" field=$locality}}
 {{/if}}
 
 {{if $fields.postal_code}}
-<div id="profile-edit-postal-code-wrapper" class="form-group field" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
-<input type="text" class="form-control" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
+{{include file="field_input.tpl" field=$postal_code}}
 {{/if}}
 
 {{if $fields.region}}
-<div id="profile-edit-region-wrapper" class="form-group field" >
-<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
-<input type="text" class="form-control" size="32" name="region" id="profile-edit-region" value="{{$region}}" />
-</div>
-<div id="profile-edit-region-end"></div>
+{{include file="field_input.tpl" field=$region}}
 {{/if}}
 
 {{if $fields.country_name}}
-<div id="profile-edit-country-name-wrapper" class="form-group field" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
-<input type="text" class="form-control" size="32" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" />
-</div>
-<div id="profile-edit-country-name-end"></div>
+{{include file="field_input.tpl" field=$country_name}}
 {{/if}}
 
 {{if $fields.hometown}}
-<div id="profile-edit-hometown-wrapper" class="form-group field" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
-<input type="text" class="form-control" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
-</div>
-<div id="profile-edit-hometown-end"></div>
+{{include file="field_input.tpl" field=$hometown}}
 {{/if}}
 
-<div class="profile-edit-submit-wrapper" class="form-group field" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+<div class="form-group" >
+<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
 </div>
-<div class="profile-edit-submit-end"></div>
+<div class="clear"></div>
 
 {{if $fields.marital }}
 <div id="profile-edit-marital-wrapper" class="form-group field" >
@@ -141,19 +98,25 @@
 {{/if}}
 </div>
 <div class="clear"></div>
+
 {{if $fields.with}}
+<div class="form-group">
 <label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
 <input type="text" class="form-control" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
 <div class="clear"></div>
+</div>
 {{/if}}
+
 {{if $fields.howlong}}
+<div class="form-group">
 <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
 <input type="text" class="form-control" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
 <div class="clear"></div>
+</div>
 {{/if}}
 <div id="profile-edit-marital-end"></div>
 {{/if}}
-<br /><br />
+
 {{if $fields.homepage}}
 <div id="profile-edit-homepage-wrapper" class="form-group field" >
 <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>