Adding simple search to gallery. Fixinx ratings CSS.

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs

@@ -18,8 +18,8 @@ namespace Orchard.Packaging {
                 .Add(T("Available"), "2", item => item.Action("Modules", "Gallery", new { area = "Orchard.Packaging" })
                     .Permission(StandardPermissions.SiteOwner).LocalNav()));
 
-            builder.Add(T("Settings"), "30", menu => menu
+            builder.Add(T("Configuration"), "50", menu => menu
-                .Add(T("Feeds"), "3", item => item.Action("Sources", "Gallery", new { area = "Orchard.Packaging" })
+                .Add(T("Feeds"), "25", item => item.Action("Sources", "Gallery", new { area = "Orchard.Packaging" })
                     .Permission(StandardPermissions.SiteOwner)));
         }
     }

src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs

@@ -1,3 +1,4 @@
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -149,7 +150,8 @@ namespace Orchard.Packaging.Controllers {
                     var sourceExtensions = _packagingSourceManager.GetExtensionList(
                         source,
                         packages => {
-                            packages = packages.Where(p => p.PackageType == packageType);
+                            packages = packages.Where(p => p.PackageType == packageType &&
+                                (string.IsNullOrEmpty(options.SearchText) || p.Id.Contains(options.SearchText)));
 
                             switch (options.Order) {
                                 case PackagingExtensionsOrder.Downloads:
@@ -174,7 +176,8 @@ namespace Orchard.Packaging.Controllers {
                     // count packages separately to prevent loading everything just to count
                     totalCount += _packagingSourceManager.GetExtensionCount(
                         source,
-                        packages => packages.Where(p => p.PackageType == packageType)
+                        packages => packages.Where(p => p.PackageType == packageType &&
+                            (string.IsNullOrEmpty(options.SearchText) || p.Id.Contains(options.SearchText)))
                         );
 
                     extensions = extensions == null ? sourceExtensions : extensions.Concat(sourceExtensions);

src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css

@@ -47,7 +47,11 @@
     width: 171px; 
     height: 128px;
 }
+.properties li p {
+    float: left;
+}
 .ratings {
+    float: right;
     background:url(../Content/Images/stars.png) repeat-x;
     height: 14px;
     width: 75px;
@@ -58,3 +62,10 @@
     position: absolute;
     width: 45px;
 }
+.search-actions {
+    float: right;
+    display: inline;
+    height: auto;
+    margin: 0 1.4em 0 0;
+    padding-top: 0;
+}

src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingExtensionsViewModel.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Orchard.Packaging.Models;
-using Orchard.Packaging.Services;
 
 namespace Orchard.Packaging.ViewModels {
     public class PackagingExtensionsViewModel {
@@ -13,6 +12,7 @@ namespace Orchard.Packaging.ViewModels {
 
     public class PackagingExtensionsOptions {
         public int? SourceId { get; set; }
+        public string SearchText { get; set; }
         public PackagingExtensionsOrder Order { get; set; }
     }
 

src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml

@@ -24,6 +24,7 @@
             }
         </select>
     </fieldset>
+
     <fieldset class="bulk-actions">
         <label for="filterResults">@T("Sort by:")</label>
         <select id="filterResults" name="@Html.NameOf(m => m.Options.Order)">
@@ -38,10 +39,16 @@
             @foreach(int size in pageSizes.OrderBy(p => p)) {
                 @Html.SelectOption((int)Model.Pager.PageSize, size, size.ToString())
             }
-        <select>
+        </select>
         <button type="submit">@T("Apply")</button>
     </fieldset>
 
+    <fieldset class="search-actions">
+        <input type="text" id="searchText" name="@Html.NameOf(m => m.Options.SearchText)" />
+
+        <button type="submit">@T("Search")</button>
+    </fieldset>
+
     if (Model.Extensions.Count() > 0) {
         <ul class="contentItems">
         @foreach (var item in Model.Extensions) {
@@ -79,10 +86,11 @@
                                 <li>&nbsp;&#124;&nbsp;@T("Website: ")
                                     @if (!string.IsNullOrEmpty(item.ProjectUrl)) { <a href="@item.ProjectUrl">@item.ProjectUrl</a> } else { @T("Unknown").ToString() }
                                 </li>
-                                <li>&nbsp;&#124;&nbsp;@T("Rating")
+                                <li><div>&nbsp;&#124;&nbsp;@T("Rating: ")
                                         <div class="ratings" style="width:@(15 * 5)px" title="@T("Ratings: {0} ({1})", item.Rating, item.RatingsCount)">
                                             <div class="score" style="width:@(15 * (item.Rating))px">&nbsp;</div>
                                         </div>
+                                    </div>
                                 </li>
                             </ul>
                         </div>

src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml

@@ -16,14 +16,15 @@
 
 @using (Html.BeginFormAntiForgeryPost(Url.Action("Themes", "Gallery"))) {
     <fieldset class="bulk-actions">
-        <label for="filterResults" class="bulk-filter">@T("Feed:")</label>
+        <label for="filterResults" class="bulk-filter">@T("Show")</label>
         <select id="sourceId" name="sourceId">
-            @Html.SelectOption("", Model.SelectedSource == null, T("Any (show all feeds)").ToString())
+            @Html.SelectOption("", Model.SelectedSource == null, T("All feeds").ToString())
             @foreach (var source in Model.Sources) {
                 @Html.SelectOption(source.Id, Model.SelectedSource != null && Model.SelectedSource.Id == source.Id, source.FeedTitle)
             }
         </select>
     </fieldset>
+
     <fieldset class="bulk-actions">
         <label for="filterResults">@T("Sort by:")</label>
         <select id="filterResults" name="@Html.NameOf(m => m.Options.Order)">
@@ -38,10 +39,16 @@
             @foreach (int size in pageSizes.OrderBy(p => p)) {
                 @Html.SelectOption((int)Model.Pager.PageSize, size, size.ToString())
             }
-        <select>
+        </select>
         <button type="submit">@T("Apply")</button>
     </fieldset>
 
+    <fieldset class="search-actions">
+        <input type="text" id="searchText" name="@Html.NameOf(m => m.Options.SearchText)" value="@Model.Options.SearchText" />
+
+        <button type="submit">@T("Search")</button>
+    </fieldset>
+
     if (Model.Extensions.Count() > 0) {
         <ul class="contentItems theme">
         @foreach (var item in Model.Extensions) {
@@ -52,8 +59,7 @@
             if (!string.IsNullOrWhiteSpace(@item.FirstScreenshot)) {
                 iconUrl = @item.FirstScreenshot;
                 extensionClass = "screenshotThumbnail";
-                    }
+            } else if (string.IsNullOrWhiteSpace(iconUrl)) {
-                    else if (string.IsNullOrWhiteSpace(iconUrl)) {
                 iconUrl = Href("../../Content/Images/imagePlaceholder.png");
                 extensionClass = "screenshotThumbnail";
             }
@@ -83,13 +89,13 @@
                                 <li>&nbsp;&#124;&nbsp;@T("Author: {0}", !string.IsNullOrEmpty(item.Authors) ? item.Authors : T("Unknown").ToString())</li>
                                 <li>&nbsp;&#124;&nbsp;@T("Downloads: {0}", item.DownloadCount)</li>
                                 <li>&nbsp;&#124;&nbsp;@T("Website: ")
-                                    @if(!string.IsNullOrEmpty(item.ProjectUrl)) { <a href="@item.ProjectUrl">@item.ProjectUrl</a> }
+                                    @if (!string.IsNullOrEmpty(item.ProjectUrl)) { <a href="@item.ProjectUrl">@item.ProjectUrl</a> } else { @T("Unknown").ToString() }
-                                    else { @T("Unknown").ToString() }
                                 </li>
-                                <li>&nbsp;&#124;&nbsp;@T("Rating")
+                                <li><div>&nbsp;&#124;&nbsp;@T("Rating: ")
                                         <div class="ratings" style="width:@(15 * 5)px" title="@T("Ratings: {0} ({1})", item.Rating, item.RatingsCount)">
                                             <div class="score" style="width:@(15 * (item.Rating))px">&nbsp;</div>
                                         </div>
+                                    </div>
                                 </li>
                             </ul>
                         </div>