- Themes: Theme discovery and related infrastructure work. Theme content item and metadata (Theme.txt). Some initial Theme Admin and a couple skeleton themes.

- Extensions: Theme and Package extensions are now automatically discovered, their metadata parsed and their types loaded by the ExtensionManager. The ExtensionDescriptor now contains an ExtensionType property which will help distinguish extension types.

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

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -85,8 +85,10 @@
     <Compile Include="Settings\ViewModels\SettingsIndexViewModel.cs" />
     <Compile Include="Themes\AdminMenu.cs" />
     <Compile Include="Themes\Controllers\AdminController.cs" />
+    <Compile Include="Themes\Models\Theme.cs" />
     <Compile Include="Themes\Models\ThemeSiteSettings.cs" />
     <Compile Include="Themes\Models\ThemeSiteSettingsHandler.cs" />
+    <Compile Include="Themes\Records\ThemeRecord.cs" />
     <Compile Include="Themes\Records\ThemeSiteSettingsRecord.cs" />
     <Compile Include="Themes\Services\ThemeService.cs" />
     <Compile Include="Themes\ViewModels\ThemesIndexViewModel.cs" />

src/Orchard.Web/Core/Themes/AdminMenu.cs

@@ -7,8 +7,7 @@ namespace Orchard.Core.Themes {
         public void GetNavigation(NavigationBuilder builder) {
             builder.Add("Themes", "11",
                         menu => menu
-                                    .Add("Manage Themes", "2.0", item => item.Action("Index", "Admin", new { area = "Themes" }))
-                                    .Add("Upload a Theme", "2.1", item => item.Action("Index", "Admin",new { area = "Themes" })));
+                                    .Add("Manage Themes", "2.0", item => item.Action("Index", "Admin", new { area = "Themes" })));
         }
     }
 }

src/Orchard.Web/Core/Themes/Controllers/AdminController.cs

@@ -1,4 +1,5 @@
-using System.Web.Mvc;
+using System;
+using System.Web.Mvc;
 using Orchard.Core.Themes.ViewModels;
 using Orchard.Localization;
 using Orchard.Themes;
@@ -19,7 +20,16 @@ namespace Orchard.Core.Themes.Controllers {
         public Localizer T { get; set; }
 
         public ActionResult Index() {
-            return View(new ThemesIndexViewModel());
+            try {
+                var themes = _themeService.GetInstalledThemes();
+                var currentTheme = _themeService.GetCurrentTheme();
+                var model = new ThemesIndexViewModel { CurrentTheme = currentTheme, Themes = themes };
+                return View(model);
+            }
+            catch (Exception exception) {
+                _notifier.Error(T("Listing themes failed: " + exception.Message));
+                return View(new ThemesIndexViewModel());
+            }
         }
     }
 }

src/Orchard.Web/Core/Themes/Models/Theme.cs

@@ -0,0 +1,43 @@
+using Orchard.Core.Themes.Records;
+using Orchard.Models;
+using Orchard.Themes;
+
+namespace Orchard.Core.Themes.Models {
+    public class Theme : ContentPart<ThemeRecord>, ITheme {
+        public static readonly ContentType ContentType = new ContentType { Name = "theme", DisplayName = "Themes" };
+
+        #region Implementation of ITheme
+
+        public string ThemeName { 
+            get; 
+            set; 
+        }
+
+        public string DisplayName {
+            get;
+            set;
+        }
+
+        public string Description {
+            get;
+            set;
+        }
+
+        public string Version {
+            get;
+            set;
+        }
+
+        public string Author {
+            get;
+            set;
+        }
+
+        public string HomePage {
+            get;
+            set;
+        }
+
+        #endregion
+    }
+}

src/Orchard.Web/Core/Themes/Records/ThemeRecord.cs

@@ -0,0 +1,12 @@
+using Orchard.Models.Records;
+
+namespace Orchard.Core.Themes.Records {
+    public class ThemeRecord : ContentPartRecord {
+        public virtual string ThemeName { get; set; }
+        public virtual string DisplayName { get; set; }
+        public virtual string Description { get; set; }
+        public virtual string Version { get; set; }
+        public virtual string Author { get; set; }
+        public virtual string HomePage { get; set; }
+    }
+}

src/Orchard.Web/Core/Themes/Services/ThemeService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Orchard.Extensions;
 using Orchard.Logging;
 using Orchard.Models;
 using Orchard.Settings;
