diff --git a/src/Orchard.Web/Content/Site.css b/src/Orchard.Web/Content/Site.css index f29f72a8c..f45c3af97 100644 --- a/src/Orchard.Web/Content/Site.css +++ b/src/Orchard.Web/Content/Site.css @@ -315,3 +315,86 @@ div#title font-weight: bold; color: #ff0000; } + + +/* ALL THAT IS BELOW IS TEMPORARY TO MAKE THINGS LOOK DECENT IN THIS SKIN */ +.manage { + float:right; +} +.metadata { + color:#999; + margin-top:-2em; +} +.blog.metadata { + margin-top:-1.5em; +} +.metadata, p.tags { + font-size:95%; +} +ul.blogs, ul.posts { + padding-left:0; +} +ul.blogs li, ul.posts li { + list-style-type:none; +} + +/* Icon buttons +----------------------------------------------------------*/ +a.ibutton, a.ibutton:link, a.ibutton:visited { + background:url(Admin/css/images/icons.png) 0 -20px; + border:none; + display:inline; + float:left; + height:17px; + overflow:hidden; + padding:0 0 0 17px; + width:0; +} +a.ibutton:hover, a.ibutton:active, a.ibutton:focus { background-position:0 0; } +a.ibutton.remove, +a.ibutton.remove:link, +a.ibutton.remove:visited { background-position:-20px -20px; } +a.ibutton.remove:hover, a.ibutton.remove:active, a.ibutton.remove:focus { background-position:-20px 0; } +a.ibutton.view, +a.ibutton.view:link, +a.ibutton.view:visited { background-position:-40px -20px; } +a.ibutton.view:hover, a.ibutton.view:active, a.ibutton.view:focus { background-position:-40px 0; } +a.ibutton.add.page, +a.ibutton.add.page:link, +a.ibutton.add.page:visited { background-position:-60px -20px; } +a.ibutton.add.page:hover, a.ibutton.add.page:active, a.ibutton.add.page:focus { background-position:-60px 0; } +a.ibutton.edit, +a.ibutton.edit:link, +a.ibutton.edit:visited { background-position:-80px -20px; } +a.ibutton.edit:hover, a.ibutton.edit:active, a.ibutton.edit:focus { background-position:-80px 0; } +a.ibutton.publish, +a.ibutton.publish:link, +a.ibutton.publish:visited { background-position:-100px -20px; } +a.ibutton.publish:hover, a.ibutton.publish:active, a.ibutton.publish:focus { background-position:-100px 0; } +a.ibutton.blog, +a.ibutton.blog:link, +a.ibutton.blog:visited { background-position:-120px -20px; } +a.ibutton.blog:hover, a.ibutton.blog:active, a.ibutton.blog:focus { background-position:-120px 0; } + +/* Forms +----------------------------------------------------------*/ +fieldset { + border:0; + margin:0 0 1em; + padding:0; +} +form.comments { + overflow:hidden; +} +form.comments fieldset.who, form.comments fieldset.what { + float:left; + margin-right:15px; +} +form.comments label { + font-weight:bold; + margin-top:15px; +} +form.comments .button { + margin-top:15px; + +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Providers/BodyAspectProvider.cs b/src/Orchard.Web/Core/Common/Providers/BodyAspectProvider.cs index 2deba52a9..89410a1e0 100644 --- a/src/Orchard.Web/Core/Common/Providers/BodyAspectProvider.cs +++ b/src/Orchard.Web/Core/Common/Providers/BodyAspectProvider.cs @@ -16,7 +16,7 @@ namespace Orchard.Core.Common.Providers { OnGetDisplayViewModel((context, body) => { var model = new BodyDisplayViewModel { BodyAspect = body }; - context.AddDisplay(new TemplateViewModel(model, TemplatePrefix) { TemplateName = TemplateName, ZoneName = "body" }); + context.AddDisplay(new TemplateViewModel(model, TemplatePrefix) { TemplateName = TemplateName }); }); OnGetEditorViewModel((context, body) => { diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs index 408cd7abe..8c74bfb76 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs @@ -168,7 +168,7 @@ namespace Orchard.Blogs.Controllers { IValueProvider values = input.ToValueProvider(); TryUpdateModel(model, values); - _notifier.Information(T("Blog post information updated")); + _notifier.Information(T("Blog post information updated.")); //TODO: (erikpo) Since the model isn't actually updated yet and it's possible the slug changed I'm getting the slug from input. Lame?!?! return Redirect(Url.BlogPostEdit(blog.Slug, values.GetValue(ControllerContext, "Slug").AttemptedValue)); diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/Blog.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/Blog.ascx index 36bf6463f..7598eeacd 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/Blog.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/Blog.ascx @@ -1,8 +1,6 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> -

