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

Renaming shape and adding a hint

Browse Source 
--HG--
branch : 1.x
extra : rebase_source : 4d74199aa85e9194ae579959cab33a6a2740310c
This commit is contained in:
Sebastien Ros
2013-03-04 11:51:22 -08:00
parent c2cf232534
commit 833093c9aa
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.MediaProcessing/Shapes/MediaShapes.cs
View File

@@ -44,7 +44,7 @@ namespace Orchard.MediaProcessing.Shapes {
public ILogger Logger { get; set; } public ILogger Logger { get; set; }
[Shape] [Shape]
public void ImageUrl(dynamic Display, TextWriter Output, string Profile, string Path, ContentItem ContentItem) { public void MediaUrl(dynamic Display, TextWriter Output, string Profile, string Path, ContentItem ContentItem) {
var filePath = _fileNameProvider.Value.GetFileName(Profile, Path); var filePath = _fileNameProvider.Value.GetFileName(Profile, Path);
// todo: regenerate the file if the profile is newer, by getting IStorageFile. // todo: regenerate the file if the profile is newer, by getting IStorageFile.
if (string.IsNullOrEmpty(filePath) || !_storageProvider.Value.FileExists(filePath)) { if (string.IsNullOrEmpty(filePath) || !_storageProvider.Value.FileExists(filePath)) {

34
src/Orchard.Web/Modules/Orchard.MediaProcessing/Views/Admin/Edit.cshtml
View File

@@ -22,24 +22,26 @@
<th scope="col" class="actions">&nbsp;</th> <th scope="col" class="actions">&nbsp;</th>
</tr> </tr>
</thead> </thead>
@foreach (var filter in Model.Filters) @foreach (var filter in Model.Filters)
{ {
<tr> <tr>
<td>@filter.DisplayText</td> <td>@filter.DisplayText</td>
<td> <td>
@Html.ActionLink(T("Edit").Text, "Edit", new { controller = "Filter", id = Model.Id, category = filter.Category, type = filter.Type, filterId = filter.FilterRecordId }) | @Html.ActionLink(T("Edit").Text, "Edit", new { controller = "Filter", id = Model.Id, category = filter.Category, type = filter.Type, filterId = filter.FilterRecordId }) |
@Html.ActionLink(T("Delete").Text, "Delete", new { controller = "Filter", id = Model.Id, filterId = filter.FilterRecordId }, new { itemprop = "RemoveUrl UnsafeUrl" }) | @Html.ActionLink(T("Delete").Text, "Delete", new { controller = "Filter", id = Model.Id, filterId = filter.FilterRecordId }, new { itemprop = "RemoveUrl UnsafeUrl" }) |
@if (filter != Model.Filters.First()) { @if (filter != Model.Filters.First()) {
@Html.ActionLink(T("Up").Text, "Move", new { controller = "Admin", id = Model.Id, direction = "up", filterId = filter.FilterRecordId }) @:| @Html.ActionLink(T("Up").Text, "Move", new { controller = "Admin", id = Model.Id, direction = "up", filterId = filter.FilterRecordId }) @:|
} }
@if (filter != Model.Filters.Last()) { @if (filter != Model.Filters.Last()) {
@Html.ActionLink(T("Down").Text, "Move", new { controller = "Admin", id = Model.Id, direction = "down", filterId = filter.FilterRecordId }) @Html.ActionLink(T("Down").Text, "Move", new { controller = "Admin", id = Model.Id, direction = "down", filterId = filter.FilterRecordId })
} }
</td> </td>
</tr> </tr>
} }
</table> </table>
<span class="hint">@T("Usage example: ")@("@Display.MediaUrl(Profile: \"")@Model.Name@("\", Path: Model.ContentItem.Contact.Picture.Url)")</span>
<fieldset> <fieldset>
@*@Html.ActionLink(T("Preview").ToString(), "Preview", new { Model.Id }, new { @class = "button" })*@ @*@Html.ActionLink(T("Preview").ToString(), "Preview", new { Model.Id }, new { @class = "button" })*@