Merge pull request #29 from serra/template_review

Template review: code templates should match the default scaffolding
erichexter · Nov 13, 2014 · aa15efc · aa15efc
2 parents 4ab1c3e + e085fc7
commit aa15efc
Show file tree

Hide file tree

Showing 13 changed files with 124 additions and 135 deletions.
diff --git a/Test/EndToEnd/test.ps1 b/Test/EndToEnd/test.ps1
@@ -10,7 +10,11 @@
     $p = new-mvcapplication foobar
     install-package Newtonsoft.Json
     install-package twitter.bootstrap.mvc4.sample -source $source
-    build-project $p    
+    build-project $p
+    #close and open solution to remove annoying build errors in temp files
+    $slnFile = $dte.Solution.FullName
+    close-solution
+    open-solution $slnFile        
     pop-location
 	$dte.ExecuteCommand("debug.start")
 }

diff --git a/src/Bootstrap/CodeTemplates/AddController/ControllerWithContext.tt b/src/Bootstrap/CodeTemplates/AddController/ControllerWithContext.tt
@@ -36,7 +36,7 @@ namespace <#= Model.Namespace #>
     var lambdaVar = modelVariable[0];
     var isObjectContext = typeof(ObjectContext).IsAssignableFrom(Model.ContextType);
 #>
