UI cleanup pass (progress - Orchard.Users, TinyMce and remaining Core modules)

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

src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ascx

@@ -1,7 +1,3 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BodyDisplayViewModel>" %>
 <%@ Import Namespace="Orchard.Core.Common.ViewModels"%>
-<%@ Import Namespace="Orchard.Core.Common.Models"%>
+<%=Model.BodyAspect.Record.Text %>
-<%@ Import Namespace="Orchard.Core.Settings.ViewModels"%>
-<%@ Import Namespace="Orchard.Utility" %>
-
-<%= Model.BodyAspect.Record.Text %>

src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Body.ascx

@@ -1,9 +1,7 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BodyEditorViewModel>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BodyEditorViewModel>" %>
 <%@ Import Namespace="Orchard.Core.Common.ViewModels" %>
-<%@ Import Namespace="Orchard.Core.Common.Models" %>
-<%@ Import Namespace="Orchard.Core.Settings.ViewModels" %>
-<%@ Import Namespace="Orchard.Utility" %>
 <fieldset>
-    <label>Body</label>
+    <label><%=_Encoded("Body")%></label>
-    <%=Html.EditorFor(m=>m.Text, Model.TextEditorTemplate) %>
+    <%=Html.EditorFor(m => m.Text, Model.TextEditorTemplate) %>
+    <%=Html.ValidationMessageFor(m => m.Text) %>
 </fieldset>

src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.ascx

@@ -1,11 +1,7 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<OwnerEditorViewModel>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<OwnerEditorViewModel>" %>
-<%@ Import Namespace="Orchard.Core.Common.ViewModels" %>
+<%@ Import Namespace="Orchard.Core.Common.ViewModels"%>
-<%@ Import Namespace="Orchard.Core.Common.Models" %>
-<%@ Import Namespace="Orchard.Core.Settings.ViewModels" %>
-<%@ Import Namespace="Orchard.Utility" %>
 <fieldset>
-    <legend>System</legend>
     <%=Html.LabelFor(m=>m.Owner) %>
     <%=Html.EditorFor(m=>m.Owner) %>
     <%=Html.ValidationMessageFor(m=>m.Owner) %>
-</fieldset>
+</fieldset>

src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx

@@ -1,11 +1,10 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Core.Settings.ViewModels.SettingsIndexViewModel>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SettingsIndexViewModel>" %>
-
+<%@ Import Namespace="Orchard.Core.Settings.ViewModels"%>
-<h2>
+<h1><%=Html.TitleForPage(T("Edit Settings").ToString())%></h1>
-    <%=Html.TitleForPage("Edit Settings")%></h2>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
 <%= Html.ValidationSummary() %>
 <fieldset>
-    <legend>Global Settings</legend>
+    <legend><%=_Encoded("Global Settings")%></legend>
     <fieldset>
         <%=Html.LabelFor(x=>x.SiteName) %>
         <%=Html.EditorFor(x=>x.SiteName) %>
@@ -23,10 +22,8 @@
     </fieldset>
     <%=Html.EditorFor(s=>s.Id) %>
 </fieldset>
-
 <%= Html.EditorForItem(Model.ViewModel) %>
-
 <fieldset>
-    <input class="button" type="submit" value="Save" />
+    <input class="button" type="submit" value="<%=_Encoded("Save") %>" />
 </fieldset>
 <% } %>

src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx

