Skip to content

#24 updating some aspects to Bootstrap 5 and adding in both search lo… #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#24 updating some aspects to Bootstrap 5 and adding in both search lo… #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions src/Demo.WebApp/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,21 @@
<google-analytics profile-id="@Tenant.GoogleAnalyticsProfileId" user-id="@User.GetUserId()"></google-analytics>
</head>
<body class="@ViewData["BodyClass"]">
<div class="navbar navbar-inverse navbar-fixed-top">
<nav class="navbar navbar-light bg-light">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="~/@(Tenant?.SiteFolderName ?? "")" class="navbar-brand">@(Tenant?.SiteName ?? "Sample")</a>
</div>
<div class="navbar-collapse collapse">
@await Component.InvokeAsync("Navigation", new { viewName = "BootstrapTopNavWithDropdowns", filterName = NamedNavigationFilters.TopNav, startingNodeKey = "" })
@await Html.PartialAsync("_LoginPartial")
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a href="~/@(Tenant?.SiteFolderName ?? "")" class="navbar-brand">@(Tenant?.SiteName ?? "Sample")</a>
<div class="container">
<div class="collapse navbar-collapse" id="navbarSupportedContent">
@await Component.InvokeAsync("Navigation", new { viewName = "BootstrapTopNavWithDropdowns", filterName = NamedNavigationFilters.TopNav, startingNodeKey = "" })
@await Html.PartialAsync("_LoginPartial")
</div>
</div>
</div>
</div>
</nav>

@RenderSection("Toolbar", required: false)
<div class="container body-content">
@await Component.InvokeAsync("Navigation", new { viewName = "BootstrapBreadcrumbs", filterName = NamedNavigationFilters.Breadcrumbs, startingNodeKey = "" })
Expand All @@ -57,7 +55,7 @@
</div>
<environment names="Development">
<script src="~/js/jquery.js"></script>
<script src="~/js/bootstrap.js"></script>
<script src="~/js/bootstrap.bundle.js"></script>
<script src="~/js/site.js" asp-append-version="true"></script>
</environment>
<environment names="Staging,Production">
Expand Down
2 changes: 1 addition & 1 deletion src/Demo.WebApp/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"DataSettings": {
"DbPlatform": "ef",
"EFProvider": "mssql",
"MSSQLConnectionString": "Server=(localdb)\\mssqllocaldb;Database=Demo.WebApp-669FC474-D8EB-4DBC-9061-C2EEC0CB6D14;Trusted_Connection=True;MultipleActiveResultSets=true",
"MSSQLConnectionString": "Server=(localdb)\\mssqllocaldb;Database=cloudscribe;Trusted_Connection=True;MultipleActiveResultSets=true",
"MySqlConnectionString": "Server=localhost;Database=yourdbname;Uid=yourdbuser;Pwd=yourdbpassword;Charset=utf8;",
"PostgreSqlConnectionString": "Server=yourserver;Port=5432;User Id=youruser;Password=yourpassword;Database=yourdbname;",
"SqliteConnectionString": "Data Source=appdata.db;"
Expand Down
25 changes: 11 additions & 14 deletions src/Demo.WebApp/sitefiles/s1/themes/cerulean/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,20 @@
<google-analytics profile-id="@Tenant.GoogleAnalyticsProfileId" user-id="@User.GetUserId()"></google-analytics>
</head>
<body class="@ViewData["BodyClass"]">
<header class="navbar navbar-default navbar-fixed-top">
<nav class="navbar navbar-light bg-light">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="~/@(Tenant?.SiteFolderName ?? "")" class="navbar-brand">@(Tenant?.SiteName ?? "Sample")</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a href="~/@(Tenant?.SiteFolderName ?? "")" class="navbar-brand">@(Tenant?.SiteName ?? "Sample")</a>
<div class="container">
<div class="collapse navbar-collapse" id="navbarSupportedContent">
@await Component.InvokeAsync("Navigation", new { viewName = "BootstrapTopNavWithDropdowns", filterName = NamedNavigationFilters.TopNav, startingNodeKey = "" })
@await Html.PartialAsync("_LoginPartial")
</div>
</div>
<nav class="navbar-collapse collapse">
@await Component.InvokeAsync("Navigation", new { viewName = "BootstrapTopNavWithDropdowns", filterName = NamedNavigationFilters.TopNav, startingNodeKey = "" })
@await Html.PartialAsync("_LoginPartial")
</nav>
</div>
</header>
</nav>
@RenderSection("Toolbar", required: false)
<div class="container body-content">
@await Component.InvokeAsync("Navigation", new { viewName = "BootstrapBreadcrumbs", filterName = NamedNavigationFilters.Breadcrumbs, startingNodeKey = "" })
Expand Down
Loading