-    public class <#= Model.ControllerName #> : BootstrapBaseController
+    public class <#= Model.ControllerName #> : BootstrapMvcSample.Controllers.BootstrapBaseController
     {
         private <#= Model.ContextType.Name #> db = new <#= Model.ContextType.Name #>();
 
@@ -160,8 +160,24 @@ namespace <#= Model.Namespace #>
 
         //
         // GET: <#= routePrefix #>Delete/5
+
+		[HttpGet]
+		public ActionResult Delete(<#= primaryKey.ShortTypeName #> id)
+        {
+<# if(isObjectContext) { #>
+            <#= modelName #> <#= modelVariable #> = db.<#= entitySetName #>.Single(<#= lambdaVar #> => <#= lambdaVar #>.<#= primaryKey.Name #> == id);
+<# } else { #>
+            <#= modelName #> <#= modelVariable #> = db.<#= entitySetName #>.Find(id);
+<# } #>
+            if (<#= modelVariable #> == null)
+            {
+                return HttpNotFound();
+            }
+            return View(<#= modelVariable #>);
+        }
 
-        public ActionResult Delete(<#= primaryKey.ShortTypeName #> id)
+		[HttpPost, ActionName("Delete")]
+        public ActionResult DeleteModel(<#= primaryKey.ShortTypeName #> id)
         {
 <# if(isObjectContext) { #>
             <#= modelName #> <#= modelVariable #> = db.<#= entitySetName #>.Single(<#= lambdaVar #> => <#= lambdaVar #>.<#= primaryKey.Name #> == id);

diff --git a/src/Bootstrap/CodeTemplates/AddView/CSHTML/Create.tt b/src/Bootstrap/CodeTemplates/AddView/CSHTML/Create.tt
@@ -15,6 +15,7 @@
 <#
 MvcTextTemplateHost mvcHost = MvcTemplateHost;
 #>
+@using BootstrapSupport
 @model <#= mvcHost.ViewDataTypeName #>
 <#
 // The following chained if-statement outputs the file header code and markup for a partial view, a content page, or a regular view.
@@ -36,8 +37,6 @@ if (!String.IsNullOrEmpty(mvcHost.MasterPageFile)) {
 #>
 }
 
-<h2><#= mvcHost.ViewName#></h2>
-
 <#
 } else {
 #>
@@ -75,8 +74,8 @@ if (mvcHost.ReferenceScriptLibraries) {
 @using (Html.BeginForm()) {
     @Html.ValidationSummary(true)
 
-    <fieldset>
-        <legend><#= mvcHost.ViewDataType.Name #></legend>
+    <fieldset class="form-horizontal">
+        <legend>@Model.GetLabel() <small>Details</small></legend>
 
 <#
 foreach (ModelProperty property in GetModelProperties(mvcHost.ViewDataType)) {
@@ -86,11 +85,11 @@ foreach (ModelProperty property in GetModelProperties(mvcHost.ViewDataType)) {
 <#
         if (property.IsForeignKey) {
 #>
-			@Html.LabelFor(model => model.<#= property.Name #>, "<#= property.AssociationName #>")
+			@Html.LabelFor(model => model.<#= property.Name #>, "<#= property.AssociationName #>", new { @class = "control-label" })
 <#
         } else {
 #>
-			@Html.LabelFor(model => model.<#= property.Name #>)
+			@Html.LabelFor(model => model.<#= property.Name #>, new { @class = "control-label" })
 <#
         }
 #>
@@ -115,33 +114,17 @@ foreach (ModelProperty property in GetModelProperties(mvcHost.ViewDataType)) {
     }
 }
 #>
-        <div class="control-group">
-			<div class="controls">
-				<input type="submit" value="Create" class="btn" /> &nbsp; @Html.ActionLink("Cancel", "Index")
-			</div>
-        </div>
+		<div class="form-actions">
+			<button type="submit" class="btn btn-primary">Save changes</button>
+			@Html.ActionLink("Cancel", "Index", null, new { @class = "btn " })
+		</div>
     </fieldset>
 }
 
 <#
 if(mvcHost.IsContentPage && mvcHost.ReferenceScriptLibraries) {
 #>
 
-@section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
-
-	<script>
-
-	$.validator.setDefaults({
-            highlight: function (element) {
-                $(element).closest(".control-group").addClass("error");
-            },
-            unhighlight: function (element) {
-                $(element).closest(".control-group").removeClass("error");
-            }
-        });
-	</script>
-}
 <#
 }
 #>

diff --git a/src/Bootstrap/CodeTemplates/AddView/CSHTML/Delete.tt b/src/Bootstrap/CodeTemplates/AddView/CSHTML/Delete.tt
@@ -16,6 +16,7 @@
 <#
 MvcTextTemplateHost mvcHost = MvcTemplateHost;
 #>
+@using BootstrapSupport
 @model <#= mvcHost.ViewDataTypeName #>
 <#
 // The following chained if-statement outputs the file header code and markup for a partial view, a content page, or a regular view.
@@ -37,8 +38,6 @@ if (!String.IsNullOrEmpty(mvcHost.MasterPageFile)) {
 #>
 }
 
-<h2><#= mvcHost.ViewName#></h2>
-
 <#
 } else {
 #>
@@ -59,33 +58,34 @@ if (!String.IsNullOrEmpty(mvcHost.MasterPageFile)) {
     PushIndent("    ");
 }
 #>
-<h3>Are you sure you want to delete this?</h3>
+@using (Html.BeginForm())
+{
+
 <fieldset>
-    <legend><#= mvcHost.ViewDataType.Name #></legend>
+    <legend>@Model.GetLabel() <small>Details</small></legend>
+	<dl>
 <#
 foreach (ModelProperty property in GetModelProperties(mvcHost.ViewDataType)) {
     if (!property.IsPrimaryKey && property.Scaffold) {
 #>
 
-    <dl class="dl-horizontal">
 		<dt>
 			@Html.DisplayNameFor(model => model.<#= property.ValueExpression #>)
 		</dt>    
 		<dd>
 			@Html.DisplayFor(model => model.<#= property.ValueExpression #>)
 		</dd>
-    </dl>
 <#
     }
 }
 #>
-</fieldset>
-@using (Html.BeginForm()) {
-    <div class="control-group">
-		<div class="controls">
-			<input type="submit" value="Delete" class="btn" /> &nbsp; @Html.ActionLink("Cancel", "Index")
-		</div>
+    </dl>
+    <div class="form-actions">
+        <button type="submit" class="btn btn-danger">Delete</button>
+        @Html.ActionLink("Cancel", "Index", null, new { @class = "btn" })
     </div>
+</fieldset>
+
 }
 <#
 // The following code closes the asp:Content tag used in the case of a master page and the body and html tags in the case of a regular view page

diff --git a/src/Bootstrap/CodeTemplates/AddView/CSHTML/Details.tt b/src/Bootstrap/CodeTemplates/AddView/CSHTML/Details.tt
@@ -16,6 +16,7 @@
 <#
 MvcTextTemplateHost mvcHost = MvcTemplateHost;
 #>
+@using BootstrapSupport
 @model <#= mvcHost.ViewDataTypeName #>
 <#
 // The following chained if-statement outputs the file header code and markup for a partial view, a content page, or a regular view.
@@ -37,8 +38,6 @@ if (!String.IsNullOrEmpty(mvcHost.MasterPageFile)) {
 #>
 }
 
-<h2><#= mvcHost.ViewName#></h2>
-
 <#
 } else {
 #>
@@ -60,24 +59,23 @@ if (!String.IsNullOrEmpty(mvcHost.MasterPageFile)) {
 }
 #>
 <fieldset>
-    <legend><#= mvcHost.ViewDataType.Name #></legend>
+    <legend>@Model.GetLabel() <small>Details</small></legend>
+	    <dl>  <!-- consider adding class="dl-horizontal" for horizontal styling -->
 <#
 foreach (ModelProperty property in GetModelProperties(mvcHost.ViewDataType)) {
     if (!property.IsPrimaryKey && property.Scaffold) {
 #>
-
-    <dl class="dl-horizontal">
-		<dt>
-			@Html.DisplayNameFor(model => model.<#= property.ValueExpression #>)
-		</dt>
-		<dd>
-			@Html.DisplayFor(model => model.<#= property.ValueExpression #>)
-		</dd>
-	</dl>
+			<dt>
+				@Html.DisplayNameFor(model => model.<#= property.ValueExpression #>)
+			</dt>
+			<dd>
+				@Html.DisplayFor(model => model.<#= property.ValueExpression #>)
+			</dd>
 <#
     }
 }
 #>
+	</dl>
 </fieldset>
 <p>
 <#

diff --git a/src/Bootstrap/CodeTemplates/AddView/CSHTML/Edit.tt b/src/Bootstrap/CodeTemplates/AddView/CSHTML/Edit.tt
@@ -15,6 +15,7 @@
 <#
 MvcTextTemplateHost mvcHost = MvcTemplateHost;
 #>
+@using BootstrapSupport
 @model <#= mvcHost.ViewDataTypeName #>
 <#
 // The following chained if-statement outputs the file header code and markup for a partial view, a content page, or a regular view.
@@ -36,8 +37,6 @@ if (!String.IsNullOrEmpty(mvcHost.MasterPageFile)) {
 #>
 }
 
-<h2><#= mvcHost.ViewName#></h2>
-
 <#
 } else {
 #>
@@ -75,81 +74,57 @@ if (mvcHost.ReferenceScriptLibraries) {
 @using (Html.BeginForm()) {
     @Html.ValidationSummary(true)
 
-    <fieldset>
-        <legend><#= mvcHost.ViewDataType.Name #></legend>
+    <fieldset class="form-horizontal">
+        <legend>@Model.GetLabel() <small>Details</small></legend>
 
 <#
 foreach (ModelProperty property in GetModelProperties(mvcHost.ViewDataType)) {
-    if (property.Scaffold) {
-        if (property.IsPrimaryKey) {
-#>
-        @Html.HiddenFor(model => model.<#= property.Name #>)
-
-<#
-        } else if (!property.IsReadOnly) {
+    if (!property.IsPrimaryKey && !property.IsReadOnly && property.Scaffold) {
 #>
-
         <div class="control-group">
 <#
-            if (property.IsForeignKey) {
+        if (property.IsForeignKey) {
 #>
-            @Html.LabelFor(model => model.<#= property.Name #>, "<#= property.AssociationName #>")
+			@Html.LabelFor(model => model.<#= property.Name #>, "<#= property.AssociationName #>", new { @class = "control-label" })
 <#
-            } else {
+        } else {
 #>
-            @Html.LabelFor(model => model.<#= property.Name #>)
+			@Html.LabelFor(model => model.<#= property.Name #>, new { @class = "control-label" })
 <#
-            }
+        }
 #>
 
 			<div class="controls">
 <#
-            if (property.IsForeignKey) {
+        if (property.IsForeignKey) {
 #>
 				@Html.DropDownList("<#= property.Name #>", String.Empty)
 <#
-            } else {
+        } else {
 #>
 				@Html.EditorFor(model => model.<#= property.Name #>)
 <#
-            }
+        }
 #>
 				@Html.ValidationMessageFor(model => model.<#= property.Name #>, string.Empty, new { @class="help-inline" })
-			</div> 
-		</div>	
+			</div>
+		</div>
 
 <#
-        }
     }
 }
 #>
-        <div class="control-group">
-			<div class="controls">
-				<input type="submit" value="Save" class="btn" /> &nbsp; @Html.ActionLink("Cancel", "Index")
-			</div>
-        </div>
+		<div class="form-actions">
+			<button type="submit" class="btn btn-primary">Save changes</button>
+			@Html.ActionLink("Cancel", "Index", null, new { @class = "btn " })
+		</div>
     </fieldset>
 }
 
 <#
 if(mvcHost.IsContentPage && mvcHost.ReferenceScriptLibraries) {
 #>
 
-@section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
-
-	<script>
-
-	$.validator.setDefaults({
-            highlight: function (element) {
-                $(element).closest(".control-group").addClass("error");
-            },
-            unhighlight: function (element) {
-                $(element).closest(".control-group").removeClass("error");
-            }
-        });
-	</script>
-}
 <#
 }
 #>