diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 69924912a..449a33bb6 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -161,6 +161,22 @@ + + + + + + + + + + + + + + + + @@ -233,6 +249,7 @@ + diff --git a/src/Orchard.Web/Themes/ClassicDark/Content/Images/bodyBackgroundgrey.gif b/src/Orchard.Web/Themes/ClassicDark/Content/Images/bodyBackgroundgrey.gif new file mode 100644 index 000000000..49e39c1ba Binary files /dev/null and b/src/Orchard.Web/Themes/ClassicDark/Content/Images/bodyBackgroundgrey.gif differ diff --git a/src/Orchard.Web/Themes/ClassicDark/Content/Images/sidebarBackground.gif b/src/Orchard.Web/Themes/ClassicDark/Content/Images/sidebarBackground.gif new file mode 100644 index 000000000..d356b39c3 Binary files /dev/null and b/src/Orchard.Web/Themes/ClassicDark/Content/Images/sidebarBackground.gif differ diff --git a/src/Orchard.Web/Themes/ClassicDark/Styles/blog.css b/src/Orchard.Web/Themes/ClassicDark/Styles/blog.css new file mode 100644 index 000000000..3e9fd3bd9 --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Styles/blog.css @@ -0,0 +1,25 @@ +/*Blog specific styles +----------------------------------------------------------*/ + +h3.blogs, h3.blog { + display:block; + border-bottom:1px solid #f1f1f1; +} + +ul.blogs p { + clear:both; +} + +.post { + margin: -8px 0 12px 0px; +} + +.postsummary { + border-bottom:1px dotted #f1f1f1; +} + +.meta { + font-style:italic; + color:#666666; +} + diff --git a/src/Orchard.Web/Themes/ClassicDark/Styles/site.css b/src/Orchard.Web/Themes/ClassicDark/Styles/site.css new file mode 100644 index 000000000..bda11a9ff --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Styles/site.css @@ -0,0 +1,287 @@ +/*Yahoo browser reset +----------------------------------------------------------*/ + +body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p, +blockquote,th,td {margin:0; padding:0; } +table { border-collapse:collapse; border-spacing:0; } +fieldset,img { border:0; } +address,caption,cite,code,dfn,em,strong,th,var { font-style:normal; font-weight:normal; } +ol,ul { list-style:none; } +caption,th { text-align:left; } +h1,h2,h3,h4,h5,h6 { font-size:100%; font-weight:normal; } +abbr,acronym { border:0; } +q:before,q:after {content:'';} +abbr,acronym { border:0;} + +/*Defaults +----------------------------------------------------------*/ + +html {height: 100%;} + +body { + font: normal 90% "Georgia", Times New Roman, Times, serif; + height: 100%; + text-align:left; + color:#dedede; + /*background:#515457 url(../Content/Images/bodyBackgroundgrey.gif) repeat-x scroll left top;*/ + background:#0c0c0c; +} + +/* ---------- Headings and defaults ---------- */ + +h1,h2,h3,h4,h5,h6,legend {font-weight:normal; font-style: normal; margin:12px 0 4px 0; color:#f2f8ef;} + +h1 {font-size: 180%;} +h2 {font-size: 160%;} +h3 {font-size: 145%;} +h4 {font-size: 130%;} +h5 {font-size: 120%;} +h6 {font-size: 105%;} + +h1.sitename {border-bottom:none;} + +p {line-height:24px; margin:12px 0 32px 0;} +p.small {line-height:24px; font-size:85%;} + +a { + color:#fff; + text-decoration:underline; +} +a:hover { + color:#99ff66; +} + +ul.square {list-style:square; list-style-position:inside; line-height:24px; margin:0 0 0 12px;} +ol.decimal {list-style:decimal; list-style-position:inside; line-height:24px; margin:0 0 0 12px;} + + +/* Forms +----------------------------------------------------------*/ + +input[type="text"], #CommentText, #password, #confirmPassword { + border:1px solid #cacec6; + background:#DEDEDE; + display: block; + padding:2px; + width:90%; + } + +fieldset div {margin:16px 0 0 0} + +legend { + font-size: 110%; + border:none; +} + +label { + display: block; + margin:0 0 2px 0; + font-style:normal; + } + +input[type="checkbox"] { + margin:2px 0 20px 10px; +} + +input[type="submit"], input[type="button"], .button { + font: normal 90% "Georgia", Times New Roman, Times, serif; + color:#474747; + padding:2px 14px; + display: block; + margin:2px 0 20px 0; + font-weight:600; + } + +.forcheckbox { + margin:0 0 0 4px; + display:inline; +} + + +/* Tables +----------------------------------------------------------*/ +table { + background:#fff; + border:1px solid #f1f1f1; + border-collapse:collapse; + width:100%; +} + +table thead, table th { + overflow:hidden; + text-align:left; +} + +table th { + font:70% Verdana, Geneva, Tahoma, sans-serif; + background-color:#69625e; + color:#f1f1f1; + } + +table caption { + padding:8px 0; + text-indent:0; +} + +table col { + display:table-column; +} + +table colgroup { + display:table-column-group; + } + +table tbody { + vertical-align:middle; + } + + +th, td { + font:70% Verdana, Geneva, Tahoma, sans-serif; + padding:6px + } + +td.even { + background-color:#f1f1f1; +} + +/* ---------- Layout ---------- */ + +#headercontainer { + border:2px solid #474747; + border-left:0; + border-right:0; + margin:0 auto; + width:930px; +} + +#header { + border:1px dotted #474747; + border-left:0; + border-right:0; + margin:3px 0 3px 0; + } + +#header h1 { + font-size:240%; + border:0; + margin:12px 18px; + float:left; +} + + +#logindisplay { + font:80%; + margin:12px auto; + text-align:right; + width: 930px; +} + +#wrapper { + width:985px; + display:block; + margin:0em auto; + background:#1d2025; + border:1px solid #474747; +} + +#main { + margin:0 0 0 27px; + width:930px; + background:url(../Content/Images/sidebarBackground.gif) no-repeat right top #1d2025; +} + + +#content { + float:left; + margin:26px 0 0 27px; + width:520px; + min-height:555px; +} + +#sidebar { + float:right; + margin:28px 0 0 0; + width:325px; +} + +#sidebar h3 { + border-bottom:1px dotted #474747; + font-size: 130%; +} + +#footercontainer { + clear:both; + border:2px solid #474747; + width:930px; + background:#0c0c0c; + margin:18px 0; +} + +#footer { + border:1px solid #474747; + margin:3px; +} + +#footer a{ + text-transform:uppercase; + color:#fff; +} + + +/* ---------- Navigation ---------- */ + +.menucontainer { + display:block; + float:right; + margin:18px 0; +} + +.menucontainer ul, #footer ul { + list-style:none +} + +.menucontainer ul li { + margin:8px 0 0 0; + float:left; + } + +.menucontainer ul li a +{ + color:#A8B934; + margin:0 18px 0 18px; + display:block; + text-decoration:none; + text-transform:uppercase; + float:left; +} + +.menucontainer ul li a:hover { + color:#99ff66; +} + +#footer .menucontainer { + font-size:80%; + float:left; + margin:0px; +} + +#footer .menucontainer ul li { + margin:12px 0; +} + +/* ---------- Tags and Comments ---------- */ +.tags, .comment { + font-style:italic; +} + + +/* ---------- Generic ---------- */ +.clearBoth { + clear:both; +} + +/* ---------- Hide the edit link for blogs hack ---------- */ +.manage { + display:none; +} \ No newline at end of file diff --git a/src/Orchard.Web/Themes/ClassicDark/Theme.png b/src/Orchard.Web/Themes/ClassicDark/Theme.png new file mode 100644 index 000000000..2832f9504 Binary files /dev/null and b/src/Orchard.Web/Themes/ClassicDark/Theme.png differ diff --git a/src/Orchard.Web/Themes/ClassicDark/Theme.txt b/src/Orchard.Web/Themes/ClassicDark/Theme.txt new file mode 100644 index 000000000..b2bcb4a9c --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Theme.txt @@ -0,0 +1,6 @@ +name: Classic Dark +author: Jonathan Wall +description: Dark version of the Classic theme. +version: 1.0 +tags: Classic, Dark, Serif +homepage: http://www.orchardproject.net diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx new file mode 100644 index 000000000..c5952fce6 --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx @@ -0,0 +1,8 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Import Namespace="Orchard.Mvc.ViewModels"%> +<%@ Import Namespace="Orchard.Blogs.Extensions"%> +<%@ Import Namespace="Orchard.Blogs.Models"%> + +

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

+
<%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%>
+

<%=Html.Encode(Model.Item.Description) %>

diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.ascx new file mode 100644 index 000000000..de1c636a7 --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.ascx @@ -0,0 +1,9 @@ +<%@ 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) %>

