Combine layouts

Web/Models/Log.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Web.Mvc;
+using MileageTraker.Web.Attributes;
 using MileageTraker.Web.DAL;
 using MileageTraker.Web.Utility;
 

Web/Models/User.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Web.Mvc;
 using System.Web.Security;
 
 namespace MileageTraker.Web.Models
@@ -8,11 +9,16 @@ namespace MileageTraker.Web.Models
 	public class User
 	{
 		[Key]
+		[HiddenInput(DisplayValue = false)]
 		public virtual Guid UserId { get; set; }
 
 		[Required]
+		[Display(Name = "Email")]
+		[DataType(DataType.EmailAddress)]
 		public virtual String Username { get; set; }
 
+		[HiddenInput(DisplayValue = false)]
+		[DataType(DataType.EmailAddress)]
 		public virtual String Email { get; set; }
 
 		[Required, DataType(DataType.Password)]
@@ -24,21 +30,39 @@ namespace MileageTraker.Web.Models
 		[DataType(DataType.MultilineText)]
 		public virtual String Comment { get; set; }
 
+		[HiddenInput(DisplayValue = false)]
 		public virtual Boolean IsApproved { get; set; }
+
+		[HiddenInput]
 		public virtual int PasswordFailuresSinceLastSuccess { get; set; }
+
 		public virtual DateTime? LastPasswordFailureDate { get; set; }
 		public virtual DateTime? LastActivityDate { get; set; }
 		public virtual DateTime? LastLockoutDate { get; set; }
 		public virtual DateTime? LastLoginDate { get; set; }
+
+		[HiddenInput(DisplayValue = false)]
 		public virtual String ConfirmationToken { get; set; }
+
+		[HiddenInput]
 		public virtual DateTime? CreateDate { get; set; }
+
+		[HiddenInput]
 		public virtual Boolean IsLockedOut { get; set; }
+
+		[HiddenInput]
 		public virtual DateTime? LastPasswordChangedDate { get; set; }
+
+		// TODO: change to Password Reset Token
+		[HiddenInput(DisplayValue = false)]
 		public virtual String PasswordVerificationToken { get; set; }
+
+		[HiddenInput(DisplayValue = false)]
 		public virtual DateTime? PasswordVerificationTokenExpirationDate { get; set; }
 
+		[HiddenInput]
 		public virtual ICollection<Role> Roles { get; set; }
-		
+
 		public MembershipUser CloneToMembershipUser(string providerName)
 		{
 			return new MembershipUser(providerName, Username, UserId,

Web/Models/Vehicle.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using MileageTraker.Web.Attributes;
 using MileageTraker.Web.Utility;
 
 namespace MileageTraker.Web.Models