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 pull request #5827 from rtpHarry/1.9.x

Browse Source 
[Fixes #5826] Restore placements confirmation message fix
This commit is contained in:
Sébastien Ros
2015-09-21 14:36:44 -07:00
parent 6e90f704f8 20fbd99658
commit 46182edc5d
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Core/Shapes/Scripts/base.js
View File

@@ -236,7 +236,13 @@
} }
if (_this.filter("[itemprop~='RemoveUrl']").length == 1) { if (_this.filter("[itemprop~='RemoveUrl']").length == 1) {
if (!confirm(confirmRemoveMessage)) { // use a custom message if its set in data-message
var dataMessage = _this.data('message');
if (dataMessage === undefined) {
dataMessage = confirmRemoveMessage;
}
if (!confirm(dataMessage)) {
return false; return false;
} }
} }

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

@@ -43,7 +43,7 @@
<fieldset class="action"> <fieldset class="action">
<button class="primaryAction" type="submit" name="submit.Save" value="Save">@T("Save")</button> <button class="primaryAction" type="submit" name="submit.Save" value="Save">@T("Save")</button>
<button class="primaryAction" type="submit" name="submit.Restore" value="Restore" itemprop="RemoveUrl">@T("Restore")</button> <button class="primaryAction" type="submit" name="submit.Restore" value="Restore" itemprop="RemoveUrl" data-message="@T("Are you sure you want to restore these placements?")">@T("Restore")</button>
</fieldset> </fieldset>
} }

8
src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
View File

@@ -68,7 +68,13 @@
return false; return false;
} }
return confirm(confirmRemoveMessage); // use a custom message if its set in data-message
var dataMessage = $(this).data('message');
if (dataMessage === undefined) {
dataMessage = confirmRemoveMessage;
}
return confirm(dataMessage);
}); });
$(".check-all").change(function () { $(".check-all").change(function () {

2
src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
View File

@@ -97,7 +97,7 @@
@using (Script.Foot()) { @using (Script.Foot()) {
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
var confirmRemoveMessage = '@T("Are you sure you want to remove this element ?")'; var confirmRemoveMessage = '@T("Are you sure you want to remove this element?")';
//]]> //]]>
</script> </script>
} }