Skip to content
This repository was archived by the owner on Sep 21, 2018. It is now read-only.

Improve Area support in default templates #593

Merged
merged 2 commits into from
Jun 8, 2016
Merged

Improve Area support in default templates #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76eb67e
Add asp-area="" to shared views
phenning Jun 7, 2016
c48bd51
Add Areas\**\Views to publish options
phenning Jun 8, 2016
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
8 changes: 4 additions & 4 deletions src/BaseTemplates/StarterWeb/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a asp-controller="Home" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
<a asp-controller="Home" asp-area="" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a asp-controller="Home" asp-action="Index">Home</a></li>
<li><a asp-controller="Home" asp-action="About">About</a></li>
<li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="Index">Home</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="About">About</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="Contact">Contact</a></li>
</ul>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/BaseTemplates/StarterWeb/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ $endif$
"include": [
"wwwroot",
"Views",
"Areas\**\Views",
Copy link
Member

@rynowak rynowak Jun 8, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this do the right thing? Just making sure you double checked that this is actually the right include

Copy link
Contributor Author

@phenning phenning Jun 8, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup this works, verified in a sample app

Copy link
Contributor Author

@phenning phenning Jun 8, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually the include should be Areas/**/Views / instead of \

"appsettings.json",
"web.config"
]
Expand Down
1 change: 1 addition & 0 deletions src/BaseTemplates/WebAPI/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ $endif$
"include": [
"wwwroot",
"Views",
"Areas\**\Views",
"appsettings.json",
"web.config"
]
Expand Down
8 changes: 4 additions & 4 deletions src/Rules/StarterWeb/AI/CommonAuth/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a asp-controller="Home" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
<a asp-controller="Home" asp-area="" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a asp-controller="Home" asp-action="Index">Home</a></li>
<li><a asp-controller="Home" asp-action="About">About</a></li>
<li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="Index">Home</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="About">About</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="Contact">Contact</a></li>
</ul>
@await Html.PartialAsync("_LoginPartial")
</div>
Expand Down
1 change: 1 addition & 0 deletions src/Rules/StarterWeb/AI/IndividualAuth/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ $endif$
"include": [
"wwwroot",
"Views",
"Areas\**\Views",
"appsettings.json",
"web.config"
]
Expand Down
8 changes: 4 additions & 4 deletions src/Rules/StarterWeb/AI/NoAuth/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a asp-controller="Home" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
<a asp-controller="Home" asp-area="" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a asp-controller="Home" asp-action="Index">Home</a></li>
<li><a asp-controller="Home" asp-action="About">About</a></li>
<li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="Index">Home</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="About">About</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="Contact">Contact</a></li>
</ul>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/Rules/StarterWeb/AI/NoAuth/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ $endif$
"include": [
"wwwroot",
"Views",
"Areas\**\Views",
"appsettings.json",
"web.config"
]
Expand Down
1 change: 1 addition & 0 deletions src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/Common/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ $endif$
"include": [
"wwwroot",
"Views",
"Areas\**\Views",
"appsettings.json",
"web.config"
]
Expand Down
1 change: 1 addition & 0 deletions src/Rules/StarterWeb/AI/OrganizationalAuth/Single/Common/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ $endif$
"include": [
"wwwroot",
"Views",
"Areas\**\Views",
"appsettings.json",
"web.config"
]
Expand Down
8 changes: 4 additions & 4 deletions src/Rules/StarterWeb/AI/WindowsAuth/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a asp-controller="Home" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
<a asp-controller="Home" asp-area="" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a asp-controller="Home" asp-action="Index">Home</a></li>
<li><a asp-controller="Home" asp-action="About">About</a></li>
<li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="Index">Home</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="About">About</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="Contact">Contact</a></li>
</ul>
<p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/Rules/StarterWeb/CommonAuth/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a asp-controller="Home" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
<a asp-controller="Home" asp-area="" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a asp-controller="Home" asp-action="Index">Home</a></li>
<li><a asp-controller="Home" asp-action="About">About</a></li>
<li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="Index">Home</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="About">About</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="Contact">Contact</a></li>
</ul>
@await Html.PartialAsync("_LoginPartial")
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/Rules/StarterWeb/IndividualAuth/Views/Shared/_LoginPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