@@ -8,7 +9,10 @@ using Orchard.Core.Themes.Models;
 
 namespace Orchard.Core.Themes.Services {
     public class ThemeService : IThemeService {
-        public ThemeService() {
+        private readonly IExtensionManager _extensionManager;
+
+        public ThemeService(IExtensionManager extensionManager) {
+            _extensionManager = extensionManager;
             Logger = NullLogger.Instance;
         }
 
@@ -28,11 +32,37 @@ namespace Orchard.Core.Themes.Services {
         }
 
         public ITheme GetThemeByName(string name) {
-            throw new NotImplementedException();
+            foreach (var descriptor in _extensionManager.AvailableExtensions()) {
+                if (String.Equals(descriptor.Name, name, StringComparison.OrdinalIgnoreCase)) {
+                    return new Theme {
+                        Author = descriptor.Author ?? String.Empty,
+                        Description = descriptor.Description ?? String.Empty,
+                        DisplayName = descriptor.DisplayName ?? String.Empty,
+                        HomePage = descriptor.HomePage ?? String.Empty,
+                        ThemeName = descriptor.Name,
+                        Version = descriptor.Version ?? String.Empty
+                    };
+                }
+            }
+            return null;
         }
 
         public IEnumerable<ITheme> GetInstalledThemes() {
-            throw new NotImplementedException();
+            List<ITheme> themes = new List<ITheme>();
+            foreach (var descriptor in _extensionManager.AvailableExtensions()) {
+                if (String.Equals(descriptor.ExtensionType, "Theme", StringComparison.OrdinalIgnoreCase)) {
+                    Theme theme = new Theme {
+                        Author = descriptor.Author ?? String.Empty,
+                        Description = descriptor.Description ?? String.Empty,
+                        DisplayName = descriptor.DisplayName ?? String.Empty,
+                        HomePage = descriptor.HomePage ?? String.Empty,
+                        ThemeName = descriptor.Name,
+                        Version = descriptor.Version ?? String.Empty
+                    };
+                    themes.Add(theme);
+                }
+            }
+            return themes;
         }
 
         #endregion

src/Orchard.Web/Core/Themes/ViewModels/ThemesIndexViewModel.cs

@@ -1,6 +1,10 @@
-using Orchard.Mvc.ViewModels;
+using System.Collections.Generic;
+using Orchard.Mvc.ViewModels;
+using Orchard.Themes;
 
 namespace Orchard.Core.Themes.ViewModels {
     public class ThemesIndexViewModel : AdminViewModel {
+        public ITheme CurrentTheme { get; set; }
+        public IEnumerable<ITheme> Themes { get; set; }
     }
 }

src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx

@@ -7,6 +7,14 @@
             Themes</h2>
     </div>
     <div class="yui-u">
-    List of Orchard Themes
+    <% foreach (var theme in Model.Themes) { %>
+       <p>Name: <%= theme.ThemeName %></p>
+       <p>DisplayName: <%= theme.DisplayName %></p>
+       <p>Description: <%= theme.Description %></p>
+       <p>Author: <%= theme.Author %></p>
+       <p>Version: <%= theme.Version %></p>
+       <p>HomePage: <%= theme.HomePage %></p>
+    <% } %>
+    Current Theme: <%= Model.CurrentTheme != null ? Model.CurrentTheme.ThemeName : "None" %>
     </div>
 <% Html.Include("AdminFoot"); %>

src/Orchard.Web/Orchard.Web.csproj

@@ -175,6 +175,10 @@
     <Content Include="Content\Images\title_background.gif" />
     <Content Include="Content\Site2.css" />
     <Content Include="Content\Site3.css" />
+    <Content Include="Themes\BlueSky\Theme.gif" />
+    <Content Include="Themes\BlueSky\Theme.txt" />
+    <Content Include="Themes\PinkPretty\Theme.gif" />
+    <Content Include="Themes\PinkPretty\Theme.txt" />
     <Content Include="Views\Shared\AdminHead.aspx" />
     <Content Include="Views\Shared\AdminFoot.aspx" />
     <Content Include="Views\Shared\Messages.ascx" />
@@ -187,7 +191,6 @@
     <Folder Include="App_Data\" />
     <Folder Include="Media\Images\" />
     <Folder Include="Media\Videos\" />
-    <Folder Include="Themes\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />

src/Orchard.Web/Themes/BlueSky/Theme.txt

@@ -0,0 +1,6 @@
+name: Blue Sky
+author: Jon Wall
+description: This theme uses the best of colors Blue.
+version: 1.0
+tags: blue
+homepage: http://www.orchardproject.net

src/Orchard.Web/Themes/PinkPretty/Theme.txt

@@ -0,0 +1,6 @@
+name: Pretty in Pink
+author: Bertrand Le Roy
+description: This theme is full of butterflies, hearts and unicorns.
+version: 1.0
+tags: pink,butterfly,heart,unicorn
+homepage: http://weblogs.asp.net/bleroy