aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--view/js/main.js4
-rw-r--r--view/theme/redbasic/js/redbasic.js13
-rwxr-xr-xview/tpl/nav.tpl9
-rw-r--r--view/tpl/notifications_widget.tpl30
4 files changed, 26 insertions, 30 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 186cefbd0..6557b1d8e 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -445,10 +445,10 @@ function NavUpdate() {
updateCountsOnly = false;
if(data.network || data.home || data.intros || data.register || data.mail || data.all_events || data.notify || data.files || data.pubs) {
- $('#notifications-btn').css('opacity', 1);
+ $('#notifications-btn, #notifications-btn-1').css('opacity', 1);
}
else {
- $('#notifications-btn').css('opacity', 0.5);
+ $('#notifications-btn, #notifications-btn-1').css('opacity', 0.5);
$('#navbar-collapse-1').removeClass('show');
}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index c67c67a51..257e7cfb6 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -24,11 +24,6 @@ $(document).ready(function() {
});
}
- if(($(window).width() < 767) && ($('#left_aside_wrapper .widget, #left_aside_wrapper .vcard').length > 0))
- $('#expand-aside').show();
- else
- $('#expand-aside').hide();
-
$('#expand-aside').on('click', toggleAside);
$('section').on('click', function() {
@@ -64,8 +59,14 @@ $(document).ready(function() {
}
});
+ var notifications_parent = $('#notifications')[0].parentElement.id;
$('#notifications-btn-1').click(function() {
- $('#region_3').toggleClass('fs');
+ if($('#notifications').hasClass('fs'))
+ $('#notifications').prependTo('#' + notifications_parent);
+ else
+ $('#notifications').prependTo('body');
+
+ $('#notifications').toggleClass('fs');
if($('#navbar-collapse-2').hasClass('show')){
$('#navbar-collapse-2').removeClass('show');
}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index a19fa15a1..bbc5b4fb0 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -53,6 +53,9 @@
</div>
{{/if}}
</div>
+<div class="navbar-nav mr-auto">
+ <div class="text-white">{{$sel.active}}</div>
+</div>
{{/if}}
<div class="navbar-toggler-right">
{{if $nav.help.6}}
@@ -60,7 +63,7 @@
<i class="fa fa-question-circle"></i>
</button>
{{/if}}
- <button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
+ <button id="expand-aside" type="button" class="d-md-none navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
</button>
{{if ! $experimental_notif}}
@@ -212,9 +215,7 @@
{{/if}}
</ul>
{{else}}
- <div class="navbar-nav mr-auto">
- <div class="text-white">{{$sel.active}}</div>
- </div>
+ <div class="navbar-text mr-auto d-none d-xl-flex"></div>
{{/if}}
<div id="banner" class="navbar-text d-none d-xl-flex">{{$banner}}</div>
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 83174b3a1..26004338d 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -16,33 +16,27 @@
}
.fs {
- position: fixed;
- top: 0px;
+ top: 0px !important;
left: 0px;
- display: block !important;
+ padding-top: 4.5rem !important;
background-color: white;
- width: 100%;
+ width: 100% !important;
max-width: 100%;
height: 100vh;
- z-index: 1020;
- }
-
- .fs #notifications {
- position: relative;
- width: 100%;
- top: 0px;
+ z-index: 1030;
}
</style>
-<div id="nav-notifications-template" rel="template">
- <a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}">
- <img class="menu-img-3" data-src="{1}">
- <span class="contactname">{2}</span>
- <span class="dropdown-sub-text">{3}<br>{4}</span>
- </a>
-</div>
+
<div id="notifications" class="navbar-nav" data-children=".nav-item">
+ <div id="nav-notifications-template" rel="template">
+ <a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}">
+ <img class="menu-img-3" data-src="{1}">
+ <span class="contactname">{2}</span>
+ <span class="dropdown-sub-text">{3}<br>{4}</span>
+ </a>
+ </div>
{{foreach $notifications as $notification}}
<div class="collapse {{$notification.type}}-button">
<a class="list-group-item" href="#nav-{{$notification.type}}-menu" title="{{$notification.title}}" data-toggle="collapse" data-parent="#notifications" rel="#nav-{{$notification.type}}-menu">