Merge

--HG-- branch : 1.x
2025-12-02 19:44:02 +08:00 · 2011-06-09 09:18:26 -07:00
parent 340c2bdbc2 145031473d
commit 5a4f0ed1f3
3 changed files with 126 additions and 98 deletions
--- a/src/Orchard.Specs/Setup.feature
+++ b/src/Orchard.Specs/Setup.feature
@@ -7,7 +7,7 @@ Scenario: Root request shows setup form
    Given I have a clean site with
            | extension | names |
            | Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Messaging, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.jQuery, TinyMce |
-            | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc  |
+            | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc |
            | Theme | SafeMode |
    When I go to "/"
    Then I should see "Welcome to Orchard"
@@ -18,7 +18,7 @@ Scenario: Setup folder also shows setup form
    Given I have a clean site with
            | extension | names |
            | Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Messaging, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.jQuery, TinyMce |
-            | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc  |
+            | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc |
            | Theme | SafeMode |
    When I go to "/Setup"
    Then I should see "Welcome to Orchard"
@@ -29,7 +29,7 @@ Scenario: Some of the initial form values are required
    Given I have a clean site with
            | extension | names |
            | Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Messaging, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.jQuery, TinyMce |
-            | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc  |
+            | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc |
            | Theme | SafeMode |
    When I go to "/Setup"
        And I hit "Finish Setup"
@@ -39,8 +39,8 @@ Scenario: Some of the initial form values are required
 Scenario: Calling setup on a brand new install
    Given I have a clean site with
            | extension | names |
-            | Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Lists, Orchard.ContentTypes, Orchard.Messaging, Orchard.Media, Orchard.MediaPicker, Orchard.Scripting, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce, Orchard.Blogs, Orchard.Tags, Orchard.Packaging, Orchard.Recipes |
-            | Core | Common, Containers, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc  |
+            | Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Lists, Orchard.ContentTypes, Orchard.Messaging, Orchard.Media, Orchard.MediaPicker, Orchard.Scripting, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce, Orchard.Blogs, Orchard.Tags, Orchard.Packaging, Orchard.Recipes, Orchard.Warmup |
+            | Core | Common, Containers, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc |
            | Theme | SafeMode, TheThemeMachine |
        And I am on "/Setup"
    When I fill in 
