diff options
| author | zotlabs <mike@macgirvin.com> | 2016-10-19 16:31:35 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-10-19 16:31:35 -0700 |
| commit | c79c1b391331ab7c8c0f01265a627ffae23d54e2 (patch) | |
| tree | 66d988e77e1af2b8695a9726a76fc7d5743a69a6 /view | |
| parent | 716a83d1f77e2d6f26b25ab03ffe130c11ef7feb (diff) | |
| parent | b926a4c67e4d7dcba01df91dddcc047abde246bb (diff) | |
| download | volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.tar.gz volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.tar.bz2 volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.zip | |
Merge branch 'dev' into pdo
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/profile_photo.tpl | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index dbdbd6a56..c23840c16 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -15,10 +15,10 @@ {{/if}} <label for="acl-select">{{$select_label}}</label> <select id="acl-select" name="optionsRadios" class="form-control form-group"> - <option id="acl-showall" value="public" selected>{{$showall}}</option> + <option id="acl-showall" value="public" {{$public_selected}}>{{$showall}}</option> {{$groups}} - <option id="acl-onlyme" value="onlyme">{{$onlyme}}</option> - <option id="acl-custom" value="custom">{{$custom}}</option> + <option id="acl-onlyme" value="onlyme" {{$justme_selected}}>{{$onlyme}}</option> + <option id="acl-custom" value="custom" {{$custom_selected}}>{{$custom}}</option> </select> {{if $showallOrigin}} diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index a2bb1f112..0f37d8287 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -105,10 +105,6 @@ </div> </div> - {{if ! $eid}} - {{include file="field_checkbox.tpl" field=$share}} - {{/if}} - <div class="clear"></div> <button type="button" class="btn btn-default" onclick="openClose('advanced');">{{$advanced}}</button> diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index 88e17407b..ca107bfcc 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -9,10 +9,15 @@ <div id="profile-photo-upload-wrapper"> + {{if $importfile}} + <input type="hidden" name="importfile" value="{{$importfile}}"> + {{else}} <label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label> <input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" /> + {{/if}} <div class="clear"></div> + {{if $single}} <input type="hidden" name="profile" value="{{$profile0.id}}" /> {{else}} |