From fd9152eb4f9a70865a3810335e4db037bfdf8faa Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Tue, 21 Sep 2010 13:56:51 -0700 Subject: [PATCH] Changed the default theme back to "Classic" for now and making "Classic" look decent w/ existing CSS and minimal template overrides --HG-- branch : dev --- src/Orchard.Web/Core/Shapes/Views/User.cshtml | 2 +- .../Orchard.DevTools/Orchard.DevTools.csproj | 4 +- .../Orchard.Setup/Services/SetupService.cs | 2 +- src/Orchard.Web/Orchard.Web.csproj | 12 +----- .../Themes/Classic/Styles/site.css | 2 +- .../Items/Blogs.Blog.Summary.ascx | 8 ---- .../DisplayTemplates/Items/Blogs.Blog.ascx | 9 ----- .../Items/Blogs.BlogPost.Summary.ascx | 11 ----- .../Items/Blogs.BlogPost.ascx | 14 ------- .../Parts/Blogs.BlogPost.Metadata.ascx | 7 ---- .../Parts/Common.Metadata.ascx | 5 --- .../Themes/Classic/Views/Footer.ascx | 10 ----- .../Themes/Classic/Views/Footer.cshtml | 8 ++++ .../Themes/Classic/Views/Layout.ascx | 40 ------------------- .../Themes/Classic/Views/Layout.cshtml | 34 ++++++++++++++++ .../Themes/Classic/Views/Zone.cshtml | 6 --- .../Themes/Classic/Views/ZoneTest.ascx | 3 -- 17 files changed, 50 insertions(+), 127 deletions(-) delete mode 100644 src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx delete mode 100644 src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx delete mode 100644 src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx delete mode 100644 src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx delete mode 100644 src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx delete mode 100644 src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Common.Metadata.ascx delete mode 100644 src/Orchard.Web/Themes/Classic/Views/Footer.ascx create mode 100644 src/Orchard.Web/Themes/Classic/Views/Footer.cshtml delete mode 100644 src/Orchard.Web/Themes/Classic/Views/Layout.ascx create mode 100644 src/Orchard.Web/Themes/Classic/Views/Layout.cshtml delete mode 100644 src/Orchard.Web/Themes/Classic/Views/Zone.cshtml delete mode 100644 src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx diff --git a/src/Orchard.Web/Core/Shapes/Views/User.cshtml b/src/Orchard.Web/Core/Shapes/Views/User.cshtml index 9f67d5622..f9bc647c5 100644 --- a/src/Orchard.Web/Core/Shapes/Views/User.cshtml +++ b/src/Orchard.Web/Core/Shapes/Views/User.cshtml @@ -1,5 +1,5 @@ @using System.Web.Mvc -
+
@if (Request.IsAuthenticated) { @T("Welcome, {0}!", WorkContext.CurrentUser.UserName) @Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl }) diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj b/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj index fbda6f86d..f760e64ed 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj @@ -130,7 +130,9 @@ - + + Designer + diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index b2e6d34f5..366201cf6 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -182,7 +182,7 @@ namespace Orchard.Setup.Services { // set site theme var themeService = environment.Resolve(); - themeService.SetSiteTheme("Contoso"); + themeService.SetSiteTheme("Classic"); // add default culture var cultureManager = environment.Resolve(); diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index e3fa0e17e..a9761ad74 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -136,7 +136,6 @@ - @@ -160,20 +159,13 @@ - - - - - - - - - + + diff --git a/src/Orchard.Web/Themes/Classic/Styles/site.css b/src/Orchard.Web/Themes/Classic/Styles/site.css index dbd92dc09..aa19fd77b 100644 --- a/src/Orchard.Web/Themes/Classic/Styles/site.css +++ b/src/Orchard.Web/Themes/Classic/Styles/site.css @@ -176,7 +176,7 @@ td.even { } -#logindisplay { +.user-display { font-size:1.4em; margin:1em auto; text-align:right; diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx deleted file mode 100644 index 7ea5d7aa3..000000000 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx +++ /dev/null @@ -1,8 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> -<%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.Models"%> - -

<%: Html.Link(Model.Item.Name, Url.Blog(Model.Item.Slug)) %>

-
<%: T.Plural("1 post", "{0} posts", Model.Item.PostCount)%>
-

<%: Model.Item.Description %>

diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx deleted file mode 100644 index 0e541f4bf..000000000 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx +++ /dev/null @@ -1,9 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> -<%@ Import Namespace="Orchard.UI.Resources"%> -<%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.Models"%> -

<%: Html.TitleForPage(Model.Item.Name) %>

-<% RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest(Model.Item.Slug) });%> -<% RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd(Model.Item.Slug) });%> -<% Html.Zone("primary", ":manage");%> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx deleted file mode 100644 index 084f3a86c..000000000 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx +++ /dev/null @@ -1,11 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> -<%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.Models"%> -<%@ Import Namespace="Orchard.Core.Common.Extensions" %> -<%Model.Zones.AddRenderPartial("zonetest", "ZoneTest", Model); %> -

