diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 14 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 16 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 3 |
4 files changed, 20 insertions, 15 deletions
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 3fee0f282..ed9ef02aa 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -2,7 +2,6 @@ * redbasic theme specific JavaScript */ -var notifications_parent; $(document).ready(function() { // CSS3 calc() fallback (for unsupported browsers) @@ -84,19 +83,6 @@ $(document).ready(function() { } }); - notifications_parent = $('#notifications_wrapper')[0].parentElement.id; - $('#notifications-btn').click(function() { - if($('#notifications_wrapper').hasClass('fs')) - $('#notifications_wrapper').prependTo('#' + notifications_parent); - else - $('#notifications_wrapper').prependTo('section'); - - $('#notifications_wrapper').toggleClass('fs'); - if($('#navbar-collapse-2').hasClass('show')){ - $('#navbar-collapse-2').removeClass('show'); - } - }); - $("input[data-role=cat-tagsinput]").tagsinput({ tagClass: 'badge badge-pill badge-warning text-dark' }); diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 0ece84891..29892ba79 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -28,6 +28,22 @@ {{if $module == 'display'}} <script> + var notifications_parent; + $(document).ready(function() { + notifications_parent = $('#notifications_wrapper')[0].parentElement.id; + $('#notifications-btn').click(function() { + if($('#notifications_wrapper').hasClass('fs')) + $('#notifications_wrapper').prependTo('#' + notifications_parent); + else + $('#notifications_wrapper').prependTo('section'); + + $('#notifications_wrapper').toggleClass('fs'); + if($('#navbar-collapse-2').hasClass('show')){ + $('#navbar-collapse-2').removeClass('show'); + } + }); + }); + $(document).on('click', '.notification', function(e) { var b64mid = $(this).data('b64mid'); var path = $(this)[0].pathname.substr(1,7); diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 2431329ec..105cf0ac8 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -92,7 +92,7 @@ <i id="jot-perms-icon" class="fa fa-{{$edit.lockstate}}"></i> </button> {{/if}} - <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button> + <button id="tool-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button> </div> </form> {{$edit.aclselect}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 704d89bdd..33e0aa925 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -104,6 +104,9 @@ <div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings"> <div class="section-content-tools-wrapper"> <div id="settings-notifications"> + + {{include file="field_input.tpl" field=$mailhost}} + <h3>{{$activity_options}}</h3> <div class="group"> {{*not yet implemented *}} |