diff --git a/src/Orchard.Web/Core/Navigation/Scripts/navigation-admin.js b/src/Orchard.Web/Core/Navigation/Scripts/navigation-admin.js index 347854cd5..08dc685de 100644 --- a/src/Orchard.Web/Core/Navigation/Scripts/navigation-admin.js +++ b/src/Orchard.Web/Core/Navigation/Scripts/navigation-admin.js @@ -42,7 +42,7 @@ // display a message on leave if changes have been made window.onbeforeunload = function (e) { - return leaveConfirmation; + return $("
").html(leaveConfirmation).text(); }; // cancel leaving message on save diff --git a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml index bb81da637..9388e2ae4 100644 --- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml @@ -134,12 +134,12 @@ @using (Script.Foot()) { } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Scripts/features.admin.js b/src/Orchard.Web/Modules/Orchard.Modules/Scripts/features.admin.js index ad88615d8..7fd4e0ae9 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Scripts/features.admin.js +++ b/src/Orchard.Web/Modules/Orchard.Modules/Scripts/features.admin.js @@ -43,7 +43,7 @@ var force = actionLink.data("feature-force"); var dependants = actionLink.data("feature-dependants"); - if (!dependants || /^\s*$/.test(dependants) || confirm(confirmDisableMessage + "\n\n" + dependants)) { + if (!dependants || /^\s*$/.test(dependants) || confirm($("
").html(confirmDisableMessage + "\n\n" + dependants).text())) { $("[name='submit.BulkExecute']").val("yes"); $("[name='featureIds']").val(featureId); diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Scripts/features.admin.min.js b/src/Orchard.Web/Modules/Orchard.Modules/Scripts/features.admin.min.js index dc6081236..1b85a1176 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Scripts/features.admin.min.js +++ b/src/Orchard.Web/Modules/Orchard.Modules/Scripts/features.admin.min.js @@ -1,4 +1 @@ -$(function(){var n=function(){var n=$(".bulk-actions-wrapper").addClass("visible"),t=$(".switch-for-switchable");t.prepend(n);$("#search-box").focus().keyup(function(){var n=$(this).val(),t;if(n==""){$("li.category").show();$("li.feature:hidden").show();return}$("li.feature").each(function(){var t=$(this),i=t.find("h3:first").text();i.toLowerCase().indexOf(n.toLowerCase())>=0?t.show():t.hide()});$("li.category:hidden").show();t=$("li.category:not(:has(li.feature:visible))").hide()})},t=function(){$("li.feature h3").on("change","input[type='checkbox']",function(){var n=$(this).is(":checked"),t=$(this).parents("li.feature:first");t.toggleClass("selected",n)})},i=function(){$("li.feature .actions").on("click","a[data-feature-action]",function(n){var t=$(this),r=t.data("feature-id"),u=t.data("feature-action"),f=t.data("feature-force"),i=t.data("feature-dependants");(!i||/^\s*$/.test(i)||confirm(confirmDisableMessage+"\n\n"+i))&&($("[name='submit.BulkExecute']").val("yes"),$("[name='featureIds']").val(r),$("[name='bulkAction']").val(u),$("[name='force']").val(f),t.parents("form:first").submit());n.preventDefault()})};n();t();i()}); -/* -//# sourceMappingURL=features.admin.min.js.map -*/ \ No newline at end of file +$(function(){var n=function(){var n=$(".bulk-actions-wrapper").addClass("visible"),t=$(".switch-for-switchable");t.prepend(n);$("#search-box").keyup(function(){var n=$(this).val(),t;if(n==""){$("li.category").show();$("li.feature:hidden").show();return}$("li.feature").each(function(){var t=$(this),i=t.find("h3:first").text();i.toLowerCase().indexOf(n.toLowerCase())>=0?t.show():t.hide()});$("li.category:hidden").show();t=$("li.category:not(:has(li.feature:visible))").hide()})},t=function(){$("li.feature h3").on("change","input[type='checkbox']",function(){var n=$(this).is(":checked"),t=$(this).parents("li.feature:first");t.toggleClass("selected",n)})},i=function(){$("li.feature .actions").on("click","a[data-feature-action]",function(n){var t=$(this),r=t.data("feature-id"),u=t.data("feature-action"),f=t.data("feature-force"),i=t.data("feature-dependants");(!i||/^\s*$/.test(i)||confirm($("
").html(confirmDisableMessage+"\n\n"+i).text()))&&($("[name='submit.BulkExecute']").val("yes"),$("[name='featureIds']").val(r),$("[name='bulkAction']").val(u),$("[name='force']").val(f),t.parents("form:first").submit());n.preventDefault()})};n();t();i()}); \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml index 36295b52f..ec6da75a3 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml @@ -16,29 +16,29 @@ @if (Model.Features.Any()) { using (Html.BeginFormAntiForgeryPost()) { - @Html.Hidden("submit.BulkExecute") - @Html.Hidden("force", true) - @Html.Hidden("featureIds") -
-
- - -
-
- - - -
-
+ @Html.Hidden("submit.BulkExecute") + @Html.Hidden("force", true) + @Html.Hidden("featureIds") +
+
+ + +
+
+ + + +
+
-
    - @{ +
      + @{ var featureGroups = Model.Features.OrderBy(f => f.Descriptor.Category, new DoghouseComparer("Core")).GroupBy(f => f.Descriptor.Category).ToList(); foreach (var featureGroup in featureGroups) { if (!featureGroup.Any(x => Model.IsAllowed(x.Descriptor.Extension))) { @@ -98,8 +98,7 @@ @featureName - } - else { + } else { @featureName } @@ -138,14 +137,14 @@ }
    } - } -
} + } + } using (Script.Foot()) { } } \ No newline at end of file