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

Not breaking media editor for images, and refactoring into ext method.

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Bertrand Le Roy
2012-08-12 17:17:08 -07:00
parent 7e3453d26e
commit 9d0cc7b3a5
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard.Web/Modules/Orchard.Media/Helpers/MediaHelpers.cs
View File

@@ -1,6 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Web.Mvc;
using Orchard.Media.Models; using Orchard.Media.Models;
namespace Orchard.Media.Helpers { namespace Orchard.Media.Helpers {
@@ -24,5 +26,10 @@ namespace Orchard.Media.Helpers {
return navigations; return navigations;
} }
public static bool IsPicture(this HtmlHelper htmlHelper, string path) {
return new[] {".png", ".jpg", ".jpeg", ".gif", ".bmp", ".ico"}
.Contains((Path.GetExtension(path) ?? "").ToLowerInvariant());
}
} }
} }

3
src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml
View File

@@ -5,8 +5,7 @@
@{ @{
Style.Require("MediaAdmin"); Style.Require("MediaAdmin");
Layout.Title = T("Edit Media - {0}", Model.Name).ToString(); Layout.Title = T("Edit Media - {0}", Model.Name).ToString();
var isPicture = new[] {".png", ".jpg", ".jpeg", ".gif", ".bmp", ".ico"} var isPicture = Html.IsPicture(Model.Name);
.Contains(Path.GetExtension(Model.RelativePath ?? "").ToLowerInvariant());
var embedHTML = isPicture ? var embedHTML = isPicture ?
"<img src=\"" + Model.PublicUrl + "\"/>" : "<img src=\"" + Model.PublicUrl + "\"/>" :
"<a href=\"" + Model.PublicUrl + "\">" + Model.Name + "</a>"; "<a href=\"" + Model.PublicUrl + "\">" + Model.Name + "</a>";