Kolpack-Software-Consulting/LeafWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate to bootstrap 4 in LeafWeb

Browse Source
This commit is contained in:
James Kolpack
2019-12-06 22:29:15 -05:00
parent f9a452045f
commit 88469b19be
248 changed files with 20293 additions and 21639 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebCms/Views/Partials/BottomNavigation.cshtml
+1 -19
View File
@@ -1,24 +1,6 @@
@inherits UmbracoTemplatePage
@{
var home = CurrentPage.Site();
var loginStatus = Members.GetCurrentLoginStatus();
}
<div class="col-xs-6 col-sm-3">
<strong>User</strong>
<ul>
<li>
@Html.Partial("LoginStatus")
</li>
@if (loginStatus.IsLoggedIn)
{
<li>
<a href="~/umbraco#"><span class="glyphicon glyphicon-cog"></span> Site Editor</a>
</li>
}
</ul>
</div>
<div class="col-xs-6 col-sm-6 text-center">
<div class="col text-center">
<span class="copyright">
<i class="fa fa-copyright copyright"></i> ORNL @DateTime.Now.Year
</span>
WebCms/Views/Partials/LoginStatus.cshtml
+22 -17
View File
@@ -13,21 +13,26 @@
var logoutModel = new PostRedirectModel { RedirectUrl = "/" };
}
@if (loginStatusModel.IsLoggedIn)
{
<div class="row row-no-padding">
<div class="col-xs-8"><span class="glyphicon glyphicon-user"></span> @loginStatusModel.Name</div>
<div class="col-xs-4">
@using (Html.BeginUmbracoForm<UmbLoginStatusController>("HandleLogout"))
{
<button href="#" class="btn btn-primary btn-transparent btn-xs">Logout</button>
@Html.HiddenFor(m => logoutModel.RedirectUrl)
}
</div>
<div class="container">
<div class="row align-items-center">
@if (loginStatusModel.IsLoggedIn)
{
<div class="col-md-auto">
<span class="fa fa-user"></span> @loginStatusModel.Name
</div>
<div class="col-sm">
@using (Html.BeginUmbracoForm<UmbLoginStatusController>("HandleLogout"))
{
<button href="#" class="btn btn-outline-secondary btn-sm">Logout</button>
@Html.HiddenFor(m => logoutModel.RedirectUrl)
}
</div>
}
else
{
<div class="col-md-auto">
<a href="/membership/login" class="nav-link"><span class="fa fa-user"></span> Login</a>
</div>
}
</div>
}
else
{
<a href="/membership/login" class="btn btn-default btn-transparent btn-xs" >Login</a>
}
</div>
WebCms/Views/Partials/MainNavigation.cshtml
+58 -54
View File
@@ -1,36 +1,54 @@
@inherits UmbracoTemplatePage
@{ var home = CurrentPage.Site(); }
@{
var home = CurrentPage.Site();
var loginStatus = Members.GetCurrentLoginStatus();
}
@if (home.Children.Any())
{
@* Get the first page in the children *@
var naviLevel = home.Children.First().Level;
@* Add in level for a CSS hook *@
<ul class="level-@naviLevel">
@* For each child page under the home node *@
@foreach (var childPage in home.Children.Where("Visible"))
{
if (childPage.Children.Where("Visible").Any())
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
@* For each child page under the home node *@
@foreach (var childPage in home.Children.Where("Visible"))
{
<li class="has-child @(childPage.IsAncestorOrSelf(CurrentPage) ? "selected" : null)">
@if(childPage.DocumentTypeAlias == "LandingPage")
{
<span>@childPage.Name</span>
@childPages(childPage.Children)
} else {
<a href="@childPage.Url">@childPage.Name</a>
}
</li>
}
else
if (childPage.Children.Where("Visible").Any())
{
<li class="nav-item dropdown @(childPage.IsAncestorOrSelf(CurrentPage) ? "active" : null)">
@if (childPage.DocumentTypeAlias == "LandingPage")
{
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@childPage.Name
</a>
@childPages(childPage.Children)
}
else
{
<a class="nav-link" href="@childPage.Url">@childPage.Name</a>
}
</li>
}
else
{
<li class="nav-item @(childPage.IsAncestorOrSelf(CurrentPage) ? "active" : null)">
<a class="nav-link" href="@childPage.Url">@childPage.Name</a>
</li>
}
}
</ul>
<div class="navbar-text text-light text-left">
@Html.Partial("LoginStatus")
@if (loginStatus.IsLoggedIn)
{
<li class="@(childPage.IsAncestorOrSelf(CurrentPage) ? "selected" : null)">
<a href="@childPage.Url">@childPage.Name</a>
</li>
}
}
</ul>
<div class="align-items-center">
<a href="~/umbraco#"><span class="fa fa-cog"></span> Site Editor</a>
<i class="fa fa-lock fa-fw text-danger" aria-hidden="true"></i>
</div>
}
</div>
</div>
}
@helper childPages(dynamic pages)
@@ -38,35 +56,21 @@
@* Ensure that we have a collection of pages *@
if (pages.Where("Visible").Any())
{
@* Get the first page in pages and get the level *@
var naviLevel = pages.First().Level;
@* Add in level for a CSS hook *@
<ul class="sublevel level-@(naviLevel)">
@foreach (var page in pages.Where("Visible"))
<div class="dropdown-menu bg-dark" aria-labelledby="navbarDropdown">
@foreach (var page in pages.Where("Visible"))
{
if (library.IsProtected(page.id, page.path)
&& !library.HasAccess(page.id, page.path))
{
if (library.IsProtected(page.id, page.path)
&& !library.HasAccess(page.id, page.path))
{
continue;
}
<li>
<a href="@page.Url">
@page.Name
@if (library.IsProtected(page.id, page.path)) {
<i class="fa fa-lock fa-fw text-danger" aria-hidden="true"></i>
}
</a>
@* if the current page has any children *@
@if (page.Children.Where("Visible").Any())
{
@* Call our helper to display the children *@
@childPages(page.Children)
}
</li>
continue;
}
</ul>
<a class="dropdown-item text-light" href="@page.Url">
@page.Name
@if (library.IsProtected(page.id, page.path)) {
<i class="fa fa-lock fa-fw text-danger" aria-hidden="true"></i>
}
</a>
}
</div>
}
}