diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-12 16:07:04 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-12 16:07:04 -0800 |
| commit | 59caf141d1e271ee4a6e7ab8b66f4070835dde95 (patch) | |
| tree | 44056bdac329f6356fa75ed3566c88568677d89f /view/tpl | |
| parent | 71a30cd9a5f5c749e3b76e961876afbd0afa87f9 (diff) | |
| parent | 6ea7ef43e0a0a99f81986c8e1fe5955800bfa496 (diff) | |
| download | volse-hubzilla-59caf141d1e271ee4a6e7ab8b66f4070835dde95.tar.gz volse-hubzilla-59caf141d1e271ee4a6e7ab8b66f4070835dde95.tar.bz2 volse-hubzilla-59caf141d1e271ee4a6e7ab8b66f4070835dde95.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/cover_photo_widget.tpl | 5 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl index 7404a740c..3aaad5ae5 100755 --- a/view/tpl/cover_photo_widget.tpl +++ b/view/tpl/cover_photo_widget.tpl @@ -8,8 +8,7 @@ aside_padding_top = parseInt($('aside').css('padding-top')); section_padding_top = parseInt($('section').css('padding-top')); - $('#cover-photo').on('click', slideUpCover); - $('#cover-photo').on('keyup', slideUpCover); + $(document).on('click mouseup keyup', slideUpCover); if($('#cover-photo').length && $(window).width() > 755) { if($(window).scrollTop() < $('#cover-photo').height()) { @@ -63,7 +62,7 @@ if(coverSlid) { return; } - $('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' }); + $('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' }, 'fast'); return; } </script> diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 1e752c313..0ece84891 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -29,16 +29,16 @@ {{if $module == 'display'}} <script> $(document).on('click', '.notification', function(e) { - var mid = $(this)[0].pathname.substr(9); + var b64mid = $(this).data('b64mid'); var path = $(this)[0].pathname.substr(1,7); - if(path === 'display' && mid) { + if(path === 'display' && b64mid) { e.preventDefault(); e.stopPropagation(); $('.thread-wrapper').remove(); $(this).fadeOut(); - bParam_mid = mid; + bParam_mid = b64mid; mode = 'replace'; page_load = true; liveUpdate(); @@ -54,7 +54,7 @@ <div id="notifications_wrapper"> <div id="notifications" class="navbar-nav" data-children=".nav-item"> <div id="nav-notifications-template" rel="template"> - <a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}"> + <a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}"> <img class="menu-img-3" data-src="{1}"> <span class="contactname">{2}</span> <span class="dropdown-sub-text">{3}<br>{4}</span> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index d52bad5a2..46b1d3fd0 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -56,6 +56,9 @@ {{/if}} </form> </div> + <table id="upload-index"> + <tr id="new-upload-progress-bar--1"></tr> {{* this is needed to append the upload files in the right order *}} + </table> {{$aclselect}} <div id="photos-upload-end" class="clear"></div> </div> |