Skip to content

Commit 26235c3

Browse files
poppastringpoppastring
authored
Merge pull request #561 from rullyrmd/enhancement/nav-bar-responsive-toggle
Enhancement/nav bar responsive toggle
2 parents 77292e5 + 836fc5b commit 26235c3

File tree

11 files changed

+45
-25
lines changed

11 files changed

+45
-25
lines changed

‎azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pool:
1010

1111
variables:
1212
buildConfiguration: 'Release'
13-
version: 2.40
13+
version: 2.41
1414

1515
steps:
1616
- task: UseDotNet@2

‎source/DasBlog.Services/ConfigFile/Interfaces/ISiteConfig.cs

+2
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,8 @@ public interface ISiteConfig
346346

347347
string SecurityStyleSources { get; set; }
348348

349+
string DefaultSources { get; set; }
350+
349351
bool CookieConsentEnabled { get; set; }
350352

351353
bool EnableDoubleDecode { get; set; }

‎source/DasBlog.Services/ConfigFile/SiteConfig.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,9 @@ public SiteConfig() { }
215215
public string SecurityScriptSources { get; set; }
216216

217217
public string SecurityStyleSources { get; set; }
218-
public bool EnableDoubleDecode { get; set; }
218+
219+
public string DefaultSources { get; set; }
220+
221+
public bool EnableDoubleDecode { get; set; }
219222
}
220223
}

‎source/DasBlog.Services/DasBlog.Services.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
<Version>2.40.0</Version>
5+
<Version>3.0.0</Version>
66
</PropertyGroup>
77
<ItemGroup>
88
<ProjectReference Include="..\DasBlog.Web.Core\DasBlog.Core.csproj" />

‎source/DasBlog.Tests/UnitTests/SiteConfigTest.cs

+1
Original file line numberDiff line numberDiff line change
@@ -166,5 +166,6 @@ public class SiteConfigTest : ISiteConfig
166166

167167
public string SecurityStyleSources { get; set; }
168168
public bool EnableDoubleDecode { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
169+
public string DefaultSources { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
169170
}
170171
}

‎source/DasBlog.Web.UI/Config/site.config

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112

113113
<CookieConsentEnabled>false</CookieConsentEnabled>
114114

115+
<DefaultSources>data:;https:</DefaultSources>
115116
<SecurityStyleSources>cloud.tinymce.com;cdn.tiny.cloud;cdn.jsdelivr.net;js.nicedit.com;www.google.com;platform.twitter.com;cdn.syndication.twimg.com;fonts.googleapis.com;maxcdn.bootstrapcdn.com</SecurityStyleSources>
116117
<SecurityScriptSources>cloud.tinymce.com;cdn.tiny.cloud;cdn.jsdelivr.net;js.nicedit.com;www.google.com;cse.google.com;cdn.syndication.twimg.com;platform.twitter.com;apis.google.com;www.google-analytics.com;www.googletagservices.com;adservice.google.com;securepubads.g.doubleclick.net;ajax.aspnetcdn.com;ssl.google-analytics.com</SecurityScriptSources>
117118

‎source/DasBlog.Web.UI/DasBlog.Web.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
1515
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
1616
<UserSecretsId>d3583964-0aca-4de4-9521-c74cdf42f990</UserSecretsId>
17-
<Version>2.40.0</Version>
17+
<Version>2.41.0</Version>
1818
</PropertyGroup>
1919
<ItemGroup>
2020
<PackageReference Include="AutoMapper" Version="9.0.0" />

‎source/DasBlog.Web.UI/Models/AdminViewModels/SiteViewModel.cs

+5
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,11 @@ public class SiteViewModel
286286
[Description("")]
287287
public bool EnableDoubleDecode { get; set; }
288288

289+
[DisplayName("Default Sources (seperated by semi colon")]
290+
[Description("")]
291+
[StringLength(50, MinimumLength = 1, ErrorMessage = "{0} should be between 1 to 50 characters")]
292+
public string DefaultSources { get; set; }
293+
289294
public bool EntryTitleAsLink { get; set; }
290295
public bool ObfuscateEmail { get; set; }
291296
public bool SendReferralsByEmail { get; set; }

‎source/DasBlog.Web.UI/Startup.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -386,13 +386,14 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IDasBlog
386386

387387
var SecurityScriptSources = Configuration.GetSection("SecurityScriptSources")?.Value?.Split(";");
388388
var SecurityStyleSources = Configuration.GetSection("SecurityStyleSources")?.Value?.Split(";");
389+
var DefaultSources = Configuration.GetSection("DefaultSources")?.Value?.Split(";");
389390

