lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into replace-lib-with-nuget

Browse Source 
Conflicts:
	src/Orchard.Web/Core/Orchard.Core.csproj
	src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj
This commit is contained in:
Rob King
2015-12-22 09:48:44 +00:00
parent 6a2b56e714 a492f89ea0
commit 89f0213a78
88 changed files with 752 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/Orchard.Web/Modules/Orchard.MediaLibrary/Extensions/MediaMetaDataExtensions.cs Normal file
View File

@@ -0,0 +1,65 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Orchard.ContentManagement.MetaData.Builders;
namespace Orchard.ContentManagement.MetaData {
public static class MediaMetaDataExtensions {
/// <summary>
/// This extension method can be used for easy image part creation. Adds all necessary parts and settings to the part.
/// </summary>
public static ContentTypeDefinitionBuilder AsImage(this ContentTypeDefinitionBuilder builder) {
return builder
.AsMedia()
.WithPart("ImagePart");
}
/// <summary>
/// This extension method can be used for easy vector image part creation. Adds all necessary parts and settings to the part.
/// </summary>
public static ContentTypeDefinitionBuilder AsVectorImage(this ContentTypeDefinitionBuilder builder) {
return builder
.AsMedia()
.WithPart("VectorImagePart");
}
/// <summary>
/// This extension method can be used for easy audio part creation. Adds all necessary parts and settings to the part.
/// </summary>
public static ContentTypeDefinitionBuilder AsAudio(this ContentTypeDefinitionBuilder builder) {
return builder
.AsMedia()
.WithPart("AudioPart");
}
/// <summary>
/// This extension method can be used for video image part creation. Adds all necessary parts and settings to the part.
/// </summary>
public static ContentTypeDefinitionBuilder AsVideo(this ContentTypeDefinitionBuilder builder) {
return builder
.AsMedia()
.WithPart("VideoPart");
}
/// <summary>
/// This extension method can be used for easy document part creation. Adds all necessary parts and settings to the part.
/// </summary>
public static ContentTypeDefinitionBuilder AsDocument(this ContentTypeDefinitionBuilder builder) {
return builder
.AsMedia()
.WithPart("DocumentPart");
}
/// <summary>
/// This extension method can be used for easy media part creation. Adds all necessary parts and settings to the part.
/// </summary>
public static ContentTypeDefinitionBuilder AsMedia(this ContentTypeDefinitionBuilder builder) {
return builder
.WithSetting("Stereotype", "Media")
.WithPart("CommonPart")
.WithPart("MediaPart")
.WithPart("TitlePart");
}
}
}

30
src/Orchard.Web/Modules/Orchard.MediaLibrary/Migrations.cs
View File

@@ -57,57 +57,37 @@ namespace Orchard.MediaLibrary {
ContentDefinitionManager.AlterTypeDefinition("Image", td => td
.DisplayedAs("Image")
.WithSetting("Stereotype", "Media")
.WithSetting("MediaFileNameEditorSettings.ShowFileNameEditor", "True")
.AsImage()
.WithPart("IdentityPart")
.WithPart("CommonPart")
.WithPart("MediaPart")
.WithPart("ImagePart")
.WithPart("TitlePart")
);
ContentDefinitionManager.AlterTypeDefinition("VectorImage", td => td
.DisplayedAs("Vector Image")
.WithSetting("Stereotype", "Media")
.WithSetting("MediaFileNameEditorSettings.ShowFileNameEditor", "True")
.AsVectorImage()
.WithPart("IdentityPart")
.WithPart("CommonPart")
.WithPart("MediaPart")
.WithPart("VectorImagePart")
.WithPart("TitlePart")
);
ContentDefinitionManager.AlterTypeDefinition("Video", td => td
.DisplayedAs("Video")
.WithSetting("Stereotype", "Media")
.WithSetting("MediaFileNameEditorSettings.ShowFileNameEditor", "True")
.AsVideo()
.WithPart("IdentityPart")
.WithPart("CommonPart")
.WithPart("MediaPart")
.WithPart("VideoPart")
.WithPart("TitlePart")
);
ContentDefinitionManager.AlterTypeDefinition("Audio", td => td
.DisplayedAs("Audio")
.WithSetting("Stereotype", "Media")
.WithSetting("MediaFileNameEditorSettings.ShowFileNameEditor", "True")
.AsAudio()
.WithPart("IdentityPart")
.WithPart("CommonPart")
.WithPart("MediaPart")
.WithPart("AudioPart")
.WithPart("TitlePart")
);
ContentDefinitionManager.AlterTypeDefinition("Document", td => td
.DisplayedAs("Document")
.WithSetting("Stereotype", "Media")
.WithSetting("MediaFileNameEditorSettings.ShowFileNameEditor", "True")
.AsDocument()
.WithPart("IdentityPart")
.WithPart("CommonPart")
.WithPart("MediaPart")
.WithPart("DocumentPart")
.WithPart("TitlePart")
);
ContentDefinitionManager.AlterTypeDefinition("OEmbed", td => td

1
src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj
View File

@@ -125,6 +125,7 @@
<Content Include="Scripts\Web.config" />
<Content Include="Styles\Web.config" />
<Compile Include="Drivers\VectorImagePartDriver.cs" />
<Compile Include="Extensions\MediaMetaDataExtensions.cs" />
<Compile Include="Factories\VectorImageFactory.cs" />
<Compile Include="Handlers\MediaLibrarySettingsPartHandler.cs" />
<Compile Include="Models\MediaLibrarySettingsPart.cs" />

2
src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library-picker.js
View File

@@ -14,7 +14,7 @@
var promptOnNavigate = element.data("prompt-on-navigate");
var showSaveWarning = element.data("show-save-warning");
var addButton = element.find(".button.add");
var saveButton = $('.button.save');
var saveButton = element.find('.button.save');
var removeAllButton = element.find(".button.remove");
var template =
'<li><div data-id="{contentItemId}" class="media-library-picker-item"><div class="thumbnail">{thumbnail}<div class="overlay"><h3>{title}</h3></div></div></div><a href="#" data-id="{contentItemId}" class="media-library-picker-remove">' + removeText + '</a>' + pipe + '<a href="{editLink}?ReturnUrl=' + returnUrl + '">' + editText + '</a></li>';