--- a/src/Orchard.Specs/Setup.feature.cs
+++ b/src/Orchard.Specs/Setup.feature.cs
@@ -2,7 +2,7 @@
 //  <auto-generated>
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.5.0.0
-//      Runtime Version:4.0.30319.1
+//      Runtime Version:4.0.30319.225
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
@@ -176,7 +176,7 @@ this.ScenarioSetup(scenarioInfo);
                        "names"});
            table4.AddRow(new string[] {
                        "Module",
-                        @"Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Lists, Orchard.ContentTypes, Orchard.Messaging, Orchard.Media, Orchard.MediaPicker, Orchard.Scripting, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce, Orchard.Blogs, Orchard.Tags, Orchard.Packaging, Orchard.Recipes"});
+                        @"Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Lists, Orchard.ContentTypes, Orchard.Messaging, Orchard.Media, Orchard.MediaPicker, Orchard.Scripting, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce, Orchard.Blogs, Orchard.Tags, Orchard.Packaging, Orchard.Recipes, Orchard.Warmup"});
            table4.AddRow(new string[] {
                        "Core",
                        "Common, Containers, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, S" +
--- a/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml
@@ -24,7 +24,10 @@

    Model.Classes.Add("pager");
    Model.Classes.Add("group");
-    var tag = Tag(Model, "ul");
+    var pageTag = Tag(Model, "ul");
+
+    Model.Classes.Add("selector");
+    var pageSizeTag = Tag(Model, "ul");

    if (Model.RouteData != null) {
        foreach (var rd in Model.RouteData.Values) {
@@ -40,109 +43,134 @@
 }

@if (Model.TotalItemCount > 1) {
-    using (Html.BeginFormAntiForgeryPost()) {    
-        <div class="pager-footer">
+    <div class="pager-footer">
+        @if (totalPageCount > 1 || Model.PageSize == 0 || Model.PageSize > pageSizes.First()) {
+            <div class="page-size-options">
+                <div>@T("Show:")</div>

-            @if (totalPageCount > 1 || Model.PageSize == 0 || Model.PageSize > pageSizes.First()) {
-                <div class="page-size-options">
-                    <input type="hidden" name="Page" value="1" />
-                    <label for="pageSize">@T("Show:")</label>
-                    <select id="pageSize" name="PageSize">
-                        @Html.SelectOption((int)Model.PageSize, 0, T("All").ToString())
-                        @foreach (int size in pageSizes.OrderBy(p => p)) {
-                            @Html.SelectOption((int)Model.PageSize, size, size.ToString())
+                @pageSizeTag.StartElement
+
+                    @{ routeData["pageSize"] = 0; }
+
+                    @if ((int)Model.PageSize == 0) {
+                        <li class="selected"><span>@T("All").ToString()</span></li>
+                    } else {
+                        <li>@Html.ActionLink(T("All").ToString(), (string)routeData["action"], (string)routeData["controller"], routeData, null)</li>
+                    }
+
+                    @foreach (int size in pageSizes.OrderBy(p => p)) {
+                        routeData["pageSize"] = size;
+
+                        if ((int)Model.PageSize == size) {
+                            <li class="selected"><span>@size.ToString()</span></li>
+                        } else {
+                            <li>@Html.ActionLink(size.ToString(), (string)routeData["action"], (string)routeData["controller"], routeData, null)</li>
                        }
-                    </select>
+                    }

-                    <button id="submit-pager" type="submit">@T("Apply")</button>
-                </div>
+                @pageSizeTag.EndElement
+            </div>
+        }
+
+        <span class="page-results">@T("Showing items {0} - {1} of {2}", (Model.Page - 1) * (int)Model.PageSize + 1, Model.PageSize == 0 ? Model.TotalItemCount : Math.Min(Model.TotalItemCount, (Model.Page) * (int)Model.PageSize), Model.TotalItemCount)</span>
+
+        @if (totalPageCount > 1) {
+            routeData["pageSize"] = Model.PageSize;
+            @pageTag.StartElement
+
+            // first
+            if (firstPage > 1) {
+                if (routeData.ContainsKey("page")) {
+                    routeData.Remove("page");
+                }
+
+                <li class="page-first">
+                @Html.ActionLink(T("<<").Text, (string)routeData["action"], (string)routeData["controller"], routeData, null)
+                </li>
            }

-            <span class="page-results">@T("Showing items {0} - {1} of {2}", (Model.Page - 1) * (int)Model.PageSize + 1, Model.PageSize == 0 ? Model.TotalItemCount : Math.Min(Model.TotalItemCount, (Model.Page) * (int)Model.PageSize), Model.TotalItemCount)</span>
+            // previous page
+            if (Model.Page > 1) {
+                if (Model.Page == 2 && routeData.ContainsKey("page")) {
+                    routeData.Remove("page");
+                }
+                else {
+                    routeData["page"] = Model.Page - 1;
+                }

-            @if (totalPageCount > 1) {
-                routeData["pageSize"] = Model.PageSize;
-                @tag.StartElement
-
-                    // first
-                    if (firstPage > 1) {
-                        if (routeData.ContainsKey("page")) {
-                            routeData.Remove("page");
-                        }
-
-                        <li class="page-first">
-                        @Html.ActionLink(T("<<").Text, (string)routeData["action"], (string)routeData["controller"], routeData, null)
-                        </li>
-                    }
-
-                    // previous page
-                    if (Model.Page > 1) {
-                        if (Model.Page == 2 && routeData.ContainsKey("page")) {
-                            routeData.Remove("page");
-                        } else {
-                            routeData["page"] = Model.Page - 1;
-                        }
-
-                        <li class="page-previous">
-                        @Html.ActionLink((string)previousText, (string)routeData["action"], (string)routeData["controller"], routeData, null)
-                        </li>
-                    }
-
-                    // page numbers
-                    for (var p = firstPage; p <= lastPage; p++) {
-                        <li class="page-@p">
-                        @if (p == Model.Page) {
-                            <span>@p</span>
-                        } else {
-                            if (p == 1) {
-                                routeData.Remove("page");
-                            } else {
-                                routeData["page"] = p;
-                            }
-                            @Html.ActionLink(p.ToString(), (string)routeData["action"], (string)routeData["controller"], routeData, null)
-                        }
-                        </li>
-                    }
-
-                    // next page
-                    if (Model.Page < totalPageCount) {
-                        routeData["page"] = Model.Page + 1;
-
-                        <li class="page-next">
-                        @Html.ActionLink((string)nextText, (string)routeData["action"], (string)routeData["controller"], routeData, null)
-                        </li>
-                    }
-
-                    // last page
-                    if (lastPage < totalPageCount) {
-                        routeData["page"] = totalPageCount;
-
-                        <li class="page-last">
-                        @Html.ActionLink(T(">>").Text, (string)routeData["action"], (string)routeData["controller"], routeData, null)
-                        </li>
-                    }
-
-                @tag.EndElement
+                <li class="page-previous">
+                @Html.ActionLink((string)previousText, (string)routeData["action"], (string)routeData["controller"], routeData, null)
+                </li>
            }

-        </div>
-    }
+            // page numbers
+            for (var p = firstPage; p <= lastPage; p++) {
+                <li class="page-@p">
+                @if (p == Model.Page) {
+                    <span>@p</span>
+                }
+                else {
+                    if (p == 1) {
+                        routeData.Remove("page");
+                    }
+                    else {
+                        routeData["page"] = p;
+                    }
+                    @Html.ActionLink(p.ToString(), (string)routeData["action"], (string)routeData["controller"], routeData, null)
+                }
+                </li>
+            }
+
+            // next page
+            if (Model.Page < totalPageCount) {
+                routeData["page"] = Model.Page + 1;
+
+                <li class="page-next">
+                @Html.ActionLink((string)nextText, (string)routeData["action"], (string)routeData["controller"], routeData, null)
+                </li>
+            }
+
+            // last page
+            if (lastPage < totalPageCount) {
+                routeData["page"] = totalPageCount;
+
+                <li class="page-last">
+                @Html.ActionLink(T(">>").Text, (string)routeData["action"], (string)routeData["controller"], routeData, null)
+                </li>
+            }
+
+            @pageTag.EndElement
+        }
+
+    </div>
 }
-@using(Script.Foot()) {
+@using (Script.Foot()) {
 <script type="text/javascript">
 //<![CDATA[
    $(function () {
-        // Add the event handler for value change in the select field
-        $("#pageSize").change(function () {
-            var self = $(this);
-            var form = self.parents("form");
-
-            // Submit form
-            form.submit();
-
-            // disable button so that no other value can be chosen while the form is submited
-            self.attr("disabled", true);
+        $('ul.selector').each(function () {
+            var self = $(this),
+                options = $.map(self.find("li"), function (li) {
+                    var self = $(li);
+                    return $("<option/>", {
+                        value: self.children("a").attr("href"),
+                        text: self.text(),
+                        selected: self.hasClass("selected")
+                    })[0];
+                }),
+                select = $("<select/>", {
+                    id: self.attr("id") + "Selector",
+                    "class": self.attr("class"),
+                    name: self.attr("name") + "Selector"
+                }).change(onSelectChange).append(options);
+            self.replaceWith(select);
        });
+
+        function onSelectChange() {
+            // redirect to page with new page size
+            // disable button so that no other value can be chosen while the form is submited
+            window.location = $(this).attr("disabled", true).val();
+        }
    })
 //]]>
 </script>