diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-09-08 09:52:35 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-09-08 09:52:35 +0200 |
| commit | 35f1055739f133cdeda290aa3a45992f97bb32fa (patch) | |
| tree | 188798d75af9eedaa7884cb4522ada748eb3f4a7 /view | |
| parent | 98d5ae91f5a716d415fa3dd639e9819ae7003202 (diff) | |
| parent | 83b89b9576655c11a9beaaf2261b3a9013a52da5 (diff) | |
| download | volse-hubzilla-35f1055739f133cdeda290aa3a45992f97bb32fa.tar.gz volse-hubzilla-35f1055739f133cdeda290aa3a45992f97bb32fa.tar.bz2 volse-hubzilla-35f1055739f133cdeda290aa3a45992f97bb32fa.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 56e6087d6..a5b32f08f 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -42,6 +42,12 @@ {{include file="field_input.tpl" field=$sitename}} {{include file="field_select.tpl" field=$server_role}} + + {{if $z_server_role == 'pro'}} + {{include file="field_select.tpl" field=$techlevel}} + {{include file="field_checkbox.tpl" field=$techlock}} + {{/if}} + {{include file="field_textarea.tpl" field=$banner}} {{include file="field_textarea.tpl" field=$admininfo}} {{include file="field_select.tpl" field=$language}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index ec827d990..db5ffe3f5 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -79,6 +79,9 @@ <input name="newtag" id="photo-edit-newtag" class="form-control" title="{{$edit.help_tags}}" type="text" /> </div> <div class="form-group"> + {{include file="field_select.tpl" field=$edit.album_select}} + </div> + <div class="form-group"> <label class="radio-inline" id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw"><input id="photo-edit-rotate-cw" type="radio" name="rotate" value="1" />{{$edit.rotatecw}}</label> <label class="radio-inline" id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw"><input id="photo-edit-rotate-ccw" type="radio" name="rotate" value="2" />{{$edit.rotateccw}}</label> </div> |