Retiring ContentItemViewModel

...and all that entails
- things like IZone and IZoneCollection are barely roughed in

--HG--
branch : theming

src/Orchard.Web/Modules/Orchard.Users/ViewModels/UserCreateViewModel.cs

@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Orchard.Mvc.ViewModels;
-using Orchard.Security;
+using Orchard.ContentManagement;
 
 namespace Orchard.Users.ViewModels {
     public class UserCreateViewModel  {
@@ -16,6 +15,6 @@ namespace Orchard.Users.ViewModels {
         [Required, DataType(DataType.Password)]
         public string ConfirmPassword { get; set; }
 
-        public ContentItemViewModel<IUser> User { get; set; }
+        public IContent User { get; set; }
     }
 }

src/Orchard.Web/Modules/Orchard.Users/ViewModels/UserEditViewModel.cs

@@ -1,27 +1,27 @@
 using System.ComponentModel.DataAnnotations;
 using System.Web.Mvc;
-using Orchard.Mvc.ViewModels;
+using Orchard.ContentManagement;
 using Orchard.Users.Models;
 
 namespace Orchard.Users.ViewModels {
     public class UserEditViewModel  {
         [HiddenInput(DisplayValue = false)]
         public int Id {
-            get { return User.Item.Id; }
+            get { return User.ContentItem.Id; }
         }
 
         [Required]
         public string UserName {
-            get { return User.Item.Record.UserName; }
-            set { User.Item.Record.UserName = value; }
+            get { return User.As<UserPart>().Record.UserName; }
+            set { User.As<UserPart>().Record.UserName = value; }
         }
 
         [Required]
         public string Email {
-            get { return User.Item.Record.Email; }
-            set { User.Item.Record.Email = value; }
+            get { return User.As<UserPart>().Record.Email; }
+            set { User.As<UserPart>().Record.Email = value; }
         }
 
-        public ContentItemViewModel<UserPart> User { get; set; }
+        public IContent User { get; set; }
     }
 }