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 branch '1.9.x' into dev

Browse Source
This commit is contained in:
Sebastien Ros
2015-06-22 10:11:56 -07:00
parent 45aeb7b467 78fb58f016
commit 622b191ad5
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/DefinitionTemplates/AuditTrailPartSettings.cshtml
View File

@@ -17,6 +17,6 @@
<div> <div>
@Html.CheckBoxFor(m => m.ShowAuditTrailCommentInput) @Html.CheckBoxFor(m => m.ShowAuditTrailCommentInput)
@Html.LabelFor(m => m.ShowAuditTrailCommentInput, T("Show comment input").Text, new { @class = "forcheckbox" }) @Html.LabelFor(m => m.ShowAuditTrailCommentInput, T("Show comment input").Text, new { @class = "forcheckbox" })
<span class="hint">@T("Renders a text field to allow the user to enter a comment about the changes she made.")</span> <span class="hint">@T("Renders a text field to allow the user to enter a comment about the changes they made.")</span>
</div> </div>
</fieldset> </fieldset>

6
src/Orchard.Web/Modules/Orchard.Localization/Views/EditorTemplates/Parts/Localization.ContentTranslations.Edit.cshtml
View File

@@ -65,7 +65,7 @@
@functions{ @functions{
private string BuildSelectedCultureList(string id, string name, IEnumerable<string> siteCultures, string culture) { private IHtmlString BuildSelectedCultureList(string id, string name, IEnumerable<string> siteCultures, string culture) {
TagBuilder selectTag = new TagBuilder("select"); TagBuilder selectTag = new TagBuilder("select");
selectTag.Attributes["id"] = id; selectTag.Attributes["id"] = id;
selectTag.Attributes["name"] = name; selectTag.Attributes["name"] = name;
@@ -77,11 +77,11 @@
if (siteCulture == culture) { if (siteCulture == culture) {
optionTag.Attributes["selected"] = "selected"; optionTag.Attributes["selected"] = "selected";
} }
optionTag.SetInnerText(siteCulture); optionTag.SetInnerText(Html.Encode(siteCulture));
selectTag.InnerHtml += optionTag.ToString(); selectTag.InnerHtml += optionTag.ToString();
} }
return selectTag.ToString(); return Html.Raw(selectTag);
} }
} }
@using (Script.Foot()) { @using (Script.Foot()) {

2
src/Orchard.Web/Modules/Orchard.OutputCache/Module.txt
View File

@@ -4,7 +4,7 @@ Author: The Orchard Team
Website: http://orchardproject.net/ Website: http://orchardproject.net/
Version: 1.9.0 Version: 1.9.0
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Adds output caching functiona Description: Adds output caching functionality
Features: Features:
Orchard.OutputCache: Orchard.OutputCache:
Description: Adds output caching functionality. Description: Adds output caching functionality.

2
src/Orchard.Web/Modules/Orchard.OutputCache/Views/Admin/Index.cshtml
View File

@@ -23,7 +23,7 @@
<fieldset> <fieldset>
<label>@T("Default Cache Grace Time")</label> <label>@T("Default Cache Grace Time")</label>
@Html.TextBoxFor(m => m.DefaultCacheGraceTime, new { @class = "text small" }) @Html.TextBoxFor(m => m.DefaultCacheGraceTime, new { @class = "text small" })
<span class="hint">@T("Number of seconds past duration that stale items can be served from cache while regenaration is in progress. Enter 0 to disable grace time by default.")</span> <span class="hint">@T("Number of seconds past duration that stale items can be served from cache while regeneration is in progress. Enter 0 to disable grace time by default.")</span>
</fieldset> </fieldset>
<fieldset> <fieldset>

2
src/Orchard.Web/Modules/Orchard.Users/Activities/SignInUserActivity.cs
View File

@@ -32,7 +32,7 @@ namespace Orchard.Users.Activities {
} }
public override LocalizedString Description { public override LocalizedString Description {
get { return T("Signs in a user based on the specified credentials, or if the current content item us a user, that user is signed in."); } get { return T("Signs in a user based on the specified credentials, or if the current content item is a user, that user is signed in."); }
} }
public override string Form { public override string Form {