From de32e6ed5caae291d74ba086203cb8b6e1247967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=9F=B3=E5=A4=B4?= <nnhy@vip.qq.com>
Date: Tue, 20 Sep 2016 10:15:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=B0=83=E8=A1=A8=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E5=B0=BE=E5=A4=84=20=E5=88=9B=E5=BB=BA=E3=80=81=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E3=80=81=E5=A4=87=E6=B3=A8=20=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 NewLife.Cube/Common/HtmlExtensions.cs         |  4 +--
 NewLife.Cube/Views/Shared/_Form_Footer.cshtml | 16 +++++-----
 .../Views/Shared/_Form_Footer.generated.cs    | 29 +++++++++----------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/NewLife.Cube/Common/HtmlExtensions.cs b/NewLife.Cube/Common/HtmlExtensions.cs
index 0ee8139a3e..d5ab49df0d 100644
--- a/NewLife.Cube/Common/HtmlExtensions.cs
+++ b/NewLife.Cube/Common/HtmlExtensions.cs
@@ -245,7 +245,7 @@ public static MvcHtmlString ForString(this HtmlHelper Html, String name, String
             }
             else if (length < 0 || length > 300)
             {
-                txt = Html.TextArea(name, value, atts);
+                txt = Html.TextArea(name, value, 3, 20, atts);
             }
             else
             {
@@ -365,7 +365,7 @@ public static MvcHtmlString ForDouble(this HtmlHelper Html, String name, Double
         {
             var atts = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes);
             if (!atts.ContainsKey("class")) atts.Add("class", "form-control");
-            
+
             var txt = Html.TextBox(name, value, format, atts);
 
             return txt;
diff --git a/NewLife.Cube/Views/Shared/_Form_Footer.cshtml b/NewLife.Cube/Views/Shared/_Form_Footer.cshtml
index d83d83fa4d..bc6348cf21 100644
--- a/NewLife.Cube/Views/Shared/_Form_Footer.cshtml
+++ b/NewLife.Cube/Views/Shared/_Form_Footer.cshtml
@@ -10,15 +10,15 @@
     var cip = fact.Table.FindByName("CreateIP") as FieldItem;
     var uip = fact.Table.FindByName("UpdateIP") as FieldItem;
     var remark = fact.Table.FindByName("Remark") as FieldItem;
-    if (remark != null) { remark = fact.Table.FindByName("Description"); }
+    if (remark == null) { remark = fact.Table.FindByName("Description"); }
 }
 @if (cid != null)
 {
     var user = fact.Table.FindByName("CreateUserName") as FieldItem;
     var time = fact.Table.FindByName("CreateTime") as FieldItem;
     <div class="form-group col-sm-12 col-md-6">
-        <label class="control-label col-md-2">创建</label>
-        <div class="control-label col-md-10" style="text-align: left;">
+        <label class="control-label col-xs-2 col-sm-2 col-md-2">创建</label>
+        <div class="control-label col-xs-8 col-sm-8 col-md-10" style="text-align: left;">
             @if (user != null)
                 {
                 <span class="text-primary">@entity[user.Name]</span>
@@ -41,8 +41,8 @@
     var user = fact.Table.FindByName("UpdateUserName") as FieldItem;
     var time = fact.Table.FindByName("UpdateTime") as FieldItem;
     <div class="form-group col-sm-12 col-md-6">
-        <label class="control-label col-md-2">更新</label>
-        <div class="control-label col-md-10" style="text-align: left;">
+        <label class="control-label col-xs-2 col-sm-2 col-md-2">更新</label>
+        <div class="control-label col-xs-8 col-sm-8 col-md-10" style="text-align: left;">
             @if (user != null)
                 {
                 <span class="text-primary">@entity[user.Name]</span>
@@ -63,10 +63,10 @@
 @if (remark != null && !fields.Contains(remark))
 {
     <div class="form-group col-sm-12 col-md-12">
-        <label class="control-label col-md-2">@remark.DisplayName</label>
-        <div class="input-group col-md-6">
+        <label class="control-label col-xs-2 col-sm-2 col-md-1">@remark.DisplayName</label>
+        <div class="col-xs-8 col-sm-8 col-md-8">
             @Html.ForString(remark.Name, (String)entity[remark.Name], -1)
             @Html.ForDescription(remark)
         </div>
     </div>
-}
+}
\ No newline at end of file
diff --git a/NewLife.Cube/Views/Shared/_Form_Footer.generated.cs b/NewLife.Cube/Views/Shared/_Form_Footer.generated.cs
index 794599051b..4cc05c6b0f 100644
--- a/NewLife.Cube/Views/Shared/_Form_Footer.generated.cs
+++ b/NewLife.Cube/Views/Shared/_Form_Footer.generated.cs
@@ -65,7 +65,7 @@ public override void Execute()
     var cip = fact.Table.FindByName("CreateIP") as FieldItem;
     var uip = fact.Table.FindByName("UpdateIP") as FieldItem;
     var remark = fact.Table.FindByName("Remark") as FieldItem;
-    if (remark != null) { remark = fact.Table.FindByName("Description"); }
+    if (remark == null) { remark = fact.Table.FindByName("Description"); }
 
             
             #line default
@@ -88,11 +88,11 @@ public override void Execute()
 
 WriteLiteral(">\r\n        <label");
 
-WriteLiteral(" class=\"control-label col-md-2\"");
+WriteLiteral(" class=\"control-label col-xs-2 col-sm-2 col-md-2\"");
 
 WriteLiteral(">创建</label>\r\n        <div");
 
-WriteLiteral(" class=\"control-label col-md-10\"");
+WriteLiteral(" class=\"control-label col-xs-8 col-sm-8 col-md-10\"");
 
 WriteLiteral(" style=\"text-align: left;\"");
 
@@ -182,14 +182,14 @@ public override void Execute()
 
 WriteLiteral(" class=\"text-primary\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 1426), Tuple.Create("\"", 1437)
+WriteAttribute("title", Tuple.Create(" title=\"", 1462), Tuple.Create("\"", 1473)
             
             #line 34 "..\..\Views\Shared\_Form_Footer.cshtml"
-, Tuple.Create(Tuple.Create("", 1434), Tuple.Create<System.Object, System.Int32>(ip
+, Tuple.Create(Tuple.Create("", 1470), Tuple.Create<System.Object, System.Int32>(ip
             
             #line default
             #line hidden
-, 1434), false)
+, 1470), false)
 );
 
 WriteLiteral(">");
@@ -235,11 +235,11 @@ public override void Execute()
 
 WriteLiteral(">\r\n        <label");
 
-WriteLiteral(" class=\"control-label col-md-2\"");
+WriteLiteral(" class=\"control-label col-xs-2 col-sm-2 col-md-2\"");
 
 WriteLiteral(">更新</label>\r\n        <div");
 
-WriteLiteral(" class=\"control-label col-md-10\"");
+WriteLiteral(" class=\"control-label col-xs-8 col-sm-8 col-md-10\"");
 
 WriteLiteral(" style=\"text-align: left;\"");
 
@@ -329,14 +329,14 @@ public override void Execute()
 
 WriteLiteral(" class=\"text-primary\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 2325), Tuple.Create("\"", 2336)
+WriteAttribute("title", Tuple.Create(" title=\"", 2397), Tuple.Create("\"", 2408)
             
             #line 58 "..\..\Views\Shared\_Form_Footer.cshtml"
-, Tuple.Create(Tuple.Create("", 2333), Tuple.Create<System.Object, System.Int32>(ip
+, Tuple.Create(Tuple.Create("", 2405), Tuple.Create<System.Object, System.Int32>(ip
             
             #line default
             #line hidden
-, 2333), false)
+, 2405), false)
 );
 
 WriteLiteral(">");
@@ -380,20 +380,20 @@ public override void Execute()
 
 WriteLiteral(">\r\n        <label");
 
-WriteLiteral(" class=\"control-label col-md-2\"");
+WriteLiteral(" class=\"control-label col-xs-2 col-sm-2 col-md-1\"");
 
 WriteLiteral(">");
 
             
             #line 66 "..\..\Views\Shared\_Form_Footer.cshtml"
-                                         Write(remark.DisplayName);
+                                                           Write(remark.DisplayName);
 
             
             #line default
             #line hidden
 WriteLiteral("</label>\r\n        <div");
 
-WriteLiteral(" class=\"input-group col-md-6\"");
+WriteLiteral(" class=\"col-xs-8 col-sm-8 col-md-8\"");
 
 WriteLiteral(">\r\n");
 
@@ -422,7 +422,6 @@ public override void Execute()
             
             #line 72 "..\..\Views\Shared\_Form_Footer.cshtml"
 }
-
             
             #line default
             #line hidden