Renaming "Packages" -> "Modules"

--HG--
branch : dev
rename : src/Orchard.Tests.Packages/DatabaseEnabledTestsBase.cs => src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs
rename : src/Orchard.Tests.Packages/Orchard.Tests.Packages.csproj => src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
rename : src/Orchard.Tests.Packages/Properties/AssemblyInfo.cs => src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs
rename : src/Orchard.Tests.Packages/Roles/Controllers/AdminControllerTests.cs => src/Orchard.Tests.Modules/Roles/Controllers/AdminControllerTests.cs
rename : src/Orchard.Tests.Packages/Roles/Services/RoleServiceTests.cs => src/Orchard.Tests.Modules/Roles/Services/RoleServiceTests.cs
rename : src/Orchard.Tests.Packages/Users/Controllers/AdminControllerTests.cs => src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs
rename : src/Orchard.Tests.Packages/Users/Services/MembershipServiceTests.cs => src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
rename : src/Orchard.Tests.Packages/Values.cs => src/Orchard.Tests.Modules/Values.cs
rename : src/Orchard.Tests.Packages/XmlRpc/Controllers/HomeControllerTests.cs => src/Orchard.Tests.Modules/XmlRpc/Controllers/HomeControllerTests.cs
rename : src/Orchard.Tests.Packages/XmlRpc/Services/XmlRpcReaderTests.cs => src/Orchard.Tests.Modules/XmlRpc/Services/XmlRpcReaderTests.cs
rename : src/Orchard.Tests.Packages/XmlRpc/Services/XmlRpcWriterTests.cs => src/Orchard.Tests.Modules/XmlRpc/Services/XmlRpcWriterTests.cs
rename : src/Orchard.Tests/Extensions/FoldersData/Sample1/Package.txt => src/Orchard.Tests/Extensions/FoldersData/Sample1/Module.txt
rename : src/Orchard.Tests/Extensions/FoldersData/Sample3/Package.txt => src/Orchard.Tests/Extensions/FoldersData/Sample3/Module.txt
rename : src/Orchard.Web/Core/Common/Package.txt => src/Orchard.Web/Core/Common/Module.txt
rename : src/Orchard.Web/Core/Feeds/Package.txt => src/Orchard.Web/Core/Feeds/Module.txt
rename : src/Orchard.Web/Core/Scheduling/Package.txt => src/Orchard.Web/Core/Scheduling/Module.txt
rename : src/Orchard.Web/Core/Settings/Package.txt => src/Orchard.Web/Core/Settings/Module.txt
rename : src/Orchard.Web/Core/Themes/Package.txt => src/Orchard.Web/Core/Themes/Module.txt
rename : src/Orchard.Web/Core/XmlRpc/Package.txt => src/Orchard.Web/Core/XmlRpc/Module.txt
rename : src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs => src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogAdminController.cs => src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogController.cs => src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogDriver.cs => src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogDriver.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostAdminController.cs => src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs => src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostDriver.cs => src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostDriver.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Extensions/FeedManagerExtensions.cs => src/Orchard.Web/Modules/Orchard.Blogs/Extensions/FeedManagerExtensions.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs => src/Orchard.Web/Modules/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Extensions/UriExtensions.cs => src/Orchard.Web/Modules/Orchard.Blogs/Extensions/UriExtensions.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Extensions/UrlHelperExtensions.cs => src/Orchard.Web/Modules/Orchard.Blogs/Extensions/UrlHelperExtensions.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Filters/ArchivesFilter.cs => src/Orchard.Web/Modules/Orchard.Blogs/Filters/ArchivesFilter.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Models/ArchiveData.cs => src/Orchard.Web/Modules/Orchard.Blogs/Models/ArchiveData.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Models/Blog.cs => src/Orchard.Web/Modules/Orchard.Blogs/Models/Blog.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogArchiveHandler.cs => src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogArchiveHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogArchiveRecord.cs => src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogArchiveRecord.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogHandler.cs => src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPost.cs => src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPost.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs => src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPostHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogRecord.cs => src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogRecord.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Package.txt => src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
rename : src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj => src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
rename : src/Orchard.Web/Packages/Orchard.Blogs/Permissions.cs => src/Orchard.Web/Modules/Orchard.Blogs/Permissions.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Properties/AssemblyInfo.cs => src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Routes.cs => src/Orchard.Web/Modules/Orchard.Blogs/Routes.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Routing/IsArchiveConstraint.cs => src/Orchard.Web/Modules/Orchard.Blogs/Routing/IsArchiveConstraint.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Routing/IsBlogConstraint.cs => src/Orchard.Web/Modules/Orchard.Blogs/Routing/IsBlogConstraint.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Scripts/archives.js => src/Orchard.Web/Modules/Orchard.Blogs/Scripts/archives.js
rename : src/Orchard.Web/Packages/Orchard.Pages/Scripts/jquery.ui.core.js => src/Orchard.Web/Modules/Orchard.Blogs/Scripts/jquery.ui.core.js
rename : src/Orchard.Web/Packages/Orchard.Pages/Scripts/jquery.ui.datepicker.js => src/Orchard.Web/Modules/Orchard.Blogs/Scripts/jquery.ui.datepicker.js
rename : src/Orchard.Web/Packages/Orchard.Pages/Scripts/jquery.ui.widget.js => src/Orchard.Web/Modules/Orchard.Blogs/Scripts/jquery.ui.widget.js
rename : src/Orchard.Web/Packages/Orchard.Pages/Scripts/jquery.utils.js => src/Orchard.Web/Modules/Orchard.Blogs/Scripts/jquery.utils.js
rename : src/Orchard.Web/Packages/Orchard.Pages/Scripts/ui.timepickr.js => src/Orchard.Web/Modules/Orchard.Blogs/Scripts/ui.timepickr.js
rename : src/Orchard.Web/Packages/Orchard.Blogs/Services/BlogPostService.cs => src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Services/BlogService.cs => src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogService.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Services/IBlogPostService.cs => src/Orchard.Web/Modules/Orchard.Blogs/Services/IBlogPostService.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Services/IBlogService.cs => src/Orchard.Web/Modules/Orchard.Blogs/Services/IBlogService.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Styles/archives.css => src/Orchard.Web/Modules/Orchard.Blogs/Styles/archives.css
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/datetime.css => src/Orchard.Web/Modules/Orchard.Blogs/Styles/datetime.css
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_flat_0_aaaaaa_40x100.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-bg_flat_0_aaaaaa_40x100.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_flat_75_ffffff_40x100.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-bg_flat_75_ffffff_40x100.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_glass_55_fbf9ee_1x400.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-bg_glass_55_fbf9ee_1x400.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_glass_65_ffffff_1x400.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-bg_glass_65_ffffff_1x400.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_glass_75_dadada_1x400.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-bg_glass_75_dadada_1x400.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_glass_75_e6e6e6_1x400.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-bg_glass_75_e6e6e6_1x400.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_glass_95_fef1ec_1x400.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-bg_glass_95_fef1ec_1x400.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_highlight-soft_75_cccccc_1x100.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-icons_222222_256x240.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-icons_222222_256x240.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-icons_2e83ff_256x240.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-icons_2e83ff_256x240.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-icons_454545_256x240.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-icons_454545_256x240.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-icons_888888_256x240.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-icons_888888_256x240.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-icons_cd0a0a_256x240.png => src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/ui-icons_cd0a0a_256x240.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/jquery-ui-1.7.2.custom.css => src/Orchard.Web/Modules/Orchard.Blogs/Styles/jquery-ui-1.7.2.custom.css
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/ui.datepicker.css => src/Orchard.Web/Modules/Orchard.Blogs/Styles/ui.datepicker.css
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/ui.timepickr.css => src/Orchard.Web/Modules/Orchard.Blogs/Styles/ui.timepickr.css
rename : src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/AdminBlogsViewModel.cs => src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/AdminBlogsViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogArchivesViewModel.cs => src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/BlogArchivesViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogEditViewModel.cs => src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/BlogEditViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogForAdminViewModel.cs => src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/BlogForAdminViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostArchiveViewModel.cs => src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/BlogPostArchiveViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostEditViewModel.cs => src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/BlogPostEditViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostViewModel.cs => src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/BlogPostViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogViewModel.cs => src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/BlogViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogsViewModel.cs => src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/BlogsViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogPostViewModel.cs => src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/CreateBlogPostViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogViewModel.cs => src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/CreateBlogViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/Archives.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/Archives.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/Blog/Item.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/Blog/List.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/Create.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/Edit.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/Item.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Item.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/List.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/Item.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/ListByArchive.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/ListByArchive.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPostAdmin/Create.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPostAdmin/Create.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPostAdmin/Edit.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPostAdmin/Edit.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.Blog.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.Blog.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.BlogPost.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.BlogPost.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.Blog.Fields.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.Blog.Fields.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogPost.Publish.ascx => src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogPost.Publish.ascx
rename : src/Orchard.Web/Packages/Orchard.Blogs/Views/Web.config => src/Orchard.Web/Modules/Orchard.Blogs/Views/Web.config
rename : src/Orchard.Web/Packages/TinyMce/Web.config => src/Orchard.Web/Modules/Orchard.Blogs/Web.config
rename : src/Orchard.Web/Packages/Orchard.Comments/AdminMenu.cs => src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Controllers/AdminController.cs => src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Controllers/CommentController.cs => src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Extensions/HtmlHelperExtensions.cs => src/Orchard.Web/Modules/Orchard.Comments/Extensions/HtmlHelperExtensions.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Feeds/CommentFeedItemBuilder.cs => src/Orchard.Web/Modules/Orchard.Comments/Feeds/CommentFeedItemBuilder.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Feeds/CommentFeedQuery.cs => src/Orchard.Web/Modules/Orchard.Comments/Feeds/CommentFeedQuery.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Feeds/CommentedOnContainerFeedQuery.cs => src/Orchard.Web/Modules/Orchard.Comments/Feeds/CommentedOnContainerFeedQuery.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Feeds/CommentedOnFeedQuery.cs => src/Orchard.Web/Modules/Orchard.Comments/Feeds/CommentedOnFeedQuery.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/ClosedCommentsRecord.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/ClosedCommentsRecord.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/Comment.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/Comment.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/CommentDriver.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/CommentDriver.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/CommentHandler.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/CommentHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/CommentRecord.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/CommentRecord.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/CommentSettings.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/CommentSettings.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/CommentSettingsHandler.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/CommentSettingsHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/CommentSettingsRecord.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/CommentSettingsRecord.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/CommentStatus.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/CommentStatus.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/HasComments.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/HasComments.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/HasCommentsContainer.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/HasCommentsContainer.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/HasCommentsContainerDriver.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/HasCommentsContainerDriver.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/HasCommentsContainerHandler.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/HasCommentsContainerHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/HasCommentsDriver.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/HasCommentsDriver.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/HasCommentsHandler.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/HasCommentsHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Models/HasCommentsRecord.cs => src/Orchard.Web/Modules/Orchard.Comments/Models/HasCommentsRecord.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Package.txt => src/Orchard.Web/Modules/Orchard.Comments/Module.txt
rename : src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj => src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
rename : src/Orchard.Web/Packages/Orchard.Comments/Permissions.cs => src/Orchard.Web/Modules/Orchard.Comments/Permissions.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Properties/AssemblyInfo.cs => src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Services/CommentService.cs => src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Services/CommentValidator.cs => src/Orchard.Web/Modules/Orchard.Comments/Services/CommentValidator.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Services/ICommentValidator.cs => src/Orchard.Web/Modules/Orchard.Comments/Services/ICommentValidator.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/ViewModels/CommentCountViewModel.cs => src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentCountViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/ViewModels/CommentsCreateViewModel.cs => src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsCreateViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/ViewModels/CommentsDetailsViewModel.cs => src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsDetailsViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/ViewModels/CommentsEditViewModel.cs => src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsEditViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/ViewModels/CommentsIndexViewModel.cs => src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsIndexViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/ViewModels/EditCommentsViewModel.cs => src/Orchard.Web/Modules/Orchard.Comments/ViewModels/EditCommentsViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx => src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx
rename : src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx => src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.aspx
rename : src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx => src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx
rename : src/Orchard.Web/Packages/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.ascx => src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.ascx
rename : src/Orchard.Web/Packages/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.CountAdmin.ascx => src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.CountAdmin.ascx
rename : src/Orchard.Web/Packages/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx => src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx
rename : src/Orchard.Web/Packages/Orchard.Comments/Views/EditorTemplates/Parts/Comments.HasComments.ascx => src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.HasComments.ascx
rename : src/Orchard.Web/Packages/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.ascx => src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.ascx
rename : src/Orchard.Web/Packages/Orchard.Comments/Views/ListOfComments.ascx => src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.ascx
rename : src/Orchard.Web/Packages/TinyMce/Views/Web.config => src/Orchard.Web/Modules/Orchard.Comments/Views/Web.config
rename : src/Orchard.Web/Packages/Orchard.Tags/Web.config => src/Orchard.Web/Modules/Orchard.Comments/Web.config
rename : src/Orchard.Web/Packages/Orchard.DevTools/AdminMenu.cs => src/Orchard.Web/Modules/Orchard.DevTools/AdminMenu.cs
rename : src/Orchard.Web/Packages/Orchard.DevTools/Controllers/ContentController.cs => src/Orchard.Web/Modules/Orchard.DevTools/Controllers/ContentController.cs
rename : src/Orchard.Web/Packages/Orchard.DevTools/Controllers/HomeController.cs => src/Orchard.Web/Modules/Orchard.DevTools/Controllers/HomeController.cs
rename : src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkHandler.cs => src/Orchard.Web/Modules/Orchard.DevTools/Models/DebugLinkHandler.cs
rename : src/Orchard.Web/Packages/Orchard.DevTools/Models/ShowDebugLink.cs => src/Orchard.Web/Modules/Orchard.DevTools/Models/ShowDebugLink.cs
rename : src/Orchard.Web/Packages/Orchard.DevTools/Orchard.DevTools.csproj => src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj
rename : src/Orchard.Web/Packages/Orchard.DevTools/Permissions.cs => src/Orchard.Web/Modules/Orchard.DevTools/Permissions.cs
rename : src/Orchard.Web/Packages/Orchard.DevTools/Profiler.cs => src/Orchard.Web/Modules/Orchard.DevTools/Profiler.cs
rename : src/Orchard.Web/Packages/Orchard.DevTools/Properties/AssemblyInfo.cs => src/Orchard.Web/Modules/Orchard.DevTools/Properties/AssemblyInfo.cs
rename : src/Orchard.Web/Packages/Orchard.DevTools/ViewModels/ContentDetailsViewModel.cs => src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/ContentDetailsViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.DevTools/ViewModels/ContentIndexViewModel.cs => src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/ContentIndexViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Details.aspx => src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Details.aspx
rename : src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Index.aspx => src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Index.aspx
rename : src/Orchard.Web/Packages/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx => src/Orchard.Web/Modules/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx
rename : src/Orchard.Web/Packages/Orchard.DevTools/Views/EditorTemplates/Parts/DevTools.ShowDebugLink.ascx => src/Orchard.Web/Modules/Orchard.DevTools/Views/EditorTemplates/Parts/DevTools.ShowDebugLink.ascx
rename : src/Orchard.Web/Packages/Orchard.DevTools/Views/Home/Index.aspx => src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Index.aspx
rename : src/Orchard.Web/Packages/TinyMce/Views/Web.config => src/Orchard.Web/Modules/Orchard.DevTools/Views/Web.config
rename : src/Orchard.Web/Packages/Orchard.DevTools/Web.config => src/Orchard.Web/Modules/Orchard.DevTools/Web.config
rename : src/Orchard.Web/Packages/Orchard.DevTools/_Package.txt => src/Orchard.Web/Modules/Orchard.DevTools/_Module.txt
rename : src/Orchard.Web/Packages/Orchard.Media/AdminMenu.cs => src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs
rename : src/Orchard.Web/Packages/Orchard.Media/Content/Admin/images/folder.gif => src/Orchard.Web/Modules/Orchard.Media/Content/Admin/images/folder.gif
rename : src/Orchard.Web/Packages/Orchard.Roles/Content/Site.css => src/Orchard.Web/Modules/Orchard.Media/Content/Site.css
rename : src/Orchard.Web/Packages/Orchard.Media/Controllers/AdminController.cs => src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs
rename : src/Orchard.Web/Packages/Orchard.Media/Helpers/MediaHelpers.cs => src/Orchard.Web/Modules/Orchard.Media/Helpers/MediaHelpers.cs
rename : src/Orchard.Web/Packages/Orchard.Media/Models/FolderNavigation.cs => src/Orchard.Web/Modules/Orchard.Media/Models/FolderNavigation.cs
rename : src/Orchard.Web/Packages/Orchard.Media/Models/MediaFile.cs => src/Orchard.Web/Modules/Orchard.Media/Models/MediaFile.cs
rename : src/Orchard.Web/Packages/Orchard.Media/Models/MediaFolder.cs => src/Orchard.Web/Modules/Orchard.Media/Models/MediaFolder.cs
rename : src/Orchard.Web/Packages/Orchard.Media/Models/MediaSettings.cs => src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettings.cs
rename : src/Orchard.Web/Packages/Orchard.Media/Package.txt => src/Orchard.Web/Modules/Orchard.Media/Module.txt
rename : src/Orchard.Web/Packages/Orchard.Media/Orchard.Media.csproj => src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
rename : src/Orchard.Web/Packages/Orchard.Media/Permissions.cs => src/Orchard.Web/Modules/Orchard.Media/Permissions.cs
rename : src/Orchard.Web/Packages/Orchard.Media/Properties/AssemblyInfo.cs => src/Orchard.Web/Modules/Orchard.Media/Properties/AssemblyInfo.cs
rename : src/Orchard.Web/Packages/Orchard.Media/Services/MediaService.cs => src/Orchard.Web/Modules/Orchard.Media/Services/MediaService.cs
rename : src/Orchard.Web/Packages/Orchard.Media/Services/XmlRpcHandler.cs => src/Orchard.Web/Modules/Orchard.Media/Services/XmlRpcHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Media/ViewModels/MediaFolderCreateViewModel.cs => src/Orchard.Web/Modules/Orchard.Media/ViewModels/MediaFolderCreateViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Media/ViewModels/MediaFolderEditPropertiesViewModel.cs => src/Orchard.Web/Modules/Orchard.Media/ViewModels/MediaFolderEditPropertiesViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Media/ViewModels/MediaFolderEditViewModel.cs => src/Orchard.Web/Modules/Orchard.Media/ViewModels/MediaFolderEditViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Media/ViewModels/MediaFolderIndexViewModel.cs => src/Orchard.Web/Modules/Orchard.Media/ViewModels/MediaFolderIndexViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Media/ViewModels/MediaItemAddViewModel.cs => src/Orchard.Web/Modules/Orchard.Media/ViewModels/MediaItemAddViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Media/ViewModels/MediaItemEditViewModel.cs => src/Orchard.Web/Modules/Orchard.Media/ViewModels/MediaItemEditViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx => src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx
rename : src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx => src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx
rename : src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx => src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx
rename : src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx => src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx
rename : src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx => src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx
rename : src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx => src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.aspx
rename : src/Orchard.Web/Packages/Orchard.Media/Views/EditorTemplates/Parts/Media.SiteSettings.ascx => src/Orchard.Web/Modules/Orchard.Media/Views/EditorTemplates/Parts/Media.SiteSettings.ascx
rename : src/Orchard.Web/Packages/TinyMce/Views/Web.config => src/Orchard.Web/Modules/Orchard.Media/Views/Web.config
rename : src/Orchard.Web/Packages/Orchard.Tags/Web.config => src/Orchard.Web/Modules/Orchard.Media/Web.config
rename : src/Orchard.Web/Packages/Orchard.Pages/AdminMenu.cs => src/Orchard.Web/Modules/Orchard.Pages/AdminMenu.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/draft.gif => src/Orchard.Web/Modules/Orchard.Pages/Content/Admin/images/draft.gif
rename : src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/offline.gif => src/Orchard.Web/Modules/Orchard.Pages/Content/Admin/images/offline.gif
rename : src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/online.gif => src/Orchard.Web/Modules/Orchard.Pages/Content/Admin/images/online.gif
rename : src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/published.gif => src/Orchard.Web/Modules/Orchard.Pages/Content/Admin/images/published.gif
rename : src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/scheduled.gif => src/Orchard.Web/Modules/Orchard.Pages/Content/Admin/images/scheduled.gif
rename : src/Orchard.Web/Packages/Orchard.Roles/Content/Site.css => src/Orchard.Web/Modules/Orchard.Pages/Content/Site.css
rename : src/Orchard.Web/Packages/Orchard.Pages/Controllers/AdminController.cs => src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Controllers/PageController.cs => src/Orchard.Web/Modules/Orchard.Pages/Controllers/PageController.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Controllers/PageDriver.cs => src/Orchard.Web/Modules/Orchard.Pages/Controllers/PageDriver.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Extensions/UriExtensions.cs => src/Orchard.Web/Modules/Orchard.Pages/Extensions/UriExtensions.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Models/Page.cs => src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Models/PageHandler.cs => src/Orchard.Web/Modules/Orchard.Pages/Models/PageHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Package.txt => src/Orchard.Web/Modules/Orchard.Pages/Module.txt
rename : src/Orchard.Web/Packages/Orchard.Pages/Orchard.Pages.csproj => src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
rename : src/Orchard.Web/Packages/Orchard.Pages/Permissions.cs => src/Orchard.Web/Modules/Orchard.Pages/Permissions.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Properties/AssemblyInfo.cs => src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Routes.cs => src/Orchard.Web/Modules/Orchard.Pages/Routes.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Scripts/jquery.ui.core.js => src/Orchard.Web/Modules/Orchard.Pages/Scripts/jquery.ui.core.js
rename : src/Orchard.Web/Packages/Orchard.Pages/Scripts/jquery.ui.datepicker.js => src/Orchard.Web/Modules/Orchard.Pages/Scripts/jquery.ui.datepicker.js
rename : src/Orchard.Web/Packages/Orchard.Pages/Scripts/jquery.ui.widget.js => src/Orchard.Web/Modules/Orchard.Pages/Scripts/jquery.ui.widget.js
rename : src/Orchard.Web/Packages/Orchard.Pages/Scripts/jquery.utils.js => src/Orchard.Web/Modules/Orchard.Pages/Scripts/jquery.utils.js
rename : src/Orchard.Web/Packages/Orchard.Pages/Scripts/ui.timepickr.js => src/Orchard.Web/Modules/Orchard.Pages/Scripts/ui.timepickr.js
rename : src/Orchard.Web/Packages/Orchard.Pages/Security/Authorization.cs => src/Orchard.Web/Modules/Orchard.Pages/Security/Authorization.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Services/IPageService.cs => src/Orchard.Web/Modules/Orchard.Pages/Services/IPageService.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Services/PageService.cs => src/Orchard.Web/Modules/Orchard.Pages/Services/PageService.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Services/SlugConstraint.cs => src/Orchard.Web/Modules/Orchard.Pages/Services/SlugConstraint.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Services/SlugConstraintUpdator.cs => src/Orchard.Web/Modules/Orchard.Pages/Services/SlugConstraintUpdator.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/datetime.css => src/Orchard.Web/Modules/Orchard.Pages/Styles/datetime.css
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_flat_0_aaaaaa_40x100.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-bg_flat_0_aaaaaa_40x100.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_flat_75_ffffff_40x100.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-bg_flat_75_ffffff_40x100.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_glass_55_fbf9ee_1x400.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-bg_glass_55_fbf9ee_1x400.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_glass_65_ffffff_1x400.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-bg_glass_65_ffffff_1x400.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_glass_75_dadada_1x400.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-bg_glass_75_dadada_1x400.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_glass_75_e6e6e6_1x400.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-bg_glass_75_e6e6e6_1x400.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_glass_95_fef1ec_1x400.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-bg_glass_95_fef1ec_1x400.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-bg_highlight-soft_75_cccccc_1x100.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-icons_222222_256x240.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-icons_222222_256x240.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-icons_2e83ff_256x240.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-icons_2e83ff_256x240.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-icons_454545_256x240.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-icons_454545_256x240.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-icons_888888_256x240.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-icons_888888_256x240.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/images/ui-icons_cd0a0a_256x240.png => src/Orchard.Web/Modules/Orchard.Pages/Styles/images/ui-icons_cd0a0a_256x240.png
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/jquery-ui-1.7.2.custom.css => src/Orchard.Web/Modules/Orchard.Pages/Styles/jquery-ui-1.7.2.custom.css
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/ui.datepicker.css => src/Orchard.Web/Modules/Orchard.Pages/Styles/ui.datepicker.css
rename : src/Orchard.Web/Packages/Orchard.Pages/Styles/ui.timepickr.css => src/Orchard.Web/Modules/Orchard.Pages/Styles/ui.timepickr.css
rename : src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PageCreateViewModel.cs => src/Orchard.Web/Modules/Orchard.Pages/ViewModels/PageCreateViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PageEditViewModel.cs => src/Orchard.Web/Modules/Orchard.Pages/ViewModels/PageEditViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PageViewModel.cs => src/Orchard.Web/Modules/Orchard.Pages/ViewModels/PageViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PagesViewModel.cs => src/Orchard.Web/Modules/Orchard.Pages/ViewModels/PagesViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Create.ascx => src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/Create.ascx
rename : src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Edit.ascx => src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/Edit.ascx
rename : src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/List.aspx => src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx
rename : src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx => src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx
rename : src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.ascx => src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.ascx
rename : src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Items/Pages.Page.ascx => src/Orchard.Web/Modules/Orchard.Pages/Views/EditorTemplates/Items/Pages.Page.ascx
rename : src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Parts/Pages.Page.Publish.ascx => src/Orchard.Web/Modules/Orchard.Pages/Views/EditorTemplates/Parts/Pages.Page.Publish.ascx
rename : src/Orchard.Web/Packages/Orchard.Pages/Views/Page/Item.ascx => src/Orchard.Web/Modules/Orchard.Pages/Views/Page/Item.ascx
rename : src/Orchard.Web/Packages/TinyMce/Views/Web.config => src/Orchard.Web/Modules/Orchard.Pages/Views/Web.config
rename : src/Orchard.Web/Packages/Orchard.Pages/Web.config => src/Orchard.Web/Modules/Orchard.Pages/Web.config
rename : src/Orchard.Web/Packages/Orchard.Roles/AdminMenu.cs => src/Orchard.Web/Modules/Orchard.Roles/AdminMenu.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Content/Site.css => src/Orchard.Web/Modules/Orchard.Roles/Content/Site.css
rename : src/Orchard.Web/Packages/Orchard.Roles/Controllers/AdminController.cs => src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Controllers/UserRolesDriver.cs => src/Orchard.Web/Modules/Orchard.Roles/Controllers/UserRolesDriver.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Extension.cs => src/Orchard.Web/Modules/Orchard.Roles/Extension.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Models/UserRoles.cs => src/Orchard.Web/Modules/Orchard.Roles/Models/UserRoles.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesHandler.cs => src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Models/UserSimulation.cs => src/Orchard.Web/Modules/Orchard.Roles/Models/UserSimulation.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Package.txt => src/Orchard.Web/Modules/Orchard.Roles/Module.txt
rename : src/Orchard.Web/Packages/Orchard.Roles/Orchard.Roles.csproj => src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
rename : src/Orchard.Web/Packages/Orchard.Roles/Permissions.cs => src/Orchard.Web/Modules/Orchard.Roles/Permissions.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Properties/AssemblyInfo.cs => src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Records/PermissionRecord.cs => src/Orchard.Web/Modules/Orchard.Roles/Records/PermissionRecord.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Records/RoleRecord.cs => src/Orchard.Web/Modules/Orchard.Roles/Records/RoleRecord.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Records/RolesPermissions.cs => src/Orchard.Web/Modules/Orchard.Roles/Records/RolesPermissions.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Records/UserRolesRecord.cs => src/Orchard.Web/Modules/Orchard.Roles/Records/UserRolesRecord.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Services/RoleService.cs => src/Orchard.Web/Modules/Orchard.Roles/Services/RoleService.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Services/RolesBasedAuthorizationService.cs => src/Orchard.Web/Modules/Orchard.Roles/Services/RolesBasedAuthorizationService.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/ViewModels/RoleCreateViewModel.cs => src/Orchard.Web/Modules/Orchard.Roles/ViewModels/RoleCreateViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/ViewModels/RoleEditViewModel.cs => src/Orchard.Web/Modules/Orchard.Roles/ViewModels/RoleEditViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/ViewModels/RolesIndexViewModel.cs => src/Orchard.Web/Modules/Orchard.Roles/ViewModels/RolesIndexViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/ViewModels/UserRolesViewModel.cs => src/Orchard.Web/Modules/Orchard.Roles/ViewModels/UserRolesViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx => src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx
rename : src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx => src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx
rename : src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx => src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx
rename : src/Orchard.Web/Packages/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx => src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx
rename : src/Orchard.Web/Packages/TinyMce/Views/Web.config => src/Orchard.Web/Modules/Orchard.Roles/Views/Web.config
rename : src/Orchard.Web/Packages/Orchard.Users/Web.config => src/Orchard.Web/Modules/Orchard.Roles/Web.config
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Controllers/HomeController.cs => src/Orchard.Web/Modules/Orchard.Sandbox/Controllers/HomeController.cs
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Controllers/PageController.cs => src/Orchard.Web/Modules/Orchard.Sandbox/Controllers/PageController.cs
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Controllers/SandboxPageDriver.cs => src/Orchard.Web/Modules/Orchard.Sandbox/Controllers/SandboxPageDriver.cs
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Models/SandboxContentHandler.cs => src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxContentHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Models/SandboxPage.cs => src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxPage.cs
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Models/SandboxPageRecord.cs => src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxPageRecord.cs
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Models/SandboxSettingsRecord.cs => src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxSettingsRecord.cs
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Orchard.Sandbox.csproj => src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Properties/AssemblyInfo.cs => src/Orchard.Web/Modules/Orchard.Sandbox/Properties/AssemblyInfo.cs
rename : src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageCreateViewModel.cs => src/Orchard.Web/Modules/Orchard.Sandbox/ViewModels/PageCreateViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageEditViewModel.cs => src/Orchard.Web/Modules/Orchard.Sandbox/ViewModels/PageEditViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageIndexViewModel.cs => src/Orchard.Web/Modules/Orchard.Sandbox/ViewModels/PageIndexViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageShowViewModel.cs => src/Orchard.Web/Modules/Orchard.Sandbox/ViewModels/PageShowViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.Summary.ascx => src/Orchard.Web/Modules/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.Summary.ascx
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.ascx => src/Orchard.Web/Modules/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.ascx
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Parts/Sandbox.Page.Title.ascx => src/Orchard.Web/Modules/Orchard.Sandbox/Views/DisplayTemplates/Parts/Sandbox.Page.Title.ascx
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Views/EditorTemplates/Items/Sandbox.Page.ascx => src/Orchard.Web/Modules/Orchard.Sandbox/Views/EditorTemplates/Items/Sandbox.Page.ascx
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Views/EditorTemplates/Parts/Sandbox.SiteSettings.ascx => src/Orchard.Web/Modules/Orchard.Sandbox/Views/EditorTemplates/Parts/Sandbox.SiteSettings.ascx
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Create.aspx => src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Create.aspx
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Edit.aspx => src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Edit.aspx
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Index.aspx => src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Index.aspx
rename : src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Show.aspx => src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Show.aspx
rename : src/Orchard.Web/Packages/TinyMce/Views/Web.config => src/Orchard.Web/Modules/Orchard.Sandbox/Views/Web.config
rename : src/Orchard.Web/Packages/Orchard.Users/Web.config => src/Orchard.Web/Modules/Orchard.Sandbox/Web.config
rename : src/Orchard.Web/Packages/Orchard.Sandbox/_Package.txt => src/Orchard.Web/Modules/Orchard.Sandbox/_Module.txt
rename : src/Orchard.Web/Packages/Orchard.Setup/Annotations/SqlDatabaseConnectionStringAttribute.cs => src/Orchard.Web/Modules/Orchard.Setup/Annotations/SqlDatabaseConnectionStringAttribute.cs
rename : src/Orchard.Web/Packages/Orchard.Setup/Annotations/StringLengthMin.cs => src/Orchard.Web/Modules/Orchard.Setup/Annotations/StringLengthMin.cs
rename : src/Orchard.Web/Packages/Orchard.Setup/Controllers/SetupController.cs => src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
rename : src/Orchard.Web/Packages/Orchard.Setup/Package.txt => src/Orchard.Web/Modules/Orchard.Setup/Module.txt
rename : src/Orchard.Web/Packages/Orchard.Setup/Orchard.Setup.csproj => src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
rename : src/Orchard.Web/Packages/Orchard.Setup/Properties/AssemblyInfo.cs => src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs
rename : src/Orchard.Web/Packages/Orchard.Setup/Routes.cs => src/Orchard.Web/Modules/Orchard.Setup/Routes.cs
rename : src/Orchard.Web/Packages/Orchard.Setup/Services/ISetupService.cs => src/Orchard.Web/Modules/Orchard.Setup/Services/ISetupService.cs
rename : src/Orchard.Web/Packages/Orchard.Setup/Services/SetupService.cs => src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
rename : src/Orchard.Web/Packages/Orchard.Setup/ViewModels/SetupViewModel.cs => src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Setup/Views/Setup/Index.ascx => src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
rename : src/Orchard.Web/Packages/Orchard.Setup/Views/Web.config => src/Orchard.Web/Modules/Orchard.Setup/Views/Web.config
rename : src/Orchard.Web/Packages/Orchard.Users/Web.config => src/Orchard.Web/Modules/Orchard.Setup/Web.config
rename : src/Orchard.Web/Packages/Orchard.Tags/AdminMenu.cs => src/Orchard.Web/Modules/Orchard.Tags/AdminMenu.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Controllers/AdminController.cs => src/Orchard.Web/Modules/Orchard.Tags/Controllers/AdminController.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Controllers/HasTagsDriver.cs => src/Orchard.Web/Modules/Orchard.Tags/Controllers/HasTagsDriver.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs => src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Helpers/TagHelpers.cs => src/Orchard.Web/Modules/Orchard.Tags/Helpers/TagHelpers.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Models/HasTags.cs => src/Orchard.Web/Modules/Orchard.Tags/Models/HasTags.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Models/HasTagsHandler.cs => src/Orchard.Web/Modules/Orchard.Tags/Models/HasTagsHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Models/Tag.cs => src/Orchard.Web/Modules/Orchard.Tags/Models/Tag.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Models/TagSettings.cs => src/Orchard.Web/Modules/Orchard.Tags/Models/TagSettings.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Models/TagsContentItems.cs => src/Orchard.Web/Modules/Orchard.Tags/Models/TagsContentItems.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Package.txt => src/Orchard.Web/Modules/Orchard.Tags/Module.txt
rename : src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj => src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
rename : src/Orchard.Web/Packages/Orchard.Tags/Permissions.cs => src/Orchard.Web/Modules/Orchard.Tags/Permissions.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Properties/AssemblyInfo.cs => src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Routes.cs => src/Orchard.Web/Modules/Orchard.Tags/Routes.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Services/TagService.cs => src/Orchard.Web/Modules/Orchard.Tags/Services/TagService.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/ViewModels/EditTagsViewModel.cs => src/Orchard.Web/Modules/Orchard.Tags/ViewModels/EditTagsViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsAdminCreateViewModel.cs => src/Orchard.Web/Modules/Orchard.Tags/ViewModels/TagsAdminCreateViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsAdminEditViewModel.cs => src/Orchard.Web/Modules/Orchard.Tags/ViewModels/TagsAdminEditViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsAdminIndexViewModel.cs => src/Orchard.Web/Modules/Orchard.Tags/ViewModels/TagsAdminIndexViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsAdminSearchViewModel.cs => src/Orchard.Web/Modules/Orchard.Tags/ViewModels/TagsAdminSearchViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsIndexViewModel.cs => src/Orchard.Web/Modules/Orchard.Tags/ViewModels/TagsIndexViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsSearchViewModel.cs => src/Orchard.Web/Modules/Orchard.Tags/ViewModels/TagsSearchViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Create.aspx => src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.aspx
rename : src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Edit.aspx => src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.aspx
rename : src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx => src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx
rename : src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Search.aspx => src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Search.aspx
rename : src/Orchard.Web/Packages/Orchard.Tags/Views/DisplayTemplates/Parts/Tags.ShowTags.ascx => src/Orchard.Web/Modules/Orchard.Tags/Views/DisplayTemplates/Parts/Tags.ShowTags.ascx
rename : src/Orchard.Web/Packages/Orchard.Tags/Views/EditorTemplates/Parts/Tags.EditTags.ascx => src/Orchard.Web/Modules/Orchard.Tags/Views/EditorTemplates/Parts/Tags.EditTags.ascx
rename : src/Orchard.Web/Packages/Orchard.Tags/Views/EditorTemplates/Parts/Tags.SiteSettings.ascx => src/Orchard.Web/Modules/Orchard.Tags/Views/EditorTemplates/Parts/Tags.SiteSettings.ascx
rename : src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Index.ascx => src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Index.ascx
rename : src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Search.ascx => src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.ascx
rename : src/Orchard.Web/Packages/TinyMce/Views/Web.config => src/Orchard.Web/Modules/Orchard.Tags/Views/Web.config
rename : src/Orchard.Web/Packages/Orchard.Tags/Web.config => src/Orchard.Web/Modules/Orchard.Tags/Web.config
rename : src/Orchard.Web/Packages/Orchard.Users/AdminMenu.cs => src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs
rename : src/Orchard.Web/Packages/Orchard.Users/Controllers/AccountController.cs => src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
rename : src/Orchard.Web/Packages/Orchard.Users/Controllers/AdminController.cs => src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
rename : src/Orchard.Web/Packages/Orchard.Users/Controllers/UserDriver.cs => src/Orchard.Web/Modules/Orchard.Users/Controllers/UserDriver.cs
rename : src/Orchard.Web/Packages/Orchard.Users/Models/User.cs => src/Orchard.Web/Modules/Orchard.Users/Models/User.cs
rename : src/Orchard.Web/Packages/Orchard.Users/Models/UserHandler.cs => src/Orchard.Web/Modules/Orchard.Users/Models/UserHandler.cs
rename : src/Orchard.Web/Packages/Orchard.Users/Models/UserRecord.cs => src/Orchard.Web/Modules/Orchard.Users/Models/UserRecord.cs
rename : src/Orchard.Web/Packages/Orchard.Users/Package.txt => src/Orchard.Web/Modules/Orchard.Users/Module.txt
rename : src/Orchard.Web/Packages/Orchard.Users/Orchard.Users.csproj => src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
rename : src/Orchard.Web/Packages/Orchard.Users/Permissions.cs => src/Orchard.Web/Modules/Orchard.Users/Permissions.cs
rename : src/Orchard.Web/Packages/Orchard.Users/Properties/AssemblyInfo.cs => src/Orchard.Web/Modules/Orchard.Users/Properties/AssemblyInfo.cs
rename : src/Orchard.Web/Packages/Orchard.Users/Services/MembershipService.cs => src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
rename : src/Orchard.Web/Packages/Orchard.Users/ViewModels/LogOnViewModel.cs => src/Orchard.Web/Modules/Orchard.Users/ViewModels/LogOnViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserCreateViewModel.cs => src/Orchard.Web/Modules/Orchard.Users/ViewModels/UserCreateViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserEditViewModel.cs => src/Orchard.Web/Modules/Orchard.Users/ViewModels/UserEditViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Users/ViewModels/UsersIndexViewModel.cs => src/Orchard.Web/Modules/Orchard.Users/ViewModels/UsersIndexViewModel.cs
rename : src/Orchard.Web/Packages/Orchard.Users/Views/Account/AccessDenied.ascx => src/Orchard.Web/Modules/Orchard.Users/Views/Account/AccessDenied.ascx
rename : src/Orchard.Web/Packages/Orchard.Users/Views/Account/ChangePassword.ascx => src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.ascx
rename : src/Orchard.Web/Packages/Orchard.Users/Views/Account/ChangePasswordSuccess.ascx => src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePasswordSuccess.ascx
rename : src/Orchard.Web/Packages/Orchard.Users/Views/Account/LogOn.ascx => src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx
rename : src/Orchard.Web/Packages/Orchard.Users/Views/Account/Register.ascx => src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.ascx
rename : src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx => src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.aspx
rename : src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx => src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.aspx
rename : src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/inputPasswordLarge.ascx => src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputPasswordLarge.ascx
rename : src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/inputTextLarge.ascx => src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputTextLarge.ascx
rename : src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx => src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx
rename : src/Orchard.Web/Packages/Orchard.Users/Views/EditorTemplates/Items/Users.User.ascx => src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Items/Users.User.ascx
rename : src/Orchard.Web/Packages/TinyMce/Views/Web.config => src/Orchard.Web/Modules/Orchard.Users/Views/Web.config
rename : src/Orchard.Web/Packages/Orchard.Users/Web.config => src/Orchard.Web/Modules/Orchard.Users/Web.config
rename : src/Orchard.Web/Packages/TinyMce/Package.txt => src/Orchard.Web/Modules/TinyMce/Module.txt
rename : src/Orchard.Web/Packages/TinyMce/Properties/AssemblyInfo.cs => src/Orchard.Web/Modules/TinyMce/Properties/AssemblyInfo.cs
rename : src/Orchard.Web/Packages/TinyMce/Scripts/langs/en.js => src/Orchard.Web/Modules/TinyMce/Scripts/langs/en.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/license.txt => src/Orchard.Web/Modules/TinyMce/Scripts/license.txt
rename : src/Orchard.Web/Packages/TinyMce/Scripts/plugins/autoresize/editor_plugin.js => src/Orchard.Web/Modules/TinyMce/Scripts/plugins/autoresize/editor_plugin.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/plugins/autoresize/editor_plugin_src.js => src/Orchard.Web/Modules/TinyMce/Scripts/plugins/autoresize/editor_plugin_src.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/plugins/fullscreen/editor_plugin.js => src/Orchard.Web/Modules/TinyMce/Scripts/plugins/fullscreen/editor_plugin.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/plugins/fullscreen/editor_plugin_src.js => src/Orchard.Web/Modules/TinyMce/Scripts/plugins/fullscreen/editor_plugin_src.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/plugins/fullscreen/fullscreen.htm => src/Orchard.Web/Modules/TinyMce/Scripts/plugins/fullscreen/fullscreen.htm
rename : src/Orchard.Web/Packages/TinyMce/Scripts/plugins/searchreplace/css/searchreplace.css => src/Orchard.Web/Modules/TinyMce/Scripts/plugins/searchreplace/css/searchreplace.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/plugins/searchreplace/editor_plugin.js => src/Orchard.Web/Modules/TinyMce/Scripts/plugins/searchreplace/editor_plugin.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/plugins/searchreplace/editor_plugin_src.js => src/Orchard.Web/Modules/TinyMce/Scripts/plugins/searchreplace/editor_plugin_src.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/plugins/searchreplace/js/searchreplace.js => src/Orchard.Web/Modules/TinyMce/Scripts/plugins/searchreplace/js/searchreplace.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/plugins/searchreplace/langs/en_dlg.js => src/Orchard.Web/Modules/TinyMce/Scripts/plugins/searchreplace/langs/en_dlg.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/plugins/searchreplace/searchreplace.htm => src/Orchard.Web/Modules/TinyMce/Scripts/plugins/searchreplace/searchreplace.htm
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/about.htm => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/about.htm
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/anchor.htm => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/anchor.htm
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/charmap.htm => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/charmap.htm
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/color_picker.htm => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/color_picker.htm
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/editor_template.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/editor_template.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/editor_template_src.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/editor_template_src.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/image.htm => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/image.htm
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/img/colorpicker.jpg => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/img/colorpicker.jpg
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/img/icons.gif => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/img/icons.gif
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/js/about.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/js/about.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/js/anchor.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/js/anchor.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/js/charmap.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/js/charmap.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/js/color_picker.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/js/color_picker.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/js/image.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/js/image.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/js/link.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/js/link.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/js/source_editor.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/js/source_editor.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/langs/en.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/langs/en.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/langs/en_dlg.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/langs/en_dlg.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/link.htm => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/link.htm
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/default/content.css => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/default/content.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/default/dialog.css => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/default/dialog.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/default/img/buttons.png => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/default/img/buttons.png
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/default/img/items.gif => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/default/img/items.gif
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/default/img/menu_arrow.gif => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/default/img/menu_arrow.gif
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/default/img/menu_check.gif => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/default/img/menu_check.gif
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/default/img/progress.gif => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/default/img/progress.gif
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/default/img/tabs.gif => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/default/img/tabs.gif
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/default/ui.css => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/default/ui.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/o2k7/content.css => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/o2k7/content.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/o2k7/dialog.css => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/o2k7/dialog.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/o2k7/img/button_bg.png => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/o2k7/img/button_bg.png
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/o2k7/img/button_bg_black.png => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/o2k7/img/button_bg_black.png
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/o2k7/img/button_bg_silver.png => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/o2k7/img/button_bg_silver.png
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/o2k7/ui.css => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/o2k7/ui.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/o2k7/ui_black.css => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/o2k7/ui_black.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/skins/o2k7/ui_silver.css => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/skins/o2k7/ui_silver.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/advanced/source_editor.htm => src/Orchard.Web/Modules/TinyMce/Scripts/themes/advanced/source_editor.htm
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/simple/editor_template.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/simple/editor_template.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/simple/editor_template_src.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/simple/editor_template_src.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/simple/img/icons.gif => src/Orchard.Web/Modules/TinyMce/Scripts/themes/simple/img/icons.gif
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/simple/langs/en.js => src/Orchard.Web/Modules/TinyMce/Scripts/themes/simple/langs/en.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/simple/skins/default/content.css => src/Orchard.Web/Modules/TinyMce/Scripts/themes/simple/skins/default/content.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/simple/skins/default/ui.css => src/Orchard.Web/Modules/TinyMce/Scripts/themes/simple/skins/default/ui.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/simple/skins/o2k7/content.css => src/Orchard.Web/Modules/TinyMce/Scripts/themes/simple/skins/o2k7/content.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/simple/skins/o2k7/img/button_bg.png => src/Orchard.Web/Modules/TinyMce/Scripts/themes/simple/skins/o2k7/img/button_bg.png
rename : src/Orchard.Web/Packages/TinyMce/Scripts/themes/simple/skins/o2k7/ui.css => src/Orchard.Web/Modules/TinyMce/Scripts/themes/simple/skins/o2k7/ui.css
rename : src/Orchard.Web/Packages/TinyMce/Scripts/tiny_mce.js => src/Orchard.Web/Modules/TinyMce/Scripts/tiny_mce.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/tiny_mce_popup.js => src/Orchard.Web/Modules/TinyMce/Scripts/tiny_mce_popup.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/tiny_mce_src.js => src/Orchard.Web/Modules/TinyMce/Scripts/tiny_mce_src.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/utils/editable_selects.js => src/Orchard.Web/Modules/TinyMce/Scripts/utils/editable_selects.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/utils/form_utils.js => src/Orchard.Web/Modules/TinyMce/Scripts/utils/form_utils.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/utils/mctabs.js => src/Orchard.Web/Modules/TinyMce/Scripts/utils/mctabs.js
rename : src/Orchard.Web/Packages/TinyMce/Scripts/utils/validate.js => src/Orchard.Web/Modules/TinyMce/Scripts/utils/validate.js
rename : src/Orchard.Web/Packages/TinyMce/TinyMce.csproj => src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
rename : src/Orchard.Web/Packages/TinyMce/Views/EditorTemplates/TinyMceTextEditor.ascx => src/Orchard.Web/Modules/TinyMce/Views/EditorTemplates/TinyMceTextEditor.ascx
rename : src/Orchard.Web/Packages/TinyMce/Views/Web.config => src/Orchard.Web/Modules/TinyMce/Views/Web.config
rename : src/Orchard.Web/Packages/TinyMce/Web.config => src/Orchard.Web/Modules/TinyMce/Web.config
This commit is contained in:
Nathan Heskew
2010-02-06 01:10:22 -08:00
parent aa74798f22
commit 62f4a9e5d9
496 changed files with 156 additions and 156 deletions

