From 89864bee85fd60bb22c0c64d603bde8e700507f9 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Sun, 25 Jul 2010 02:05:48 -0700
Subject: [PATCH] A little more cleanup for the content type/part edit UI

--HG--
branch : dev
---
 .../Core/ContentsLocation/Styles/admin.css           |  6 ++++--
 .../Modules/Orchard.ContentTypes/Styles/admin.css    |  6 ++++--
 .../ViewModels/EditTypeViewModel.cs                  |  7 ++++---
 .../Orchard.ContentTypes/Views/Admin/Edit.ascx       |  2 +-
 .../Views/EditorTemplates/Field.ascx                 | 12 +++++++-----
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/Orchard.Web/Core/ContentsLocation/Styles/admin.css b/src/Orchard.Web/Core/ContentsLocation/Styles/admin.css
index 619ebfa2b..376c52109 100644
--- a/src/Orchard.Web/Core/ContentsLocation/Styles/admin.css
+++ b/src/Orchard.Web/Core/ContentsLocation/Styles/admin.css
@@ -3,13 +3,15 @@
 }
 fieldset.location-setting legend {
     font-weight:normal;
+    margin:0;
+    padding-bottom:0;
 }
 fieldset.location-setting label {
     display:inline;
 }
-fieldset.location-setting input {
+fieldset.location-setting input.text-box {
     display:block;
-    width:20em;
+    width:24em;
 }
 fieldset.location-setting fieldset {
     clear:none;
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css
index a39291ea6..ad2620ebe 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css
@@ -10,7 +10,7 @@
     margin-top:-3.1em;
 }
 .manage-part {
-    margin-bottom:2em;
+    margin-bottom:1em;
 }
 .manage-part h3,
 .manage-field h3 {
@@ -23,8 +23,8 @@
 .manage-part h3,
 .manage-field h3,
 .manage-part h4,
+.manage-type .manage-field .details,
 .manage-type .manage-part .manage-field,
-.manage-type .manage-field fieldset,
 .manage-type .manage-part .settings {
     padding-left:20px;
 }
@@ -46,6 +46,7 @@
     font-size:1.4em;
     margin-top:-2.4em;
 }
+.manage-field .details,
 .manage-part .details {
     overflow:auto;
 }
@@ -56,6 +57,7 @@
 .manage-field label {
     font-weight:normal;
 }
+.manage-field fieldset,
 .manage-part fieldset {
     margin:.5em 0 1em;
     padding:0;
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
index 28e548d61..386cbcc9b 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Orchard.ContentManagement.MetaData.Models;
 using Orchard.ContentManagement.ViewModels;
@@ -31,7 +32,7 @@ namespace Orchard.ContentTypes.ViewModels {
         public ContentTypeDefinition _Definition { get; private set; }
 
         private IEnumerable<EditPartFieldViewModel> GetTypeFields(ContentTypeDefinition contentTypeDefinition) {
-            var implicitTypePart = contentTypeDefinition.Parts.SingleOrDefault(p => p.PartDefinition.Name == Name);
+            var implicitTypePart = contentTypeDefinition.Parts.SingleOrDefault(p => string.Equals(p.PartDefinition.Name, Name, StringComparison.OrdinalIgnoreCase));
 
             return implicitTypePart == null
                 ? Enumerable.Empty<EditPartFieldViewModel>()
@@ -40,7 +41,7 @@ namespace Orchard.ContentTypes.ViewModels {
 
         private IEnumerable<EditTypePartViewModel> GetTypeParts(ContentTypeDefinition contentTypeDefinition) {
             return contentTypeDefinition.Parts
-                .Where(p => p.PartDefinition.Name != Name)
+                .Where(p => !string.Equals(p.PartDefinition.Name, Name, StringComparison.OrdinalIgnoreCase))
                 .Select((p, i) => new EditTypePartViewModel(i, p) { Type = this });
         }
     }
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
index d525ed5d2..89c8f540d 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
@@ -31,7 +31,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
 using (this.Capture("end-of-page-scripts")) { %>
 <script type="text/javascript">
     (function ($) {
-        $(".manage-part h3").expandoControl(function (controller) { return controller.nextAll(".details"); }, { collapse: true, remember: false });
+        $(".manage-field h3,.manage-part h3").expandoControl(function (controller) { return controller.nextAll(".details"); }, { collapse: true, remember: false });
         $(".manage-field h4").expandoControl(function (controller) { return controller.nextAll(".settings"); }, { collapse: true, remember: false });
     })(jQuery);
 </script><%
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx
index 65e6fc7e8..0970b33a6 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx
@@ -3,9 +3,11 @@
         <h3><%:Model.Name %> <span>(<%:Model.FieldDefinition.Name %>)</span></h3>
         <div class="manage">
             <%:Html.ActionLink(T("Remove").Text, "RemoveFieldFrom", new { area = "Orchard.ContentTypes", id = Model.Part.Name, Model.Name }, new { itemprop = "RemoveUrl UnsafeUrl" })%><%--// <- some experimentation--%>
-        </div><%
-        Html.RenderTemplates(Model.Templates);
-        %><%:Html.HiddenFor(m => m.Name)
-        %><%:Html.HiddenFor(m => m.FieldDefinition.Name)
-        %><%:Html.HiddenFor(m => m.Index) %>
+        </div>
+        <div class="details"><%
+            Html.RenderTemplates(Model.Templates);
+            %><%:Html.HiddenFor(m => m.Name)
+            %><%:Html.HiddenFor(m => m.FieldDefinition.Name)
+            %><%:Html.HiddenFor(m => m.Index) %>
+        </div>
     </fieldset>
\ No newline at end of file