Skip to content

Commit 26f6687

Browse files
rxturrxtur
committed
Notifications to main menu
1 parent c9d4bb5 commit 26f6687

File tree

5 files changed

+88
-25
lines changed

5 files changed

+88
-25
lines changed

‎src/App/Pages/Admin/Notifications/Index.cshtml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
@page
2+
@inject IViewLocalizer Localizer
3+
@{
4+
ViewData["Title"] = Localizer["notifications"];
5+
}
6+
7+
<div class="bf-main">
8+
<partial name="~/Pages/Admin/Shared/_Notifybar.cshtml" />
9+
<div id="app" class="bf-body">
10+
<div class="bf-content">
11+
<label class="form-group-label">@Localizer["notifications"] placeholder</label>
12+
13+
</div>
14+
</div>
15+
</div>
16+
17+
@section Scripts{
18+
<script>
19+
new Vue({
20+
el: "#app",
21+
data: {
22+
},
23+
methods: {
24+
load: function (page) {
25+
26+
}
27+
},
28+
beforeMount() {
29+
this.load(1)
30+
}
31+
})
32+
</script>
33+
}

src/App/Pages/Admin/Settings/Newsletter.cshtml renamed to src/App/Pages/Admin/Notifications/Newsletter.cshtml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,25 @@
33
@{
44
ViewData["Title"] = Localizer["newsletter"];
55
}
6-
76
<style>
7+
.modal-body .row {
8+
line-height: 2.5em;
9+
border-bottom: 1px solid #efefef;
10+
}
11+
.post-grid-col {
12+
max-width: 200px !important
13+
}
814
.card-email a {
915
float: right;
1016
}
1117
.card-email {
1218
margin: 2px;
1319
}
1420
</style>
15-
<div id="app" class="bf-main" style="display:none">
16-
<partial name="~/Pages/Admin/Shared/_Taskbar.cshtml" />
17-
<div class="bf-body">
21+
22+
<div class="bf-main">
23+
<partial name="~/Pages/Admin/Shared/_Notifybar.cshtml" />
24+
<div id="app" class="bf-body">
1825
<div class="bf-content">
1926

2027
<label class="form-group-label">@Localizer["newsletter-subscribers"]</label>
@@ -104,7 +111,7 @@
104111
},
105112
beforeMount() {
106113
this.page = 1;
107-
if(fromQueryString('page')){ this.page = fromQueryString('page'); }
114+
if (fromQueryString('page')) { this.page = fromQueryString('page'); }
108115
this.load(this.page)
109116
}
110117
})

‎src/App/Pages/Admin/Shared/_Layout.cshtml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@
7777
<i class="taskbar-item-icon fas fa-palette"></i>
7878
</a>
7979
</li>
80+
<li is-active-route asp-controller="notifications" class="taskbar-item">
81+
<a href="~/admin/notifications" class="taskbar-item-link" title="@Localizer["notifications"]">
82+
<i class="taskbar-item-icon fas fa-envelope"></i>
83+
</a>
84+
</li>
8085
}
8186
else
8287
{
@@ -86,14 +91,6 @@
8691
</a>
8792
</li>
8893
}
89-
@if (_notifications.Count() > 0)
90-
{
91-
<li class="taskbar-item">
92-
<a class="taskbar-item-link" href="" onclick="return notificationsController.open();" return false; title="@Localizer["notifications"]">
93-
<i class="taskbar-item-icon fas fa-envelope"></i>
94-
</a>
95-
</li>
96-
}
9794
@if (_isAdmin)
9895
{
9996
<li is-active-route asp-controller="about" class="taskbar-item">

‎src/App/Pages/Admin/Shared/_Notifybar.cshtml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
@inject IViewLocalizer Localizer
2+
@inject Core.Services.IDataService _data;
3+
@{
4+
bool _isAdmin = false;
5+
try
6+
{
7+
var user = _data.Authors.Single(a => a.AppUserName == User.Identity.Name);
8+
if (user != null)
9+
{
10+
_isAdmin = user.IsAdmin;
11+
}
12+
}
13+
catch { }
14+
}
15+
<div class="bf-sidebar d-lg-block">
16+
<div class="bf-settings-sidebar">
17+
<ul class="bf-settings-sidebar-nav">
18+
@if (_isAdmin)
19+
{
20+
<li is-active-route asp-controller="notifications" asp-action="index">
21+
<a href="~/admin/notifications">@Localizer["notifications"]</a>
22+
</li>
23+
<li is-active-route asp-controller="notifications" asp-action="newsletter">
24+
<a href="~/admin/notifications/newsletter">@Localizer["newsletter"]</a>
25+
</li>
26+
}
27+
</ul>
28+
</div>
29+
</div>

‎src/App/Pages/Admin/Shared/_Taskbar.cshtml‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,21 @@
1717
<ul class="bf-settings-sidebar-nav">
1818
@if (_isAdmin)
1919
{
20-
<li is-active-route asp-controller="settings" asp-action="index">
21-
<a href="~/admin/settings">@Localizer["general"]</a>
22-
</li>
20+
<li is-active-route asp-controller="settings" asp-action="index">
21+
<a href="~/admin/settings">@Localizer["general"]</a>
22+
</li>
2323
}
2424
<li is-active-route asp-controller="settings" asp-action="profile">
2525
<a href="~/admin/settings/profile">@Localizer["profile"]</a>
2626
</li>
2727
@if (_isAdmin)
2828
{
29-
<li is-active-route asp-controller="settings" asp-action="newsletter">
30-
<a href="~/admin/settings/newsletter">@Localizer["newsletter"] </a>
31-
</li>
32-
<li is-active-route asp-controller="settings" asp-action="users">
33-
<a href="~/admin/settings/users">@Localizer["users"]</a>
34-
</li>
35-
<li is-active-route asp-controller="settings" asp-action="import">
36-
<a href="~/admin/settings/import">@Localizer["import"]</a>
37-
</li>
29+
<li is-active-route asp-controller="settings" asp-action="users">
30+
<a href="~/admin/settings/users">@Localizer["users"]</a>
31+
</li>
32+
<li is-active-route asp-controller="settings" asp-action="import">
33+
<a href="~/admin/settings/import">@Localizer["import"]</a>
34+
</li>
3835
}
3936
</ul>
4037
</div>

0 commit comments

Comments
 (0)