Renaming wiki to sandbox

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041931

src/Orchard.Web/Orchard.Web.csproj

@@ -144,9 +144,9 @@
       <Project>{79AED36E-ABD0-4747-93D3-8722B042454B}</Project>
       <Name>Orchard.Users</Name>
     </ProjectReference>
-    <ProjectReference Include="Packages\Orchard.Wikis\Orchard.Wikis.csproj">
+    <ProjectReference Include="Packages\Orchard.Wikis\Orchard.Sandbox.csproj">
       <Project>{17C44253-65A2-4597-98C7-16EE576824B6}</Project>
-      <Name>Orchard.Wikis</Name>
+      <Name>Orchard.Sandbox</Name>
     </ProjectReference>
     <ProjectReference Include="Packages\TinyMce\TinyMce.csproj">
       <Project>{954CA994-D204-468B-9D69-51F6AD3E1C29}</Project>

src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs

@@ -22,7 +22,7 @@ namespace Orchard.Comments.Models {
         public HasCommentsProvider(IRepository<Comment> commentsRepository, IRepository<ClosedComments> closedCommentsRepository) {
             _commentsRepository = commentsRepository;
             _closedCommentsRepository = closedCommentsRepository;
-            Filters.Add(new ActivatingFilter<HasComments>("wikipage"));
+            Filters.Add(new ActivatingFilter<HasComments>("sandboxpage"));
         }
 
         protected override void GetDisplays(GetDisplaysContext context) {

src/Orchard.Web/Packages/Orchard.Wikis/AdminMenu.cs

@@ -1,14 +1,15 @@
 using Orchard.UI.Navigation;
 
-namespace Orchard.Wikis {
+namespace Orchard.Sandbox {
-    //public class AdminMenu : INavigationProvider {
+    public class AdminMenu : INavigationProvider {
-    //    public string MenuName { get { return "admin"; } }
+        public string MenuName { get { return "admin"; } }
 
-    //    public void GetNavigation(NavigationBuilder builder) {
+        public void GetNavigation(NavigationBuilder builder) {
-    //        builder.Add("Wiki", "9",
+            builder.Add("Sandbox", "9",
-    //                    menu => menu
+                        menu => menu
-    //                                .Add("Wiki Pages", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Wikis" }))
+                                    .Add("List Sandbox Pages", "1.0", item => item.Action("Index", "Page", new { area = "Orchard.Sandbox" }))
-    //                                );
+                                    .Add("Create Sandbox Pages", "1.1", item => item.Action("Create", "Page", new { area = "Orchard.Sandbox" }))
-    //    }
+                                    );
-    //}
+        }
+    }
 }

src/Orchard.Web/Packages/Orchard.Wikis/Controllers/AdminController.cs

@@ -1,33 +0,0 @@
-using System.Web.Mvc;
-using Orchard.Core.Common.Models;
-using Orchard.Models;
-using Orchard.Mvc.ViewModels;
-using Orchard.Security;
-
-namespace Orchard.Wikis.Controllers {
-    public class AdminController : Controller {
-        //private readonly IContentManager _contentManager;
-
-        //public AdminController(IContentManager contentManager) {
-        //    _contentManager = contentManager;
-        //}
-
-        //public ActionResult Index() {
-        //    return View(new AdminViewModel());
-        //}
-
-        //public IUser CurrentUser { get; set; }
-
-        //public ActionResult Create() {
-        //    var page = _contentManager.New("wikipage");
-        //    _contentManager.Create(page);
-            
-        //    return RedirectToAction("View", new{page.Id});
-        //}
-
-        //public ActionResult View(int id) {
-        //    var page = _contentManager.Get(id).As<CommonPart>();
-        //    return View(page);
-        //}
-    }
-}

src/Orchard.Web/Packages/Orchard.Wikis/Controllers/HomeController.cs

@@ -4,10 +4,10 @@ using System.Web.Mvc;
 using Orchard.Data;
 using Orchard.Models;
 using Orchard.Models.Driver;
-using Orchard.Wikis.Models;
+using Orchard.Sandbox.Models;
-using Orchard.Wikis.ViewModels;
+using Orchard.Sandbox.ViewModels;
 
-namespace Orchard.Wikis.Controllers
+namespace Orchard.Sandbox.Controllers
 {
     public class Home : Controller {
         

src/Orchard.Web/Packages/Orchard.Wikis/Controllers/PageController.cs

@@ -5,33 +5,33 @@ using Orchard.Core.Common.Models;
 using Orchard.Data;
 using Orchard.Models;
 using Orchard.Models.Driver;
+using Orchard.Sandbox.Models;
+using Orchard.Sandbox.ViewModels;
 using Orchard.Settings;
-using Orchard.Wikis.Models;
-using Orchard.Wikis.ViewModels;
 
-namespace Orchard.Wikis.Controllers
+namespace Orchard.Sandbox.Controllers
 {
     public class PageController : Controller, IUpdateModel {
-        private readonly IRepository<WikiPageRecord> _wikiPageRepository;
+        private readonly IRepository<SandboxPageRecord> _pageRepository;
         private readonly IContentManager _contentManager;
 
-        public PageController(IRepository<WikiPageRecord> wikiPageRepository, IContentManager contentManager) {
+        public PageController(IRepository<SandboxPageRecord> pageRepository, IContentManager contentManager) {
-            _wikiPageRepository = wikiPageRepository;
+            _pageRepository = pageRepository;
             _contentManager = contentManager;
         }
 
         public ActionResult Index()
         {
-            var pages = _wikiPageRepository.Fetch(x => true, o => o.Asc(x => x.Name));
+            var pages = _pageRepository.Fetch(x => true, o => o.Asc(x => x.Name));
             var model = new PageIndexViewModel {
-                Pages = pages.Select(x => _contentManager.Get<WikiPage>(x.Id)).ToList()
+                Pages = pages.Select(x => _contentManager.Get<SandboxPage>(x.Id)).ToList()
             };
             return View(model);
         }
 
         public ActionResult Show(int id) {
             var model = new PageShowViewModel {
-                Page = _contentManager.Get<WikiPage>(id)
+                Page = _contentManager.Get<SandboxPage>(id)
             };
             model.Displays = _contentManager.GetDisplays(model.Page.ContentItem);
             return View(model);
@@ -45,7 +45,7 @@ namespace Orchard.Wikis.Controllers
 
         [HttpPost]
         public ActionResult Create(PageCreateViewModel model) {
-            var page = _contentManager.Create<WikiPage>("wikipage", item => {
+            var page = _contentManager.Create<SandboxPage>("sandboxpage", item => {
                 item.Record.Name = model.Name;
                 item.As<CommonPart>().Container = CurrentSite.ContentItem;
             });
@@ -54,14 +54,14 @@ namespace Orchard.Wikis.Controllers
 
 
         public ActionResult Edit(int id) {
-            var model = new PageEditViewModel {Page = _contentManager.Get<WikiPage>(id)};
+            var model = new PageEditViewModel {Page = _contentManager.Get<SandboxPage>(id)};
             model.Editors = _contentManager.GetEditors(model.Page.ContentItem);
             return View(model);
         }
 
         [HttpPost]
         public ActionResult Edit(int id, FormCollection input) {
-            var model = new PageEditViewModel { Page = _contentManager.Get<WikiPage>(id) };
+            var model = new PageEditViewModel { Page = _contentManager.Get<SandboxPage>(id) };
             model.Editors = _contentManager.UpdateEditors(model.Page.ContentItem, this);
             if (!TryUpdateModel(model, input.ToValueProvider()))
                 return View(model);

src/Orchard.Web/Packages/Orchard.Wikis/Models/SandboxContentProvider.cs

@@ -0,0 +1,26 @@
+using Orchard.Core.Common.Models;
+using Orchard.Data;
+using Orchard.Models;
+using Orchard.Models.Driver;
+
+namespace Orchard.Sandbox.Models {
+    public class SandboxContentProvider : ContentProvider {
+        public SandboxContentProvider(
+            IRepository<SandboxPageRecord> pageRepository, 
+            IRepository<SandboxSettingsRecord> settingsRepository) {
+
+            // define the "sandboxpage" content type
+            Filters.Add(new ActivatingFilter<SandboxPage>("sandboxpage"));
+            Filters.Add(new ActivatingFilter<CommonPart>("sandboxpage"));
+            Filters.Add(new ActivatingFilter<RoutablePart>("sandboxpage"));
+            Filters.Add(new ActivatingFilter<BodyPart>("sandboxpage"));
+            Filters.Add(new StorageFilter<SandboxPageRecord>(pageRepository) { AutomaticallyCreateMissingRecord = true });
+
+            // add settings to site, and simple record-template gui
+            Filters.Add(new ActivatingFilter<ContentPart<SandboxSettingsRecord>>("site"));
+            Filters.Add(new StorageFilter<SandboxSettingsRecord>(settingsRepository) { AutomaticallyCreateMissingRecord = true });
+            Filters.Add(new TemplateFilterForRecord<SandboxSettingsRecord>("SandboxSettings"));
+
+        }
+    }
+}

src/Orchard.Web/Packages/Orchard.Wikis/Models/SandboxPage.cs

@@ -1,8 +1,8 @@
 using System.Web.Routing;
 using Orchard.Models;
 
-namespace Orchard.Wikis.Models {
+namespace Orchard.Sandbox.Models {
-    public class WikiPage : ContentPart<WikiPageRecord>, IContentDisplayInfo {
+    public class SandboxPage : ContentPart<SandboxPageRecord>, IContentDisplayInfo {
 
         string IContentDisplayInfo.DisplayText {
             get { return Record.Name; }

src/Orchard.Web/Packages/Orchard.Wikis/Models/SandboxPageRecord.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Web;
 using Orchard.Models.Records;
 
-namespace Orchard.Wikis.Models {
+namespace Orchard.Sandbox.Models {
-    public class WikiPageRecord : ContentPartRecord{
+    public class SandboxPageRecord : ContentPartRecord{
         public virtual string Name { get; set; }
     }
 }

src/Orchard.Web/Packages/Orchard.Wikis/Models/SandboxSettingsRecord.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+using Orchard.Data;
+using Orchard.Models;
+using Orchard.Models.Driver;
+using Orchard.Models.Records;
+
+namespace Orchard.Sandbox.Models {
+    public class SandboxSettingsRecord : ContentPartRecord {
+        public virtual bool AllowAnonymousEdits { get; set; }
+
+        [Required]
+        public virtual string NameOfThemeWhenEditingPage { get; set; }
+    }
+
+
+}

src/Orchard.Web/Packages/Orchard.Wikis/Models/WikiPageProvider.cs

@@ -1,15 +0,0 @@
-using Orchard.Core.Common.Models;
-using Orchard.Data;
-using Orchard.Models.Driver;
-
-namespace Orchard.Wikis.Models {
-    public class WikiPageProvider : ContentProvider {
-        public WikiPageProvider(IRepository<WikiPageRecord> wikiPageRepository) {
-            Filters.Add(new ActivatingFilter<WikiPage>("wikipage"));
-            Filters.Add(new ActivatingFilter<CommonPart>("wikipage"));
-            Filters.Add(new ActivatingFilter<RoutablePart>("wikipage"));
-            Filters.Add(new ActivatingFilter<BodyPart>("wikipage"));
-            Filters.Add(new StorageFilter<WikiPageRecord>(wikiPageRepository) { AutomaticallyCreateMissingRecord = true });
-        }
-    }
-}

src/Orchard.Web/Packages/Orchard.Wikis/Models/WikiSettings.cs

@@ -1,23 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using Orchard.Data;
-using Orchard.Models;
-using Orchard.Models.Driver;
-using Orchard.Models.Records;
-
-namespace Orchard.Wikis.Models {
-    public class WikiSettingsRecord : ContentPartRecord {
-        public virtual bool AllowAnonymousEdits { get; set; }
-
-        [Required]
-        public virtual string WikiEditTheme { get; set; }
-    }
-
-    public class WikiSettingsProvider : ContentProvider {
-        public WikiSettingsProvider(IRepository<WikiSettingsRecord> repository) {
-            Filters.Add(new ActivatingFilter<ContentPart<WikiSettingsRecord>>("site"));
-            Filters.Add(new StorageFilter<WikiSettingsRecord>(repository) { AutomaticallyCreateMissingRecord = true });
-            Filters.Add(new TemplateFilterForRecord<WikiSettingsRecord>("WikiSettings"));
-        }
-    }
-
-}

src/Orchard.Web/Packages/Orchard.Wikis/Orchard.Sandbox.csproj

@@ -8,8 +8,8 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.Wikis</RootNamespace>
+    <RootNamespace>Orchard.Sandbox</RootNamespace>
-    <AssemblyName>Orchard.Wikis</AssemblyName>
+    <AssemblyName>Orchard.Sandbox</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
   </PropertyGroup>
@@ -65,10 +65,10 @@
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\PageController.cs" />
-    <Compile Include="Models\WikiPage.cs" />
+    <Compile Include="Models\SandboxPage.cs" />
-    <Compile Include="Models\WikiPageProvider.cs" />
+    <Compile Include="Models\SandboxContentProvider.cs" />
-    <Compile Include="Models\WikiPageRecord.cs" />
+    <Compile Include="Models\SandboxPageRecord.cs" />
-    <Compile Include="Models\WikiSettings.cs" />
+    <Compile Include="Models\SandboxSettingsRecord.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ViewModels\PageEditViewModel.cs" />
     <Compile Include="ViewModels\PageCreateViewModel.cs" />
@@ -78,7 +78,7 @@
   <ItemGroup>
     <Content Include="Package.txt" />
     <Content Include="Views\Admin\Index.aspx" />
-    <Content Include="Views\Models\EditorTemplates\WikiSettingsRecord.ascx" />
+    <Content Include="Views\Models\EditorTemplates\SandboxSettingsRecord.ascx" />
     <Content Include="Views\Page\Edit.aspx" />
     <Content Include="Views\Page\Create.aspx" />
     <Content Include="Views\Page\Show.aspx" />

src/Orchard.Web/Packages/Orchard.Wikis/Package.txt

@@ -1 +1 @@
-name: Wiki
+name: Sandbox

src/Orchard.Web/Packages/Orchard.Wikis/Properties/AssemblyInfo.cs

@@ -5,12 +5,10 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Orchard.Wiki")]
+[assembly: AssemblyTitle("Orchard.Sandbox")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Orchard.Sandbox")]
-[assembly: AssemblyProduct("Orchard.Wiki")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

src/Orchard.Web/Packages/Orchard.Wikis/ViewModels/PageCreateViewModel.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
-using Orchard.Wikis.Models;
+using Orchard.Sandbox.Models;
 
-namespace Orchard.Wikis.ViewModels {
+namespace Orchard.Sandbox.ViewModels {
     public class PageCreateViewModel {
         public string Name { get; set; }
     }

src/Orchard.Web/Packages/Orchard.Wikis/ViewModels/PageEditViewModel.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
+using Orchard.Sandbox.Models;
 using Orchard.UI.Models;
-using Orchard.Wikis.Models;
 
-namespace Orchard.Wikis.ViewModels {
+namespace Orchard.Sandbox.ViewModels {
     public class PageEditViewModel {
-        public WikiPage Page { get; set; }
+        public SandboxPage Page { get; set; }
         public IEnumerable<ModelTemplate> Editors { get; set; }
     }
 }

src/Orchard.Web/Packages/Orchard.Wikis/ViewModels/PageIndexViewModel.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using Orchard.Mvc.ViewModels;
-using Orchard.Wikis.Models;
+using Orchard.Sandbox.Models;
 
-namespace Orchard.Wikis.ViewModels {
+namespace Orchard.Sandbox.ViewModels {
     public class PageIndexViewModel : BaseViewModel {
-        public IList<WikiPage> Pages { get; set; }
+        public IList<SandboxPage> Pages { get; set; }
     } 
 }

src/Orchard.Web/Packages/Orchard.Wikis/ViewModels/PageShowViewModel.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
+using Orchard.Sandbox.Models;
 using Orchard.UI.Models;
-using Orchard.Wikis.Models;
 
-namespace Orchard.Wikis.ViewModels {
+namespace Orchard.Sandbox.ViewModels {
     public class PageShowViewModel {
-        public WikiPage Page { get; set; }
+        public SandboxPage Page { get; set; }
         public IEnumerable<ModelTemplate> Displays { get; set; }
     }
 }

src/Orchard.Web/Packages/Orchard.Wikis/Views/Models/EditorTemplates/SandboxSettingsRecord.ascx

@@ -1,5 +1,5 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Wikis.Models.WikiSettingsRecord>" %>
+<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Sandbox.Models.SandboxSettingsRecord>" %>
-<h3>Wiki</h3>
+<h3>Sandbox</h3>
 <ol>
     <li>
         <%= Html.LabelFor(x=>x.AllowAnonymousEdits) %>
@@ -7,8 +7,8 @@
         <%= Html.ValidationMessage("AllowAnonymousEdits", "*")%>
     </li>
     <li>
-        <%= Html.LabelFor(x => x.WikiEditTheme)%>
+        <%= Html.LabelFor(x => x.NameOfThemeWhenEditingPage)%>
-        <%= Html.EditorFor(x=>x.WikiEditTheme) %>
+        <%= Html.EditorFor(x=>x.NameOfThemeWhenEditingPage) %>
-        <%= Html.ValidationMessage("WikiEditTheme", "*")%>
+        <%= Html.ValidationMessage("NameOfThemeWhenEditingPage", "*")%>
     </li>
 </ol>

src/Orchard.Web/Packages/Orchard.Wikis/Views/Page/Create.aspx

@@ -1,6 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageCreateViewModel>" %>
 
-<%@ Import Namespace="Orchard.Wikis.ViewModels" %>
+<%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">

src/Orchard.Web/Packages/Orchard.Wikis/Views/Page/Edit.aspx

@@ -1,6 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageEditViewModel>" %>
 
-<%@ Import Namespace="Orchard.Wikis.ViewModels" %>
+<%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">

src/Orchard.Web/Packages/Orchard.Wikis/Views/Page/Index.aspx

@@ -1,5 +1,5 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageIndexViewModel>" %>
-<%@ Import Namespace="Orchard.Wikis.ViewModels"%>
+<%@ Import Namespace="Orchard.Sandbox.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -23,7 +23,7 @@
 </div>
 
 <div id="main">
-<h3>Wiki Pages</h3>
+<h3>Sandbox Pages</h3>
 <ul>
 <li><%=Html.ActionLink("Create new page", "create") %></li>
 <%foreach(var item in Model.Pages.OrderBy(x=>x.Record.Name)){%>

src/Orchard.Web/Packages/Orchard.Wikis/Views/Page/Show.aspx

@@ -1,6 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageShowViewModel>" %>
 
-<%@ Import Namespace="Orchard.Wikis.ViewModels" %>
+<%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">

src/Orchard.sln

@@ -29,7 +29,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Core.Tests", "Orcha
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{74E681ED-FECC-4034-B9BD-01B0BB1BDECA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Wikis", "Orchard.Web\Packages\Orchard.Wikis\Orchard.Wikis.csproj", "{17C44253-65A2-4597-98C7-16EE576824B6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Sandbox", "Orchard.Web\Packages\Orchard.Wikis\Orchard.Sandbox.csproj", "{17C44253-65A2-4597-98C7-16EE576824B6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Blogs", "Orchard.Web\Packages\Orchard.Blogs\Orchard.Blogs.csproj", "{63FBD4D9-E1DA-4A7B-AA6A-D6074FE50867}"
 EndProject

src/Orchard/Data/HackSessionLocator.cs

@@ -32,7 +32,7 @@ namespace Orchard.Data {
                     CreatePersistenceModel(Assembly.Load("Orchard")),
                     CreatePersistenceModel(Assembly.Load("Orchard.Media")),
                     CreatePersistenceModel(Assembly.Load("Orchard.Core")),
-                    CreatePersistenceModel(Assembly.Load("Orchard.Wikis")),
+                    CreatePersistenceModel(Assembly.Load("Orchard.Sandbox")),
                     CreatePersistenceModel(Assembly.Load("Orchard.Comments")),
                     CreatePersistenceModel(Assembly.Load("Orchard.Blogs")),
                 };