Merge pull request #7 from OrchardCMS/dev

Update

OrchardCore.sln

@@ -381,6 +381,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.ContentPreview.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Tests.Functional", "test\Functional\OrchardCore.Tests.Functional.csproj", "{2CA507BD-5517-4CD2-8F30-093AC5D11EBA}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Placements", "src\OrchardCore.Modules\OrchardCore.Placements\OrchardCore.Placements.csproj", "{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1031,6 +1033,10 @@ Global
 		{2CA507BD-5517-4CD2-8F30-093AC5D11EBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2CA507BD-5517-4CD2-8F30-093AC5D11EBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2CA507BD-5517-4CD2-8F30-093AC5D11EBA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1211,6 +1217,7 @@ Global
 		{1286E568-BAFE-45E2-BF60-4350DB99FF83} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{57EA05E8-0275-4163-8FD1-2B244E396F91} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{2CA507BD-5517-4CD2-8F30-093AC5D11EBA} = {B8D16C60-99B4-43D5-A3AD-4CD89AF39B25}
+		{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D} = {90030E85-0C4F-456F-B879-443E8A3F220D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {46A1D25A-78D1-4476-9CBF-25B75E296341}

mkdocs.yml

@@ -126,6 +126,7 @@ nav:
             - Widgets: docs/reference/modules/Widgets/README.md
             - Forms: docs/reference/modules/Forms/README.md
             - Templates: docs/reference/modules/Templates/README.md
+            - Placements: docs/reference/modules/Placements/README.md
             - Themes: docs/reference/modules/Themes/README.md
             - Liquid: docs/reference/modules/Liquid/README.md
             - Indexing: docs/reference/modules/Indexing/README.md

src/OrchardCore.Build/OrchardCore.Commons.props

@@ -18,10 +18,27 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 
     <!-- Common NuGet properties-->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSourceRevisionInInformationalVersion>true</IncludeSourceRevisionInInformationalVersion>
+    <ContinuousIntegrationBuild Condition="'$(CI)' == 'true'">true</ContinuousIntegrationBuild>
+
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <!--This is used to generate symbol package for Source Link-->
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
     <!-- This is used by GitHub Repository to find which repository should contain the package when updloaded -->
     <RepositoryUrl>https://github.com/OrchardCMS/OrchardCore</RepositoryUrl>
+    <PackageProjectUrl>https://www.orchardcore.net/</PackageProjectUrl>
+    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
 
+    <PackageTags>OrchardCore</PackageTags>
+    <Copyright>Orchard Core Community and Contributors</Copyright>
+    <Authors>Orchard Core Community and Contributors</Authors>
+    <Owners>Orchard Core Community and Contributors</Owners>
   </PropertyGroup>
-
+  <ItemGroup>
+      <!--This is used for Source Link -->
+       <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+  </ItemGroup>
 </Project>

src/OrchardCore.Cms.Web/appsettings.json

@@ -50,6 +50,9 @@
     // Uncomment to configure markdown
     //"OrchardCore_Markdown": {
     //  "Extensions": "nohtml+advanced"
-    //}
+    //},
+    "OrchardCore_Admin": {
+      "AdminUrlPrefix": "Admin"
+    }
   }
 }

src/OrchardCore.Modules/Directory.Build.props

@@ -3,9 +3,5 @@
   <Import Project="..\OrchardCore.Build\OrchardCore.Commons.props" />
   <Import Project="..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.props" />
 
-  <PropertyGroup>
-    <DebugType>embedded</DebugType>
-    <EmbedAllSources>true</EmbedAllSources>
-  </PropertyGroup>
 
 </Project>

src/OrchardCore.Modules/Directory.Build.targets

@@ -3,8 +3,4 @@
   <Import Project="..\OrchardCore.Build\OrchardCore.Commons.targets" />
   <Import Project="..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.targets" />
 
-  <PropertyGroup>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-  </PropertyGroup>
-
 </Project>

src/OrchardCore.Modules/OrchardCore.Admin/Drivers/AdminSiteSettingsDisplayDriver.cs

@@ -37,6 +37,7 @@ public override async Task<IDisplayResult> EditAsync(AdminSettings settings, Bui
                 {
                     model.DisplayMenuFilter = settings.DisplayMenuFilter;
                     model.DisplayDarkMode = settings.DisplayDarkMode;
+                    model.DisplayTitlesInTopbar = settings.DisplayTitlesInTopbar;
                 }).Location("Content:3").OnGroup(GroupId);
         }
 
