Merge branch 'dev' of https://github.com/abpframework/abp into dev

abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/en.json

@@ -1,7 +1,7 @@
 {
   "culture": "en",
   "texts": {
-    "Account": "Account",
+    "Account": "ABP Account - Login & Register | ABP.IO",
     "Welcome": "Welcome",
     "UseOneOfTheFollowingLinksToContinue": "Use one of the following links to continue",
     "FrameworkHomePage": "Framework home page",

abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json

@@ -1,7 +1,7 @@
 {
   "culture": "en",
   "texts": {
-    "GetStarted": "Get Started",
+    "GetStarted": "Get Started - Startup Templates",
     "Create": "Create",
     "NewProject": "New Project",
     "DirectDownload": "Direct Download",
@@ -86,7 +86,7 @@
     "BasedOnFamiliarToolsExplanation": "Built on and integrated to popular tools you already know. Low learning curve, easy adaptation, comfortable development.",
     "ORMIndependent": "ORM Independent",
     "ORMIndependentExplanation": "The core framework is ORM/database independent and can work with any data source. Entity Framework Core and MongoDB providers are already available.",
-    "Features": "Features",
+    "Features": "Explore the ABP Framework Features",
     "ABPCLI": "ABP CLI",
     "Modularity": "Modularity",
     "BootstrapTagHelpers": "Bootstrap Tag Helpers",

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml

@@ -23,6 +23,7 @@
     Layout = null;
     AbpAntiForgeryManager.SetCookie();
     var containerClass = ViewBag.FluidLayout == true ? "container-fluid" : "container"; //TODO: Better and type-safe options
+
 }
 
 <!DOCTYPE html>
@@ -37,6 +38,8 @@
 
     <title>@(ViewBag.Title == null ? BrandingProvider.AppName : ViewBag.Title)</title>
 
+    <meta name="description" content="@(ViewBag.Description != null ? ViewBag.Description as string : "Login or register to check out your ABP account. You need to be logged in to to view pay statements, generate new project and manage your license.")" />
+
     <abp-style-bundle name="@BasicThemeBundles.Styles.Global" />
 
     @await RenderSectionAsync("styles", false)
@@ -54,32 +57,32 @@
         <abp-row>
             <abp-column size-md="_5" class="mx-auto">
                 @if (MultiTenancyOptions.Value.IsEnabled &&
-                    (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true))
+                  (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true))
                 {
-                <div class="card shadow-sm rounded mb-3">
+                    <div class="card shadow-sm rounded mb-3">
-                    <div class="card-body px-5">
+                        <div class="card-body px-5">
-                        <div class="row">
+                            <div class="row">
-                            <div class="col">
+                                <div class="col">
-                                <span style="font-size: .8em;" class="text-uppercase text-muted">@MultiTenancyStringLocalizer["Tenant"]</span><br/>
+                                    <span style="font-size: .8em;" class="text-uppercase text-muted">@MultiTenancyStringLocalizer["Tenant"]</span><br />
-                                <h6 class="m-0 d-inline-block">
+                                    <h6 class="m-0 d-inline-block">
-                                    @if (CurrentTenant.Id == null)
+                                        @if (CurrentTenant.Id == null)
-                                    {
+                                        {
-                                        <span>
+                                            <span>
-                                            @MultiTenancyStringLocalizer["NotSelected"]
+                                                @MultiTenancyStringLocalizer["NotSelected"]
-                                        </span>
+                                            </span>
-                                    }
+                                        }
-                                    else
+                                        else
-                                    {
+                                        {
-                                        <strong>@(CurrentTenant.Name ?? CurrentTenant.Id.Value.ToString())</strong>
+                                            <strong>@(CurrentTenant.Name ?? CurrentTenant.Id.Value.ToString())</strong>
-                                    }
+                                        }
-                                </h6>
+                                    </h6>
-                            </div>
+                                </div>
-                            <div class="col-auto">
+                                <div class="col-auto">
-                                <a id="AbpTenantSwitchLink" href="javascript:;" class="btn btn-sm mt-3 btn-outline-primary">@MultiTenancyStringLocalizer["Switch"]</a>
+                                    <a id="AbpTenantSwitchLink" href="javascript:;" class="btn btn-sm mt-3 btn-outline-primary">@MultiTenancyStringLocalizer["Switch"]</a>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
                 }
                 @(await Component.InvokeAsync<PageAlertsViewComponent>())
                 @RenderBody()

modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml

@@ -7,7 +7,8 @@
 @inject IAuthorizationService Authorization
 @model Volo.Blogging.Pages.Blog.Posts.IndexModel
 @{
-    ViewBag.PageTitle = "Blog";
+    ViewBag.Title = "Read All Blog Posts";
+    ViewBag.Description = "Volosoft blogs about new features and technologies either used to build Volosoft's open-source repositories and products or general interest.";
 }
 @section scripts {
     <abp-script-bundle name="@typeof(IndexModel).FullName">

modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml

@@ -18,7 +18,8 @@
 @{
     ViewBag.FluidLayout = true;
     Layout = ThemeManager.CurrentTheme.GetEmptyLayout();
-    PageLayout.Content.Title = Model.DocumentName?.Replace("-", " ");
+   @* PageLayout.Content.Title = Model.DocumentName?.Replace("-", " ");*@
+    ViewBag.Title = "Documentation Center";
 }
 @section styles {
     <abp-style-bundle name="@typeof(IndexModel).FullName">