diff --git a/src/Orchard.Web/Core/Shapes/CoreShapes.cs b/src/Orchard.Web/Core/Shapes/CoreShapes.cs
index d31a001e2..cb6c55152 100644
--- a/src/Orchard.Web/Core/Shapes/CoreShapes.cs
+++ b/src/Orchard.Web/Core/Shapes/CoreShapes.cs
@@ -8,7 +8,6 @@ using System.Web.Mvc;
using System.Web.Mvc.Html;
using Orchard.DisplayManagement;
using Orchard.DisplayManagement.Descriptors;
-using Orchard.DisplayManagement.Implementation;
using Orchard.Settings;
using Orchard.UI;
using Orchard.UI.Resources;
diff --git a/src/Orchard.Web/Core/Shapes/Views/Document.cshtml b/src/Orchard.Web/Core/Shapes/Views/Document.cshtml
index bbef65ac1..9b7bf9617 100644
--- a/src/Orchard.Web/Core/Shapes/Views/Document.cshtml
+++ b/src/Orchard.Web/Core/Shapes/Views/Document.cshtml
@@ -4,12 +4,18 @@
RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")});
//todo: (heskew) get conditions (as in conditional comments) hooked up for script tags too
Script.Include("html5.js").AtLocation(ResourceLocation.Head);
+
+ //a bit opinionated - only the site name on the homepage
+ var title = (Request.Path != Request.ApplicationPath && !string.IsNullOrWhiteSpace((string)Model.Title)
+ ? Model.Title + WorkContext.CurrentSite.PageTitleSeparator
+ : "") +
+ WorkContext.CurrentSite.SiteName;
}
- @Model.Title
+ @title
@Display(Model.Head)
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Content-WidgetPage.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Content-WidgetPage.cshtml
index 237d9471c..cc5b404e1 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Content-WidgetPage.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Content-WidgetPage.cshtml
@@ -1,4 +1,7 @@
-@if(Model.Content != null) {
+@{
+ Layout.Title = Model.Title;
+}
+@if(Model.Content != null) {
@if(Model.Header != null) {
diff --git a/src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs b/src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs
index beef92c55..d72e48e9c 100644
--- a/src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs
+++ b/src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs
@@ -11,7 +11,6 @@ using Orchard.Mvc.Spooling;
using Orchard.Security;
using Orchard.Security.Permissions;
using Orchard.UI.Resources;
-using TagBuilder = System.Web.Mvc.TagBuilder;
namespace Orchard.Mvc.ViewEngines.Razor {