- More blogs admin UI work (mostly on /admin/blogs/<blog name>)

- More admin UI cleanup (working on getting rid of the remaining yui markup)

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043118

src/Orchard.Web/Content/Admin/css/base.css

@@ -322,6 +322,9 @@ select, textarea, input.text, input.text-box, #PublishLaterDate {
 	border:1px solid #d2d6c6;
 	color:#5a5b32;
 }
+input.text {
+    line-height:1.2em;
+}
 select:focus, textarea:focus, input.text:focus, input.text-box:focus, #PublishLaterDate:focus {
 	border-color:#666d51;
 }

src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogForAdmin.ascx

@@ -1,8 +1,12 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Blog>" %>
+<%@ Import Namespace="Orchard.Comments.Models"%>
+<%@ Import Namespace="Orchard.Models"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h3><a href="<%=Url.BlogForAdmin(Model.Slug) %>"><%=Html.Encode(Model.Name) %></a></h3>
-<div class="meta"><a href="<%=Url.BlogForAdmin(Model.Slug) %>"><%=Model.PostCount %> posts</a> | <a href="#"><%=(new Random()).Next(0, 1000) %> comments</a></div>
+<div class="meta">
+    <% var postCount = Model.PostCount; %><a href="<%=Url.BlogForAdmin(Model.Slug) %>"><%=string.Format("{0} post{1}", postCount, postCount == 1 ? "" : "s") %></a>
+    | <%var commentCount = (new Random()).Next(0, 1000); // Model.As<HasComments>().Comments.Count(); %><a href="#"><%=string.Format("{0} comment{1}", commentCount, commentCount == 1 ? "" : "s") %></a></div>
 <%--<p>[list of authors] [modify blog access]</p>--%>
 <p><%=Model.Description %></p>
 <p class="actions">

src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx

@@ -2,20 +2,12 @@
 <%@ Import Namespace="Orchard.Security" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
 <% Html.Include("AdminHead"); %>
-    <div class="yui-u">
+    <h2>Add a new User</h2>
-        <h2 class="separator">
+    <%using (Html.BeginForm()) { %>
-            Add a new User</h2>
+        <%= Html.ValidationSummary() %>
-            
+        <%= Html.EditorForModel() %>
-    </div>
+        <fieldset>
-    <div class="yui-u">
+            <input class="button" type="submit" value="Create" />
-        <%using (Html.BeginForm()) { %>
+        </fieldset>
-        <ol>
+    <% } %>
-            <%= Html.ValidationSummary() %>
-            <%= Html.EditorForModel() %>
-            <li class="clearLayout">
-                <input class="button" type="submit" value="Create" />
-                <%=Html.ActionLink("Cancel", "Index", new{}, new{@class="button"}) %></li>
-        </ol>
-        <%}/*EndForm*/%>
-    </div>
 <% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserCreateViewModel.ascx

@@ -1,13 +1,14 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Users.ViewModels.UserCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Utility" %>
-
+<fieldset>
-<ol>
     <%=Html.EditorFor(m=>m.UserName, "inputTextLarge") %>
     <%=Html.EditorFor(m=>m.Email, "inputTextLarge") %>
     <%=Html.EditorFor(m=>m.Password, "inputPasswordLarge") %>
     <%=Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %>
-</ol>
+</fieldset><%
-
+foreach(var e in Model.ItemView.Editors) {
-<% foreach(var e in Model.ItemView.Editors) {%>
+    var editor = e;%>
-     <%=Html.EditorFor(m => e.Model, e.TemplateName, e.Prefix)%>
+<fieldset>
-<%} %>
+    <%=Html.EditorFor(m => editor.Model, editor.TemplateName, editor.Prefix)%>
+</fieldset>
+<% } %>

src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/inputPasswordLarge.ascx

@@ -1,6 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
-<li>
+<fieldset>
     <%=Html.LabelForModel() %>
-    <%=Html.Password("",Model,new{@class="inputText inputTextLarge"}) %>
+    <%=Html.Password("",Model,new{@class="text"}) %>
     <%=Html.ValidationMessage("","*")%>
-</li>
+</fieldset>

src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/inputTextLarge.ascx

@@ -1,6 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
-<li>
+<fieldset>
     <%=Html.LabelForModel() %>
-    <%=Html.TextBox("",Model,new{@class="inputText inputTextLarge"}) %>
+    <%=Html.TextBox("",Model,new{@class="text"}) %>
     <%=Html.ValidationMessage("","*")%>
-</li>
+</fieldset>