- <%=Html.Encode(Model.Name) %> - (<%=Model.PostCount %> post<%=Model.PostCount == 1 ? "" : "s" %>) -

+

<%=Html.Encode(Model.Name) %>

+
<%=Model.PostCount %> post<%=Model.PostCount == 1 ? "" : "s" %>

<%=Model.Description %>

diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.aspx index fdca819f7..1cc971670 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.aspx @@ -8,12 +8,12 @@ <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%-- todo: (heskew) make master-less when we get into theming --%> -

<%=Html.Encode(Model.Blog.Name) %>

-
<%=Html.Encode(Model.Blog.Description) %>
-
(edit)
<% +
edit
+

<%=Html.Encode(Model.Blog.Name) %>

+
<%=Html.Encode(Model.Blog.Description) %>
<% //TODO: (erikpo) Move this into a helper if (Model.Posts.Count() > 0) { %> -
    <% +
      <% foreach (BlogPost post in Model.Posts) { %>
    • <% Html.RenderPartial("BlogPostPreview", post); %>
      • <% } %> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.aspx index 7a67c7839..1b7fec467 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.aspx @@ -5,7 +5,7 @@ <%@ Import Namespace="Orchard.Mvc.Html"%> <%-- todo: (heskew) make master-less when we get into theming --%> -

      Blogs

      +

      Blogs

      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

      <%=Html.DisplayForModel() %>       \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.aspx index 7d4f44c16..6e64e80f0 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.aspx @@ -8,14 +8,14 @@ <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%-- todo: (heskew) make master-less when we get into theming --%> -

      <%=Html.Encode(Model.Post.Title) %>

      + <%-- todo: (heskew) needs to be an h1 --%> +
      edit
      +

      <%=Html.Encode(Model.Post.Title) %>

      - <%if (Model.Post.Creator != null) {%> -
      Posted by <%=Html.Encode(Model.Post.Creator.UserName)%> <%=Html.PublishedWhen(Model.Post)%>
      - <%}%> - + <% if (Model.Post.Creator != null) { + %>
      Posted by <%=Html.Encode(Model.Post.Creator.UserName)%> <%=Html.PublishedWhen(Model.Post)%>
      <% + } %>
      - <%foreach (var display in Model.ItemView.Displays) { %> <%=Html.DisplayFor(m=>display.Model, display.TemplateName, display.Prefix) %> <%} %> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/BlogPostPreview.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/BlogPostPreview.ascx index d5d6d4862..a83f10018 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/BlogPostPreview.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/BlogPostPreview.ascx @@ -3,6 +3,6 @@ <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Core.Common.Models"%> <%@ Import Namespace="Orchard.Blogs.Models"%> -

      <%=Html.Encode(Model.As().Title) %>

      -
      <%=Html.PublishedWhen() %>
      +

      <%=Html.Encode(Model.As().Title) %>

      +
      <%=Html.PublishedState() %> | ?? comments
      <%=Model.Body %>
      \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs b/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs index c6466dda1..db7b4a4bf 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs +++ b/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs @@ -23,7 +23,7 @@ namespace Orchard.Comments.Models { if (context.ContentItem.Has() == false) { return; } - context.AddDisplay(new TemplateViewModel(context.ContentItem.Get())); + context.AddDisplay(new TemplateViewModel(context.ContentItem.Get()) { Position = "999" }); } protected override void GetEditorViewModel(GetEditorViewModelContext context) { diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/DisplayTemplates/HasComments.ascx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/DisplayTemplates/HasComments.ascx index b50c868c5..66171a2c1 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/DisplayTemplates/HasComments.ascx +++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/DisplayTemplates/HasComments.ascx @@ -1,51 +1,38 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Comments.Models"%> -

      <%=Model.Comments.Count() %> Comment<%=Model.Comments.Count() == 1 ? "" : "s" %>

      <% +

      <%=Model.Comments.Count() %> Comment<%=Model.Comments.Count() == 1 ? "" : "s" %>

      <% foreach (var comment in Model.Comments) { %> -
      -
      -

      +

      +
      <%--TODO: (erikpo) Need to clean the name and url so nothing dangerous goes out--%> - <%=Html.LinkOrDefault(comment.UserName, comment.SiteName, new { rel = "nofollow" })%> - said
      <%=Html.Link(Html.DateTimeRelative(comment.CommentDate), "#")%>       -

      + <%=Html.LinkOrDefault(comment.UserName, comment.SiteName, new { rel = "nofollow" })%> + said <%=Html.Link(Html.DateTimeRelative(comment.CommentDate), "#")%> +

      <%=comment.CommentText %>

      <% } - if (Model.Closed) { %> -

      Comments have been disabled for this content.

      <% - } - else { %> -<% Html.BeginForm("Create", "Admin", new { area = "Orchard.Comments" }); %> -<%=Html.ValidationSummary() %> -
      -

      Add a Comment

      -
        -
      1. +if (Model.Closed) { %> +

        Comments have been disabled for this content.

        <% +} else { %> + <% using(Html.BeginForm("Create", "Admin", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comments" })) { %> + <%=Html.ValidationSummary() %> +
        <%= Html.Hidden("CommentedOn", Model.ContentItem.Id) %> <%= Html.Hidden("ReturnUrl", Context.Request.Url) %> - - -
        2. -
      2. - - -
        3. -
      3. - - -
        4. -
      4. + +
        + +
        + +
        + +
        - -
        5. -
      5. +
        -
        6. -
      -
      -<% Html.EndForm(); %><% - } %> \ No newline at end of file + <% + } +} %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkProvider.cs b/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkProvider.cs index 5940d49e3..5dc2c6394 100644 --- a/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkProvider.cs +++ b/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkProvider.cs @@ -4,10 +4,10 @@ using Orchard.Models.ViewModels; namespace Orchard.DevTools.Models { public class DebugLinkProvider : ContentProvider { protected override void GetDisplayViewModel(GetDisplayViewModelContext context) { - context.AddDisplay(new TemplateViewModel(new ShowDebugLink { ContentItem = context.ContentItem }) { ZoneName = "recap", Position = "10" }); + context.AddDisplay(new TemplateViewModel(new ShowDebugLink { ContentItem = context.ContentItem }) { ZoneName = "recap", Position = "9999" }); } protected override void GetEditorViewModel(GetEditorViewModelContext context) { - context.AddEditor(new TemplateViewModel(new ShowDebugLink { ContentItem = context.ContentItem }) { ZoneName = "recap", Position = "10" }); + context.AddEditor(new TemplateViewModel(new ShowDebugLink { ContentItem = context.ContentItem }) { ZoneName = "recap", Position = "9999" }); } } } diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs b/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs index 12d553cd8..babf91c37 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs +++ b/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs @@ -32,8 +32,8 @@ namespace Orchard.Tags.Models { Filters.Add(new ActivatingFilter("blogpost")); OnGetDisplayViewModel((context, hasTags) => { - context.AddDisplay(new TemplateViewModel(hasTags) { ZoneName="metatop", Position = "2", TemplateName = "HasTagsList" }); - context.AddDisplay(new TemplateViewModel(hasTags) { ZoneName = "metabottom", Position = "5" }); + context.AddDisplay(new TemplateViewModel(hasTags) { Position = "1", TemplateName = "HasTagsList" }); + context.AddDisplay(new TemplateViewModel(hasTags) { Position = "1" }); }); } diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTags.ascx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTags.ascx index a795b446b..25d1270bb 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTags.ascx +++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTags.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Tags.Models"%> -

      Tags

      +<%--

      Tags

      <% Html.BeginForm("Edit", "Home", new { area = "Orchard.Tags" }); %> <%= Html.ValidationSummary() %>
      @@ -16,4 +16,4 @@
      -<% Html.EndForm(); %> \ No newline at end of file +<% Html.EndForm(); %>--%> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTagsList.ascx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTagsList.ascx index 1aa581a0e..4bce506a7 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTagsList.ascx +++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTagsList.ascx @@ -1,12 +1,8 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html" %> <%@ Import Namespace="Orchard.Tags.Models" %> -Tag<%=Model.CurrentTags.Count == 1 ? "" : "s" %>: <% - int tagCount = 0; - foreach (Tag tag in Model.CurrentTags) { - if (tagCount > 0) { - %>, <% - } - %><%=Html.ActionLink(tag.TagName, "Search", "Home", new{ area="Orchard.Tags", tagName=tag.TagName}, new {}) %><% - tagCount++; - } %> \ No newline at end of file +

      +<% if (Model.CurrentTags.Count > 0) { %>Tags: <% } %> +<%=string.Join(", ", Model.CurrentTags.Select(t => Html.ActionLink(t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = t.TagName }, new { }).ToHtmlString()).ToArray())%> +<%--<%=Html.UnorderedList(Model.CurrentTags, (t, i) => Html.ActionLink(t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = t.TagName }, new { }).ToHtmlString(), "tags")%>--%> +

      \ No newline at end of file