From 4ee8800bdf2c4905179cd7b1c937686d22decafa Mon Sep 17 00:00:00 2001
From: skewed <none@none>
Date: Fri, 8 Jan 2010 23:19:49 +0000
Subject: [PATCH] UI cleanup pass (progress - Orchard.Sandbox)

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045167
---
 .../Core/Settings/Views/Admin/Index.ascx           | 14 +++++++-------
 .../EditorTemplates/Parts/Themes.SiteSettings.ascx |  4 ++--
 .../Items/Sandbox.Page.Summary.ascx                | 11 +++++------
 .../Views/DisplayTemplates/Items/Sandbox.Page.ascx |  8 ++++----
 .../DisplayTemplates/Parts/Sandbox.Page.Title.ascx |  6 ++----
 .../Views/EditorTemplates/Items/Sandbox.Page.ascx  | 13 ++++++-------
 .../Parts/Sandbox.SiteSettings.ascx                | 12 +++++++-----
 .../Orchard.Sandbox/Views/Page/Create.aspx         | 13 ++++++++-----
 .../Packages/Orchard.Sandbox/Views/Page/Edit.aspx  |  8 +++++---
 .../Packages/Orchard.Sandbox/Views/Page/Index.aspx | 10 ++++------
 .../Packages/Orchard.Sandbox/Views/Page/Show.aspx  |  2 +-
 11 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx b/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx
index 61e24fabe..bb4d85414 100644
--- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx
+++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx
@@ -5,25 +5,25 @@
 <%= Html.ValidationSummary() %>
 <fieldset>
     <legend><%=_Encoded("Global Settings")%></legend>
-    <fieldset>
+    <div>
         <%=Html.LabelFor(x=>x.SiteName) %>
         <%=Html.EditorFor(x=>x.SiteName) %>
         <%=Html.ValidationMessage("SiteName", "*") %>
-    </fieldset>
-    <fieldset>
+    </div>
+    <div>
         <%=Html.LabelFor(x => x.PageTitleSeparator) %>
         <%=Html.EditorFor(x => x.PageTitleSeparator)%>
         <%=Html.ValidationMessage("PageTitleSeparator", "*")%>
-    </fieldset>
-    <fieldset>
+    </div>
+    <div>
         <%=Html.LabelFor(x => x.SuperUser) %>
         <%=Html.EditorFor(x=>x.SuperUser) %>
         <%=Html.ValidationMessage("SuperUser", "*") %>
-    </fieldset>
-    <%=Html.EditorFor(s=>s.Id) %>
+    </div>
 </fieldset>
 <%= Html.EditorForItem(Model.ViewModel) %>
 <fieldset>
+    <%=Html.EditorFor(s => s.Id) %>
     <input class="button" type="submit" value="<%=_Encoded("Save") %>" />
 </fieldset>
 <% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Parts/Themes.SiteSettings.ascx b/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Parts/Themes.SiteSettings.ascx
index 7fdbd3b60..eee660137 100644
--- a/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Parts/Themes.SiteSettings.ascx
+++ b/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Parts/Themes.SiteSettings.ascx
@@ -2,9 +2,9 @@
 <%@ Import Namespace="Orchard.Core.Themes.Records"%>
 <fieldset>
     <legend><%=_Encoded("Themes")%></legend>
-    <fieldset>
+    <div>
         <%= Html.LabelFor(x=>x.CurrentThemeName) %>
         <%= Html.EditorFor(x=>x.CurrentThemeName) %>
         <%= Html.ValidationMessage("CurrentThemeName", "*")%>
-    </fieldset>
+    </div>
 </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.Summary.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.Summary.ascx
index ff07ee172..933ccacdb 100644
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.Summary.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.Summary.ascx
@@ -1,9 +1,8 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<SandboxPage>>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<SandboxPage>>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Sandbox.Models" %>
-
 <div class="item">
-<% Html.Zone("title"); %>
-<% Html.Zone("metatop"); %>
-<% Html.Zone("body"); %>
-</div>
+<% Html.Zone("title");
+   Html.Zone("metatop");
+   Html.Zone("body"); %>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.ascx
index 4208cb10e..1b1c585e4 100644
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<SandboxPage>>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<SandboxPage>>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Sandbox.Models" %>
 <div class="item">
@@ -8,8 +8,8 @@
     </div>
     <% Html.Zone("metatop"); %>
     <div class="actions">
-        <%=Html.ItemEditLink("Edit this page", Model.Item) %>
-        <%=Html.ActionLink("Return to list", "index") %>
+        <%=Html.ItemEditLink(T("Edit this page").ToString(), Model.Item) %>
+        <%=Html.ActionLink(T("Return to list").ToString(), "index") %>
         <% Html.Zone("actions"); %>
     </div>
     <div class="body">
@@ -20,4 +20,4 @@
         <% Html.ZonesExcept("last"); %>
         <% Html.Zone("last"); %>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Parts/Sandbox.Page.Title.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Parts/Sandbox.Page.Title.ascx