<%: Html.Link(Model.Item.Title, Url.BlogPost(Model.Item)) %>

-
<%: Html.PublishedState(Model.Item, T) %> | <%Html.Zone("meta");%>
-
-<% Html.Zone("primary"); %> -
\ No newline at end of file diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx deleted file mode 100644 index 4f403f96c..000000000 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx +++ /dev/null @@ -1,14 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> -<%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Blogs.Models"%> -

<%: Html.TitleForPage(Model.Item.Title)%>

-<%-- Sorry, Jon. I need to figure out how we can make this markup possible with the recent metadata/manage split. - We can still do it this way but there's isn't yet a story for UI conditional on permissions. - What I have in this template is as close as I can get at the moment. --%> -<%--
- <% if (Model.Item.Creator != null) { - %>
<%: T("Posted by {0} {1}", Model.Item.Creator.UserName, Html.PublishedWhen(Model.Item)) %><% -- | <%: T("Edit") %>-- %>
<% - } %> -
---%> -<% Html.Zone("primary"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx deleted file mode 100644 index 55c302473..000000000 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx +++ /dev/null @@ -1,7 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.Models"%> -<%@ Import Namespace="Orchard.Core.Common.Extensions" %><% -if (Model.Creator != null) { - %><%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T)) %><% -} %> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Common.Metadata.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Common.Metadata.ascx deleted file mode 100644 index 9c5bf54e7..000000000 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Common.Metadata.ascx +++ /dev/null @@ -1,5 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%--
-
<%: T("Published by {0}", Model.Creator != null ? Model.Creator.UserName : T("nobody(?)"))%>
-
--%> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Classic/Views/Footer.ascx b/src/Orchard.Web/Themes/Classic/Views/Footer.ascx deleted file mode 100644 index 74d5935ba..000000000 --- a/src/Orchard.Web/Themes/Classic/Views/Footer.ascx +++ /dev/null @@ -1,10 +0,0 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> - -
- -
diff --git a/src/Orchard.Web/Themes/Classic/Views/Footer.cshtml b/src/Orchard.Web/Themes/Classic/Views/Footer.cshtml new file mode 100644 index 000000000..75cdc65cc --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/Views/Footer.cshtml @@ -0,0 +1,8 @@ +
+ +
diff --git a/src/Orchard.Web/Themes/Classic/Views/Layout.ascx b/src/Orchard.Web/Themes/Classic/Views/Layout.ascx deleted file mode 100644 index ab11ed531..000000000 --- a/src/Orchard.Web/Themes/Classic/Views/Layout.ascx +++ /dev/null @@ -1,40 +0,0 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Mvc.ViewModels" %> -<%@ Import Namespace="Orchard.UI.Resources" %> -<% - // todo: this is verbose because this view does not inherit from an Orchard base view and so does not - // benefit from Style.Require(). - Html.Resolve().Require(new RequireSettings { Type = "stylesheet", Name = "Classic" }); - Html.Resolve().Require(new RequireSettings { Type = "stylesheet", Name = "Classic_Blog" }); -%> - -<%-- todo:(nheskew) this will need to be a generated menu --%> - -
-<%--HTML.Include will render a div with an id="logindisplay" --%> - <% Html.Include("User"); %> - -<%--Top Navigation and branding--%> -
- -
- -
-
- <%--Main Content--%> - <%Html.ZoneBody("content");%> -
- - <%-- End Content --%> - <% Html.Include("Footer"); %> -
-
diff --git a/src/Orchard.Web/Themes/Classic/Views/Layout.cshtml b/src/Orchard.Web/Themes/Classic/Views/Layout.cshtml new file mode 100644 index 000000000..6fcf3a24a --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/Views/Layout.cshtml @@ -0,0 +1,34 @@ +@using Orchard.UI.Resources +@{ + Style.Require("Classic"); + Style.Require("Classic_Blog"); +} +
+@// HTML.Include will render a div with a class="user-display" +@// Can use this -> {Html.Include("User");} +@// or the following. At least they appear to do the same thing currently. The first is a standard Html.Include, the second "displays the (New) User shape" +@Display.User() +@// Top Navigation and branding +
+ +
+ +
+
+ @// Main Content +@Display(Model.Content) +
+ + @// End Content +@Display.Footer(Navigation:Model.Navigation) +
+
diff --git a/src/Orchard.Web/Themes/Classic/Views/Zone.cshtml b/src/Orchard.Web/Themes/Classic/Views/Zone.cshtml deleted file mode 100644 index 00ac19431..000000000 --- a/src/Orchard.Web/Themes/Classic/Views/Zone.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@{ - var tag = Html.Resolve().Create(Model, "div"); -} -@tag.StartElement -@DisplayChildren(Model) -@tag.EndElement diff --git a/src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx b/src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx deleted file mode 100644 index 9d33ac9ec..000000000 --- a/src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx +++ /dev/null @@ -1,3 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> -<%@ Import Namespace="Orchard.Blogs.Models"%> -<%@ Import Namespace="Orchard.Mvc.ViewModels"%>