diff --git a/src/Orchard.Web/Themes/Classic/Content/Images/bodyBackground.gif b/src/Orchard.Web/Themes/Classic/Content/Images/bodyBackground.gif new file mode 100644 index 000000000..cd44d7a72 Binary files /dev/null and b/src/Orchard.Web/Themes/Classic/Content/Images/bodyBackground.gif differ diff --git a/src/Orchard.Web/Themes/Classic/Content/Images/bodyBackgroundgrey.gif b/src/Orchard.Web/Themes/Classic/Content/Images/bodyBackgroundgrey.gif new file mode 100644 index 000000000..c8c151517 Binary files /dev/null and b/src/Orchard.Web/Themes/Classic/Content/Images/bodyBackgroundgrey.gif differ diff --git a/src/Orchard.Web/Themes/Classic/Content/Images/footerBackground.gif b/src/Orchard.Web/Themes/Classic/Content/Images/footerBackground.gif new file mode 100644 index 000000000..f3250a76a Binary files /dev/null and b/src/Orchard.Web/Themes/Classic/Content/Images/footerBackground.gif differ diff --git a/src/Orchard.Web/Themes/Classic/Content/Images/mainBackground.gif b/src/Orchard.Web/Themes/Classic/Content/Images/mainBackground.gif new file mode 100644 index 000000000..d29ad3d05 Binary files /dev/null and b/src/Orchard.Web/Themes/Classic/Content/Images/mainBackground.gif differ diff --git a/src/Orchard.Web/Themes/Classic/Content/Images/mainBackground.png b/src/Orchard.Web/Themes/Classic/Content/Images/mainBackground.png new file mode 100644 index 000000000..0dfeaeb60 Binary files /dev/null and b/src/Orchard.Web/Themes/Classic/Content/Images/mainBackground.png differ diff --git a/src/Orchard.Web/Themes/Classic/Content/Images/mainBackgroundgrey.gif b/src/Orchard.Web/Themes/Classic/Content/Images/mainBackgroundgrey.gif new file mode 100644 index 000000000..ef18ae7c2 Binary files /dev/null and b/src/Orchard.Web/Themes/Classic/Content/Images/mainBackgroundgrey.gif differ diff --git a/src/Orchard.Web/Themes/Classic/Content/Images/mainBackgroundgrey.png b/src/Orchard.Web/Themes/Classic/Content/Images/mainBackgroundgrey.png new file mode 100644 index 000000000..af766db4b Binary files /dev/null and b/src/Orchard.Web/Themes/Classic/Content/Images/mainBackgroundgrey.png differ diff --git a/src/Orchard.Web/Themes/Classic/Content/Images/navDivider.gif b/src/Orchard.Web/Themes/Classic/Content/Images/navDivider.gif new file mode 100644 index 000000000..bac7e4186 Binary files /dev/null and b/src/Orchard.Web/Themes/Classic/Content/Images/navDivider.gif differ diff --git a/src/Orchard.Web/Themes/Classic/Content/Images/sidebarBackground.gif b/src/Orchard.Web/Themes/Classic/Content/Images/sidebarBackground.gif new file mode 100644 index 000000000..204fb6ebe Binary files /dev/null and b/src/Orchard.Web/Themes/Classic/Content/Images/sidebarBackground.gif differ diff --git a/src/Orchard.Web/Themes/Classic/Styles/blog.css b/src/Orchard.Web/Themes/Classic/Styles/blog.css new file mode 100644 index 000000000..cdd057ce2 --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/Styles/blog.css @@ -0,0 +1,15 @@ +/*Blog specific styles +----------------------------------------------------------*/ + +.meta, .manage, .posted, div.comment { + margin: 8px 0; + font:80% Verdana, Geneva, Tahoma, sans-serif; +} + +.meta, .manage { + float:right; +} + +.blogdescription, .postsummary { + clear:both; + } diff --git a/src/Orchard.Web/Themes/Classic/Styles/site.css b/src/Orchard.Web/Themes/Classic/Styles/site.css new file mode 100644 index 000000000..abb2e62b7 --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/Styles/site.css @@ -0,0 +1,212 @@ +/*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; + background:url(../Content/Images/bodyBackgroundgrey.gif) top left repeat-x #e5e5e5; + height: 100%; + text-align:left; + color:#333; +} + +/* ---------- Headings and defaults ---------- */ + +h1,h2,h3,h4,h5,h6, legend {font-weight:normal; font-style: normal; color:#670404; border-bottom:1px solid #f1f1f1;} + +h1 {font-size: 190%;} +h2 {font-size: 160%;} +h3 {font-size: 150%;} +h4 {font-size: 130%;} +h5 {font-size: 120%;} +h6 {font-size: 105%;} + +p {line-height:24px; margin:12px 0 32px 0;} +p.small {line-height:22px; font-size:85%;} + +a { + color:#004386; + color:#05325f; + text-decoration:none; +} + +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 { + border:1px solid #DDDEDF; + display: block; +} + +fieldset {margin: 20px 0;} + +fieldset div {margin:16px 0 0 0} + +legend { + font-size: 105%; + border:none; +} + +label { + font:80% Verdana, Geneva, Tahoma, sans-serif; + display: block; + margin:0 0 2px 0; + } + +input[type="text"], #CommentText, #password { + border-color:#cacec6; + padding:2px; + width:90%; + } + +input[type="checkbox"] { + margin:2px 0 20px 10px; +} + +input[type="submit"], input[type="button"], .button { + font:90% Verdana, Geneva, Tahoma, sans-serif; + color:#333; + padding:2px 14px; + display: block; + margin:2px 0 20px 0; + font-weight:600; + } + +.forcheckbox { + margin:0 0 0 4px; + display:inline; +} + + +/* ---------- Layout ---------- */ + +#header { + margin:0 38px 0 40px; + height:75px; + border-bottom:1px #d6d6d6 solid; +} + + +#header h1{ + float:left; + font-size:220%; + color:#000; + padding:16px 0 0 0; + border-bottom:none; +} + +#logindisplay { + font:80% Verdana, Geneva, Tahoma, sans-serif; + float:right; + margin:32px 8px 0 0; +} + +#wrapper { + width:985px; + height:100%; + display:block; + margin:0em auto; + background:url(../Content/Images/mainBackgroundgrey.png) no-repeat center top; +} + +#main { + clear:both; + margin:32px 0 0 27px; + width:930px; + border:1px #f5f5f5 solid; + border-top:none; + background:url(../Content/Images/sidebarBackground.gif) no-repeat right top #fff; +} + + +#content { + float:left; + margin:0 0 0 27px; + width:520px; + min-height:555px; +} + +#sidebar { + float:right; + margin:4px 12px 0 0; + width:325px; +} + +#sidebar h3 { + border-bottom:1px solid #f1f1f1; +} + + +#content ul,#sideBar1 ul { + list-style:none; + line-height:normal; +} + +#footer { + font:80% Verdana, Geneva, Tahoma, sans-serif; + color:#918e8e; + clear:both; + border-top:1px solid #d6d6d6; + margin:0 12px 0 12px; + padding:18px 0 18px 8px; +} + +#footer a{ + text-transform:uppercase; + color:#918e8e; +} + +/* ---------- Navigation ---------- */ + +#menucontainer { + width:960px; + display:block; + height:35px; + margin:0em auto; +} + +#menucontainer ul, #footer ul { + list-style:none; + float:right; +} + +#menucontainer ul li { + margin:8px 0 0 0; + float:left; + background:url(../Content/Images/navDivider.gif) no-repeat top right; +} + +#menucontainer ul li.last { + background:none; +} + +#menucontainer ul li a { + margin:0 18px 0 18px; + font:80% Verdana, Geneva, Tahoma, sans-serif; + display:block; + text-decoration:none; + text-transform:uppercase; + float:left; + color:#fff; + } + diff --git a/src/Orchard.Web/Themes/Classic/Theme.gif b/src/Orchard.Web/Themes/Classic/Theme.gif new file mode 100644 index 000000000..1f0fbd29a Binary files /dev/null and b/src/Orchard.Web/Themes/Classic/Theme.gif differ diff --git a/src/Orchard.Web/Themes/Classic/Theme.txt b/src/Orchard.Web/Themes/Classic/Theme.txt new file mode 100644 index 000000000..46f52a9ec --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/Theme.txt @@ -0,0 +1,6 @@ +name: Classic +author: Jonathan Wall +description: Theme using serif. +version: 1.0 +tags: Classic, Serif +homepage: http://www.orchardproject.net 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 new file mode 100644 index 000000000..eb7aa6eaf --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx @@ -0,0 +1,7 @@ +<%@ 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) %>

\ No newline at end of file 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 new file mode 100644 index 000000000..7c2dada8e --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx @@ -0,0 +1,9 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Import Namespace="Orchard.Mvc.ViewModels"%> +<%@ Import Namespace="Orchard.Blogs.Extensions"%> +<%@ Import Namespace="Orchard.Blogs.Models"%> +

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

+
<%=_Encoded("Edit") %>
+

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

+<% Html.Zone("primary"); + Html.ZonesAny(); %> \ 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 new file mode 100644 index 000000000..d361e29b0 --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx @@ -0,0 +1,9 @@ +<%@ 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"%> +

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

+
<%=Html.PublishedState(Model.Item) %> | <%=Html.Link(_Encoded("?? comments").ToString(), "") %>
+
<%=Model.Item.As().Text ?? string.Format("

{0}

", _Encoded("there's no content for this blog post"))%>
\ No newline at end of file diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Pages.Page.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Pages.Page.ascx new file mode 100644 index 000000000..1992d8dc4 --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Pages.Page.ascx @@ -0,0 +1,12 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Import Namespace="Orchard.Mvc.Html"%> +<%@ Import Namespace="Orchard.Mvc.ViewModels"%> +

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

+
" class="ibutton edit"><%=_Encoded("edit")%>
+
+
Published by <%=Model.Item.Creator != null ? Html.Encode(Model.Item.Creator.UserName) : _Encoded("nobody(?)").ToString()%>
+
+<% Html.Zone("primary"); + Html.ZonesAny(); %> + + diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.ascx new file mode 100644 index 000000000..1c6087561 --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/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/Classic/Views/footer.ascx b/src/Orchard.Web/Themes/Classic/Views/footer.ascx new file mode 100644 index 000000000..51512109c --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/Views/footer.ascx @@ -0,0 +1,5 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> + + \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Classic/Views/layout.ascx b/src/Orchard.Web/Themes/Classic/Views/layout.ascx new file mode 100644 index 000000000..cedb0196e --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/Views/layout.ascx @@ -0,0 +1,40 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Mvc.ViewModels" %> +<%@ Import Namespace="Orchard.Mvc.Html" %> +<% + Html.RegisterStyle("site.css"); + Html.RegisterStyle("blog.css"); +%> +<%--Top Navigation--%> +<%-- todo:(nheskew) this will need to be a generated menu --%> +<% Html.Include("menu"); %> +
+ +
+
+ + <%--Main Content--%> + <%Html.ZoneBody("content");%> + +
+ + <%-- End Content --%> + <%Html.Zone("footer");%> + <% Html.Include("footer"); %> +
+
diff --git a/src/Orchard.Web/Themes/Classic/Views/menu.ascx b/src/Orchard.Web/Themes/Classic/Views/menu.ascx new file mode 100644 index 000000000..f476ee1cf --- /dev/null +++ b/src/Orchard.Web/Themes/Classic/Views/menu.ascx @@ -0,0 +1,8 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> + \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Times/Styles/site.css b/src/Orchard.Web/Themes/Times/Styles/site.css index d6e03b59c..abb2e62b7 100644 --- a/src/Orchard.Web/Themes/Times/Styles/site.css +++ b/src/Orchard.Web/Themes/Times/Styles/site.css @@ -19,7 +19,7 @@ abbr,acronym { border:0;} html {height: 100%;} body { - font: normal 100% Times New Roman, Times, serif; + font: normal 90% "Georgia", Times New Roman, Times, serif; background:url(../Content/Images/bodyBackgroundgrey.gif) top left repeat-x #e5e5e5; height: 100%; text-align:left; @@ -28,7 +28,7 @@ body { /* ---------- Headings and defaults ---------- */ -h1,h2,h3,h4,h5,h6, legend {font-weight:normal; font-style: normal; margin:12px 0 6px 0; color:#670404; border-bottom:1px solid #f1f1f1;} +h1,h2,h3,h4,h5,h6, legend {font-weight:normal; font-style: normal; color:#670404; border-bottom:1px solid #f1f1f1;} h1 {font-size: 190%;} h2 {font-size: 160%;} @@ -118,7 +118,7 @@ input[type="submit"], input[type="button"], .button { #logindisplay { font:80% Verdana, Geneva, Tahoma, sans-serif; float:right; - margin:48px 8px 0 0; + margin:32px 8px 0 0; } #wrapper { @@ -131,7 +131,7 @@ input[type="submit"], input[type="button"], .button { #main { clear:both; - margin:20px 0 0 27px; + margin:32px 0 0 27px; width:930px; border:1px #f5f5f5 solid; border-top:none; @@ -148,7 +148,7 @@ input[type="submit"], input[type="button"], .button { #sidebar { float:right; - margin:8px 12px 0 0; + margin:4px 12px 0 0; width:325px; }