@if (SignInManager.IsSignedIn(User))
{
<form asp-controller="Account" asp-action="LogOff" method="post" id="logoutForm" class="navbar-right">
<form asp-controller="Account" asp-area="" asp-action="LogOff" method="post" id="logoutForm" class="navbar-right">
<ul class="nav navbar-nav navbar-right">
<li>
<a asp-controller="Manage" asp-action="Index" title="Manage">Hello @UserManager.GetUserName(User)!</a>
<a asp-controller="Manage" asp-area="" asp-action="Index" title="Manage">Hello @UserManager.GetUserName(User)!</a>
</li>
<li>
<button type="submit" class="btn btn-link navbar-btn navbar-link">Log off</button>
Expand All @@ -20,7 +20,7 @@
else
{
<ul class="nav navbar-nav navbar-right">
<li><a asp-controller="Account" asp-action="Register">Register</a></li>
<li><a asp-controller="Account" asp-action="Login">Log in</a></li>
<li><a asp-controller="Account" asp-area="" asp-action="Register">Register</a></li>
<li><a asp-controller="Account" asp-area="" asp-action="Login">Log in</a></li>
</ul>
}
1 change: 1 addition & 0 deletions src/Rules/StarterWeb/IndividualAuth/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ $endif$
"include": [
"wwwroot",
"Views",
"Areas\**\Views",
"appsettings.json",
"web.config"
]
Expand Down
4 changes: 2 additions & 2 deletions src/Rules/StarterWeb/OrganizationalAuth/Common/Views/Shared/_LoginPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
{
<ul class="nav navbar-nav navbar-right">
<li class="navbar-text">Hello @User.Identity.Name!</li>
<li><a asp-controller="Account" asp-action="SignOut">Sign Out</a></li>
<li><a asp-controller="Account" asp-area="" asp-action="SignOut">Sign Out</a></li>
</ul>
}
else
{
<ul class="nav navbar-nav navbar-right">
<li><a asp-controller="Account" asp-action="Signin">Sign in</a></li>
<li><a asp-controller="Account" asp-area="" asp-action="Signin">Sign in</a></li>
</ul>
}
1 change: 1 addition & 0 deletions src/Rules/StarterWeb/OrganizationalAuth/Common/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ $endif$
"include": [
"wwwroot",
"Views",
"Areas\**\Views",
"appsettings.json",
"web.config"
]
Expand Down
8 changes: 4 additions & 4 deletions src/Rules/StarterWeb/WindowsAuth/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a asp-controller="Home" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
<a asp-controller="Home" asp-area="" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a asp-controller="Home" asp-action="Index">Home</a></li>
<li><a asp-controller="Home" asp-action="About">About</a></li>
<li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="Index">Home</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="About">About</a></li>
<li><a asp-controller="Home" asp-area="" asp-action="Contact">Contact</a></li>
</ul>
<p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/Rules/WebAPI/AI/NoAuth/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ $endif$
"include": [
"wwwroot",
"Views",
"Areas\**\Views",
"appsettings.json",
"web.config"
]
Expand Down
1 change: 1 addition & 0 deletions src/Rules/WebAPI/AI/OrganizationalAuth/Single/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ $endif$
"include": [
"wwwroot",
"Views",
"Areas\**\Views",
"appsettings.json",
"web.config"
]
Expand Down
1 change: 1 addition & 0 deletions src/Rules/WebAPI/OrganizationalAuth/Single/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ $endif$
"include": [
"wwwroot",
"Views",
"Areas\**\Views",
"appsettings.json",
"web.config"
]
Expand Down