diff options
| author | marijus <mario@mariovavti.com> | 2014-08-21 13:20:49 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-08-21 13:20:49 +0200 |
| commit | 1a3be504516db7106ea0ce385691e5a3eca4c084 (patch) | |
| tree | 55f499ebec38276e2d055d07788a18bafbb7d74d /view | |
| parent | 0b95a60f22949eccb9acd28ac7400f6da00f3585 (diff) | |
| parent | a59a6fbd90d115cf9e9836c986c81541a88697ee (diff) | |
| download | volse-hubzilla-1a3be504516db7106ea0ce385691e5a3eca4c084.tar.gz volse-hubzilla-1a3be504516db7106ea0ce385691e5a3eca4c084.tar.bz2 volse-hubzilla-1a3be504516db7106ea0ce385691e5a3eca4c084.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/field_acheckbox.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/frphotos.tpl | 13 | ||||
| -rwxr-xr-x | view/tpl/profile_edit.tpl | 5 |
4 files changed, 7 insertions, 14 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index c6c15cec4..2a7742a3e 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -65,6 +65,7 @@ <h3>{{$corporate}}</h3> {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$disable_discover_tab}} diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 342491ded..89de170b7 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -6,7 +6,7 @@ <input type="checkbox" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} /> </td> <td class="abook-me"> - <input type="checkbox" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> + <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> </td> <td> {{if $field.5}}<span class="permission-inherited">{{$inherited}}</span> {{/if}} diff --git a/view/tpl/frphotos.tpl b/view/tpl/frphotos.tpl deleted file mode 100644 index b8e978825..000000000 --- a/view/tpl/frphotos.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<h3>{{$header}}</h3> - -<p class="descriptive-text">{{$desc}}</p> - -<form action="frphotos" method="post" autocomplete="off" > - -{{include file="field_input.tpl" field=$fr_server}} -{{include file="field_input.tpl" field=$fr_username}} -{{include file="field_password.tpl" field=$fr_password}} - -<input type="submit" name="submit" value="{{$submit}}" /> -</form> - diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 0e902e9e2..87582da56 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -349,6 +349,11 @@ <div id="education-jot-end"></div> {{/if}} +{{if $extra_fields}} +{{foreach $extra_fields as $field }} +{{include file="field_input.tpl" field=$field}} +{{/foreach}} +{{/if}} <div class="profile-edit-submit-wrapper" > <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> |