index 7ca78b3ed..df84c03ff 100644
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Parts/Sandbox.Page.Title.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Parts/Sandbox.Page.Title.ascx
@@ -1,5 +1,3 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IContent>" %>
-<%@ Import Namespace="Orchard.Sandbox.Models" %>
-<%@ Import Namespace="Orchard.ContentManagement.ViewModels" %>
-<%@ Import Namespace="Orchard.ContentManagement" %>
-<h1><%=Html.ItemDisplayLink(Model) %></h1>
+<%@ Import Namespace="Orchard.ContentManagement"%>
+<h2><%=Html.ItemDisplayLink(Model) %></h2>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/EditorTemplates/Items/Sandbox.Page.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/EditorTemplates/Items/Sandbox.Page.ascx
index 553526d12..8d6cd3591 100644
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/EditorTemplates/Items/Sandbox.Page.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/EditorTemplates/Items/Sandbox.Page.ascx
@@ -1,9 +1,8 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<SandboxPage>>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<%@ Import Namespace="Orchard.Sandbox.Models" %>
-
-<li>
-    <%=Html.LabelFor(m => m.Item.Record.Name)%>
-    <%=Html.EditorFor(m => m.Item.Record.Name)%>
-</li>
-<% Html.ZonesAny(); %>
+<%@ Import Namespace="Orchard.Sandbox.Models"%>
+<fieldset>
+    <%=Html.LabelFor(m => m.Item.Record.Name) %>
+    <%=Html.EditorFor(m => m.Item.Record.Name) %>
+</fieldset>
+<% Html.ZonesAny(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/EditorTemplates/Parts/Sandbox.SiteSettings.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/EditorTemplates/Parts/Sandbox.SiteSettings.ascx
index 40875d89e..62148ff78 100644
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/EditorTemplates/Parts/Sandbox.SiteSettings.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/EditorTemplates/Parts/Sandbox.SiteSettings.ascx
@@ -1,8 +1,10 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Sandbox.Models.SandboxSettingsRecord>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SandboxSettingsRecord>" %>
+<%@ Import Namespace="Orchard.Sandbox.Models"%>
 <fieldset>
     <legend>Sandbox</legend>
-    <%= Html.LabelFor(x=>x.AllowAnonymousEdits) %>
-    <%= Html.EditorFor(x=>x.AllowAnonymousEdits) %>
-    <%= Html.ValidationMessage("AllowAnonymousEdits", "*")%>
-    <br />
+    <div>
+        <%=Html.EditorFor(m => m.AllowAnonymousEdits) %>
+        <label class="forcheckbox" for="SandboxSettings_AllowAnonymousEdits"><%=_Encoded("Anyone can create and edit pages") %></label>
+        <%=Html.ValidationMessage("AllowAnonymousEdits", "*") %>
+    </div>
 </fieldset>
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Create.aspx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Create.aspx
index 355d09531..9e55fc775 100644
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Create.aspx
@@ -1,7 +1,10 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageCreateViewModel>" %>
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<PageCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<h1><%=Html.TitleForPage("Create Page")%></h1>
-<%using (Html.BeginFormAntiForgeryPost()) { %>
-    <%=Html.LabelFor(x => x.Name)%><%=Html.EditorFor(x => x.Name)%>
-    <input type="submit" name="submit" value="Create" />
+<h1><%=Html.TitleForPage(T("Create Page").ToString())%></h1>
+<% using (Html.BeginFormAntiForgeryPost()) { %>
+    <fieldset>
+        <%=Html.LabelFor(x => x.Name) %>
+        <%=Html.EditorFor(x => x.Name) %>
+        <input type="submit" name="submit" value="<%=_Encoded("Create") %>" />
+    </fieldset>
 <% } %>
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Edit.aspx
index 8f56849a3..5fc6feb18 100644
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Edit.aspx
@@ -1,7 +1,9 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageEditViewModel>" %>
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<PageEditViewModel>" %>
 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<h1><%=Html.TitleForPage("Edit Page")%></h1>
+<h1><%=Html.TitleForPage(T("Edit Page").ToString()) %></h1>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.EditorForItem(Model.Page) %>
-    <input type="submit" name="submit" value="Save" />
+    <fieldset>
+        <input type="submit" name="submit" value="<%=_Encoded("Save") %>" />
+    </fieldset>
 <% } %>
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Index.aspx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Index.aspx
index 606cdd7c9..b129f242b 100644
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Index.aspx
@@ -1,7 +1,5 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageIndexViewModel>" %>
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<PageIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<h1><%=Html.TitleForPage("Sandbox Pages")%></h1>
-<p><%=Html.ActionLink("Create new page", "create") %></p>
-<%foreach (var item in Model.Pages) {%>
-    <%=Html.DisplayForItem(item) %>
-<%}%>
+<h1><%=Html.TitleForPage(T("Sandbox Pages").ToString()) %></h1>
+<p><%=Html.ActionLink(T("Create new page").ToString(), "create") %></p>
+<%=Html.UnorderedList(Model.Pages, (sp, i) => Html.DisplayForItem(sp).ToHtmlString(), "pages contentItems") %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Show.aspx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Show.aspx
index 9f67d524b..165490752 100644
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Show.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Show.aspx
@@ -1,3 +1,3 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageShowViewModel>" %>
 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<%= Html.DisplayForItem(Model.Page) %>
+<%=Html.DisplayForItem(Model.Page) %>
\ No newline at end of file