diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-29 15:42:33 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-29 15:42:33 -0700 |
| commit | 2ee0f769d90f424d2332708df8c86c7bc8390268 (patch) | |
| tree | 8b902fbcefb505b9916ff880605055bf89dcd153 /view/tpl | |
| parent | 9b9fe39839632811f22a718307116b61b220b752 (diff) | |
| parent | 8161ec88e5a2b9d1f7071dfed6a70c850e42ed4b (diff) | |
| download | volse-hubzilla-2ee0f769d90f424d2332708df8c86c7bc8390268.tar.gz volse-hubzilla-2ee0f769d90f424d2332708df8c86c7bc8390268.tar.bz2 volse-hubzilla-2ee0f769d90f424d2332708df8c86c7bc8390268.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/cloud_actionspanel.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 0ebecce29..fc3e7f82f 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -26,6 +26,7 @@ <input type="hidden" name="return_url" value="{{$return_url}}" /> <label for="files-upload">{{$upload_header}}</label> <input class="form-group pull-left" id="files-upload" type="file" name="userfile"> + {{include file="field_checkbox.tpl" field=$notify}} <div class="pull-right btn-group"> <div class="btn-group"> {{if $lockstate}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 137fed790..ae354e371 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -68,7 +68,7 @@ <i class="fa fa-exclamation-circle"></i> </button> {{/if}} - <button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> + <button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> <i class="fa fa-bars"></i> </button> </div> |