From 5650b8560d1aec91ad45f06cce6661df8aa60ba3 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 6 Nov 2019 12:19:06 +0900
Subject: [PATCH] Refactor the Header in its own partial view

---
 .../Views/Account/_WelcomeLayout.cshtml       | 18 +--------------
 BTCPayServer/Views/Shared/Confirm.cshtml      | 20 ++---------------
 BTCPayServer/Views/Shared/Header.cshtml       | 18 +++++++++++++++
 BTCPayServer/Views/Shared/_Layout.cshtml      | 22 +------------------
 4 files changed, 22 insertions(+), 56 deletions(-)
 create mode 100644 BTCPayServer/Views/Shared/Header.cshtml
diff --git a/BTCPayServer/Views/Account/_WelcomeLayout.cshtml b/BTCPayServer/Views/Account/_WelcomeLayout.cshtml
index 12e329a0d..469cef793 100644
--- a/BTCPayServer/Views/Account/_WelcomeLayout.cshtml
+++ b/BTCPayServer/Views/Account/_WelcomeLayout.cshtml
@@ -1,6 +1,4 @@
 ﻿@model LoginViewModel
-@inject BTCPayServer.HostedServices.CssThemeManager themeManager
-@addTagHelper *, BundlerMinifier.TagHelpers
 @{
     Layout = null;
 }
@@ -8,21 +6,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="description" content="">
-    <meta name="author" content="">
-    @if (themeManager.DiscourageSearchEngines)
-    {
-        <META NAME="robots" CONTENT="noindex">
-    }
-    <title>@ViewData["Title"]</title>
-    @* CSS *@
-    <link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet" />
-    <link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.CreativeStartUri)" rel="stylesheet" />
-    <bundle name="wwwroot/bundles/main-bundle.min.css" />
-    @* JS *@
-    <bundle name="wwwroot/bundles/main-bundle.min.js" />
+    <partial name="Header" />
     <style>
         .lead-title {
             font-family: Montserrat;
diff --git a/BTCPayServer/Views/Shared/Confirm.cshtml b/BTCPayServer/Views/Shared/Confirm.cshtml
index 9ed0f0707..8632fe749 100644
--- a/BTCPayServer/Views/Shared/Confirm.cshtml
+++ b/BTCPayServer/Views/Shared/Confirm.cshtml
@@ -1,30 +1,14 @@
 ﻿@model ConfirmModel
 
-@inject BTCPayServer.HostedServices.NBXplorerDashboard dashboard
-@inject BTCPayServer.HostedServices.CssThemeManager themeManager
-@addTagHelper *, BundlerMinifier.TagHelpers
 @{
+    ViewData["Title"] = Model.Title;
     Layout = null;
 }
 
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="description" content="">
-    <meta name="author" content="">
-    @if (themeManager.DiscourageSearchEngines)
-    {
-        <META NAME="robots" CONTENT="noindex">
-    }
-    <title>BTCPay Server</title>
-    @* CSS *@
-    <link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet" />
-    <link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.CreativeStartUri)" rel="stylesheet" />
-    <bundle name="wwwroot/bundles/main-bundle.min.css" />
-    @* JS *@
-    <bundle name="wwwroot/bundles/main-bundle.min.js" />
+    <partial name="Header" />
 </head>
 <body class="bg-light">
     <div class="modal-dialog modal-dialog-centered">
diff --git a/BTCPayServer/Views/Shared/Header.cshtml b/BTCPayServer/Views/Shared/Header.cshtml
new file mode 100644
index 000000000..4f0805d1d
--- /dev/null
+++ b/BTCPayServer/Views/Shared/Header.cshtml
@@ -0,0 +1,18 @@
+﻿@inject BTCPayServer.HostedServices.CssThemeManager themeManager
+@addTagHelper *, BundlerMinifier.TagHelpers
+
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<meta name="description" content="">
+<meta name="author" content="">
+@if (themeManager.DiscourageSearchEngines)
+{
+    <META NAME="robots" CONTENT="noindex">
+}
+<title>@ViewData["Title"]</title>
+@* CSS *@
+<link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet" />
+<link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.CreativeStartUri)" rel="stylesheet" />
+<bundle name="wwwroot/bundles/main-bundle.min.css" />
+@* JS *@
+<bundle name="wwwroot/bundles/main-bundle.min.js" />
diff --git a/BTCPayServer/Views/Shared/_Layout.cshtml b/BTCPayServer/Views/Shared/_Layout.cshtml
index 9dfd3bebf..b2f320f1d 100644
--- a/BTCPayServer/Views/Shared/_Layout.cshtml
+++ b/BTCPayServer/Views/Shared/_Layout.cshtml
@@ -5,31 +5,11 @@
 @inject BTCPayServer.HostedServices.NBXplorerDashboard dashboard
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
 
-@addTagHelper *, BundlerMinifier.TagHelpers
-
 <!DOCTYPE html>
 <html lang="en">
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    @if (themeManager.DiscourageSearchEngines)
-    {
-        <META NAME="robots" CONTENT="noindex">
-    }
-
-    <title>BTCPay Server</title>
-
-    @* CSS *@
-    <link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet" />
-    <link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.CreativeStartUri)" rel="stylesheet" />
-
-    <bundle name="wwwroot/bundles/main-bundle.min.css" />
-
-    @* JS *@
-    <bundle name="wwwroot/bundles/main-bundle.min.js" />
+    <partial name="Header" />
 
     @RenderSection("HeadScripts", required: false)
     @RenderSection("HeaderContent", false)
