Last of the yui related markup cleanup

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

src/Orchard.Web/Core/Settings/Views/Admin/EditorTemplates/SettingsIndexViewModel.ascx

@@ -1,23 +1,20 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<SettingsIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Core.Settings.ViewModels"%>
 <%@ Import Namespace="Orchard.Utility" %>
-
-<h3>Global Settings</h3>
-<ol>
-<%=Html.EditorFor(s=>s.Id) %>
-    <li>
-        <%= Html.LabelFor(x=>x.SiteName) %>
-        <%= Html.EditorFor(x=>x.SiteName) %>
-        <%= Html.ValidationMessage("SiteName", "*")%>
-    </li>
-    <li>
-        <%= Html.LabelFor(x => x.SuperUser)%>
-        <%= Html.EditorFor(x=>x.SuperUser) %>
-        <%= Html.ValidationMessage("SuperUser", "*")%>
-    </li>
-</ol>
-
-
-<% foreach(var e in Model.EditorModel.Editors) {%>
+<fieldset>
+    <legend>Global Settings</legend>
+    <fieldset>
+        <%=Html.LabelFor(x=>x.SiteName) %>
+        <%=Html.EditorFor(x=>x.SiteName) %>
+        <%=Html.ValidationMessage("SiteName", "*") %>
+    </fieldset>
+    <fieldset>
+        <%=Html.LabelFor(x => x.SuperUser) %>
+        <%=Html.EditorFor(x=>x.SuperUser) %>
+        <%=Html.ValidationMessage("SuperUser", "*") %>
+    </fieldset>
+    <%=Html.EditorFor(s=>s.Id) %>
+</fieldset>
+<% foreach(var e in Model.EditorModel.Editors) { %>
      <%=Html.EditorFor(m => e.Model, e.TemplateName, e.Prefix)%>
-<%} %>
+<% } %>

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

@@ -1,24 +1,12 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Core.Settings.ViewModels.SettingsIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <% Html.Include("AdminHead"); %>
-    <div class="yui-u">
-        <h2 class="separator">
-            Edit Settings</h2>
-    </div>
-    <div class="yui-u">
-        <%using (Html.BeginForm()) { %>
-        <ol>
-            <%= Html.ValidationSummary() %>
-            <%= Html.EditorForModel() %>
-            <li class="clearLayout">
-            <%--<label for="SiteName">Site Name:</label>
-                <input id="SiteName" class="inputText inputTextLarge roundCorners" name="SiteName" type="text" value="<%= Model.SiteSettings.SiteName %>" />    
-            <label for="SuperUser">Super User Name:</label>    
-                <input id="SuperUser" class="inputText inputTextLarge roundCorners" name="SuperUser" type="text" value="<%= Model.SiteSettings.SuperUser %>" />
---%>                <input class="button" type="submit" value="Save" /> 
-                <%=Html.ActionLink("Cancel", "Index", new{}, new{@class="button"}) %>
-                </li>
-        </ol>
-        <%}/*EndForm*/%>
-    </div>
+    <h2>Edit Settings</h2>
+    <%using (Html.BeginForm()) { %>
+        <%= Html.ValidationSummary() %>
+        <%= Html.EditorForModel() %>
+        <fieldset>
+            <input class="button" type="submit" value="Save" /> 
+        </fieldset>
+    <% } %>
 <% Html.Include("AdminFoot"); %>

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

@@ -1,22 +1,13 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<ThemesIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Core.Themes.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<%
-    Html.Include("AdminHead");%>
-    <div class="yui-u">
-        <h2 class="separator">
-            Manage Themes</h2>
-    </div>
-    <div class="yui-u">
-    <ul class="templates">
-        <li>
-        <div>
+<%Html.Include("AdminHead");%>
+    <h2>Manage Themes</h2>
     <h3>Current Theme</h3>
-    <% if (Model.CurrentTheme == null) { %>
-           <p>There is no current theme in the application. The built-in theme will be used.<br />
-           <%=Html.ActionLink("Install a new Theme", "Install") %></p>
-    <% } else { %>
-        <h4><%= Model.CurrentTheme.DisplayName %> </h4>
+    <% if (Model.CurrentTheme == null) {
+        %><p>There is no current theme in the application. The built-in theme will be used.<br /><%=Html.ActionLink("Install a new Theme", "Install") %></p><%
+       } else {
+        %><h4><%= Model.CurrentTheme.DisplayName %></h4>
          <p><img src="<%= ResolveUrl("~/Themes/" + Model.CurrentTheme.ThemeName + "/Theme.gif")%>" alt="<%= Model.CurrentTheme.DisplayName %>" /><br />
             By <%= Model.CurrentTheme.Author %><br />
             <%= Model.CurrentTheme.Version %><br />
@@ -25,14 +16,11 @@
             <%=Html.ActionLink("Install a new Theme", "Install") %>
          </p>
     <% } %>
-    </div>
-        </li>
-        <li>
-            
-    <div>
     <h3>Available Themes</h3>
+    <ul class="templates">
     <% foreach (var theme in Model.Themes) {
-        if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) {%>
+        if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) {
+            %><li>
             <h4><%= theme.DisplayName %> </h4>
             <p><img src="<%= ResolveUrl("~/Themes/" + theme.ThemeName + "/Theme.gif") %>" alt="<%= theme.DisplayName %>" /><br />
             By <%= theme.Author %><br />
@@ -41,10 +29,8 @@
             <%= theme.HomePage %><br />
             <%=Html.ActionLink("Activate", "Activate", new {themeName = theme.ThemeName}) %>
             </p>
+        </li>
         <% }
     } %>
-</div>
-        </li>
-</ul>
-    </div>
+    </ul>
 <% Html.Include("AdminFoot"); %>