View File

@@ -0,0 +1,14 @@
using Orchard.UI.Navigation;
namespace Orchard.Media {
public class AdminMenu : INavigationProvider {
public string MenuName { get { return "admin"; } }
public void GetNavigation(NavigationBuilder builder) {
builder.Add("Media", "4",
menu => menu
.Add("Manage Folders", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Media" }).Permission(Permissions.ManageMediaFiles))
);
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 995 B

View File

@@ -0,0 +1,317 @@
/*----------------------------------------------------------
The base color for this template is #5c87b2. If you'd like
to use a different color start by replacing all instances of
#5c87b2 with your new color.
----------------------------------------------------------*/
body
{
background-color: #5c87b2;
font-size: .75em;
font-family: Verdana, Helvetica, Sans-Serif;
margin: 0;
padding: 0;
color: #696969;
}
a:link
{
color: #034af3;
text-decoration: underline;
}
a:visited
{
color: #505abc;
}
a:hover
{
color: #1d60ff;
text-decoration: none;
}
a:active
{
color: #12eb87;
}
p, ul
{
margin-bottom: 20px;
line-height: 1.6em;
}
/* HEADINGS
----------------------------------------------------------*/
h1, h2, h3, h4, h5, h6
{
font-size: 1.5em;
color: #000;
font-family: Arial, Helvetica, sans-serif;
}
h1
{
font-size: 2em;
padding-bottom: 0;
margin-bottom: 0;
}
h2
{
padding: 0 0 10px 0;
}
h3
{
font-size: 1.2em;
}
h4
{
font-size: 1.1em;
}
h5, h6
{
font-size: 1em;
}
/* this rule styles <h2> tags that are the
first child of the left and right table columns */
.rightColumn > h1, .rightColumn > h2, .leftColumn > h1, .leftColumn > h2
{
margin-top: 0;
}
/* PRIMARY LAYOUT ELEMENTS
----------------------------------------------------------*/
/* you can specify a greater or lesser percentage for the
page width. Or, you can specify an exact pixel width. */
.page
{
width: 90%;
margin-left: auto;
margin-right: auto;
}
#header
{
position: relative;
margin-bottom: 0px;
color: #000;
padding: 0;
}
#header h1
{
font-weight: bold;
padding: 5px 0;
margin: 0;
color: #fff;
border: none;
line-height: 2em;
font-family: Arial, Helvetica, sans-serif;
font-size: 32px !important;
}
#main
{
padding: 30px 30px 15px 30px;
background-color: #fff;
margin-bottom: 30px;
_height: 1px; /* only IE6 applies CSS properties starting with an underscrore */
}
#footer
{
color: #999;
padding: 10px 0;
text-align: center;
line-height: normal;
margin: 0;
font-size: .9em;
}
/* TAB MENU
----------------------------------------------------------*/
ul#menu
{
border-bottom: 1px #5C87B2 solid;
padding: 0 0 2px;
position: relative;
margin: 0;
text-align: right;
}
ul#menu li
{
display: inline;
list-style: none;
}
ul#menu li#greeting
{
padding: 10px 20px;
font-weight: bold;
text-decoration: none;
line-height: 2.8em;
color: #fff;
}
ul#menu li a
{
padding: 10px 20px;
font-weight: bold;
text-decoration: none;
line-height: 2.8em;
background-color: #e8eef4;
color: #034af3;
}
ul#menu li a:hover
{
background-color: #fff;
text-decoration: none;
}
ul#menu li a:active
{
background-color: #a6e2a6;
text-decoration: none;
}
ul#menu li.selected a
{
background-color: #fff;
color: #000;
}
/* FORM LAYOUT ELEMENTS
----------------------------------------------------------*/
fieldset
{
margin: 1em 0;
padding: 1em;
border: 1px solid #CCC;
}
fieldset p
{
margin: 2px 12px 10px 10px;
}
fieldset label
{
display: block;
}
fieldset label.inline
{
display: inline;
}
legend
{
font-size: 1.1em;
font-weight: 600;
padding: 2px 4px 8px 4px;
}
input[type="text"]
{
width: 200px;
border: 1px solid #CCC;
}
input[type="password"]
{
width: 200px;
border: 1px solid #CCC;
}
/* TABLE
----------------------------------------------------------*/
table
{
border: solid 1px #e8eef4;
border-collapse: collapse;
}
table td
{
padding: 5px;
border: solid 1px #e8eef4;
}
table th
{
padding: 6px 5px;
text-align: left;
background-color: #e8eef4;
border: solid 1px #e8eef4;
}
/* MISC
----------------------------------------------------------*/
.clear
{
clear: both;
}
.error
{
color:Red;
}
#menucontainer
{
margin-top:40px;
}
div#title
{
display:block;
float:left;
text-align:left;
}
#logindisplay
{
font-size:1.1em;
display:block;
text-align:right;
margin:10px;
color:White;
}
#logindisplay a:link
{
color: white;
text-decoration: underline;
}
#logindisplay a:visited
{
color: white;
text-decoration: underline;
}
#logindisplay a:hover
{
color: white;
text-decoration: none;
}
.field-validation-error
{
color: #ff0000;
}
.input-validation-error
{
border: 1px solid #ff0000;
background-color: #ffeeee;
}
.validation-summary-errors
{
font-weight: bold;
color: #ff0000;
}

View File

@@ -0,0 +1,213 @@
using System;
using System.Collections.Generic;
using System.Web;
using System.Web.Mvc;
using Orchard.Localization;
using Orchard.Media.Models;
using Orchard.Media.Services;
using Orchard.Media.ViewModels;
using Orchard.Security;
using Orchard.UI.Notify;
namespace Orchard.Media.Controllers {
[ValidateInput(false)]
public class AdminController : Controller {
private readonly IMediaService _mediaService;
private readonly IAuthorizer _authorizer;
private readonly INotifier _notifier;
public AdminController(IMediaService mediaService, IAuthorizer authorizer, INotifier notifier) {
_mediaService = mediaService;
_authorizer = authorizer;
_notifier = notifier;
}
public Localizer T { get; set; }
public ActionResult Index() {
// Root media folders
IEnumerable<MediaFolder> mediaFolders = _mediaService.GetMediaFolders(null);
var model = new MediaFolderIndexViewModel { MediaFolders = mediaFolders };
return View(model);
}
[HttpPost]
public ActionResult Index(FormCollection input) {
try {
foreach (string key in input.Keys) {
if (key.StartsWith("Checkbox.") && input[key] == "true") {
string folderName = key.Substring("Checkbox.".Length);
_mediaService.DeleteFolder(folderName);
}
}
return RedirectToAction("Index");
}
catch (Exception exception) {
_notifier.Error("Deleting Folder failed: " + exception.Message);
return View();
}
}
public ActionResult Create(string mediaPath) {
return View(new MediaFolderCreateViewModel { MediaPath = mediaPath });
}
[HttpPost]
public ActionResult Create() {
var viewModel = new MediaFolderCreateViewModel();
try {
UpdateModel(viewModel);
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't create media folder")))
return new HttpUnauthorizedResult();
_mediaService.CreateFolder(viewModel.MediaPath, viewModel.Name);
return RedirectToAction("Index");
}
catch (Exception exception) {
_notifier.Error("Creating Folder failed: " + exception.Message);
return View(viewModel);
}
}
public ActionResult Edit(string name, string mediaPath) {
IEnumerable<MediaFile> mediaFiles = _mediaService.GetMediaFiles(mediaPath);
IEnumerable<MediaFolder> mediaFolders = _mediaService.GetMediaFolders(mediaPath);
var model = new MediaFolderEditViewModel { FolderName = name, MediaFiles = mediaFiles, MediaFolders = mediaFolders, MediaPath = mediaPath };
return View(model);
}
[HttpPost]
public ActionResult Edit(FormCollection input) {
try {
foreach (string key in input.Keys) {
if (key.StartsWith("Checkbox.File.") && input[key] == "true") {
string fileName = key.Substring("Checkbox.File.".Length);
string folderName = input[fileName];
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media file")))
return new HttpUnauthorizedResult();
_mediaService.DeleteFile(fileName, folderName);
}
else if (key.StartsWith("Checkbox.Folder.") && input[key] == "true") {
string folderName = key.Substring("Checkbox.Folder.".Length);
string folderPath = input[folderName];
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media folder")))
return new HttpUnauthorizedResult();
_mediaService.DeleteFolder(folderPath);
}
}
return RedirectToAction("Index");
}
catch (Exception exception) {
_notifier.Error("Deleting failed: " + exception.Message);
return View();
}
}
public ActionResult EditProperties(string folderName, string mediaPath) {
var model = new MediaFolderEditPropertiesViewModel { Name = folderName, MediaPath = mediaPath };
return View(model);
}
[HttpPost]
public ActionResult EditProperties() {
var viewModel = new MediaFolderEditPropertiesViewModel();
try {
UpdateModel(viewModel);
//TODO: There may be better ways to do this.
// Delete
if (!String.IsNullOrEmpty(HttpContext.Request.Form["submit.Delete"])) {
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media folder")))
return new HttpUnauthorizedResult();
_mediaService.DeleteFolder(viewModel.MediaPath);
}
// Save
else {
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't rename media folder")))
return new HttpUnauthorizedResult();
_mediaService.RenameFolder(viewModel.MediaPath, viewModel.Name);
}
return RedirectToAction("Index");
}
catch (Exception exception) {
_notifier.Error("Modifying Folder Properties failed: " + exception.Message);
return View(viewModel);
}
}
public ActionResult Add(string folderName, string mediaPath) {
var model = new MediaItemAddViewModel { FolderName = folderName, MediaPath = mediaPath };
return View(model);
}
[HttpPost]
public ActionResult Add() {
var viewModel = new MediaItemAddViewModel();
try {
UpdateModel(viewModel);
if (!_authorizer.Authorize(Permissions.UploadMediaFiles, T("Couldn't upload media file")))
return new HttpUnauthorizedResult();
foreach (string fileName in Request.Files) {
HttpPostedFileBase file = Request.Files[fileName];
_mediaService.UploadMediaFile(viewModel.MediaPath, file);
}
return RedirectToAction("Edit", new { name = viewModel.FolderName, mediaPath = viewModel.MediaPath });
}
catch (Exception exception) {
_notifier.Error("Uploading media file failed: " + exception.Message);
return View(viewModel);
}
}
public ActionResult EditMedia(string name, string caption, DateTime lastUpdated, long size, string folderName, string mediaPath) {
var model = new MediaItemEditViewModel();
model.Name = name;
model.Caption = caption ?? String.Empty;
model.LastUpdated = lastUpdated;
model.Size = size;
model.FolderName = folderName;
model.MediaPath = mediaPath;
return View(model);
}
[HttpPost]
public ActionResult EditMedia(FormCollection input) {
var viewModel = new MediaItemEditViewModel();
try {
UpdateModel(viewModel);
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't modify media file")))
return new HttpUnauthorizedResult();
// Delete
if (!String.IsNullOrEmpty(HttpContext.Request.Form["submit.Delete"])) {
if (!_authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media file")))
return new HttpUnauthorizedResult();
_mediaService.DeleteFile(viewModel.Name, viewModel.MediaPath);
return RedirectToAction("Edit", new { name = viewModel.FolderName, mediaPath = viewModel.MediaPath });
}
// Save and Rename
if (!String.Equals(viewModel.Name, input["NewName"], StringComparison.OrdinalIgnoreCase)) {
_mediaService.RenameFile(viewModel.Name, input["NewName"], viewModel.MediaPath);
return RedirectToAction("EditMedia", new { name = input["NewName"],
caption = viewModel.Caption,
lastUpdated = viewModel.LastUpdated,
size = viewModel.Size,
folderName = viewModel.FolderName,
mediaPath = viewModel.MediaPath });
}
// Save
return RedirectToAction("EditMedia", new { name = viewModel.Name,
caption = viewModel.Caption,
lastUpdated = viewModel.LastUpdated,
size = viewModel.Size,
folderName = viewModel.FolderName,
mediaPath = viewModel.MediaPath });
}
catch (Exception exception) {
_notifier.Error("Editing media file failed: " + exception.Message);
return View(viewModel);
}
}
}
}

View File

@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using Orchard.Media.Models;
namespace Orchard.Media.Helpers {
public static class MediaHelpers {
public static IEnumerable<FolderNavigation> GetFolderNavigationHierarchy(string mediaPath) {
List<FolderNavigation> navigations = new List<FolderNavigation>();
if (String.IsNullOrEmpty(mediaPath)) {
return navigations;
}
if (!mediaPath.Contains("\\")) {
navigations.Add(new FolderNavigation { FolderName = mediaPath, FolderPath = mediaPath });
return navigations;
}
string[] navigationParts = mediaPath.Split(new[] { "\\" }, StringSplitOptions.RemoveEmptyEntries);
string currentPath = String.Empty;
foreach (string navigationPart in navigationParts) {
currentPath = (currentPath == String.Empty ? navigationPart : currentPath + "\\" + navigationPart);
navigations.Add(new FolderNavigation { FolderName = navigationPart, FolderPath = currentPath });
}
return navigations;
}
}
}

View File

@@ -0,0 +1,6 @@
namespace Orchard.Media.Models {
public class FolderNavigation {
public string FolderName { get; set; }
public string FolderPath { get; set; }
}
}

View File

@@ -0,0 +1,12 @@
using System;
namespace Orchard.Media.Models {
public class MediaFile{
public string Name { get; set; }
public string User { get; set; }
public string Type { get; set; }
public long Size { get; set; }
public string FolderName { get; set; }
public DateTime LastUpdated { get; set; }
}
}

View File

@@ -0,0 +1,11 @@
using System;
namespace Orchard.Media.Models {
public class MediaFolder {
public string Name { get; set; }
public string MediaPath { get; set; }
public string User { get; set; }
public long Size { get; set; }
public DateTime LastUpdated { get; set; }
}
}

View File

@@ -0,0 +1,44 @@
using Orchard.Data;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Handlers;
using Orchard.ContentManagement.Records;
using Orchard.ContentManagement.ViewModels;
namespace Orchard.Media.Models {
public class MediaSettings : ContentPart<MediaSettingsRecord> {
}
public class MediaSettingsRecord : ContentPartRecord {
public virtual string RootMediaFolder { get; set; }
}
public class MediaSettingsHandler : ContentHandler {
public MediaSettingsHandler(IRepository<MediaSettingsRecord> repository) {
Filters.Add(new ActivatingFilter<MediaSettings>("site"));
Filters.Add(StorageFilter.For(repository) );
OnActivated<MediaSettings>(DefaultSettings);
}
private static void DefaultSettings(ActivatedContentContext context, MediaSettings settings) {
settings.Record.RootMediaFolder = "~/Media";
}
protected override void BuildEditorModel(BuildEditorModelContext context) {
var model = context.ContentItem.As<MediaSettings>();
if (model == null)
return;
context.AddEditor(new TemplateViewModel(model.Record, "MediaSettings") { TemplateName = "Parts/Media.SiteSettings" });
}
protected override void UpdateEditorModel(UpdateEditorModelContext context) {
var model = context.ContentItem.As<MediaSettings>();
if (model == null)
return;
context.Updater.TryUpdateModel(model.Record, "MediaSettings", null, null);
context.AddEditor(new TemplateViewModel(model.Record, "MediaSettings") { TemplateName = "Parts/Media.SiteSettings" });
}
}
}

View File

@@ -0,0 +1 @@
name: Media

View File

@@ -0,0 +1,156 @@
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Orchard.Media</RootNamespace>
<AssemblyName>Orchard.Media</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\lib\sharpziplib\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Routing" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
<Reference Include="System.Web.Mobile" />
</ItemGroup>
<ItemGroup>
<Compile Include="AdminMenu.cs" />
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="Helpers\MediaHelpers.cs" />
<Compile Include="Models\MediaSettings.cs" />
<Compile Include="Permissions.cs" />
<Compile Include="Models\FolderNavigation.cs" />
<Compile Include="Models\MediaFile.cs" />
<Compile Include="Models\MediaFolder.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Services\MediaService.cs" />
<Compile Include="Services\XmlRpcHandler.cs" />
<Compile Include="ViewModels\MediaItemEditViewModel.cs" />
<Compile Include="ViewModels\MediaFolderCreateViewModel.cs" />
<Compile Include="ViewModels\MediaFolderEditPropertiesViewModel.cs" />
<Compile Include="ViewModels\MediaFolderEditViewModel.cs" />
<Compile Include="ViewModels\MediaFolderIndexViewModel.cs" />
<Compile Include="ViewModels\MediaItemAddViewModel.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Content\Admin\images\folder.gif" />
<Content Include="Module.txt" />
<Content Include="Views\Admin\Add.aspx" />
<Content Include="Views\Admin\Create.aspx" />
<Content Include="Views\Admin\Edit.aspx" />
<Content Include="Views\Admin\EditMedia.aspx" />
<Content Include="Views\Admin\EditProperties.aspx" />
<Content Include="Views\Admin\Index.aspx" />
<Content Include="Views\EditorTemplates\Parts\Media.SiteSettings.ascx" />
<Content Include="Web.config" />
<Content Include="Content\Site.css" />
<Content Include="Views\Web.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Orchard\Orchard.csproj">
<Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
<Name>Orchard</Name>
</ProjectReference>
<ProjectReference Include="..\..\Core\Orchard.Core.csproj">
<Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
<Name>Orchard.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target> -->
<!-- To enable MVC area subproject support, uncomment the following two lines:
<UsingTask TaskName="Microsoft.Web.Mvc.Build.CreateAreaManifest" AssemblyName="Microsoft.Web.Mvc.Build, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<UsingTask TaskName="Microsoft.Web.Mvc.Build.CopyAreaManifests" AssemblyName="Microsoft.Web.Mvc.Build, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-->
<Target Name="AfterBuild" DependsOnTargets="AfterBuildCompiler">
<PropertyGroup>
<AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
</PropertyGroup>
<!-- If this is an area child project, uncomment the following line:
<CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-->
<!-- If this is an area parent project, uncomment the following lines:
<CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
<CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
-->
</Target>
<Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
<AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
</Target>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>53597</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>True</UseCustomServer>
<CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>

View File

@@ -0,0 +1,49 @@
using System.Collections.Generic;
using System.Linq;
using Orchard.Security.Permissions;
namespace Orchard.Media {
public class Permissions : IPermissionProvider {
public static readonly Permission ManageMediaFiles = new Permission { Description = "Modifying Media Files", Name = "ManageMediaFiles" };
public static readonly Permission UploadMediaFiles = new Permission { Description = "Uploading Media Files", Name = "UploadMediaFiles", ImpliedBy = new[] { ManageMediaFiles } };
public string ModuleName {
get {
return "Media";
}
}
public IEnumerable<Permission> GetPermissions() {
return new Permission[] {
ManageMediaFiles,
UploadMediaFiles,
};
}
public IEnumerable<PermissionStereotype> GetDefaultStereotypes() {
return new[] {
new PermissionStereotype {
Name = "Administrators",
Permissions = new[] {ManageMediaFiles}
},
new PermissionStereotype {
Name = "Editor",
Permissions = new[] {ManageMediaFiles}
},
new PermissionStereotype {
Name = "Moderator",
//Permissions = new[] {}
},
new PermissionStereotype {
Name = "Author",
Permissions = new[] {ManageMediaFiles}
},
new PermissionStereotype {
Name = "Contributor",
Permissions = new[] {UploadMediaFiles}
},
};
}
}
}

View File

@@ -0,0 +1,34 @@
using System.Reflection;
using System.Runtime.CompilerServices;
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.Media")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Orchard")]
[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("26ae646f-4561-40f8-bd01-0962c9e52343")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

View File

@@ -0,0 +1,185 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Text;
using System.Web;
using ICSharpCode.SharpZipLib.Zip;
using Orchard.Logging;
using Orchard.Storage;
using Orchard.Media.Models;
namespace Orchard.Media.Services {
public interface IMediaService : IDependency {
IEnumerable<MediaFolder> GetMediaFolders(string path);
IEnumerable<MediaFile> GetMediaFiles(string path);
void CreateFolder(string path, string name);
void DeleteFolder(string name);
void RenameFolder(string path, string newName);
void DeleteFile(string name, string folderName);
void RenameFile(string name, string newName, string folderName);
void UploadMediaFile(string folderName, HttpPostedFileBase postedFile);
}
public class MediaService : IMediaService {
private readonly IStorageProvider _storageProvider;
private readonly string _rootPath;
public MediaService (
IStorageProvider storageProvider) {
_storageProvider = storageProvider;
_rootPath = HttpContext.Current.Server.MapPath("~/Media");
Logger = NullLogger.Instance;
}
public ILogger Logger { get; set; }
#region Implementation of IMediaService
public IEnumerable<MediaFolder> GetMediaFolders(string path) {
List<MediaFolder> mediaFolders = new List<MediaFolder>();
IEnumerable<IStorageFolder> folders = (
path == null ?
_storageProvider.ListFolders(_rootPath) :
_storageProvider.ListFolders(_rootPath + "\\" + path));
foreach (IStorageFolder folder in folders) {
List<string> parentHierarchy = GetParentHierarchy(folder);
string mediaPath = GetMediaPath(parentHierarchy, folder.GetName());
MediaFolder mediaFolder = new MediaFolder {
Name = folder.GetName(),
Size = folder.GetSize(),
LastUpdated = folder.GetLastUpdated(),
MediaPath = mediaPath
};
mediaFolders.Add(mediaFolder);
}
return mediaFolders;
}
public IEnumerable<MediaFile> GetMediaFiles(string path) {
List<MediaFile> mediaFiles = new List<MediaFile>();
IEnumerable<IStorageFile> files = _storageProvider.ListFiles(_rootPath + "\\" + path);
foreach (IStorageFile file in files) {
MediaFile mediaFile = new MediaFile {
Name = file.GetName(),
Size = file.GetSize(),
LastUpdated = file.GetLastUpdated(),
Type = file.GetFileType(),
FolderName = path
};
mediaFiles.Add(mediaFile);
}
return mediaFiles;
}
//TODO: Use Path.Combine.
public void CreateFolder(string mediaPath, string name) {
if (String.IsNullOrEmpty(mediaPath)) {
_storageProvider.CreateFolder(_rootPath + "\\" + name);
return;
}
_storageProvider.CreateFolder(_rootPath + "\\" + mediaPath + "\\" + name);
}
public void DeleteFolder(string name) {
_storageProvider.DeleteFolder(_rootPath + "\\" + name);
}
public void RenameFolder(string path, string newName) {
string newPath = RenameFolderPath(path, newName);
_storageProvider.RenameFolder(_rootPath + "\\" + path, _rootPath + "\\" + newPath);
}
public void DeleteFile(string name, string folderName) {
_storageProvider.DeleteFile(_rootPath + "\\" + folderName + "\\" + name);
}
public void RenameFile(string name, string newName, string folderName) {
_storageProvider.RenameFile(_rootPath + "\\" + folderName + "\\" + name, _rootPath + "\\" + folderName + "\\" + newName);
}
public void UploadMediaFile(string folderName, HttpPostedFileBase postedFile) {
string targetFolder = HttpContext.Current.Server.MapPath("~/Media/" + folderName);
if (postedFile.FileName.EndsWith(".zip")) {
UnzipMediaFileArchive(targetFolder, postedFile);
// Don't save the zip file.
return;
}
if (postedFile.ContentLength > 0) {
string filePath = Path.Combine(targetFolder,
Path.GetFileName(postedFile.FileName));
postedFile.SaveAs(filePath);
}
}
#endregion
private static void UnzipMediaFileArchive(string targetFolder, HttpPostedFileBase postedFile) {
int postedFileLength = postedFile.ContentLength;
Stream postedFileStream = postedFile.InputStream;
byte[] postedFileData = new byte[postedFileLength];
postedFileStream.Read(postedFileData, 0, postedFileLength);
using (var memoryStream = new MemoryStream(postedFileData)) {
var fileInflater = new ZipInputStream(memoryStream);
ZipEntry entry;
// We want to preserve whatever directory structure the zip file contained instead
// of flattening it.
// The API below doesn't necessarily return the entries in the zip file in any order.
// That means the files in subdirectories can be returned as entries from the stream
// before the directories that contain them, so we create directories as soon as first
// file below their path is encountered.
while ((entry = fileInflater.GetNextEntry()) != null) {
string directoryName = Path.GetDirectoryName(entry.Name);
if (!Directory.Exists(Path.Combine(targetFolder, directoryName))) {
Directory.CreateDirectory(Path.Combine(targetFolder, directoryName));
}
if (!entry.IsDirectory && entry.Name.Length > 0) {
var len = Convert.ToInt32(entry.Size);
var extractedBytes = new byte[len];
fileInflater.Read(extractedBytes, 0, len);
File.WriteAllBytes(Path.Combine(targetFolder, entry.Name), extractedBytes);
}
}
}
}
private static List<string> GetParentHierarchy(IStorageFolder folder) {
List<string> parentHierarchy = new List<string>();
do {
IStorageFolder parentFolder = folder.GetParent();
string parentName = parentFolder.GetName();
if (String.Equals(parentName, "Media", StringComparison.OrdinalIgnoreCase)) {
break;
}
parentHierarchy.Insert(0, parentName);
folder = parentFolder;
} while (true);
return parentHierarchy;
}
private static string GetMediaPath(IEnumerable<string> parentHierarchy, string folderName) {
StringBuilder mediaPath = new StringBuilder();
foreach (string parent in parentHierarchy) {
mediaPath.Append(parent);
mediaPath.Append("\\");
}
mediaPath.Append(folderName);
return mediaPath.ToString();
}
private static string RenameFolderPath(string path, string newName) {
int lastIndex = path.LastIndexOf("\\");
if (lastIndex == -1) {
return newName;
}
string parentPath = path.Substring(0, lastIndex);
return parentPath + "\\" + newName;
}
}
}

View File

@@ -0,0 +1,69 @@
using System;
using System.IO;
using System.Web;
using Orchard.Core.XmlRpc;
using Orchard.Core.XmlRpc.Models;
using Orchard.Security;
namespace Orchard.Media.Services {
public class XmlRpcHandler : IXmlRpcHandler {
private readonly IMembershipService _membershipService;
private readonly IAuthorizationService _authorizationService;
private readonly HttpContextBase _httpContext;
public XmlRpcHandler(
IMembershipService membershipService,
IAuthorizationService authorizationService,
HttpContextBase httpContext) {
_membershipService = membershipService;
_authorizationService = authorizationService;
_httpContext = httpContext;
}
public void Process(XmlRpcContext context) {
var uriBuilder = new UriBuilder(context.HttpContext.Request.Url) {
Path = context.HttpContext.Request.ApplicationPath,
Query = string.Empty
};
if (context.Request.MethodName == "metaWeblog.newMediaObject") {
var result = MetaWeblogNewMediaObject(
uriBuilder,
Convert.ToString(context.Request.Params[0].Value),
Convert.ToString(context.Request.Params[1].Value),
Convert.ToString(context.Request.Params[2].Value),
(XRpcStruct)context.Request.Params[3].Value);
context.Response = new XRpcMethodResponse().Add(result);
}
}
private XRpcStruct MetaWeblogNewMediaObject(
UriBuilder uriBuilder,
string blogId,
string userName,
string password,
XRpcStruct file) {
var user = _membershipService.ValidateUser(userName, password);
if (!_authorizationService.TryCheckAccess(Permissions.UploadMediaFiles, user, null)) {
//TEMP: return appropriate access-denied response for user
throw new ApplicationException("Access denied");
}
var name = file.Optional<string>("name");
var bits = file.Optional<byte[]>("bits");
var target = HttpContext.Current.Server.MapPath("~/Media/" + name);
Directory.CreateDirectory(Path.GetDirectoryName(target));
using (var stream = new FileStream(target, FileMode.Create, FileAccess.Write, FileShare.ReadWrite)) {
stream.Write(bits, 0, bits.Length);
}
uriBuilder.Path = uriBuilder.Path.TrimEnd('/') + "/Media/" + name.TrimStart('/');
return new XRpcStruct().Set("url", uriBuilder.Uri.AbsoluteUri);
}
}
}

View File

@@ -0,0 +1,11 @@
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using Orchard.Mvc.ViewModels;
namespace Orchard.Media.ViewModels {
public class MediaFolderCreateViewModel : AdminViewModel {
[Required, DisplayName("Folder Name:")]
public string Name { get; set; }
public string MediaPath { get; set; }
}
}

View File

@@ -0,0 +1,8 @@
using Orchard.Mvc.ViewModels;
namespace Orchard.Media.ViewModels {
public class MediaFolderEditPropertiesViewModel : AdminViewModel {
public string Name { get; set; }
public string MediaPath { get; set; }
}
}

View File

@@ -0,0 +1,12 @@
using System.Collections.Generic;
using Orchard.Media.Models;
using Orchard.Mvc.ViewModels;
namespace Orchard.Media.ViewModels {
public class MediaFolderEditViewModel : AdminViewModel {
public string FolderName { get; set; }
public string MediaPath { get; set; }
public IEnumerable<MediaFolder> MediaFolders { get; set; }
public IEnumerable<MediaFile> MediaFiles { get; set; }
}
}

View File

@@ -0,0 +1,9 @@
using System.Collections.Generic;
using Orchard.Mvc.ViewModels;
using Orchard.Media.Models;
namespace Orchard.Media.ViewModels {
public class MediaFolderIndexViewModel : AdminViewModel {
public IEnumerable<MediaFolder> MediaFolders { get; set; }
}
}

View File

@@ -0,0 +1,8 @@
using Orchard.Mvc.ViewModels;
namespace Orchard.Media.ViewModels {
public class MediaItemAddViewModel : AdminViewModel {
public string FolderName { get; set; }
public string MediaPath { get; set; }
}
}

View File

@@ -0,0 +1,18 @@
using System;
using Orchard.Mvc.ViewModels;
namespace Orchard.Media.ViewModels {
public class MediaItemEditViewModel : AdminViewModel {
public string Name { get; set; }
public string Caption { get; set; }
public long Size { get; set; }
public DateTime LastUpdated { get; set; }
public string FolderName { get; set; }
public string MediaPath { get; set; }
public string RelativePath {
get {
return MediaPath.Replace("\\", "/");
}
}
}
}

View File

@@ -0,0 +1,26 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<MediaItemAddViewModel>" %>
<%@ Import Namespace="Orchard.Media.Helpers"%>
<%@ Import Namespace="Orchard.Media.Models"%>
<%@ Import Namespace="Orchard.Media.ViewModels"%>
<h1><%=Html.TitleForPage(T("Add Media").ToString()) %></h1>
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> &#62;
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) { %>
<%=Html.ActionLink(navigation.FolderName, "Edit",
new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> &#62;
<% } %>
<%=_Encoded("Add Media") %></p>
<% using (Html.BeginForm("Add", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) { %>
<%= Html.ValidationSummary() %>
<fieldset>
<label for="pageTitle"><%=T("File Path <span> - multiple files must be in a zipped folder</span>")%></label>
<input id="MediaItemPath" name="MediaItemPath" type="file" class="text" value="<%=_Encoded("Browse") %>" size="64"/>
<span class="hint"><%=_Encoded("After your files have been uploaded, you can edit the titles and descriptions.")%></span>
<input type="hidden" id="FolderName" name="FolderName" value="<%=Html.Encode(Model.FolderName) %>" />
<input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" />
</fieldset>
<fieldset>
<input type="submit" class="button" value="<%=_Encoded("Upload") %>" />
<%=Html.AntiForgeryTokenOrchard() %>
</fieldset>
<% } %>

View File

@@ -0,0 +1,20 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<MediaFolderCreateViewModel>" %>
<%@ Import Namespace="Orchard.Media.Helpers"%>
<%@ Import Namespace="Orchard.Media.Models"%>
<%@ Import Namespace="Orchard.Media.ViewModels"%>
<h1><%=Html.TitleForPage(T("Add a Folder").ToString()) %></h1>
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> &#62;
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) { %>
<%=Html.ActionLink(navigation.FolderName, "Edit",
new {name = navigation.FolderName, mediaPath = navigation.FolderPath}) %> &#62;
<% } %>
<%=_Encoded("Add a Folder") %></p>
<%using (Html.BeginFormAntiForgeryPost()) { %>
<%= Html.ValidationSummary() %>
<fieldset>
<label for="Name"><%=_Encoded("Folder Name") %></label>
<input id="Name" class="text" name="Name" type="text" />
<input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" />
<input type="submit" class="button" value="<%=_Encoded("Save") %>" />
</fieldset>
<% } %>

View File

@@ -0,0 +1,89 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<MediaFolderEditViewModel>" %>
<%@ Import Namespace="Orchard.Media.Models"%>
<%@ Import Namespace="Orchard.Media.Helpers"%>
<%@ Import Namespace="Orchard.Media.ViewModels"%>
<h1><%=Html.TitleForPage(T("Manage Folder").ToString())%></h1>
<div class="manage"><%=Html.ActionLink(T("Folder Properties").ToString(), "EditProperties", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button"})%></div>
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> &#62;
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
<%=Html.ActionLink(navigation.FolderName, "Edit",
new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> &#62;
<% } %>
<%=_Encoded("Manage Folder")%></p>
<% using(Html.BeginFormAntiForgeryPost()) { %>
<fieldset class="actions bulk">
<label for="publishActions"><%=_Encoded("Actions:")%></label>
<select id="Select1" name="publishActions">
<option value="1"><%=_Encoded("Delete")%></option>
</select>
<input class="button roundCorners" type="submit" value="<%=_Encoded("Apply") %>" />
</fieldset>
<div class="manage">
<%=Html.ActionLink(T("Add media").ToString(), "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%>
<%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { Model.MediaPath }, new { @class = "button" })%>
</div>
<fieldset>
<table class="items" summary="<%=_Encoded("This is a table of the pages currently available for use in your application.") %>">
<colgroup>
<col id="Col1" />
<col id="Col2" />
<col id="Col3" />
<col id="Col4" />
<col id="Col5" />
<col id="Col6" />
</colgroup>
<thead>
<tr>
<th scope="col">&nbsp;&darr;<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%></th>
<th scope="col"><%=_Encoded("Name") %></th>
<th scope="col"><%=_Encoded("Author") %></th>
<th scope="col"><%=_Encoded("Last Updated") %></th>
<th scope="col"><%=_Encoded("Type") %></th>
<th scope="col"><%=_Encoded("Size") %></th>
</tr>
</thead>
<%foreach (var mediaFile in Model.MediaFiles) {
%>
<tr>
<td>
<input type="checkbox" value="true" name="<%=_Encoded("Checkbox.File.{0}", mediaFile.Name) %>"/>
<input type="hidden" value="<%=_Encoded("Model.MediaPath") %>" name="<%=_Encoded("mediaFile.Name") %>" />
</td>
<td>
<%=Html.ActionLink(mediaFile.Name, "EditMedia", new { name = mediaFile.Name,
lastUpdated = mediaFile.LastUpdated,
size = mediaFile.Size,
folderName = mediaFile.FolderName,
mediaPath = Model.MediaPath })%>
</td>
<td><%=_Encoded("Orchard User")%></td>
<td><%=mediaFile.LastUpdated %></td>
<td><%=Html.Encode(mediaFile.Type) %></td>
<td><%=mediaFile.Size %></td>
</tr>
<%}%>
<%foreach (var mediaFolder in Model.MediaFolders) {
%>
<tr>
<td>
<input type="checkbox" value="true" name="<%=_Encoded("Checkbox.Folder.{0}", mediaFolder.Name) %>"/>
<input type="hidden" value="<%=Html.Encode(mediaFolder.MediaPath) %>" name="<%=Html.Encode(mediaFolder.Name) %>" />
</td>
<td>
<img src="<%=ResolveUrl("~/Modules/Orchard.Media/Content/Admin/images/folder.gif")%>" height="16" width="16" class="mediaTypeIcon" alt="<%=_Encoded("Folder") %>" />
<%=Html.ActionLink(mediaFolder.Name, "Edit", new { name = mediaFolder.Name, mediaPath = mediaFolder.MediaPath})%>
</td>
<td><%=_Encoded("Orchard User")%></td>
<td><%=mediaFolder.LastUpdated %></td>
<td><%=_Encoded("Folder")%></td>
<td><%=mediaFolder.Size %></td>
</tr>
<%}%>
</table>
</fieldset>
<div class="manage">
<%=Html.ActionLink(T("Add media").ToString(), "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%>
<%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { Model.MediaPath }, new { @class = "button" })%>
</div>
<% } %>

View File

@@ -0,0 +1,54 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<MediaItemEditViewModel>" %>
<%@ Import Namespace="Orchard.Media.Models"%>
<%@ Import Namespace="Orchard.Media.Helpers"%>
<%@ Import Namespace="Orchard.Media.ViewModels"%>
<h1><%=Html.TitleForPage(T("Edit Media - {0}", Model.Name).ToString())%></h1>
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> &#62;
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
<%=Html.ActionLink(navigation.FolderName, "Edit",
new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> &#62;
<% } %>
<%=_Encoded("Edit Media")%></p>
<div class="sections">
<%using (Html.BeginFormAntiForgeryPost()) { %>
<%= Html.ValidationSummary() %>
<div class="primary">
<h2><%=_Encoded("About this media")%></h2>
<fieldset>
<div>
<label for="Name"><%=_Encoded("Name")%></label>
<input id="Name" name="Name" type="hidden" value="<%=Html.Encode(Model.Name) %>"/>
<input id="NewName" class="text" name="NewName" type="text" value="<%=Html.Encode(Model.Name) %>"/>
</div>
<div>
<label for="Caption"><%=_Encoded("Caption")%></label>
<input id="Caption" class="text" name="Caption" type="text" value="<%= Model.Caption %>"/>
<span class="hint"><%=_Encoded("This will be used for the image alt tag.")%></span>
<input type="hidden" id="LastUpdated" name="LastUpdated" value="<%= Model.LastUpdated %>"/>
<input type="hidden" id="Size" name="Size" value="<%= Model.Size %>"/>
<input type="hidden" id="FolderName" name="FolderName" value="<%= Model.FolderName %>"/>
<input type="hidden" id="MediaPath" name="MediaPath" value="<%= Model.MediaPath %>" />
</div>
</fieldset>
<fieldset>
<input type="submit" class="button" name="submit.Save" value="<%=_Encoded("Save") %>" />
<%--<input type="submit" class="button" name="submit.Delete" value="<%=_Encoded("Delete") %>" />--%>
</fieldset>
</div>
<div class="secondary">
<h2><%=_Encoded("Preview")%></h2>
<div><img src="<%=ResolveUrl("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))%>" class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" /></div>
<ul>
<%-- todo: make these real (including markup) --%>
<li><label><%=T("Dimensions: <span>500 x 375 pixels</span>")%></label></li>
<li><label><%=T("Size: <span>{0}</span>", Model.Size)%></label></li>
<li><label><%=T("Added on: <span>{0} by Orchard User</span>", Model.LastUpdated)%></label></li>
<li>
<label for="embedPath"><%=_Encoded("Embed:")%></label>
<input id="embedPath" class="text" name="embedPath" type="text" readonly="readonly" value="<%=_Encoded("<img src=\"{0}\" width=\"{1}\" height=\"{2}\" alt=\"{3}\" />", ResolveUrl("~/Media/" + Model.RelativePath + "/" + Model.Name), 500, 375, Model.Caption) %>" />
<span class="hint"><%=_Encoded("Copy this html to add this image to your site.") %></p>
</li>
</ul>
</div>
<% } %>
</div>

View File

@@ -0,0 +1,22 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<MediaFolderEditPropertiesViewModel>" %>
<%@ Import Namespace="Orchard.Media.Helpers"%>
<%@ Import Namespace="Orchard.Media.Models"%>
<%@ Import Namespace="Orchard.Media.ViewModels"%>
<h1><%=Html.TitleForPage(T("Folder Properties").ToString())%></h1>
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> &#62;
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
<%=Html.ActionLink(navigation.FolderName, "Edit",
new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> &#62;
<% } %>
<%=_Encoded("Folder Properties")%></p>
<% using (Html.BeginFormAntiForgeryPost()) { %>
<%=Html.ValidationSummary() %>
<fieldset>
<label for="Name"><%=_Encoded("Folder Name:") %></label>
<input id="MediaPath" name="MediaPath" type="hidden" value="<%=Html.Encode(Model.MediaPath) %>" />
<input id="Name" class="text" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" />
<input type="submit" class="button" name="submit.Save" value="<%=_Encoded("Save") %>" />
<%--<input type="submit" class="button buttonFocus roundCorners" name="submit.Delete" value="<%=_Encoded("Delete") %>" />--%>
</fieldset>
<% } %>

View File

@@ -0,0 +1,52 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<MediaFolderIndexViewModel>" %>
<%@ Import Namespace="Orchard.Media.ViewModels"%>
<h1><%=Html.TitleForPage(T("Manage Media Folders").ToString()) %></h1>
<% using(Html.BeginFormAntiForgeryPost()) { %>
<%=Html.ValidationSummary() %>
<fieldset class="actions bulk">
<label for="publishActions"><%=_Encoded("Actions:") %></label>
<select id="Select1" name="publishActions">
<option value="1"><%=_Encoded("Delete")%></option>
</select>
<input class="button roundCorners" type="submit" value="<%=_Encoded("Apply") %>" />
</fieldset>
<div class="manage"><%=Html.ActionLink(T("Add a folder").ToString(), "Create", new {}, new { @class = "button"}) %></div>
<fieldset>
<table class="items" summary="<%=_Encoded("This is a table of the media folders currently available for use in your application.") %>">
<colgroup>
<col id="Col1" />
<col id="Col2" />
<col id="Col3" />
<col id="Col4" />
<col id="Col5" />
<col id="Col6" />
</colgroup>
<thead>
<tr>
<th scope="col">&nbsp;&darr;<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%></th>
<th scope="col"><%=_Encoded("Name")%></th>
<th scope="col"><%=_Encoded("Author") %></th>
<th scope="col"><%=_Encoded("Last Updated") %></th>
<th scope="col"><%=_Encoded("Type") %></th>
<th scope="col"><%=_Encoded("Size") %></th>
</tr>
</thead>
<%foreach (var mediaFolder in Model.MediaFolders) {
%>
<tr>
<td><input type="checkbox" value="true" name="<%=_Encoded("Checkbox.{0}", mediaFolder.Name) %>"/></td>
<%-- todo: (heskew) this URL needs to be determined from current module location --%>
<td>
<img src="<%=ResolveUrl("~/Modules/Orchard.Media/Content/Admin/images/folder.gif")%>" height="16" width="16" class="mediaTypeIcon" alt="<%=_Encoded("Folder") %>" />
<%=Html.ActionLink(mediaFolder.Name, "Edit", new { name = mediaFolder.Name, mediaPath = mediaFolder.MediaPath })%>
</td>
<td><%=_Encoded("Orchard User")%></td>
<td><%=mediaFolder.LastUpdated %></td>
<td><%=_Encoded("Folder")%></td>
<td><%=mediaFolder.Size %></td>
</tr>
<%}%>
</table>
</fieldset>
<div class="manage"><%=Html.ActionLink(T("Add a folder").ToString(), "Create", new {}, new { @class = "button"}) %></div>
<% } %>

View File

@@ -0,0 +1,10 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<MediaSettingsRecord>" %>
<%@ Import Namespace="Orchard.Media.Models"%>
<fieldset>
<legend><%=_Encoded("Media")%></legend>
<div>
<label for="MediaSettings_RootMediaFolder">Media folder</label>
<%=Html.EditorFor(x=>x.RootMediaFolder) %>
<%=Html.ValidationMessage("RootMediaFolder", "*")%>
</div>
</fieldset>

View File

@@ -0,0 +1,34 @@
<?xml version="1.0"?>
<configuration>
<system.web>
<httpHandlers>
<add path="*" verb="*"
type="System.Web.HttpNotFoundHandler"/>
</httpHandlers>
<!--
Enabling request validation in view pages would cause validation to occur
after the input has already been processed by the controller. By default
MVC performs request validation before a controller processes the input.
To change this behavior apply the ValidateInputAttribute to a
controller or action.
-->
<pages
validateRequest="false"
pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<controls>
<add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
</controls>
</pages>
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false"/>
<handlers>
<remove name="BlockViewHandler"/>
<add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
</handlers>
</system.webServer>
</configuration>

View File

@@ -0,0 +1,157 @@
<?xml version="1.0"?>
<!--
Note: As an alternative to hand editing this file you can use the
web admin tool to configure settings for your application. Use
the Website->Asp.Net Configuration option in Visual Studio.
A full list of settings and comments can be found in
machine.config.comments usually located in
\Windows\Microsoft.Net\Framework\v2.x\Config
-->
<configuration>
<configSections>
<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
</sectionGroup>
</sectionGroup>
</sectionGroup>
</configSections>
<appSettings/>
<connectionStrings>
<add name="ApplicationServices" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|aspnetdb.mdf;User Instance=true" providerName="System.Data.SqlClient"/>
</connectionStrings>
<system.web>
<!--
Set compilation debug="true" to insert debugging
symbols into the compiled page. Because this
affects performance, set this value to true only
during development.
-->
<compilation debug="false">
<assemblies>
<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Data.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
</assemblies>
</compilation>
<!--
The <customErrors> section enables configuration
of what to do if/when an unhandled error occurs
during the execution of a request. Specifically,
it enables developers to configure html error pages
to be displayed in place of a error stack trace.
<customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
<error statusCode="403" redirect="NoAccess.htm" />
<error statusCode="404" redirect="FileNotFound.htm" />
</customErrors>
-->
<pages>
<controls>
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</controls>
<namespaces>
<add namespace="System.Web.Mvc"/>
<add namespace="System.Web.Mvc.Ajax"/>
<add namespace="System.Web.Mvc.Html"/>
<add namespace="System.Web.Routing"/>
<add namespace="System.Linq"/>
<add namespace="System.Collections.Generic"/>
<add namespace="Orchard.Mvc.Html" />
</namespaces>
</pages>
<httpHandlers>
<remove verb="*" path="*.asmx"/>
<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
<add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</httpHandlers>
<httpModules>
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</httpModules>
</system.web>
<system.codedom>
<compilers>
<compiler language="c#;cs;csharp" extension=".cs" warningLevel="4"
type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v3.5"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4"
type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v3.5"/>
<providerOption name="OptionInfer" value="true"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
</compilers>
</system.codedom>
<system.web.extensions/>
<!--
The system.webServer section is required for running ASP.NET AJAX under Internet
Information Services 7.0. It is not necessary for previous version of IIS.
-->
<system.webServer>
<validation validateIntegratedModeConfiguration="false"/>
<modules runAllManagedModulesForAllRequests="true">
<remove name="ScriptModule" />
<remove name="UrlRoutingModule" />
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</modules>
<handlers>
<remove name="WebServiceHandlerFactory-Integrated"/>
<remove name="ScriptHandlerFactory" />
<remove name="ScriptHandlerFactoryAppServices" />
<remove name="ScriptResource" />
<remove name="MvcHttpHandler" />
<remove name="UrlRoutingHandler" />
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode"
type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode"
type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add name="UrlRoutingHandler" preCondition="integratedMode" verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</handlers>
</system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>