diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css index 7acaebe11..a82cdbf06 100644 --- a/src/Orchard.Web/Content/Admin/css/base.css +++ b/src/Orchard.Web/Content/Admin/css/base.css @@ -297,7 +297,6 @@ div.confirmation, div.warning, div.critical { /* Forms ----------------------------------------------------------*/ - fieldset.bulk.actions { display:inline; margin:0 1.4em -.7em 0; @@ -314,12 +313,16 @@ label span { font-weight:normal; } +/* todo: (heskew) try to get .text on stuff like #PublishLaterDate */ select, textarea, input.text, #PublishLaterDate { margin:3px 4px 4px; padding:2px; border:1px solid #d2d6c6; color:#5a5b32; } +select:focus, textarea:focus, input.text:focus, #PublishLaterDate:focus { + border-color:#666d51; +} input.large.text, textarea, fieldset { clear:both; @@ -363,7 +366,7 @@ button, .button { button:hover, .button:hover, button:focus, .button:focus { background:#8a8f7a; - border:1px solid #666d51; + border-color:#666d51; color:#f6faea; text-decoration:none; } diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx index c4265b4d0..3a415ce24 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx @@ -3,23 +3,10 @@ <%@ Import Namespace="Orchard.Security" %> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("Head"); %> -
-

- Create New Blog

-

- Manage Blogs > Create -

-
-
- <%using (Html.BeginForm()) { %> -
    - <%= Html.ValidationSummary() %> - <%= Html.EditorForModel() %> -
  1. - - Cancel -
  2. -
- <%}/*EndForm*/%> -
+

Create New Blog

+

Manage Blogs > Create

+ <%using (Html.BeginForm()) { %> + <%= Html.ValidationSummary() %> + <%= Html.EditorForModel() %> + <%}/*EndForm*/%> <% Html.Include("Foot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx index 27caade2b..a9191585e 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx @@ -1,26 +1,12 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%> -<%@ Import Namespace="Orchard.Security" %> -<%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("Head"); %> -
-

- Edit Blog

-

- Manage Blogs > Edit #<%= Model.Id%> <%=Html.Encode(Model.Name)%> -

-
-
- <%using (Html.BeginForm()) { %> -
    - <%= Html.ValidationSummary() %> - <%= Html.EditorForModel() %> -
  1. - - Cancel -
  2. -
- <%}/*EndForm*/%> -
+

Edit Blog

+

Manage Blogs > Edit #<%= Model.Id%> <%=Html.Encode(Model.Name)%>

+ <% using (Html.BeginForm()) { %> + <%= Html.ValidationSummary() %> + <%= Html.EditorForModel()%> + <% } %> <% Html.Include("Foot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogEditViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogEditViewModel.ascx new file mode 100644 index 000000000..68188084d --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogEditViewModel.ascx @@ -0,0 +1,14 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Blogs.ViewModels"%> +
+ + <%=Html.EditorFor(m => m.Name) %> +
+<%=Html.EditorFor(m => m.Slug, "BlogPermalink") %> +
+ + <%=Html.EditorFor(m => m.Description) %> +
+
+ +
\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogPermalink.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogPermalink.ascx new file mode 100644 index 000000000..c418f606f --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogPermalink.ascx @@ -0,0 +1,5 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +
+ + <%=Html.TextBox("", Model, new { id = "permalink", @class = "text" })%> « How to write a permalink. » +
\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/CreateBlogViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/CreateBlogViewModel.ascx new file mode 100644 index 000000000..18b3947e8 --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/CreateBlogViewModel.ascx @@ -0,0 +1,14 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Blogs.ViewModels"%> +
+ + <%=Html.EditorFor(m => m.Name) %> +
+<%=Html.EditorFor(m => m.Slug, "BlogPermalink") %> +
+ + <%=Html.EditorFor(m => m.Description) %> +
+
+ +
\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx index a7734fd6f..7559e6bc6 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx @@ -3,7 +3,7 @@ <% Html.Include("Head"); %>

Add a Page

Select your layout from one of the templates below.

- <%using (Html.BeginForm()) { %> + <% using (Html.BeginForm()) { %> <%=Html.ValidationSummary() %> <%=Html.EditorForModel() %> <% } %>