Fix header tab ordering issues. Fixes 1163117

Author: SteveSandersonMS

src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml

@@ -16,12 +16,7 @@
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
                 </button>
-                <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
-    @*#if (IndividualAuth || OrganizationalAuth)
-                    <partial name="_LoginPartial" />
-    #elseif (WindowsAuth)
-                    <p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
-    #endif*@
+                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
                     <ul class="navbar-nav flex-grow-1">
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
@@ -30,6 +25,11 @@
                             <a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a>
                         </li>
                     </ul>
+    @*#if (IndividualAuth || OrganizationalAuth)
+                    <partial name="_LoginPartial" />
+    #elseif (WindowsAuth)
+                    <p class="nav navbar-text">Hello, @User.Identity.Name!</p>
+    #endif*@
                 </div>
             </div>
         </nav>

src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml

@@ -16,12 +16,7 @@
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
                 </button>
-                <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
-    @*#if (IndividualAuth || OrganizationalAuth)
-                    <partial name="_LoginPartial" />
-    #elseif (WindowsAuth)
-                    <p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
-    #endif*@
+                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
                     <ul class="navbar-nav flex-grow-1">
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
@@ -30,6 +25,11 @@
                             <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
                         </li>
                     </ul>
+    @*#if (IndividualAuth || OrganizationalAuth)
+                    <partial name="_LoginPartial" />
+    #elseif (WindowsAuth)
+                    <p class="nav navbar-text">Hello, @User.Identity.Name!</p>
+    #endif*@
                 </div>
             </div>
         </nav>

src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/nav-menu/nav-menu.component.html

@@ -16,12 +16,9 @@
         <span class="navbar-toggler-icon"></span>
       </button>
       <div
-        class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse"
+        class="navbar-collapse collapse d-sm-inline-flex justify-content-end"
         [ngClass]="{ show: isExpanded }"
       >
-        <!--#if (IndividualLocalAuth) -->
-        <app-login-menu></app-login-menu>
-        <!--#endif -->
         <ul class="navbar-nav flex-grow">
           <li
             class="nav-item"
@@ -41,6 +38,9 @@
             >
           </li>
         </ul>
+        <!--#if (IndividualLocalAuth) -->
+        <app-login-menu></app-login-menu>
+        <!--#endif -->
       </div>
     </div>
   </nav>