harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new notification fixes

Browse Source
This commit is contained in:
Mario Vavti 2017-10-10 12:08:51 +02:00
parent cc1ffff7cd
commit 41cf846ee3
3 changed files with 60 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
view/js/main.js
View File

@ -365,11 +365,6 @@ $(function() {
return; return;
}); });
$('span[rel^="#"]').click(function(e){
manage_popup_menu(this, e);
return;
});
function manage_popup_menu(w,e) { function manage_popup_menu(w,e) {
menu = $( $(w).attr('rel') ); menu = $( $(w).attr('rel') );

34
view/theme/redbasic/js/redbasic.js
View File

@ -16,19 +16,27 @@ $(document).ready(function() {
} }
$('#css3-calc').remove(); // Remove the test element $('#css3-calc').remove(); // Remove the test element
if($(window).width() > 767) { if($(window).width() >= 767) {
$('#left_aside_wrapper').stick_in_parent({ $('#left_aside_wrapper').stick_in_parent({
offset_top: parseInt($('#region_1').css('padding-top')), offset_top: parseInt($('aside').css('padding-top')),
parent: 'main', parent: 'main',
spacer: '#left_aside_spacer' spacer: '#left_aside_spacer'
}); });
}
if($(window).width() >= 1200) {
$('#right_aside_wrapper').stick_in_parent({ $('#right_aside_wrapper').stick_in_parent({
offset_top: parseInt($('#region_3').css('padding-top')), offset_top: parseInt($('aside').css('padding-top')),
parent: 'main', parent: 'main',
spacer: '#right_aside_spacer' spacer: '#right_aside_spacer'
}); });
} }
$('#notifications_wrapper.fs #notifications').stick_in_parent({
parent: '#notifications_wrapper'
});
$('#expand-aside').on('click', toggleAside); $('#expand-aside').on('click', toggleAside);
$('section').on('click', function() { $('section').on('click', function() {
@ -46,6 +54,16 @@ $(document).ready(function() {
} }
}); });
var right_aside_height = $('#rightt_aside_wrapper').height();
$('#right_aside_wrapper').on('click', function() {
if(right_aside_height != $('#right_aside_wrapper').height()) {
$(document.body).trigger("sticky_kit:recalc");
right_aside_height = $('#right_aside_wrapper').height();
}
});
$('.usermenu').click(function() { $('.usermenu').click(function() {
if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){ if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){
$('#navbar-collapse-1, #navbar-collapse-2').removeClass('show'); $('#navbar-collapse-1, #navbar-collapse-2').removeClass('show');
@ -64,14 +82,14 @@ $(document).ready(function() {
} }
}); });
var notifications_parent = $('#notifications')[0].parentElement.id; var notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
$('#notifications-btn-1').click(function() { $('#notifications-btn-1').click(function() {
if($('#notifications').hasClass('fs')) if($('#notifications_wrapper').hasClass('fs'))
$('#notifications').prependTo('#' + notifications_parent); $('#notifications_wrapper').prependTo('#' + notifications_parent);
else else
$('#notifications').prependTo('body'); $('#notifications_wrapper').prependTo('section');
$('#notifications').toggleClass('fs'); $('#notifications_wrapper').toggleClass('fs');
if($('#navbar-collapse-2').hasClass('show')){ if($('#navbar-collapse-2').hasClass('show')){
$('#navbar-collapse-2').removeClass('show'); $('#navbar-collapse-2').removeClass('show');
} }

17
view/tpl/notifications_widget.tpl
View File

@ -1,6 +1,6 @@
<style> <style>
.notification-content { .notification-content {
max-height: 70vh; max-height: 60vh;
overflow: auto; overflow: auto;
} }
@ -12,17 +12,21 @@
position: fixed; position: fixed;
top: 0px; top: 0px;
left: 0px; left: 0px;
padding: 4.5rem .5rem 0 .5rem; padding: 4.5rem .5rem 1rem .5rem;
background-color: white; background-color: white;
width: 100%; width: 100%;
max-width: 100%; max-width: 100%;
height: 100vh; height: 100%;
z-index: 1030; z-index: 1020;
overflow: auto;
}
#notifications {
margin-bottom: 1rem;
} }
</style> </style>
<div id="notifications_wrapper">
<div id="notifications" class="navbar-nav" data-children=".nav-item"> <div id="notifications" class="navbar-nav" data-children=".nav-item">
<div id="nav-notifications-template" rel="template"> <div id="nav-notifications-template" rel="template">
<a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}"> <a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}">
@ -49,3 +53,4 @@
</div> </div>
{{/foreach}} {{/foreach}}
</div> </div>
</div>