@@ -57,6 +58,7 @@ public override async Task<IDisplayResult> UpdateAsync(AdminSettings settings, B
 
                 settings.DisplayMenuFilter = model.DisplayMenuFilter;
                 settings.DisplayDarkMode = model.DisplayDarkMode;
+                settings.DisplayTitlesInTopbar = model.DisplayTitlesInTopbar;
             }
 
             return await EditAsync(settings, context);

src/OrchardCore.Modules/OrchardCore.Admin/ViewModels/AdminSettingsViewModel.cs

@@ -5,5 +5,7 @@ public class AdminSettingsViewModel
         public bool DisplayMenuFilter { get; set; }
 
         public bool DisplayDarkMode { get; set; }
+
+        public bool DisplayTitlesInTopbar { get; set; }
     }
 }

src/OrchardCore.Modules/OrchardCore.Admin/Views/AdminSettings.Edit.cshtml

@@ -1,17 +1,25 @@
 @model OrchardCore.Admin.ViewModels.AdminSettingsViewModel
 
-<fieldset class="form-group" asp-validation-class-for="Zones">
+<fieldset class="form-group" asp-validation-class-for="DisplayMenuFilter">
     <div class="custom-control custom-checkbox">
         <input asp-for="DisplayMenuFilter" class="custom-control-input" type="checkbox" />
         <label asp-for="DisplayMenuFilter" class="custom-control-label">@T["Enable Admin Menu filter"]</label>
     </div>
     <span class="hint">@T["Whether a quick search to filter the admin menu is displayed."]</span>
 </fieldset>
 
-<fieldset class="form-group" asp-validation-class-for="Zones">
+<fieldset class="form-group" asp-validation-class-for="DisplayDarkMode">
     <div class="custom-control custom-checkbox">
         <input asp-for="DisplayDarkMode" class="custom-control-input" type="checkbox" />
         <label asp-for="DisplayDarkMode" class="custom-control-label">@T["Enable dark mode admin theme"]</label>
     </div>
     <span class="hint">@T["Whether a dark mode admin theme can be displayed."]</span>
 </fieldset>
+
+<fieldset class="form-group" asp-validation-class-for="DisplayTitlesInTopbar">
+    <div class="custom-control custom-checkbox">
+        <input asp-for="DisplayTitlesInTopbar" class="custom-control-input" type="checkbox" />
+        <label asp-for="DisplayTitlesInTopbar" class="custom-control-label">@T["Display titles in top bar"]</label>
+    </div>
+    <span class="hint">@T["Whether the titles are displayed in the top bar."]</span>
+</fieldset>

src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/MenuController.cs

@@ -66,7 +66,7 @@ public async Task<IActionResult> List(ContentOptions options, PagerParameters pa
 
             if (!string.IsNullOrWhiteSpace(options.Search))
             {
-                adminMenuList = adminMenuList.Where(dp => dp.Name.Contains(options.Search)).ToList();
+                adminMenuList = adminMenuList.Where(x => x.Name.Contains(options.Search)).ToList();
             }
 
             var count = adminMenuList.Count();

src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Menu/Create.cshtml

@@ -1,6 +1,6 @@
 @model AdminMenuCreateViewModel
 
-<h1>@RenderTitleSegments(T["Create Admin Menu {0}", Model.Name])</h1>
+<zone Name="Title"><h1>@RenderTitleSegments(T["Create Admin Menu {0}", Model.Name])</h1></zone>
 
 <div asp-validation-summary="ModelOnly"></div>
 

src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Menu/Edit.cshtml

@@ -1,7 +1,7 @@
 @model AdminMenuEditViewModel
 <style asp-src="~/OrchardCore.AdminMenu/Styles/admin-menu.min.css" debug-src="~/OrchardCore.AdminMenu/Styles/admin-menu.css" at="Head" depends-on="admin"></style>
 
-<h1>@RenderTitleSegments(T["Edit Admin Menu: {0}", Model.Name])</h1>
+<zone Name="Title"><h1>@RenderTitleSegments(T["Edit Admin Menu: {0}", Model.Name])</h1></zone>
 
 <div asp-validation-summary="ModelOnly"></div>
 <form asp-action="Edit" method="post">

src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Menu/List.cshtml

@@ -4,10 +4,10 @@
     int endIndex = startIndex + Model.AdminMenu.Count - 1;
 }
 
