diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 04:59:07 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 04:59:07 -0400 |
commit | 598a2563e844477de2f688663c7c46962b26b602 (patch) | |
tree | 525a6536b6ab7f9020e83daf9287c785303ad584 /view/profile_edit.tpl | |
parent | 8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6 (diff) | |
parent | daa4f5213f726b22846859f2f12d06889e9bdc9b (diff) | |
download | volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.tar.gz volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.tar.bz2 volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
zrl's when visiting public photos at the source site
doco
cleanup
turn "follow" into a function
add hometown to profiles
bug #439 - remove web port number from notification email "from" address
webfinger profile linker
"howlong" added to marital status.
fewer "bob smith to bob smith via wall-to-wall".
[quote=somebody] was appearing as an extended spoiler tag.
* master:
Diffstat (limited to 'view/profile_edit.tpl')
-rw-r--r-- | view/profile_edit.tpl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl index 2139fcf13..ad34b9956 100644 --- a/view/profile_edit.tpl +++ b/view/profile_edit.tpl @@ -97,6 +97,12 @@ $hide_friends </div> <div id="profile-edit-region-end"></div> +<div id="profile-edit-hometown-wrapper" > +<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label> +<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="$hometown" /> +</div> +<div id="profile-edit-hometown-end"></div> + <div class="profile-edit-submit-wrapper" > <input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" /> </div> @@ -108,6 +114,9 @@ $marital </div> <label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label> <input type="text" size="32" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" /> +<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label> +<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" /> + <div id="profile-edit-marital-end"></div> <div id="profile-edit-sexual-wrapper" > |