From 059b08c2474c1b7329db6938fd40e1bb987536dd Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Thu, 22 Jul 2010 23:00:00 -0700
Subject: [PATCH] Rename "Packaging" to "Gallery"

--HG--
branch : dev
rename : src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingController.cs => src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
rename : src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Harvest.ascx => src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx
rename : src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Modules.ascx => src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
rename : src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Sources.ascx => src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
rename : src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/_Subnav.ascx => src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/_Subnav.ascx
---
 .../Modules/Orchard.Packaging/AdminMenu.cs         |  8 +++++---
 ...PackagingController.cs => GalleryController.cs} |  4 ++--
 .../Orchard.Packaging/Orchard.Packaging.csproj     | 10 +++++-----
 .../Views/{Packaging => Gallery}/Harvest.ascx      |  0
 .../Orchard.Packaging/Views/Gallery/Modules.ascx   | 14 ++++++++++++++
 .../Orchard.Packaging/Views/Gallery/Sources.ascx   | 13 +++++++++++++
 .../Views/{Packaging => Gallery}/_Subnav.ascx      |  0
 .../Orchard.Packaging/Views/Packaging/Modules.ascx | 11 -----------
 .../Orchard.Packaging/Views/Packaging/Sources.ascx | 14 --------------
 9 files changed, 39 insertions(+), 35 deletions(-)
 rename src/Orchard.Web/Modules/Orchard.Packaging/Controllers/{PackagingController.cs => GalleryController.cs} (95%)
 rename src/Orchard.Web/Modules/Orchard.Packaging/Views/{Packaging => Gallery}/Harvest.ascx (100%)
 create mode 100644 src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
 create mode 100644 src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
 rename src/Orchard.Web/Modules/Orchard.Packaging/Views/{Packaging => Gallery}/_Subnav.ascx (100%)
 delete mode 100644 src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Modules.ascx
 delete mode 100644 src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Sources.ascx

diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
index 7de2ef405..563cda0e5 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
@@ -10,9 +10,11 @@ namespace Orchard.Packaging {
         public string MenuName { get { return "admin"; } }
 
         public void GetNavigation(NavigationBuilder builder) {
-            builder.Add(T("Site Configuration"), "11", menu => menu
-                        .Add(T("Gallery"), "5.0", item => item
-                             .Action("Index", "Packaging", new { area = "Orchard.Packaging" })));
+            builder.Add(T("Gallery"), "5", menu => menu
+                        .Add(T("Browse Gallery"), "1.0", item => item
+                             .Action("Index", "Gallery", new { area = "Orchard.Packaging" }))
+                        .Add(T("Manage Feeds"), "2.0", item => item
+                             .Action("Sources", "Gallery", new { area = "Orchard.Packaging" })));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingController.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
similarity index 95%
rename from src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingController.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
index 854304ee3..d36c4a137 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
@@ -12,13 +12,13 @@ using Orchard.UI.Notify;
 namespace Orchard.Packaging.Controllers {
     [OrchardFeature("Gallery")]
     [Themed, Admin]
-    public class PackagingController : Controller {
+    public class GalleryController : Controller {
         private readonly IPackageManager _packageManager;
         private readonly IPackagingSourceManager _packagingSourceManager;
         private readonly IExtensionManager _extensionManager;
         private readonly INotifier _notifier;
 
-        public PackagingController(
+        public GalleryController(
             IPackageManager packageManager,
             IPackagingSourceManager packagingSourceManager,
             IExtensionManager extensionManager,
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
index d39b45812..3dc551b0e 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
@@ -73,7 +73,7 @@
     <Compile Include="Commands\GalleryCommands.cs" />
     <Compile Include="Commands\PackagingCommands.cs" />
     <Compile Include="Controllers\DownloadStreamResult.cs" />
-    <Compile Include="Controllers\PackagingController.cs" />
+    <Compile Include="Controllers\GalleryController.cs" />
     <Compile Include="Services\AtomExtensions.cs" />
     <Compile Include="Services\IPackageBuilder.cs" />
     <Compile Include="Services\IPackageExpander.cs" />
@@ -93,10 +93,10 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Views\Packaging\Harvest.ascx" />
-    <Content Include="Views\Packaging\Modules.ascx" />
-    <Content Include="Views\Packaging\Sources.ascx" />
-    <Content Include="Views\Packaging\_Subnav.ascx" />
+    <Content Include="Views\Gallery\Harvest.ascx" />
+    <Content Include="Views\Gallery\Modules.ascx" />
+    <Content Include="Views\Gallery\Sources.ascx" />
+    <Content Include="Views\Gallery\_Subnav.ascx" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Harvest.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Harvest.ascx
rename to src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
new file mode 100644
index 000000000..9f8228b12
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
@@ -0,0 +1,14 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Packaging.ViewModels.PackagingModulesViewModel>" %>
+<h1>
+    <%: Html.TitleForPage(T("Browse Gallery").ToString())%></h1>
+
+<p><%:Html.ActionLink("Update List", "Update") %></p>
+
+<ul>
+    <%foreach (var item in Model.Modules) {%>
+    <li>
+        <a href="<%:item.PackageStreamUri%>"><%:item.SyndicationItem.Title.Text%></a>
+        [<%:Html.ActionLink("Install", "Install", new RouteValueDictionary {{"SyndicationId",item.SyndicationItem.Id}})%>]
+    </li>
+    <%}%>
+</ul>
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
new file mode 100644
index 000000000..956d48eb8
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
@@ -0,0 +1,13 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Packaging.ViewModels.PackagingSourcesViewModel>" %>
+<h1>
+    <%: Html.TitleForPage(T("Manage Feeds").ToString())%></h1>
+
+<ul>
+    <%foreach (var item in Model.Sources) {%><li>
+        <%:Html.Link(item.FeedUrl, item.FeedUrl)%></li>
+    <% }%>
+</ul>
+
+<%using (Html.BeginFormAntiForgeryPost(Url.Action("AddSource"))) {%>
+Url: <%:Html.TextBox("url") %> <input type="submit" value="Add Source" />
+<%} %>
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/_Subnav.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/_Subnav.ascx
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/_Subnav.ascx
rename to src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/_Subnav.ascx
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Modules.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Modules.ascx
deleted file mode 100644
index c8ff0ef9f..000000000
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Modules.ascx
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Packaging.ViewModels.PackagingModulesViewModel>" %>
-<h1>
-    <%: Html.TitleForPage(T("Packaging").ToString(), T("Browse Packages").ToString())%></h1>
-    <%: Html.Partial("_Subnav") %>
-
-<p><%:Html.ActionLink("Update List", "Update") %></p>
-<ul>
-    <%foreach (var item in Model.Modules) {%><li><a href="<%:item.PackageStreamUri%>">
-        <%:item.SyndicationItem.Title.Text%></a> [<%:Html.ActionLink("Install", "Install", new RouteValueDictionary {{"SyndicationId",item.SyndicationItem.Id}})%>]
-        </li><%
-      }%></ul>
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Sources.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Sources.ascx
deleted file mode 100644
index d78bd5dce..000000000
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Sources.ascx
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Packaging.ViewModels.PackagingSourcesViewModel>" %>
-<h1>
-    <%: Html.TitleForPage(T("Packaging").ToString(), T("Edit Sources").ToString())%></h1>
-    <%: Html.Partial("_Subnav") %>
-
-<ul>
-    <%foreach (var item in Model.Sources) {%><li>
-        <%:Html.Link(item.FeedUrl, item.FeedUrl)%></li><%
-                                   }%></ul>
-<%using (Html.BeginFormAntiForgeryPost(Url.Action("AddSource"))) {%>
-Url:
-<%:Html.TextBox("url") %>
-<input type="submit" value="Add Source" />
-<%} %>