aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-03-12 16:47:11 -0800
committerredmatrix <git@macgirvin.com>2016-03-12 16:47:11 -0800
commit70ad69d38c53f78d04d912495f63c6fb781f0550 (patch)
tree19c7a8282113431e6a4e47a256925d2aef6fb66f /view/tpl
parentcb0c43bc6805721cd298796aa028d96398122e7a (diff)
parent7efffbf102d7954a973816c75054bed7fdefebf6 (diff)
downloadvolse-hubzilla-70ad69d38c53f78d04d912495f63c6fb781f0550.tar.gz
volse-hubzilla-70ad69d38c53f78d04d912495f63c6fb781f0550.tar.bz2
volse-hubzilla-70ad69d38c53f78d04d912495f63c6fb781f0550.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/profile_edit.tpl31
-rw-r--r--view/tpl/profile_hide_friends.tpl20
2 files changed, 6 insertions, 45 deletions
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 26da4ebc9..f3f3efd6f 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,16 +49,10 @@
{{/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}}" />
diff --git a/view/tpl/profile_hide_friends.tpl b/view/tpl/profile_hide_friends.tpl
deleted file mode 100644
index 4ed6782bb..000000000
--- a/view/tpl/profile_hide_friends.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{include file="field_checkbox.tpl"}}
-
-{{*
-<p id="hide-friends-text">
-{{$desc}}
-</p>
- <div id="hide-friends-yes-wrapper">
- <label id="hide-friends-yes-label" for="hide-friends-yes">{{$yes_str}}</label>
- <input type="radio" name="hide-friends" id="hide-friends-yes" {{$yes_selected}} value="1" />
-
- <div id="hide-friends-break" ></div>
- </div>
-
- <div id="hide-friends-no-wrapper">
- <label id="hide-friends-no-label" for="hide-friends-no">{{$no_str}}</label>
- <input type="radio" name="hide-friends" id="hide-friends-no" {{$no_selected}} value="0" />
-
- <div id="hide-friends-end"></div>
- </div>
-*}}