lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-02 03:17:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing back button behavior in media library

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2013-04-22 16:06:10 -07:00
parent eb11f0250d
commit d8665455e8
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Modules/Orchard.ImageEditor/Views/Content-ImageEditor.cshtml
View File

@@ -1,5 +1,6 @@
@using Orchard.ContentManagement @using Orchard.ContentManagement
@using Orchard.MediaLibrary.Models @using Orchard.MediaLibrary.Models
@using Orchard.Utility.Extensions
@model dynamic @model dynamic
@{ @{
Script.Require("jQuery"); Script.Require("jQuery");
@@ -11,6 +12,11 @@
ContentItem media = Model.MediaContentItem; ContentItem media = Model.MediaContentItem;
var mediaPart = media.As<MediaPart>(); var mediaPart = media.As<MediaPart>();
var imagePart = media.As<ImagePart>(); var imagePart = media.As<ImagePart>();
var returnUrl = Request.QueryString["returnUrl"];
if (!Request.IsLocalUrl(returnUrl)) {
returnUrl = Url.Content("~/");
}
} }
<input type="hidden" id="image-editor-url" value="@Url.Content(mediaPart.Resource)"/> <input type="hidden" id="image-editor-url" value="@Url.Content(mediaPart.Resource)"/>
@@ -42,7 +48,7 @@
</div> </div>
<fieldset id="buttons-manage"> <fieldset id="buttons-manage">
<button id="button-save">@T("Save")</button> <button id="button-save">@T("Save")</button>
<a id="button-cancel" href="@Url.Action("Index", "Admin", new { area = "Orchard.MediaLibrary" })" class="button">@T("Close")</a> <a id="button-cancel" href="@returnUrl" class="button">@T("Close")</a>
</fieldset> </fieldset>
<input type="hidden" id="upload-image-url" value="@Url.Action("Upload", "Admin", new { id = media.Id })"/> <input type="hidden" id="upload-image-url" value="@Url.Action("Upload", "Admin", new { id = media.Id })"/>

15
src/Orchard.Web/Modules/Orchard.ImageEditor/Views/Parts/Image.Editor.cshtml
View File

@@ -1,8 +1,17 @@
@using Orchard.ContentManagement @using Orchard.MediaLibrary.Models
@using Orchard.MediaLibrary.Models
@{ @{
ImagePart imagePart = Model.ContentPart; ImagePart imagePart = Model.ContentPart;
} }
@Html.ActionLink(T("Edit").Text, "Index", "Admin", new { id = imagePart.Id, area = "Orchard.ImageEditor" }, new {}) @Html.ActionLink(T("Edit").Text, "Index", "Admin", new { id = imagePart.Id, area = "Orchard.ImageEditor" }, new { id="edit-image-link"})
<script type="text/javascript">
//<![CDATA[
// update the returnUrl from javascript to get the main window's location
$('#edit-image-link').each(function() {
var self = $(this);
var returnUrl = self.attr('href') + '?returnUrl=' + encodeURIComponent(window.location);
self.attr('href', returnUrl);
});
//]]>
</script>

1
src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/Media.Actions.cshtml
View File

@@ -1,6 +1,5 @@
@using Orchard.ContentManagement @using Orchard.ContentManagement
@using Orchard.Core.Contents; @using Orchard.Core.Contents;
@using Orchard.Utility.Extensions
@{ @{
ContentItem contentItem = Model.ContentItem; ContentItem contentItem = Model.ContentItem;
} }