lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ContentTypes: Adding missing T-strings in EditPlacement shape and fixing that translations could break admin-placementeditor.js

Browse Source
This commit is contained in:
Lombiq 2019-08-28 14:35:09 +02:00 committed by Benedek Farkas
parent 54a4acc042
commit b18afbe867
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Orchard.Web/Modules/Orchard.ContentTypes/Scripts/admin-placementeditor.js
View File

@ -1,11 +1,12 @@
(function ($) {
var assignPositions = function () {
var position = 0;
$('.type').each(function () {
var input = $(this);
var tab = input.closest(".zone-container").data("tab");
//input = input.next();
var postab = tab != "" ? position + "#" + tab : position + "";
var postab = tab !== "" ? position + "#" + tab : position + "";
reAssignIdName(input, position); // type
input = input.next();
@ -106,12 +107,13 @@
var $this = $(this);
var shape = $(this).next().next();
shape.toggle();
if ($this.text() == 'Show Editor Shape') {
$this.text('Hide Editor Shape');
if ($this.text() === $this.data("text-show")) {
$this.text($this.data("text-hide"));
} else {
$this.text('Show Editor Shape');
$this.text($this.data("text-show"));
}
})
});
// returns all the tabs
function getTabs(header) {

10
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
View File

@ -5,7 +5,7 @@
@{
Style.Require("ContentTypesAdmin");
Script.Require("PlacementEditor").AtFoot();
Layout.Title = T("Edit Placement - {0}", Model.ContentTypeDefinition.DisplayName).ToString();
Layout.Title = T("Edit Placement - {0}", Html.Raw(Model.ContentTypeDefinition.DisplayName)).Text;
int i = 0;
}
@ -13,8 +13,9 @@
@helper RenderPlacement(DriverResultPlacement p, int i)
{
var placement = p.PlacementSettings;
<li class="place" data-shape-type="@placement.ShapeType" data-shape-differentiator="@placement.Differentiator" data-shape-zone="Content" data-shape-position="@placement.Position">
<span class="toggle">Show Editor Shape</span>
<span class="toggle" data-text-show="@T("Show Editor Shape")" data-text-hide="@T("Hide Editor Shape")">@T("Show Editor Shape")</span>
<div class="shape-type"><h3>@placement.ShapeType @placement.Differentiator</h3></div>
<div class="shape-editor">
@try
@ -25,6 +26,7 @@
{
}
</div>
@Html.HiddenFor(m => m.AllPlacements[i].PlacementSettings.ShapeType, new { @class = "type" })
@Html.HiddenFor(m => m.AllPlacements[i].PlacementSettings.Differentiator, new { @class = "differentiator" })
@Html.HiddenFor(m => m.AllPlacements[i].PlacementSettings.Zone, new { @class = "zone" })
@ -39,7 +41,7 @@
@Html.ValidationSummary()
<div id="placement">
<div data-tab="" class="zone-container" id="content-tab">
<h2>Content</h2>
<h2>@T("Content")</h2>
<ul class="tabdrag">
@foreach (var p in Model.Content)
{
@ -53,7 +55,7 @@
@foreach (var tab in Model.Tabs)
{
<div data-tab="@tab.Key" class="zone-container tab-container">
<a class="delete">Delete</a>
<a class="delete">@T("Delete")</a>
<h2>@tab.Key</h2>
<ul class="tabdrag">
@foreach (var p in tab.Value)