390-
if (SecurityStyleSources != null && SecurityScriptSources != null)
391+
if (SecurityStyleSources != null && SecurityScriptSources != null && DefaultSources != null)
391392
{
392393
app.UseCsp(options => options
393394
.DefaultSources(s => s.Self()
394-
.CustomSources("data:")
395-
.CustomSources("https:"))
395+
.CustomSources(DefaultSources)
396+
)
396397
.StyleSources(s => s.Self()
397398
.CustomSources(SecurityStyleSources)
398399
.UnsafeInline()

‎source/DasBlog.Web.UI/Themes/darkly/_Layout.cshtml

+17-18
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,23 @@
2222
</head>
2323

2424
<body>
25-
<div class="navbar navbar-dark navbar-expand-lg sticky-top bg-dark">
26-
<div class="navbar-collapse">
27-
<a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand"><site-title /></a>
28-
<div class="container">
29-
<div>
30-
<ul class="navbar-nav mr-auto">
31-
<li class="nav-item nav-item-active"><a class="nav-link" asp-area="" asp-controller="home" asp-action="index">Home</a></li>
32-
<li class="nav-item"><a class="nav-link" asp-area="" asp-controller="category" asp-action="category">Category</a></li>
33-
<li class="nav-item"><a class="nav-link" asp-area="" asp-controller="archive" asp-action="archive">Archive</a></li>
34-
<li class="nav-item"><a class="nav-link" asp-area="" asp-controller="feed" asp-action="rss">Subscribe</a></li>
35-
<li class="nav-item" dasblog-authorized><a id="CreatePostLink" class="nav-link" asp-area="" asp-controller="post" asp-action="create">Create Post</a></li>
36-
<li class="nav-item" dasblog-authorized><a class="nav-link" asp-area="" asp-controller="admin" asp-action="settings">Site Admin</a></li>
37-
<li class="nav-item" dasblog-authorized><a class="nav-link" asp-area="" asp-controller="admin" asp-action="managecomments">Manage Comments</a></li>
38-
<li class="nav-item" dasblog-authorized><a class="nav-link" asp-area="" asp-controller="users" asp-action="index">Users</a></li>
39-
<li class="nav-item" dasblog-authorized><a class="nav-link" asp-area="" asp-controller="activity" asp-action="index">Activity</a></li>
40-
</ul>
41-
</div>
42-
</div>
25+
<div class="navbar navbar-expand-lg navbar-dark bg-dark">
26+
<a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand"><site-title /></a>
27+
<button class="navbar-toggler collapsed" type="button" data-toggle="collapse" data-target="#navbar-darkly" aria-controls="navbar-darkly" aria-expanded="true" aria-label="Toggle navigation">
28+
<span class="navbar-toggler-icon"></span>
29+
</button>
30+
<div id="navbar-darkly" class="navbar-collapse collapse" style="">
31+
<ul class="navbar-nav mr-auto">
32+
<li class="nav-item nav-item-active"><a class="nav-link" asp-area="" asp-controller="home" asp-action="index">Home</a></li>
33+
<li class="nav-item"><a class="nav-link" asp-area="" asp-controller="category" asp-action="category">Category</a></li>
34+
<li class="nav-item"><a class="nav-link" asp-area="" asp-controller="archive" asp-action="archive">Archive</a></li>
35+
<li class="nav-item"><a class="nav-link" asp-area="" asp-controller="feed" asp-action="rss">Subscribe</a></li>
36+
<li class="nav-item" dasblog-authorized><a id="CreatePostLink" class="nav-link" asp-area="" asp-controller="post" asp-action="create">Create Post</a></li>
37+
<li class="nav-item" dasblog-authorized><a class="nav-link" asp-area="" asp-controller="admin" asp-action="settings">Site Admin</a></li>
38+
<li class="nav-item" dasblog-authorized><a class="nav-link" asp-area="" asp-controller="admin" asp-action="managecomments">Manage Comments</a></li>
39+
<li class="nav-item" dasblog-authorized><a class="nav-link" asp-area="" asp-controller="users" asp-action="index">Users</a></li>
40+
<li class="nav-item" dasblog-authorized><a class="nav-link" asp-area="" asp-controller="activity" asp-action="index">Activity</a></li>
41+
</ul>
4342
<div class="navbar navbar-collapse col-md-offset-10 col-md-2">
4443
@* could not make this go further right (or perhaps it already was fully justified on an indented column *@
4544
<ul class="navbar-nav mr-auto">

‎source/DasBlog.Web.UI/Views/Admin/Settings.cshtml

+8
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,14 @@
560560

561561
</div>
562562

563+
<div class="dbc-form-group row">
564+
565+
@Html.LabelFor(m => @Model.SiteConfig.DefaultSources, null, new { @class = "dbc-col-form-label col-3" })
566+
@Html.TextBoxFor(m => @Model.SiteConfig.DefaultSources, null, new { @class = "form-control col-9" })
567+
@Html.ValidationMessageFor(m => m.SiteConfig.DefaultSources, null, new { @class = "text-danger" })
568+
569+
</div>
570+
563571
<hr />
564572

565573
<div class="form-group">

0 commit comments

Comments
 (0)