diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-15 17:30:08 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-15 17:30:08 -0700 |
| commit | 8c7472c6c337f0cf58d744433e3de70ab33b430b (patch) | |
| tree | 293bb3b84407475c380b11c015f9086138ef3766 /view/tpl | |
| parent | 859a2ac8ef1c3ce234b894598be846cbc89cf54a (diff) | |
| parent | e0779e32b42e0fc00cd060f2baa25656d15b7885 (diff) | |
| download | volse-hubzilla-8c7472c6c337f0cf58d744433e3de70ab33b430b.tar.gz volse-hubzilla-8c7472c6c337f0cf58d744433e3de70ab33b430b.tar.bz2 volse-hubzilla-8c7472c6c337f0cf58d744433e3de70ab33b430b.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/field_checkbox.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index 514626d5f..6785e522a 100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,4 +1,4 @@ - <div class="form-group field checkbox"> + <div id="{{$field.0}}_container" class="form-group field checkbox"> <label for="id_{{$field.0}}">{{$field.1}}</label> <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> <span class="help-block">{{$field.3}}</span> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 49181b018..1054d5e3a 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -79,9 +79,11 @@ <button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button> </div> <div class="form-group btn-group pull-right"> + {{if $edit.aclselect}} <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$edit.lockstate}}"></i> </button> + {{/if}} <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button> </div> </form> |