lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-07-27 15:59:58 -07:00
parent 10dd2dcc4b 16b2b37531
commit d6a51bde87
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Contents/AdminMenu.cs
View File

@@ -28,7 +28,7 @@ namespace Orchard.Core.Contents {
var cim = _contentManager.GetItemMetadata(ci); var cim = _contentManager.GetItemMetadata(ci);
var createRouteValues = cim.CreateRouteValues; var createRouteValues = cim.CreateRouteValues;
if (createRouteValues.Any()) if (createRouteValues.Any())
menu.Add(T("Create New {0}", contentTypeDefinition.DisplayName), "1.3", item => item.Action(cim.CreateRouteValues["Action"] as string, cim.CreateRouteValues["Controller"] as string, cim.CreateRouteValues)); menu.Add(T("Create {0}", contentTypeDefinition.DisplayName), "1.3", item => item.Action(cim.CreateRouteValues["Action"] as string, cim.CreateRouteValues["Controller"] as string, cim.CreateRouteValues));
} }
}); });
} }

6
src/Orchard.Web/Core/Contents/Views/Admin/List.ascx
View File

@@ -16,7 +16,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
<button type="submit" name="submit.BulkEdit" value="yes"><%:T("Apply") %></button> <button type="submit" name="submit.BulkEdit" value="yes"><%:T("Apply") %></button>
</fieldset> </fieldset>
<fieldset class="bulk-actions"> <fieldset class="bulk-actions">
<label for="filterResults" class="bulk-filter"><%:T("Show only of type")%></label> <label for="filterResults" class="bulk-filter"><%:T("Show")%></label>
<select id="filterResults" name="<%:Html.NameOf(m => m.Options.SelectedFilter) %>"> <select id="filterResults" name="<%:Html.NameOf(m => m.Options.SelectedFilter) %>">
<%:Html.SelectOption(Model.Options.SelectedFilter, "", T("any (show all)").ToString()) %> <%:Html.SelectOption(Model.Options.SelectedFilter, "", T("any (show all)").ToString()) %>
<% foreach(var filterOption in Model.Options.FilterOptions) { %> <% foreach(var filterOption in Model.Options.FilterOptions) { %>
@@ -25,8 +25,8 @@ using (Html.BeginFormAntiForgeryPost()) { %>
</select> </select>
<label for="orderResults" class="bulk-order"><%:T("Ordered by")%></label> <label for="orderResults" class="bulk-order"><%:T("Ordered by")%></label>
<select id="orderResults" name="<%:Html.NameOf(m => m.Options.OrderBy) %>"> <select id="orderResults" name="<%:Html.NameOf(m => m.Options.OrderBy) %>">
<%:Html.SelectOption(Model.Options.OrderBy, ContentsOrder.Created, T("most recently created").ToString())%> <%:Html.SelectOption(Model.Options.OrderBy, ContentsOrder.Created, T("recently created").ToString())%>
<%:Html.SelectOption(Model.Options.OrderBy, ContentsOrder.Modified, T("most recently modified").ToString())%> <%:Html.SelectOption(Model.Options.OrderBy, ContentsOrder.Modified, T("recently modified").ToString())%>
<%--<%:Html.SelectOption(Model.Options.OrderBy, ContentsOrder.Published, T("Date Published").ToString())%>--%> <%--<%:Html.SelectOption(Model.Options.OrderBy, ContentsOrder.Published, T("Date Published").ToString())%>--%>
</select> </select>
<button type="submit" name="submit.Filter" value="yes please"><%:T("Apply") %></button> <button type="submit" name="submit.Filter" value="yes please"><%:T("Apply") %></button>

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/List.ascx
View File

@@ -1,6 +1,6 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.ListContentTypesViewModel>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.ListContentTypesViewModel>" %>
<% Html.RegisterStyle("admin.css"); %> <% Html.RegisterStyle("admin.css"); %>
<h1><%:Html.TitleForPage(T("Content Types").ToString())%></h1> <h1><%:Html.TitleForPage(T("Manage Content Types").ToString())%></h1>
<div class="manage"> <div class="manage">
<%:Html.ActionLink(T("Create new type").ToString(), "Create", new{Controller="Admin",Area="Orchard.ContentTypes"}, new { @class = "button primaryAction" }) %> <%:Html.ActionLink(T("Create new type").ToString(), "Create", new{Controller="Admin",Area="Orchard.ContentTypes"}, new { @class = "button primaryAction" }) %>
<%:Html.ActionLink(T("Content Parts").ToString(), "ListParts", new{Controller="Admin",Area="Orchard.ContentTypes"}, new { @class = "button" }) %> <%:Html.ActionLink(T("Content Parts").ToString(), "ListParts", new{Controller="Admin",Area="Orchard.ContentTypes"}, new { @class = "button" }) %>

7
src/Orchard/UI/Navigation/MenuItemComparer.cs
View File

@@ -40,7 +40,12 @@ namespace Orchard.UI.Navigation {
} }
if (obj.RouteValues != null) { if (obj.RouteValues != null) {
foreach (var item in obj.RouteValues) { foreach (var item in obj.RouteValues) {
hash ^= item.Key.GetHashCode() ^ item.Value.GetHashCode(); if (item.Key != null) {
hash ^= item.Key.GetHashCode();
}
if (item.Value != null) {
hash ^= item.Value.GetHashCode();
}
} }
} }
return hash; return hash;