lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source
This commit is contained in:
Sebastien Ros
2014-04-28 13:23:27 -07:00
parent 5cac1d526c 52ec226125
commit e3c26928c1
7 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Containers/Settings/ContainableSettings.cs
View File

@@ -21,7 +21,7 @@ namespace Orchard.Core.Containers.Settings {
} }
public override IEnumerable<TemplateViewModel> TypePartEditorUpdate(ContentTypePartDefinitionBuilder builder, IUpdateModel updateModel) { public override IEnumerable<TemplateViewModel> TypePartEditorUpdate(ContentTypePartDefinitionBuilder builder, IUpdateModel updateModel) {
if (builder.Name != "ContainerPart") if (builder.Name != "ContainablePart")
yield break; yield break;
var model = new ContainableTypePartSettings(); var model = new ContainableTypePartSettings();

1
src/Orchard.Web/Core/Containers/Views/EditorTemplates/ContainerWidget.cshtml
View File

@@ -16,6 +16,7 @@
<fieldset> <fieldset>
@Html.LabelFor(m => m.Part.Record.OrderByProperty, T("Order by")) @Html.LabelFor(m => m.Part.Record.OrderByProperty, T("Order by"))
<select id="@Html.FieldIdFor(m => m.Part.Record.OrderByProperty)" name="@Html.FieldNameFor(m => m.Part.Record.OrderByProperty)"> <select id="@Html.FieldIdFor(m => m.Part.Record.OrderByProperty)" name="@Html.FieldNameFor(m => m.Part.Record.OrderByProperty)">
@Html.SelectOption(Model.Part.Record.OrderByProperty, "ContainablePart.Weight", T("Weight").Text)
@Html.SelectOption(Model.Part.Record.OrderByProperty, "CommonPart.CreatedUtc", T("Date Created").Text) @Html.SelectOption(Model.Part.Record.OrderByProperty, "CommonPart.CreatedUtc", T("Date Created").Text)
@Html.SelectOption(Model.Part.Record.OrderByProperty, "CommonPart.PublishedUtc", T("Date Published").Text) @Html.SelectOption(Model.Part.Record.OrderByProperty, "CommonPart.PublishedUtc", T("Date Published").Text)
@Html.SelectOption(Model.Part.Record.OrderByProperty, "TitlePart.Title", T("Title (Title Part)").Text) @Html.SelectOption(Model.Part.Record.OrderByProperty, "TitlePart.Title", T("Title (Title Part)").Text)

2
src/Orchard.Web/Modules/Orchard.Autoroute/Services/PathResolutionService.cs
View File

@@ -17,7 +17,7 @@ namespace Orchard.Autoroute.Services {
public AutoroutePart GetPath(string path) { public AutoroutePart GetPath(string path) {
var autorouteRecord = _autorouteRepository.Table var autorouteRecord = _autorouteRepository.Table
.Where(part => part.DisplayAlias == path && part.ContentItemVersionRecord.Latest && part.ContentItemVersionRecord.Published) .Where(part => part.DisplayAlias == path && part.ContentItemVersionRecord.Published)
.FirstOrDefault(); .FirstOrDefault();
if (autorouteRecord == null) { if (autorouteRecord == null) {

5
src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
View File

@@ -228,6 +228,11 @@ namespace Orchard.OutputCache.Filters {
} }
} }
// don't enable public caching for requests with query string
if (queryString.AllKeys.Any()) {
_maxAge = 0;
}
// compute the cache key // compute the cache key
_cacheKey = ComputeCacheKey(filterContext, parameters); _cacheKey = ComputeCacheKey(filterContext, parameters);

4
src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css
View File

@@ -132,6 +132,10 @@ position:absolute;
top:1px; top:1px;
width:20px; width:20px;
} }
.widgets-listed .widgets-zone-widgets h3,
.widgets-listed .widgets-zone-widgets .contentType {
display: inline;
}
.widgets-listed .widgets-move { .widgets-listed .widgets-move {
background:url(images/arrows.png) 7px -31px no-repeat; background:url(images/arrows.png) 7px -31px no-repeat;
border:0; border:0;

1
src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts.Widgets.WidgetPart.cshtml
View File

@@ -1,4 +1,5 @@
@model Orchard.Widgets.Models.WidgetPart @model Orchard.Widgets.Models.WidgetPart
<h2>@Model.TypeDefinition.DisplayName</h2>
<fieldset> <fieldset>
@Html.LabelFor(widget => widget.Zone, T("Zone")) @Html.LabelFor(widget => widget.Zone, T("Zone"))
@Html.DropDownListFor(widget => widget.Zone, new SelectList(Model.AvailableZones)) @Html.DropDownListFor(widget => widget.Zone, new SelectList(Model.AvailableZones))

2
src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml
View File

@@ -22,7 +22,7 @@
foreach (WidgetPart widget in widgets.Where(w => w.Zone == zone).OrderBy(w => w.Position, new Orchard.UI.FlatPositionComparer())) { foreach (WidgetPart widget in widgets.Where(w => w.Zone == zone).OrderBy(w => w.Position, new Orchard.UI.FlatPositionComparer())) {
<li class="widgets-@(widget.LayerId == Model.CurrentLayer.Id ? "this" : "other")-layer widgets-layer-@widget.LayerId@(i == 0 ? " first" : (i == count ? " last" : ""))"> <li class="widgets-@(widget.LayerId == Model.CurrentLayer.Id ? "this" : "other")-layer widgets-layer-@widget.LayerId@(i == 0 ? " first" : (i == count ? " last" : ""))">
@using (Html.BeginFormAntiForgeryPost()) { @using (Html.BeginFormAntiForgeryPost()) {
<h3>@Html.ActionLink(HasText(widget.Title) ? widget.Title : widget.TypeDefinition.DisplayName, "EditWidget", new { @widget.Id, returnUrl })</h3> <h3>@Html.ActionLink(HasText(widget.Title) ? widget.Title : widget.TypeDefinition.DisplayName, "EditWidget", new { @widget.Id, returnUrl })</h3><div class="contentType"> - @widget.TypeDefinition.DisplayName</div>
<div class="widgets-actions"> <div class="widgets-actions">
@if (widget.LayerId != Model.CurrentLayer.Id) { @if (widget.LayerId != Model.CurrentLayer.Id) {
<button name="moveHere" class="link" type="submit" value="1">@T("Move to current layer")</button> <button name="moveHere" class="link" type="submit" value="1">@T("Move to current layer")</button>