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.2-int' into 1.8.x

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
This commit is contained in:
Sipke Schoorstra
2015-04-27 16:01:10 +02:00
parent 060720e92c a88d68ee7a
commit e557151b28
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/ContentPicker.js
View File

@@ -54,6 +54,7 @@
var baseUrl = $(self).data("base-url");
var partName = $(self).data("part-name");
var fieldName = $(self).data("field-name");
var types = $(self).data("types");
var refreshIds = function() {
var id = $("[name='" + selectedItemsFieldname + "']");
@@ -90,7 +91,8 @@
},
baseUrl: baseUrl,
part: partName,
field: fieldName
field: fieldName,
types: types
});
});

12
src/Orchard.Web/Modules/Orchard.ContentPicker/Views/ContentPicker.Edit.cshtml
View File

@@ -15,6 +15,7 @@
var partName = Model.PartName;
var fieldName = Model.FieldName;
var baseUrl = Url.Content("~/") + WorkContext.Resolve<ShellSettings>().RequestUrlPrefix;
var types = String.Join(",", (IEnumerable<string>)Model.Types ?? Enumerable.Empty<string>());
}
<fieldset class="content-picker-field"
@@ -25,9 +26,10 @@
data-part-name="@HttpUtility.JavaScriptStringEncode(partName)"
data-field-name="@HttpUtility.JavaScriptStringEncode(fieldName)"
data-remove-text="@T("Remove")"
data-not-published-text="@T("Not Published")">
data-not-published-text="@T("Not Published")"
data-types="@types">
@if (!String.IsNullOrWhiteSpace(displayName)) {
<label @if(required) { <text>class="required"</text> }>@displayName</label>
<label @if (required) { <text> class="required" </text> }>@displayName</label>
}
<div class="message message-Warning content-picker-message">@T("You need to save your changes.")</div>
<table class="items content-picker" summary="@displayName">
@@ -38,7 +40,7 @@
</colgroup>
<thead>
<tr>
<th scope="col" >&nbsp;&darr;</th>
<th scope="col">&nbsp;&darr;</th>
<th scope="col">@T("Content Item")</th>
<th scope="col">&nbsp;</th>
</tr>
@@ -48,7 +50,7 @@
<tr>
<td>&nbsp;</td>
<td>
<span data-id="@contentItem.Id" data-fieldid="@idsFieldId" class="content-picker-item">@Html.ItemEditLink(contentItem) @if(!contentItem.HasPublished()) {<text> - </text>@T("Not Published")}</span>
<span data-id="@contentItem.Id" data-fieldid="@idsFieldId" class="content-picker-item">@Html.ItemEditLink(contentItem) @if (!contentItem.HasPublished()){<text> - </text>@T("Not Published")}</span>
</td>
<td>
<span data-id="@contentItem.Id" class="content-picker-remove button grey">@T("Remove")</span>
@@ -59,6 +61,6 @@
</table>
<span class="button add">@T("Add")</span>
<input type="hidden" name="@selectedItemsFieldName"/>
<input type="hidden" name="@selectedItemsFieldName" />
<span class="hint">@hint</span>
</fieldset>