Skip to content

Commit 7ffce06

Browse files
w8tchaw8tcha
committed
bump to beta 9
1 parent c50bb6e commit 7ffce06

7 files changed

Lines changed: 37 additions & 19 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
*.cache
44
YAF.SampleWebApplication/package-lock.json
55
YAF.SampleApp/package-lock.json
6+
/YAF.SampleApp/bin
7+
/YAF.SampleApp/obj

‎YAF.SampleApp/Areas/Chat/Pages/Shared/_Layout.cshtml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<link href="~/favicons/site.webmanifest" rel="manifest" />
1919
<link href="~/favicons/safari-pinned-tab.svg" rel="mask-icon" color="#5bbad5" />
2020
<link href="~/favicons/favicon.ico" rel="shortcut icon" />
21+
<script src="~/js/themeSelector.min.js"></script>
2122
</head>
2223
<body>
2324
<header>
@@ -30,21 +31,21 @@
3031
</button>
3132
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
3233
<ul class="navbar-nav flex-grow-1">
33-
<li class="nav-item">
34-
<a class="nav-link" asp-area="" asp-page="/Index">Home</a>
35-
</li>
36-
<li class="nav-item">
37-
<a class="nav-link" asp-area="Forums" asp-page="/Index">Forums</a>
38-
</li>
39-
<li class="nav-item">
40-
<a class="nav-link" asp-area="Chat" asp-page="/Index">Chat</a>
41-
</li>
34+
<li class="nav-item">
35+
<a class="nav-link" asp-area="" asp-page="/Index">Home</a>
36+
</li>
37+
<li class="nav-item">
38+
<a class="nav-link" asp-area="Forums" asp-page="/Index">Forums</a>
39+
</li>
40+
<li class="nav-item">
41+
<a class="nav-link active" asp-area="Chat" asp-page="/Index">Chat</a>
42+
</li>
4243
</ul>
4344
<div class="form-inline mt-2 mt-md-0">
4445
@if (Current.IsGuest)
4546
{
46-
<a class="btn btn-outline-success my-2 my-sm-0 me-sm-2" asp-page="/Account/Login" asp-area="Forums">Login</a>
47-
<a class="btn btn-outline-success my-2 my-sm-0" asp-page="@(Current.BoardSettings.ShowRulesForRegistration ? "/Privacy" : "/Account/Register")" asp-area="Forums">Register</a>
47+
<a class="btn btn-outline-primary my-2 my-sm-0 me-sm-2" asp-page="/Account/Login" asp-area="Forums">Login</a>
48+
<a class="btn btn-outline-secondary my-2 my-sm-0" asp-page="@(Current.BoardSettings.ShowRulesForRegistration ? "/Privacy" : "/Account/Register")" asp-area="Forums">Register</a>
4849
}
4950
else
5051
{

‎YAF.SampleApp/Areas/Chat/Pages/_ViewImports.cshtml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@using YAF.SampleApp
2+
@namespace YAF.SampleApp.Pages
3+
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
4+
@addTagHelper YAF.Web.TagHelpers.*, YAF.Web

‎YAF.SampleApp/Areas/Forums/Pages/Shared/_Layout.cshtml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
type="text/css" />
3939
<link rel="stylesheet"
4040
href="~/css/@Html.Raw($"{ViewBag.ForumCss}.css?v={ViewBag.CdvVersion}")" />
41-
@await RenderSectionAsync("StyleSheets", required: false)
41+
@await RenderSectionAsync("StyleSheets", required: false)
42+
<script src="~/js/themeSelector.min.js"></script>
4243
<link href="~/favicons/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" />
4344
<link href="~/favicons/favicon-32x32.png" rel="icon" sizes="32x32" />
4445
<link href="~/favicons/favicon-16x16.png" rel="icon" sizes="16x16" />
@@ -182,7 +183,6 @@
182183
@title
183184
</span>
184185
</span>
185-
// this.GetTextFormatted("MODERATE_NEW", this.PageContext.ModeratePosts)
186186
}
187187
</a>
188188
</li>
@@ -197,6 +197,11 @@
197197

198198
</ul>
199199
@await Html.PartialAsync("_QuickSearch")
200+
201+
@if (Current.BoardSettings.AllowUserTheme)
202+
{
203+
@await Html.PartialAsync("_ThemeModeSelector")
204+
}
200205
</div>
201206
</div>
202207
</nav>

‎YAF.SampleApp/Pages/Shared/_Layout.cshtml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<link href="~/favicons/site.webmanifest" rel="manifest" />
2121
<link href="~/favicons/safari-pinned-tab.svg" rel="mask-icon" color="#5bbad5" />
2222
<link href="~/favicons/favicon.ico" rel="shortcut icon" />
23+
<script src="~/js/themeSelector.min.js"></script>
2324
</head>
2425
<body>
2526
<header>
@@ -33,7 +34,7 @@
3334
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
3435
<ul class="navbar-nav flex-grow-1">
3536
<li class="nav-item">
36-
<a class="nav-link" asp-area="" asp-page="/Index">Home</a>
37+
<a class="nav-link" asp-page="/Index">Home</a>
3738
</li>
3839
<li class="nav-item">
3940
<a class="nav-link" asp-area="Forums" asp-page="/Index">Forums</a>
@@ -45,8 +46,8 @@
4546
<div class="form-inline mt-2 mt-md-0">
4647
@if (Current.IsGuest)
4748
{
48-
<a class="btn btn-outline-success my-2 my-sm-0 me-sm-2" asp-page="/Account/Login" asp-area="Forums">Login</a>
49-
<a class="btn btn-outline-success my-2 my-sm-0" asp-page="@(Current.BoardSettings.ShowRulesForRegistration ? "/Privacy" : "/Account/Register")" asp-area="Forums">Register</a>
49+
<a class="btn btn-outline-primary my-2 my-sm-0 me-sm-2" asp-page="/Account/Login" asp-area="Forums">Login</a>
50+
<a class="btn btn-outline-secondary my-2 my-sm-0" asp-page="@(Current.BoardSettings.ShowRulesForRegistration ? "/Privacy" : "/Account/Register")" asp-area="Forums">Register</a>
5051
}
5152
else
5253
{

‎YAF.SampleApp/YAF.SampleApp.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="YAFNET.Data.SqlServer" Version="4.0.0-beta07" />
10-
<PackageReference Include="YAFNET.RazorPages" Version="4.0.0-beta07" />
11-
<PackageReference Include="YAFNET.UI.Chat" Version="4.0.0-beta07" />
9+
<PackageReference Include="YAFNET.Data.SqlServer" Version="4.0.0-beta09" />
10+
<PackageReference Include="YAFNET.RazorPages" Version="4.0.0-beta09" />
11+
<PackageReference Include="YAFNET.UI.Chat" Version="4.0.0-beta09" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎YAF.SampleApp/libman.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"version": "1.0",
3+
"defaultProvider": "cdnjs",
4+
"libraries": []
5+
}

0 commit comments

Comments
 (0)