aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/profile_edit.tpl
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-01 09:15:56 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-01 09:15:56 +0200
commitc1039977f1d64611d2c793f3aded96d031b74183 (patch)
treefa32a8f59c863564998cd149a902388dd363d605 /view/tpl/profile_edit.tpl
parent316fee93f7f7df92db514de961b74a71556fdb63 (diff)
parentb1259876bf398880e7b0c1b44d90f94983243e72 (diff)
downloadvolse-hubzilla-c1039977f1d64611d2c793f3aded96d031b74183.tar.gz
volse-hubzilla-c1039977f1d64611d2c793f3aded96d031b74183.tar.bz2
volse-hubzilla-c1039977f1d64611d2c793f3aded96d031b74183.zip
Merge branch 'dev' into sabre32
Diffstat (limited to 'view/tpl/profile_edit.tpl')
-rwxr-xr-xview/tpl/profile_edit.tpl6
1 files changed, 3 insertions, 3 deletions
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index deabc2795..b0211d697 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -173,7 +173,7 @@
</div>
<div class="clear"></div>
- {{if $fields.with}}
+ {{if $fields.partner}}
{{include file="field_input.tpl" field=$with}}
{{/if}}
@@ -198,7 +198,7 @@
</div>
</div>
{{/if}}
- {{if $fields.keywords || $fields.politic || $fields.religion || $fields.about || $fields.contact || $fields.homepage || $fields.interest || $fields.likes || $fields.dislikes || $fields.channels || $fields.music || $fields.book || $fields.tv || $fields.romance || $fields.education || $extra_fields}}
+ {{if $fields.keywords || $fields.politic || $fields.religion || $fields.about || $fields.contact || $fields.homepage || $fields.interest || $fields.likes || $fields.dislikes || $fields.channels || $fields.music || $fields.book || $fields.tv || $fields.film || $fields.romance || $fields.employment || $fields.education || $extra_fields}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="miscellaneous">
<h3>
@@ -269,7 +269,7 @@
{{include file="field_textarea.tpl" field=$romance}}
{{/if}}
- {{if $fields.work}}
+ {{if $fields.employment}}
{{include file="field_textarea.tpl" field=$work}}
{{/if}}