+<% Html.RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest(Model.Item.Slug) });%> +<% Html.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/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx new file mode 100644 index 000000000..2037687d2 --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx @@ -0,0 +1,12 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Import Namespace="Orchard.ContentManagement"%> +<%@ Import Namespace="Orchard.Core.Common.Models"%> +<%@ Import Namespace="Orchard.Mvc.ViewModels"%> +<%@ Import Namespace="Orchard.Blogs.Extensions"%> +<%@ Import Namespace="Orchard.Blogs.Models"%> +<%Model.Zones.AddRenderPartial("zonetest", "ZoneTest", Model); %> +

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

+
<%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%>
+
+<% Html.Zone("primary"); %> +
\ No newline at end of file diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx new file mode 100644 index 000000000..b35bd5e9b --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx @@ -0,0 +1,14 @@ +<%@ 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) { + %>
<%=_Encoded("Posted by {0} {1}", Model.Item.Creator.UserName, Html.PublishedWhen(Model.Item)) %><% -- | <%=_Encoded("Edit") %>-- %>
<% + } %> +
+--%> +<% Html.Zone("primary"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.ascx new file mode 100644 index 000000000..1c6087561 --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.ascx @@ -0,0 +1,5 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>>" %> +<%@ Import Namespace="Orchard.Mvc.ViewModels"%> +<%@ Import Namespace="Orchard.Blogs.Models"%> +<%=Html.UnorderedList(Model, (bp, i) => Html.DisplayForItem(bp).ToHtmlString(), "blogPosts contentItems") %> +<% if (Model.Count() < 1) { %>

<%=_Encoded("There are no posts for this blog.") %>

<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx new file mode 100644 index 000000000..169dc04d8 --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx @@ -0,0 +1,7 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Blogs.Extensions"%> +<%@ Import Namespace="Orchard.Blogs.Models"%> +<% + if (Model.Creator != null) { + %><%=_Encoded("Posted by {0} {1}", Model.Creator.UserName, "|", Html.PublishedWhen(Model)) %><% + } %> diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx new file mode 100644 index 000000000..3154c5069 --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx @@ -0,0 +1,5 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Mvc.ViewModels"%> +<%--
+
<%=_Encoded("Published by {0}", Model.Creator != null ? Model.Creator.UserName : T("nobody(?)"))%>
+
--%> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/Footer.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/Footer.ascx new file mode 100644 index 000000000..74d5935ba --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Views/Footer.ascx @@ -0,0 +1,10 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> + +
+ +
diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx new file mode 100644 index 000000000..fe247668c --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx @@ -0,0 +1,41 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Mvc.Html" %> +<%@ Import Namespace="Orchard.Mvc.ViewModels" %> +<%@ Import Namespace="Orchard.ContentManagement"%> +<%@ Import Namespace="Orchard.Core.Common.Models"%> +<%@ Import Namespace="Orchard.Blogs.Extensions"%> +<%@ Import Namespace="Orchard.Blogs.Models"%> +<% + Html.RegisterStyle("site.css"); + Html.RegisterStyle("blog.css"); +%> + +<%-- 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/ClassicDark/Views/ZoneTest.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/ZoneTest.ascx new file mode 100644 index 000000000..418a5d370 --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Views/ZoneTest.ascx @@ -0,0 +1,3 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Import Namespace="Orchard.Blogs.Models"%> +<%@ Import Namespace="Orchard.Mvc.ViewModels"%>