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

Merge integration -> contributions.

Browse Source 
--HG--
branch : contributions
This commit is contained in:
Suha Can
2011-06-07 11:19:34 -07:00
parent 1dbc40c6ac 5549d0dfe5
commit 7dbc363757
393 changed files with 18391 additions and 15130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Media/Module.txt
View File

@@ -2,8 +2,8 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
Version: 1.1.30
OrchardVersion: 1.1.30
Version: 1.2.0
OrchardVersion: 1.2.0
Description: The media module offer basic media management features. It currently only supports image files. Storage goes into the current Orchard file system, which can be the server's physical file system or Azure blob storage.
FeatureDescription: File system based media upload, storage and management.
Category: Media

4
src/Orchard.Web/Modules/Orchard.Media/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.1.30")]
[assembly: AssemblyFileVersion("1.1.30")]
[assembly: AssemblyVersion("1.2.0")]
[assembly: AssemblyFileVersion("1.2.0")]
[assembly: SecurityTransparent]

6
src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml
View File

@@ -59,8 +59,8 @@
@foreach (var mediaFile in Model.MediaFiles) {
<tr>
<td>
<input type="checkbox" value="true" name="@T("Checkbox.File.{0}", mediaFile.Name)"/>
<input type="hidden" value="@T(Model.MediaPath)" name="@T(mediaFile.Name)" />
<input type="checkbox" value="true" name="Checkbox.File.@mediaFile.Name"/>
<input type="hidden" value="@Model.MediaPath" name="@mediaFile.Name" />
</td>
<td>
@Html.ActionLink(mediaFile.Name, "EditMedia", new { name = mediaFile.Name,
@@ -79,7 +79,7 @@
@foreach (var mediaFolder in Model.MediaFolders) {
<tr>
<td>
<input type="checkbox" value="true" name="@T("Checkbox.Folder.{0}", mediaFolder.Name)"/>
<input type="checkbox" value="true" name="Checkbox.Folder.@mediaFolder.Name"/>
<input type="hidden" value="@mediaFolder.MediaPath" name="@mediaFolder.Name" />
</td>
<td>

2
src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.cshtml
View File

@@ -37,7 +37,7 @@
</thead>
@foreach (var mediaFolder in Model.MediaFolders) {
<tr>
<td><input type="checkbox" value="true" name="@T("Checkbox.{0}", mediaFolder.Name)"/></td>
<td><input type="checkbox" value="true" name="Checkbox.@mediaFolder.Name"/></td>
@* todo: (heskew) this URL needs to be determined from current module location *@
<td>
<img src="@Href("~/Modules/Orchard.Media/Content/Admin/images/folder.gif")" height="16" width="16" class="mediaTypeIcon" alt="@T("Folder")" />