@@ -1,6 +1,6 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ThemesIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Core.Themes.ViewModels"%>
-<h1><%=Html.TitleForPage("Manage Themes") %></h1>
+<h1><%=Html.TitleForPage(T("Manage Themes").ToString()) %></h1>
 <h2><%=_Encoded("Current Theme")%></h2>
 <% if (Model.CurrentTheme == null) {
     %><p><%=_Encoded("There is no current theme in the application. The built-in theme will be used.")

src/Orchard.Web/Core/Themes/Views/Admin/Install.aspx

@@ -1,5 +1,5 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<object>" %>
-<h2><%=Html.TitleForPage("Install Theme") %></h2>
+<h1><%=Html.TitleForPage(T("Install Theme").ToString()) %></h1>
 <% using (Html.BeginForm("Install", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) {%>
     <%=Html.ValidationSummary() %>
     <fieldset>

src/Orchard.Web/Packages/Orchard.Users/Views/Account/AccessDenied.ascx

@@ -1,5 +1,4 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BaseViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<h2><%=Html.TitleForPage("Access Denied") %></h2>
+<h1><%=Html.TitleForPage(T("Access Denied").ToString()) %></h1>
-
+<p><%=_Encoded("You do not have permission to complete your request.")%></p>
-<p>You do not have permission to complete your request.</p>

src/Orchard.Web/Packages/Orchard.Users/Views/Account/ChangePassword.ascx

@@ -1,31 +1,28 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
-<h2><%=Html.TitleForPage("Change Password") %></h2>
+<h1><%=Html.TitleForPage(T("Change Password").ToString()) %></h1>
-<p>Use the form below to change your password. </p>
+<p><%=_Encoded("Use the form below to change your password.")%></p>
-<p>New passwords are required to be a minimum of <%=Html.Encode(ViewData["PasswordLength"])%> characters in length.</p>
+<p><%=_Encoded("New passwords are required to be a minimum of {0} characters in length.", ViewData["PasswordLength"] as string) %></p>
-<%= Html.ValidationSummary("Password change was unsuccessful. Please correct the errors and try again.")%>
+<%=Html.ValidationSummary(T("Password change was unsuccessful. Please correct the errors and try again.").ToString())%>
-
 <% using (Html.BeginFormAntiForgeryPost()) { %>
-    <div>
+    <fieldset>
+        <legend><%=_Encoded("Account Information")%></legend>
         <fieldset>
-            <legend>Account Information</legend>
+            <label for="currentPassword"><%=_Encoded("Current password:")%></label>
-            <p>
+            <%=Html.Password("currentPassword") %>
-                <label for="currentPassword">Current password:</label>
+            <%=Html.ValidationMessage("currentPassword") %>
-                <%= Html.Password("currentPassword") %>
-                <%= Html.ValidationMessage("currentPassword") %>
-            </p>
-            <p>
-                <label for="newPassword">New password:</label>
-                <%= Html.Password("newPassword") %>
-                <%= Html.ValidationMessage("newPassword") %>
-            </p>
-            <p>
-                <label for="confirmPassword">Confirm new password:</label>
-                <%= Html.Password("confirmPassword") %>
-                <%= Html.ValidationMessage("confirmPassword") %>
-            </p>
-            <p>
-                <input type="submit" value="Change Password" />
-            </p>
         </fieldset>
-    </div>
+        <fieldset>
+            <label for="newPassword"><%=_Encoded("New password:")%></label>
+            <%= Html.Password("newPassword") %>
+            <%= Html.ValidationMessage("newPassword") %>
+        </fieldset>
+        <fieldset>
+            <label for="confirmPassword"><%=_Encoded("Confirm new password:")%></label>
+            <%= Html.Password("confirmPassword") %>
+            <%= Html.ValidationMessage("confirmPassword") %>
+        </fieldset>
+        <fieldset>
+            <input type="submit" value="<%=_Encoded("Change Password") %>" />
+        </fieldset>
+    </fieldset>
 <% } %>

src/Orchard.Web/Packages/Orchard.Users/Views/Account/ChangePasswordSuccess.ascx

@@ -1,3 +1,3 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
-<h2><%=Html.TitleForPage("Change Password") %></h2>
+<h1><%=Html.TitleForPage(T("Change Password").ToString()) %></h2>
-<p>Your password has been changed successfully.</p>
+<p><%=_Encoded("Your password has been changed successfully.")%></p>

src/Orchard.Web/Packages/Orchard.Users/Views/Account/LogOn.ascx

@@ -1,32 +1,28 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<LogOnViewModel>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<LogOnViewModel>" %>
 <%@ Import Namespace="Orchard.Users.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<h1><%=Html.TitleForPage(Model.Title) %></h1>
-<h2><%=Html.TitleForPage(Model.Title) %></h2>
+<p><%=_Encoded("Please enter your username and password.")%> <%= Html.ActionLink("Register", "Register") %><%=_Encoded(" if you don't have an account.")%></p>
-<p>Please enter your username and password. <%= Html.ActionLink("Register", "Register") %> if you don't have an account.</p>
+<%= Html.ValidationSummary(T("Login was unsuccessful. Please correct the errors and try again.").ToString()) %>
-<%= Html.ValidationSummary("Login was unsuccessful. Please correct the errors and try again.") %>
-
 <% using (Html.BeginForm(new {Action="LogOn"})) { %>
-    <div>
+    <fieldset>
+        <legend><%=_Encoded("Account Information")%></legend>
         <fieldset>
-            <legend>Account Information</legend>
+            <label for="username"><%=_Encoded("Username:")%></label>
-            <p>
+            <%= Html.TextBox("username") %>
-                <label for="username">Username:</label>
+            <%= Html.ValidationMessage("username") %>
-                <%= Html.TextBox("username") %>
-                <%= Html.ValidationMessage("username") %>
-            </p>
-            <p>
-                <label for="password">Password:</label>
-                <%= Html.Password("password") %>
-                <%= Html.ValidationMessage("password") %>
-            </p>
-            <p>
-                <%= Html.CheckBox("rememberMe") %> <label class="inline" for="rememberMe">Remember me?</label>
-            </p>
-            <p>
-                <%=Html.HiddenFor(m=>m.ReturnUrl) %>
-                <%=Html.AntiForgeryTokenOrchard() %>
-                <input type="submit" value="Log On" />
-            </p>
         </fieldset>
-    </div>
+        <fieldset>
+            <label for="password"><%=_Encoded("Password:")%></label>
+            <%= Html.Password("password") %>
+            <%= Html.ValidationMessage("password") %>
+        </fieldset>
+        <fieldset>
+            <%= Html.CheckBox("rememberMe") %> <label class="inline" for="rememberMe"><%=_Encoded("Remember me?")%></label>
+        </fieldset>
+        <fieldset>
+            <%=Html.HiddenFor(m=>m.ReturnUrl) %>
+            <%=Html.AntiForgeryTokenOrchard() %>
+            <input type="submit" value="<%=_Encoded("Log On") %>" />
+        </fieldset>
+    </fieldset>
 <% } %>

src/Orchard.Web/Packages/Orchard.Users/Views/Account/Register.ascx

@@ -1,35 +1,33 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
-<h2><%=Html.TitleForPage("Create a New Account") %></h2>
+<h1><%=Html.TitleForPage(T("Create a New Account").ToString()) %></h1>
-<p>Use the form below to create a new account. </p>
+<p><%=_Encoded("Use the form below to create a new account.")%></p>
-<p>Passwords are required to be a minimum of <%=Html.Encode(ViewData["PasswordLength"])%> characters in length.</p>
+<p><%=_Encoded("Passwords are required to be a minimum of {0} characters in length.", ViewData["PasswordLength"] as string)%></p>
-<%= Html.ValidationSummary("Account creation was unsuccessful. Please correct the errors and try again.") %>
+<%=Html.ValidationSummary(T("Account creation was unsuccessful. Please correct the errors and try again.").ToString()) %>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
-    <div>
+    <fieldset>
+        <legend><%=_Encoded("Account Information")%></legend>
         <fieldset>
-            <legend>Account Information</legend>
+            <label for="username"><%=_Encoded("Username:")%></label>
-            <p>
+            <%= Html.TextBox("username") %>
-                <label for="username">Username:</label>
+            <%= Html.ValidationMessage("username") %>
-                <%= Html.TextBox("username") %>
-                <%= Html.ValidationMessage("username") %>
-            </p>
-            <p>
-                <label for="email">Email:</label>
-                <%= Html.TextBox("email") %>
-                <%= Html.ValidationMessage("email") %>
-            </p>
-            <p>
-                <label for="password">Password:</label>
-                <%= Html.Password("password") %>
-                <%= Html.ValidationMessage("password") %>
-            </p>
-            <p>
-                <label for="confirmPassword">Confirm password:</label>
-                <%= Html.Password("confirmPassword") %>
-                <%= Html.ValidationMessage("confirmPassword") %>
-            </p>
-            <p>
-                <input type="submit" value="Register" />
-            </p>
         </fieldset>
-    </div>
+        <fieldset>
+            <label for="email"><%=_Encoded("Email:")%></label>
+            <%= Html.TextBox("email") %>
+            <%= Html.ValidationMessage("email") %>
+        </fieldset>
+        <fieldset>
+            <label for="password"><%=_Encoded("Password:")%></label>
+            <%= Html.Password("password") %>
+            <%= Html.ValidationMessage("password") %>
+        </fieldset>
+        <fieldset>
+            <label for="confirmPassword"><%=_Encoded("Confirm password:")%></label>
+            <%= Html.Password("confirmPassword") %>
+            <%= Html.ValidationMessage("confirmPassword") %>
+        </fieldset>
+        <fieldset>
+            <input type="submit" value="<%=_Encoded("Register") %>" />
+        </fieldset>
+    </fieldset>
 <% } %>

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

@@ -1,6 +1,6 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Users.ViewModels.UserCreateViewModel>" %>
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<UserCreateViewModel>" %>
-<%@ Import Namespace="Orchard.Security" %>
+<%@ Import Namespace="Orchard.Users.ViewModels"%>
-<h2><%=Html.TitleForPage("Add User") %></h2>
+<h1><%=Html.TitleForPage(T("Add User").ToString()) %></h1>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary() %>
     <%=Html.EditorFor(m=>m.UserName, "inputTextLarge") %>
@@ -9,6 +9,6 @@
     <%=Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %>
     <%=Html.EditorForItem(Model.User) %>
     <fieldset>
-        <input class="button" type="submit" value="Create" />
+        <input class="button" type="submit" value="<%=_Encoded("Create") %>" />
     </fieldset>
 <% } %>

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

@@ -1,6 +1,6 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Users.ViewModels.UserEditViewModel>" %>
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<UserEditViewModel>" %>
-<%@ Import Namespace="Orchard.Security" %>
+<%@ Import Namespace="Orchard.Users.ViewModels"%>
-<h2><%=Html.TitleForPage("Edit User") %></h2>
+<h1><%=Html.TitleForPage(T("Edit User").ToString()) %></h1>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary() %>
     <%=Html.EditorFor(m=>m.Id) %>
@@ -8,6 +8,6 @@
     <%=Html.EditorFor(m=>m.Email, "inputTextLarge") %>
     <%=Html.EditorForItem(Model.User) %>
     <fieldset>
-        <input class="button" type="submit" value="Save" />
+        <input class="button" type="submit" value="<%=_Encoded("Save") %>" />
     </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>" %>
 <fieldset>
     <%=Html.LabelForModel() %>
-    <%=Html.Password("",Model,new{@class="text"}) %>
+    <%=Html.Password("", Model, new { @class = "text" }) %>
-    <%=Html.ValidationMessage("","*")%>
+    <%=Html.ValidationMessage("", "*") %>
 </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>" %>
 <fieldset>
     <%=Html.LabelForModel() %>
-    <%=Html.TextBox("",Model,new{@class="text"}) %>
+    <%=Html.TextBox("", Model, new { @class = "text" }) %>
-    <%=Html.ValidationMessage("","*")%>
+    <%=Html.ValidationMessage("", "*") %>
-</fieldset>
+</fieldset>

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

@@ -1,10 +1,9 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Users.ViewModels.UsersIndexViewModel>" %>
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<UsersIndexViewModel>" %>
-<%@ Import Namespace="Orchard.ContentManagement"%>
+<%@ Import Namespace="Orchard.Users.ViewModels"%>
-<%@ Import Namespace="Orchard.Security" %>
+<h1><%=Html.TitleForPage(T("Manage Users").ToString()) %></h1>
-<h2><%=Html.TitleForPage("Manage Users") %></h2>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary()%>
-    <div class="manage"><%=Html.ActionLink("Add a new user", "Create", new { }, new { @class = "button" })%></div>
+    <div class="manage"><%=Html.ActionLink(T("Add a new user").ToString(), "Create", new { }, new { @class = "button" })%></div>
     <fieldset>
         <table class="items">
             <colgroup>
@@ -14,14 +13,9 @@
             </colgroup>
             <thead>
                 <tr>
-                    <th scope="col">
+                    <th scope="col"><%=_Encoded("Name")%></th>
-                        Name
+                    <th scope="col"><%=_Encoded("Email")%></th>
-                    </th>
+                    <th scope="col"><%=_Encoded("") %></th>
-                    <th scope="col">
-                        Email
-                    </th>
-                    <th scope="col">
-                    </th>
                 </tr>
             </thead>
             <% foreach (var row in Model.Rows)
@@ -34,7 +28,7 @@
                     <%=Html.Encode(row.User.Email)%>
                 </td>
                 <td>
-                    <%=Html.ActionLink("Edit", "Edit", new { row.User.Id })%>
+                    <%=Html.ActionLink(T("Edit").ToString(), "Edit", new { row.User.Id })%>
                 </td>
             </tr>
             <%}%>

src/Orchard.Web/Packages/Orchard.Users/Views/EditorTemplates/Items/Users.User.ascx

@@ -1,4 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<User>>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<%@ Import Namespace="Orchard.Users.Models" %>
+<%@ Import Namespace="Orchard.Users.Models"%>
-<% Html.ZonesAny(); %>
+<% Html.ZonesAny(); %>

src/Orchard.Web/Packages/TinyMce/Views/EditorTemplates/TinyMceTextEditor.ascx

@@ -1,7 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
 <% Html.RegisterScript("tiny_mce.js"); %>
 <%=Html.TextArea("", Model, 25, 80, new { @class = "html" }) %>
-
 <%using (this.Capture("end-of-page-scripts")) {%>
 <script type="text/javascript">
     tinyMCE.init({

src/Orchard.Web/Themes/Orange/Styles/site.css

@@ -191,7 +191,7 @@ fieldset
     border: 1px solid #CCC;
 }
 
-fieldset p 
+fieldset fieldset 
 {
     margin: 2px 12px 10px 10px;
 }