From b1a761b640ad8f50180d75568a6d861d605b80c3 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Sun, 25 Jul 2010 23:38:14 -0700
Subject: [PATCH] Giving the TextField display template some markup around the
 value.

--HG--
branch : dev
---
 .../Fields/Common.TextField.ascx              |  5 +++--
 .../Extensions/StringExtensions.cs            | 19 +------------------
 .../ViewModels/EditTypeViewModel.cs           |  1 +
 .../Themes/TheAdmin/Styles/site.css           |  7 +++++++
 .../Utility/Extensions/StringExtensions.cs    | 14 +++++++++++++-
 5 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Fields/Common.TextField.ascx b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Fields/Common.TextField.ascx
index 7b32c89e6..546140ac5 100644
--- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Fields/Common.TextField.ascx
+++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Fields/Common.TextField.ascx
@@ -1,2 +1,3 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Core.Common.Fields.TextField>" %>
-<%: Model.Value %>
\ No newline at end of file
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Common.Fields.TextField>" %>
+<%@ Import Namespace="Orchard.Utility.Extensions" %>
+<p class="text-field"><span class="name"><%:Model.Name.CamelFriendly() %>:</span> <%:Model.Value %></p>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Extensions/StringExtensions.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Extensions/StringExtensions.cs
index ec79e96dc..c32c99fea 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Extensions/StringExtensions.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Extensions/StringExtensions.cs
@@ -1,22 +1,5 @@
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace Orchard.ContentTypes.Extensions {
+namespace Orchard.ContentTypes.Extensions {
     public static class StrinExtensions {
-        private static readonly Regex humps = new Regex("[A-Z][^A-Z]*");
-        public static string CamelFriendly(this string camel) {
-            if (camel == null)
-                return null;
-
-            var matches = humps.Matches(camel).OfType<Match>().Select(m => m.Value);
-            if (matches.Any()) {
-                return matches.Aggregate((a, b) => a + " " + b).TrimStart(' ');
-            }
-            else {
-                return camel;
-            }
-        }
-
         public static string TrimEnd(this string rough, string trim = "") {
             if (rough == null)
                 return null;
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
index 386cbcc9b..80e2d7166 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
@@ -5,6 +5,7 @@ using Orchard.ContentManagement.MetaData.Models;
 using Orchard.ContentManagement.ViewModels;
 using Orchard.ContentTypes.Extensions;
 using Orchard.Mvc.ViewModels;
+using Orchard.Utility.Extensions;
 
 namespace Orchard.ContentTypes.ViewModels {
     public class EditTypeViewModel : BaseViewModel {
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index b9818cb7c..a0847f825 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -800,6 +800,13 @@ table .button {
 }
 
 
+/* Fields
+----------------------------------------------------------*/
+/* TextField */
+#main .summary .text-field {
+    margin:.5em 0;
+}
+
 /* ---------- Generic ---------- */
 #main .breadcrumb {
     margin-top:-1.5em;
diff --git a/src/Orchard/Utility/Extensions/StringExtensions.cs b/src/Orchard/Utility/Extensions/StringExtensions.cs
index 0f81246e8..8aac63eb4 100644
--- a/src/Orchard/Utility/Extensions/StringExtensions.cs
+++ b/src/Orchard/Utility/Extensions/StringExtensions.cs
@@ -1,8 +1,20 @@
-using System.Text.RegularExpressions;
+using System.Linq;
+using System.Text.RegularExpressions;
 using Orchard.Localization;
 
 namespace Orchard.Utility.Extensions {
     public static class StringExtensions {
+        private static readonly Regex humps = new Regex("[A-Z][^A-Z]*");
+        public static string CamelFriendly(this string camel) {
+            if (camel == null)
+                return null;
+
+            var matches = humps.Matches(camel).OfType<Match>().Select(m => m.Value);
+            return matches.Any()
+                ? matches.Aggregate((a, b) => a + " " + b).TrimStart(' ')
+                : camel;
+        }
+
         public static string Ellipsize(this string text, int characterCount) {
             return text.Ellipsize(characterCount, "&#160;&#8230;");
         }