-<style asp-src="~/OrchardCore.AdminMenu/Styles/admin-menu.min.css" debug-src="~/OrchardCore.AdminMenu/Styles/admin-menu.css" at="Head" depends-on="admin"></style>
-<script asp-src="~/OrchardCore.AdminMenu/Scripts/admin-menu.min.js" debug-src="~/OrchardCore.AdminMenu/Scripts/admin-menu.js" at="Foot" depends-on="admin"></script>
+<style asp-src="~/OrchardCore.AdminMenu/Styles/admin-menu.min.css" debug-src="~/OrchardCore.AdminMenu/Styles/admin-menu.css" at="Head" depends-on="admin, jQuery-ui"></style>
+<script asp-src="~/OrchardCore.AdminMenu/Scripts/admin-menu.min.js" debug-src="~/OrchardCore.AdminMenu/Scripts/admin-menu.js" at="Foot" depends-on="admin, jQuery-ui"></script>
 
-<h1>@RenderTitleSegments(T["Admin Menus"])</h1>
+<zone Name="Title"><h1>@RenderTitleSegments(T["Admin Menus"])</h1></zone>
 
 <form asp-action="List">
     <input asp-for="Options.BulkAction" type="hidden" />
@@ -92,7 +92,7 @@
         else
         {
             <li class="list-group-item">
-                <div class="alert alert-info mb-1" role="alert">
+                <div class="alert alert-info mb-0" role="alert">
                     @T["<strong>Nothing here!</strong> There are no menus for the moment."]
                 </div>
             </li>

src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Node/Create.cshtml

@@ -1,6 +1,6 @@
 @model AdminNodeEditViewModel
 
-<h1>@RenderTitleSegments(T["Create Node"])</h1>
+<zone Name="Title"><h1>@RenderTitleSegments(T["Create Node"])</h1></zone>
 
 <div asp-validation-summary="All"></div>
 <form asp-action="Create" method="post">

src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Node/Edit.cshtml

@@ -1,6 +1,6 @@
 @model AdminNodeEditViewModel
 
-<h1>@RenderTitleSegments(T["Edit Node"])</h1>
+<zone Name="Title"><h1>@RenderTitleSegments(T["Edit Node"])</h1></zone>
 
 <div asp-validation-summary="All"></div>
 <form asp-action="Edit" method="post">

src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Node/List.cshtml

@@ -9,7 +9,7 @@
 <script asp-src="~/OrchardCore.AdminMenu/Scripts/admin-menu.min.js" at="Foot" depends-on="admin"></script>
 <style asp-src="~/OrchardCore.AdminMenu/Styles/admin-menu.min.css" debug-src="~/OrchardCore.AdminMenu/Styles/admin-menu.css"></style>
 
-<h1>@RenderTitleSegments(T["Edit Nodes for '{0}'", Model.AdminMenu.Name])</h1>
+<zone Name="Title"><h1>@RenderTitleSegments(T["Edit Nodes for '{0}'", Model.AdminMenu.Name])</h1></zone>
 
 <nav class="card mb-3">
     <div class="card-body bg-primary p-3">
@@ -49,7 +49,7 @@
         }
         else
         {
-            <div class="alert alert-info mb-1" role="alert">
+            <div class="alert alert-info mb-0" role="alert">
                 @T["<strong>Nothing here!</strong> There are no nodes on this tree for the moment."]
             </div>
         }