diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index a55ecf81d..64d973465 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -1,4 +1,4 @@ - + Debug @@ -145,6 +145,8 @@ + + @@ -152,15 +154,6 @@ - - - - - - - - - diff --git a/src/Orchard.Web/Themes/ClassicDark/Styles/blog.css b/src/Orchard.Web/Themes/ClassicDark/Styles/blog.css index 016e2dbc4..cd32f61e2 100644 --- a/src/Orchard.Web/Themes/ClassicDark/Styles/blog.css +++ b/src/Orchard.Web/Themes/ClassicDark/Styles/blog.css @@ -15,17 +15,19 @@ ul.blogs p { } .postsummary { + padding: 0 0 4px 0; border-bottom:1px dotted #474747; } .meta { + font-size:1.5em; font-style:italic; color:#999; } .tagCloud { font-style:italic; - font-size:120%; + font-size:1.8em; } .tagCloud li { @@ -39,5 +41,14 @@ ul.blogs p { } ul.archiveMonthList li { + font-size:1.5em; padding:8px; +} + +.comment span { + font-size:1.4em; +} + +.text p { + margin:0 0 1.4em 0; } \ No newline at end of file diff --git a/src/Orchard.Web/Themes/ClassicDark/Styles/site.css b/src/Orchard.Web/Themes/ClassicDark/Styles/site.css index f53c17461..1233878d8 100644 --- a/src/Orchard.Web/Themes/ClassicDark/Styles/site.css +++ b/src/Orchard.Web/Themes/ClassicDark/Styles/site.css @@ -19,43 +19,38 @@ abbr,acronym { border:0;} html {height: 100%;} body { - font: normal 90% "Georgia", Times New Roman, Times, serif; + font: normal 62.5% "Georgia", Times New Roman, Times, serif; /* 62.5% sets font to 10px */ 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,h2,h3,h4,h5,h6,legend {font-weight:normal; font-style: normal; margin:.2em 0;} -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 { font-size:2.6em; } /* 26px */ +h2 { font-size:2.4em; } /* 24px */ +h3 { font-size:2.2em; } /* 22px */ +h4 { font-size:2.0em; } /* 20px */ +h5 { font-size:1.8em; } /* 18px */ +h6 { font-size:1.6em; } /* 16px */ h1.sitename {border-bottom:none;} -p {line-height:24px; margin:12px 0 32px 0;} -p.small {line-height:24px; font-size:85%;} +p {font-size:1.4em; line-height:2em; margin:1.2em 0 1.2em 0;} +p.small {font-size:1.2em;} a {color:#ccdcce; text-decoration:underline;} /* unvisited link */ a:active {color: #ccdcce;} /* selected link */ a:visited {color: #ccdcce;} /* visited link */ a:hover {color: #99ff66;} /* mouse over link */ +#content a:hover, #sidebar a:hover {text-decoration:underline;} -h1 a,h2 a,h3 a,h4 a,h5 a,h6 a,legend a { - text-decoration:none; - color:#f2f8ef; -} - -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;} +ul.square {font-size:1.4em; list-style:square; list-style-position:inside; line-height:2em; margin:0 0 0 1.2em;} +ol.decimal {font-size:1.4em; list-style:decimal; list-style-position:inside; line-height:2em; margin:0 0 0 1.2em;} /* Forms @@ -65,72 +60,52 @@ input[type="text"], #CommentText, #password, #confirmPassword { border:1px solid #cacec6; background:#DEDEDE; display: block; - padding:2px; + padding:3px; width:90%; - } - -fieldset div {margin:16px 0 0 0} +} +form.search { + margin-bottom:2em; +} +.search input[type=text] { + display:inline; + width:17em; +} +fieldset div {margin:1.6em 0 0 0} legend { - font-size: 110%; + font-size: 1.8em; border:none; } label { + font-size: 1.4em; display: block; - margin:0 0 2px 0; - font-style:normal; + margin:0 0 .1em 0; } input[type="checkbox"] { - margin:2px 0 20px 10px; + margin:.2em 0 2em 1em; } input[type="submit"], input[type="button"], .button { - font: normal 90% "Georgia", Times New Roman, Times, serif; + font: normal 1.4em "Georgia", Times New Roman, Times, serif; color:#474747; padding:2px 14px; display: block; - margin:2px 0 20px 0; + margin:.2em 0 2em 0; font-weight:600; } .forcheckbox { - margin:0 0 0 4px; + margin:0 0 0 .4em; display:inline; } -/* Search -----------------------------------------------------------*/ - -.search -{ - margin: 0 0 14px 0; -} - -.search fieldset -{ - overflow: auto; -} - -.search input -{ - width: auto; - float: left; - padding: 3px; -} - -.search button -{ - float: left; - margin: 0 0 0 4px; -} - - /* Tables ----------------------------------------------------------*/ table { - background:#fff; + font:1.2em Verdana, Geneva, Tahoma, sans-serif; + background:#1d2025; border:1px solid #f1f1f1; border-collapse:collapse; width:100%; @@ -142,7 +117,6 @@ table thead, table th { } table th { - font:70% Verdana, Geneva, Tahoma, sans-serif; background-color:#69625e; color:#f1f1f1; } @@ -166,7 +140,7 @@ table tbody { th, td { - font:70% Verdana, Geneva, Tahoma, sans-serif; + font:1em Verdana, Geneva, Tahoma, sans-serif; padding:6px } @@ -185,23 +159,24 @@ td.even { } #header { - border:1px dotted #474747; + border:1px solid #474747; border-left:0; border-right:0; - margin:3px 0 3px 0; + margin:.3em 0 .3em 0; } #header h1 { - font-size:240%; + font-size:3.2em; border:0; - margin:12px 18px; + margin:0 0 0 .8em; + padding:10px 0; float:left; } -#logindisplay { - font:80%; - margin:12px auto; +.user-display { + font-size:1.4em; + margin:1em auto; text-align:right; width: 930px; } @@ -209,13 +184,13 @@ td.even { #wrapper { width:985px; display:block; - margin:0em auto; + margin:0px auto 10px auto; background:#1d2025; border:1px solid #333; } #main { - margin:0 0 0 27px; + margin:0 0 0 2.7em; width:930px; background:url(../Content/Images/sidebarBackground.gif) no-repeat right top #1d2025; } @@ -223,36 +198,32 @@ td.even { #content { float:left; - margin:26px 0 0 27px; + margin:2.6em 0 0 2.7em; width:520px; min-height:555px; } #sidebar { float:right; - margin:28px 0 0 0; + margin:2.8em 0 0 0; width:325px; } #sidebar h3 { border-bottom:1px dotted #474747; - font-size: 130%; + font-size: 2.0em; } #footercontainer { clear:both; border-top:2px solid #474747; - border-left:0; - border-right:0; width:930px; - margin:18px 0 6px 0; + margin:1.8em 0 .6em 0; } #footer { border-top:1px dotted #474747; - border-left:0; - border-right:0; - margin:3px 0; + margin-top:.3em; } #footer a{ @@ -265,7 +236,7 @@ td.even { .menucontainer { display:block; float:right; - margin:18px 0; + margin-top:1.3em; } .menucontainer ul, #footer ul { @@ -273,14 +244,13 @@ td.even { } .menucontainer ul li { - margin:8px 0 0 0; + margin:.8em 0 0 0; float:left; } -.menucontainer ul li a -{ - color:#A8B934; - margin:0 18px 0 18px; +.menucontainer ul li a { + font-size:1.4em; + margin:0 1.8em 0 1.8em; display:block; text-decoration:none; text-transform:uppercase; @@ -291,24 +261,20 @@ td.even { color:#99ff66; } -#footer .menucontainer { - font-size:80%; - margin:0px; -} - #footer .menucontainer ul li { - margin:12px 0; + margin:1.2em 0; } /* Confirmations, Messages and the like ----------------------------------------------------------*/ .message, .validation-summary-errors { - margin:10px 0 4px 0; + font-size:1.4em; + margin:1em 0 .4em 0; padding:4px; } span.message { display:block; - margin:4px 0 4px 4px; + margin:.4em 0 .4em .4em; } .message a { font-weight:bold; @@ -339,12 +305,37 @@ span.message { background:#eee; border:1px dashed #D2D6C6; color:#7a7a7a; - margin:20px 0 14px 0; + margin:2em 0 1.4em 0; } .debug.message:before { content:"DEBUG » "; } +/* Localization +-------------------------------------------------------------- */ +.content-localization .content-localizations h4 { + margin: 0; + vertical-align: top; +} +.content-localization .content-localizations ul { + overflow: auto; +} +.content-localization .content-localizations li { + border-bottom: 1px; + margin:0 0 0 .4em; + padding: .2em .4em; + border: 1px solid #CCC; +} +.content-localization .content-localizations li:hover { + background-color: #000; + border-color: #99ff66; +} +.content-localization .content-localizations li a { + text-decoration: none; +} +.content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited { + text-decoration: none; +} /* ---------- Tags and Comments ---------- */ .tags, .comment { font-style:italic; @@ -361,29 +352,3 @@ span.message { display:none; } -/* Localization --------------------------------------------------------------- */ -.content-localization .content-localizations h4 { - margin: 0; - vertical-align: top; -} -.content-localization .content-localizations ul { - overflow: auto; -} -.content-localization .content-localizations li { - font-size: 1.0em !important; - border-bottom: 1px; - margin: 0 0 0 4px; - padding: 2px 6px; - border: 1px solid #CCC; -} -.content-localization .content-localizations li:hover { - background-color: #000; - border-color: #99ff66; -} -.content-localization .content-localizations li a { - text-decoration: none; -} -.content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited { - text-decoration: none; -} 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 deleted file mode 100644 index 7ea5d7aa3..000000000 --- a/src/Orchard.Web/Themes/ClassicDark/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/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.ascx deleted file mode 100644 index 0e541f4bf..000000000 --- a/src/Orchard.Web/Themes/ClassicDark/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/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx deleted file mode 100644 index 084f3a86c..000000000 --- a/src/Orchard.Web/Themes/ClassicDark/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/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx deleted file mode 100644 index 4f403f96c..000000000 --- a/src/Orchard.Web/Themes/ClassicDark/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/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx deleted file mode 100644 index 55c302473..000000000 --- a/src/Orchard.Web/Themes/ClassicDark/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/ClassicDark/Views/DisplayTemplates/Parts/Common.Metadata.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Common.Metadata.ascx deleted file mode 100644 index 9c5bf54e7..000000000 --- a/src/Orchard.Web/Themes/ClassicDark/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/ClassicDark/Views/Footer.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/Footer.ascx deleted file mode 100644 index 74d5935ba..000000000 --- a/src/Orchard.Web/Themes/ClassicDark/Views/Footer.ascx +++ /dev/null @@ -1,10 +0,0 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> - -
- -
diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/Footer.cshtml b/src/Orchard.Web/Themes/ClassicDark/Views/Footer.cshtml new file mode 100644 index 000000000..75cdc65cc --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Views/Footer.cshtml @@ -0,0 +1,8 @@ +
+ +
diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx deleted file mode 100644 index 447c28c04..000000000 --- a/src/Orchard.Web/Themes/ClassicDark/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 = "ClassicDark" }); - Html.Resolve().Require(new RequireSettings { Type = "stylesheet", Name = "ClassicDark_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/ClassicDark/Views/Layout.cshtml b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.cshtml new file mode 100644 index 000000000..9041bc109 --- /dev/null +++ b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.cshtml @@ -0,0 +1,34 @@ +@using Orchard.UI.Resources +@{ + Style.Require("ClassicDark"); + Style.Require("ClassicDark_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/ClassicDark/Views/ZoneTest.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/ZoneTest.ascx deleted file mode 100644 index 9d33ac9ec..000000000 --- a/src/Orchard.Web/Themes/ClassicDark/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"%>