diff --git a/src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml b/src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml index aaa5edd12..874a5fb9c 100644 --- a/src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml +++ b/src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml @@ -6,4 +6,4 @@ string bodyHtml = Model.Html.ToString(); var body = new HtmlString(Html.Excerpt(bodyHtml, 200).ToString().Replace(Environment.NewLine, "

" + Environment.NewLine + "

")); } -

@body @Html.ItemDisplayLink(T("[more]").ToString(), contentItem)

\ No newline at end of file +

@body @Html.ItemDisplayLink(T("more").ToString(), contentItem)

\ No newline at end of file diff --git a/src/Orchard.Web/Core/Shapes/Views/User.cshtml b/src/Orchard.Web/Core/Shapes/Views/User.cshtml index f11a5ca62..ec7b45717 100644 --- a/src/Orchard.Web/Core/Shapes/Views/User.cshtml +++ b/src/Orchard.Web/Core/Shapes/Views/User.cshtml @@ -1,10 +1,13 @@ @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 }) - @:| @Html.ActionLink("Admin", "Index", new {Area = "Dashboard", Controller = "Admin"}) -} else { - @Html.ActionLink(T("Log On").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl }) -} -
\ No newline at end of file + +
+ @if (Request.IsAuthenticated) { + @T("Welcome, {0}!", WorkContext.CurrentUser.UserName) + + @Html.ActionLink(T("Sign Out").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl }) + @Html.ActionLink("Dashboard", "Index", new { Area = "Dashboard", Controller = "Admin" }) + + } else { + @Html.ActionLink(T("Sign In").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl }) + } +
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.cshtml index 0b4162ba8..c74f9a516 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.cshtml @@ -3,26 +3,30 @@ @using Orchard.Security; @using Orchard.Utility.Extensions; -@if (Model.ContentPart.Comments.Count > 0) { -

@T.Plural("1 Comment", "{0} Comments", (int)Model.ContentPart.Comments.Count)

-Html.RenderPartial("ListOfComments", (IEnumerable)Model.ContentPart.Comments); +@if (Model.ContentPart.Comments.Count > 0) { +
+

@T.Plural("1 Comment", "{0} Comments", (int)Model.ContentPart.Comments.Count)

+ @{Html.RenderPartial("ListOfComments", (IEnumerable)Model.ContentPart.Comments);} +
} @if (Model.CommentsActive == false) { if (Model.Comments.Count > 0) { -

@T("Comments have been disabled for this content.")

+
+

@T("Comments have been disabled for this content.")

+
} } else if(!Request.IsAuthenticated && !AuthorizedFor(Permissions.AddComment)) { -

@T("Add a Comment")

+

@T("Add a Comment")

@T("You must {0} to comment.", Html.ActionLink(T("log on").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = string.Format("{0}#addacomment", Context.Request.RawUrl) }))

} else { -using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment" })) { +using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment-form" })) { @Html.ValidationSummary() if (!Request.IsAuthenticated) {
- @T("Add a Comment") + @T("Add a Comment")
  1. @@ -48,7 +52,7 @@ using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, Fo
    1. - +
    2. diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml index e8dc9d9a3..cc4c6ee26 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml @@ -3,8 +3,8 @@ @{ Html.AddTitleParts(T("Tags").ToString()); Html.AddTitleParts(T("Contents tagged with {0}", Model.TagName).ToString()); - Model.List.Classes.Add("taggedPosts"); - Model.List.Classes.Add("contentItems"); + Model.List.Classes.Add("tagged-posts"); + Model.List.Classes.Add("content-items"); }

      @T("Contents tagged with {0}", Model.TagName)

      diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml index 0c5f3a985..7a52786e9 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml @@ -9,19 +9,19 @@ @T("Account Information")
      1. - - @Html.TextBox("userNameOrEmail", "", new { autofocus = "autofocus" }) + + @Html.TextBox("username-email", "", new { autofocus = "autofocus" }) @Html.ValidationMessage("userNameOrEmail")
      2. - + @Html.Password("password") @Html.ValidationMessage("password")
      3. - @Html.CheckBox("rememberMe") + @Html.CheckBox("remember-me")
        4. - +
} \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css index e785057aa..d75b48be3 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css +++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css @@ -207,7 +207,6 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: } - /* Navigation */ #layout-navigation { @@ -308,10 +307,18 @@ nav ul float:left; } + + +/* Secondary +***************************************************************/ /* Blogs */ .blog-description { font-size: 1.3em; } -/* Posts Summary List */ +.blog-post .tags { margin-top: 12px; } +.blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; } +.blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; } + +/* Blogs Posts Summary List */ .blog-posts { padding: 0; margin: 0; list-style: none; } .blog-posts li { padding: 0; margin: 0; } .blog-posts .blog-post { border-top: 1px solid #dbdbdb; padding: 6px 0 6px 0; } @@ -326,24 +333,46 @@ nav ul .blog-posts .blog-post .metadata .published { display: inline; margin: 0 6px 0 0; } .blog-posts .blog-post .metadata .commentcount { display: inline; } -/* Post Detail */ +/* Blogs Post Detail */ .blog-post {} .blog-post-title {} .meta {} - -/* Secondary -***************************************************************/ - /* Comments */ -.comment {} +#comments { margin: 24px 0 0 0; padding: 0; } +.comment-form { margin: 24px 0 0 0; padding: 0; } +.comments { margin: 0; padding: 0; list-style: none; } +.comments li { margin: 12px 0 0 0; padding: 12px; border: 1px solid #dbdbdb; } +.comment { margin: 0; padding: 0; } +.comment h4 { font-size: 1.4em; } .comment .who {} .comment .what {} .comment #add-comment {} -.comment #comment-by { font-size: 1.6em; font-weight: normal; margin: 0 0 1.2em 0; border:none; } -.comment #comment-text { width: 33.2em; } -.comment input[type="text"] { width: 32em; } +.comment-form #comment-by { font-size: 1.6em; font-weight: normal; margin: 0 0 1.2em 0; border:none; } +.comment-form #comment-text { width: 33.2em; } +.comment-form input[type="text"] { width: 32em; } + +.comment-disabled {} +.comment-count { font-size: 1.6em; } + +/* Tag Search */ + +.tagged-posts {} +.tagged-posts { padding: 0; margin: 0; list-style: none; } +.tagged-posts li { padding: 0; margin: 0; } +.tagged-posts .blog-post { border-top: 1px solid #dbdbdb; padding: 6px 0 6px 0; } +.tagged-posts .blog-post header {} +.tagged-posts .blog-post header h1 { font-size: 1.7em; } +.tagged-posts .blog-post header h1 a { color: #434343; } +.tagged-posts .blog-post header h1 a:hover {} +.tagged-posts .blog-post .tags { margin-top: 12px; } +.tagged-posts .blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; } +.tagged-posts .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; } +.tagged-posts .blog-post .metadata { margin: 0 0 12px 0; color: #999; font-size: 1.1em; } +.tagged-posts .blog-post .metadata .published { display: inline; margin: 0 6px 0 0; } +.tagged-posts .blog-post .metadata .commentcount { display: inline; } + @@ -424,6 +453,7 @@ button:focus, .button:focus { .user-display .welcome {} .user-display .user-actions {} +.login-form { margin: 24px 0 0 0; } /* CSS 3 Enhancements @@ -432,30 +462,6 @@ button:focus, .button:focus { /* For testing purposes */ -article.comment h4 { - font-size:1.4em; -} - -article.comment a { - color:#484848; - text-decoration:none; -} - -article.comment span.who { - font-weight:600; - font-style:normal; - text-transform:capitalize; - color:#333; -} - -article.comment p.text { - margin:.6em 0 2.4em 0; -} - -.user-display { - display:inline; -} - /*.aside.third { border-top:1px solid #dbdbdb; clear:both; diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/User.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/User.cshtml deleted file mode 100644 index a0a15b667..000000000 --- a/src/Orchard.Web/Themes/TheThemeMachine/Views/User.cshtml +++ /dev/null @@ -1,13 +0,0 @@ -@using System.Web.Mvc; - -
- @if (Request.IsAuthenticated) { - @T("Welcome, {0}!", WorkContext.CurrentUser.UserName) - - } else { - - } -
\ No newline at end of file diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj index 8f2bf8452..d36bb0b97 100644 --- a/src/Orchard.Web/Themes/Themes.csproj +++ b/src/Orchard.Web/Themes/Themes.csproj @@ -67,7 +67,6 @@ Designer - @@ -224,6 +223,10 @@ + + + +