lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rob King 2016-01-06 10:36:08 +00:00
commit 93ec5ea543
25 changed files with 92 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Orchard.Web/Core/Common/Extensions/CommonMetaDataExtensions.cs Normal file
View File

@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Orchard.ContentManagement.MetaData.Builders;
namespace Orchard.ContentManagement.MetaData {
public static class CommonMetaDataExtensions {
/// <summary>
/// Adds IdentityPart to the content type.
/// </summary>
/// <returns>The ContentTypeDefinitionBuilder object on which this method is called.</returns>
public static ContentTypeDefinitionBuilder WithIdentity(this ContentTypeDefinitionBuilder builder) {
return builder.WithPart("IdentityPart");
}
}
}

10
src/Orchard.Web/Core/Containers/Migrations.cs
View File

@ -38,6 +38,7 @@ namespace Orchard.Core.Containers {
.WithPart("CommonPart")
.WithPart("WidgetPart")
.WithPart("ContainerWidgetPart")
.WithIdentity()
.WithSetting("Stereotype", "Widget"));
ContentDefinitionManager.AlterPartDefinition("ContainerPart", part => part
@ -48,7 +49,7 @@ namespace Orchard.Core.Containers {
.Attachable()
.WithDescription("Allows your content item to be contained by a content item that has the ContainerPart attached."));
return 6;
return 7;
}
public int UpdateFrom1() {
@ -123,5 +124,12 @@ namespace Orchard.Core.Containers {
return 6;
}
public int UpdateFrom6() {
ContentDefinitionManager.AlterTypeDefinition("ContainerWidget", type => type
.WithIdentity());
return 7;
}
}
}

14
src/Orchard.Web/Core/Navigation/Migrations.cs
View File

@ -20,7 +20,7 @@ namespace Orchard.Core.Navigation {
ContentDefinitionManager.AlterTypeDefinition("MenuItem", cfg => cfg
.WithPart("MenuPart")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("CommonPart")
.DisplayedAs("Custom Link")
.WithSetting("Description", "Represents a simple custom link with a text and an url.")
@ -34,7 +34,7 @@ namespace Orchard.Core.Navigation {
ContentDefinitionManager.AlterTypeDefinition("MenuWidget", cfg => cfg
.WithPart("CommonPart")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("WidgetPart")
.WithPart("MenuWidgetPart")
.WithSetting("Stereotype", "Widget")
@ -52,7 +52,7 @@ namespace Orchard.Core.Navigation {
.WithPart("MenuPart")
.WithPart("BodyPart")
.WithPart("CommonPart")
.WithPart("IdentityPart")
.WithIdentity()
.DisplayedAs("Html Menu Item")
.WithSetting("Description", "Renders some custom HTML in the menu.")
.WithSetting("BodyPartSettings.FlavorDefault", "html")
@ -92,7 +92,7 @@ namespace Orchard.Core.Navigation {
ContentDefinitionManager.AlterTypeDefinition("MenuItem", cfg => cfg
.WithPart("MenuPart")
.WithPart("CommonPart")
.WithPart("IdentityPart")
.WithIdentity()
.DisplayedAs("Custom Link")
.WithSetting("Description", "Represents a simple custom link with a text and an url.")
.WithSetting("Stereotype", "MenuItem") // because we declare a new stereotype, the Shape MenuItem_Edit is needed
@ -115,7 +115,7 @@ namespace Orchard.Core.Navigation {
ContentDefinitionManager.AlterTypeDefinition("MenuWidget", cfg => cfg
.WithPart("CommonPart")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("WidgetPart")
.WithPart("MenuWidgetPart")
.WithSetting("Stereotype", "Widget")
@ -130,7 +130,7 @@ namespace Orchard.Core.Navigation {
.WithPart("MenuPart")
.WithPart("BodyPart")
.WithPart("CommonPart")
.WithPart("IdentityPart")
.WithIdentity()
.DisplayedAs("Html Menu Item")
.WithSetting("Description", "Renders some custom HTML in the menu.")
.WithSetting("BodyPartSettings.FlavorDefault", "html")
@ -172,7 +172,7 @@ namespace Orchard.Core.Navigation {
public int UpdateFrom5() {
ContentDefinitionManager.AlterTypeDefinition("Menu", cfg => cfg
.WithPart("IdentityPart")
.WithIdentity()
);
return 6;

1
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@ -95,6 +95,7 @@
<ItemGroup>
<Compile Include="Common\Controllers\ErrorController.cs" />
<Compile Include="Common\DateEditor\DateEditorSettings.cs" />
<Compile Include="Common\Extensions\CommonMetaDataExtensions.cs" />
<Compile Include="Common\OwnerEditor\OwnerEditorSettings.cs" />
<Compile Include="Common\OwnerEditor\OwnerEditorDriver.cs" />
<Compile Include="Common\DateEditor\DateEditorDriver.cs" />

6
src/Orchard.Web/Modules/Orchard.Autoroute/Services/HomeAliasService.cs
View File

@ -31,6 +31,10 @@ namespace Orchard.Autoroute.Services {
public IContent GetHomePage(VersionOptions version = null) {
var homePageRoute = GetHomeRoute();
if (homePageRoute == null)
return null;
var alias = LookupAlias(homePageRoute);
if (alias == null)
@ -74,4 +78,4 @@ namespace Orchard.Autoroute.Services {
return alias != null ? alias.Path : null;
}
}
}
}

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Migrations.cs
View File

@ -66,7 +66,7 @@ namespace Orchard.Azure.MediaServices {
ContentDefinitionManager.AlterTypeDefinition("CloudVideo", type => type
.WithPart("CommonPart")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("MediaPart")
.WithPart("TitlePart")
.WithPart("PublishLaterPart")

6
src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
View File

@ -80,7 +80,7 @@ namespace Orchard.Blogs {
.WithPart("CommonPart")
.WithPart("WidgetPart")
.WithSetting("Stereotype", "Widget")
.WithPart("IdentityPart")
.WithIdentity()
);
return 7;
@ -134,12 +134,12 @@ namespace Orchard.Blogs {
public int UpdateFrom6() {
ContentDefinitionManager.AlterTypeDefinition("RecentBlogPosts",
cfg => cfg
.WithPart("IdentityPart")
.WithIdentity()
);
ContentDefinitionManager.AlterTypeDefinition("BlogArchives",
cfg => cfg
.WithPart("IdentityPart")
.WithIdentity()
);
return 7;

4
src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
View File

@ -56,7 +56,7 @@ namespace Orchard.Comments {
p => p
.WithSetting("OwnerEditorSettings.ShowOwnerEditor", "false")
.WithSetting("DateEditorSettings.ShowDateEditor", "false"))
.WithPart("IdentityPart")
.WithIdentity()
);
ContentDefinitionManager.AlterTypeDefinition("Blog",
@ -82,7 +82,7 @@ namespace Orchard.Comments {
}
public int UpdateFrom1() {
ContentDefinitionManager.AlterTypeDefinition("Comment", cfg => cfg.WithPart("IdentityPart"));
ContentDefinitionManager.AlterTypeDefinition("Comment", cfg => cfg.WithIdentity());
return 2;
}

2
src/Orchard.Web/Modules/Orchard.ContentPicker/Migrations.cs
View File

@ -16,7 +16,7 @@ namespace Orchard.ContentPicker {
ContentDefinitionManager.AlterTypeDefinition("ContentMenuItem", cfg => cfg
.WithPart("MenuPart")
.WithPart("CommonPart")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("ContentMenuItemPart")
.DisplayedAs("Content Menu Item")
.WithSetting("Description", "Adds a Content Item to the menu.")

2
src/Orchard.Web/Modules/Orchard.CustomForms/Migrations.cs
View File

@ -37,7 +37,7 @@ namespace Orchard.CustomForms {
cfg => cfg
.WithPart("WidgetPart")
.WithPart("CommonPart")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("CustomFormPart")
.WithSetting("Stereotype", "Widget")
);

2
src/Orchard.Web/Modules/Orchard.Dashboards/Migrations.cs
View File

@ -7,7 +7,7 @@ namespace Orchard.Dashboards {
public int Create() {
ContentDefinitionManager.AlterTypeDefinition("Dashboard", type => type
.WithPart("CommonPart")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("TitlePart")
.WithPart("LayoutPart", p => p
.WithSetting("LayoutTypePartSettings.DefaultLayoutData", DefaultDashboardSelector.DefaultLayout)));

2
src/Orchard.Web/Modules/Orchard.DynamicForms/Migrations.cs
View File

@ -108,7 +108,7 @@ namespace Orchard.DynamicForms {
public int UpdateFrom2() {
ContentDefinitionManager.AlterTypeDefinition("FormWidget", type => type
.WithPart("IdentityPart"));
.WithIdentity());
return 3;
}

13
src/Orchard.Web/Modules/Orchard.Layouts/Helpers/TagBuilderExtensions.cs
View File

@ -1,5 +1,6 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using Orchard.DisplayManagement.Shapes;
using Orchard.Layouts.Framework.Elements;
@ -37,11 +38,17 @@ namespace Orchard.Layouts.Helpers {
attributes["style"] = Regex.Replace(tokenize(), @"(?:\r\n|[\r\n])", "");
}
IList<string> classes = shape.Classes;
if (!String.IsNullOrWhiteSpace(htmlClass)) {
var tokenize = (Func<string>)shape.TokenizeHtmlClass;
attributes["class"] = tokenize();
var cssClass = tokenize();
classes.Add(cssClass);
}
if(classes.Any())
attributes["class"] = String.Join(" ", classes);
return attributes;
}
@ -51,4 +58,4 @@ namespace Orchard.Layouts.Helpers {
}
}
}
}
}

8
src/Orchard.Web/Modules/Orchard.Layouts/Migrations.cs
View File

@ -29,7 +29,7 @@ namespace Orchard.Layouts {
.WithSetting("OwnerEditorSettings.ShowOwnerEditor", "false")
.WithSetting("DateEditorSettings.ShowDateEditor", "false"))
.WithPart("TitlePart")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("LayoutPart", p => p
.WithSetting("LayoutTypePartSettings.IsTemplate", "True"))
.DisplayedAs("Layout")
@ -39,7 +39,7 @@ namespace Orchard.Layouts {
.WithPart("CommonPart", p => p
.WithSetting("OwnerEditorSettings.ShowOwnerEditor", "false")
.WithSetting("DateEditorSettings.ShowDateEditor", "false"))
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("WidgetPart")
.WithPart("LayoutPart")
.WithSetting("Stereotype", "Widget")
@ -72,7 +72,7 @@ namespace Orchard.Layouts {
public int UpdateFrom2() {
ContentDefinitionManager.AlterTypeDefinition("Layout", type => type
.WithPart("IdentityPart"));
.WithIdentity());
return 3;
}
@ -83,7 +83,7 @@ namespace Orchard.Layouts {
.WithSetting("OwnerEditorSettings.ShowOwnerEditor", "false")
.WithSetting("DateEditorSettings.ShowDateEditor", "false"))
.WithPart("WidgetPart")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("ElementWrapperPart", p => p
.WithSetting("ElementWrapperPartSettings.ElementTypeName", elementTypeName))
.WithSetting("Stereotype", "Widget")

2
src/Orchard.Web/Modules/Orchard.Layouts/Services/LayoutModelMapper.cs
View File

@ -20,7 +20,7 @@ namespace Orchard.Layouts.Services {
public object ToEditorModel(string layoutData, DescribeElementsContext describeContext) {
var elements = _serializer.Deserialize(layoutData, describeContext);
var canvas = elements.FirstOrDefault(x => x is Canvas) ?? new Canvas();
var canvas = elements.FirstOrDefault(x => x is Canvas) ?? _elementManager.ActivateElement<Canvas>();
return ToEditorModel(canvas, describeContext);
}

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

@ -59,41 +59,41 @@ namespace Orchard.MediaLibrary {
.DisplayedAs("Image")
.WithSetting("MediaFileNameEditorSettings.ShowFileNameEditor", "True")
.AsImage()
.WithPart("IdentityPart")
.WithIdentity()
);
ContentDefinitionManager.AlterTypeDefinition("VectorImage", td => td
.DisplayedAs("Vector Image")
.WithSetting("MediaFileNameEditorSettings.ShowFileNameEditor", "True")
.AsVectorImage()
.WithPart("IdentityPart")
.WithIdentity()
);
ContentDefinitionManager.AlterTypeDefinition("Video", td => td
.DisplayedAs("Video")
.WithSetting("MediaFileNameEditorSettings.ShowFileNameEditor", "True")
.AsVideo()
.WithPart("IdentityPart")
.WithIdentity()
);
ContentDefinitionManager.AlterTypeDefinition("Audio", td => td
.DisplayedAs("Audio")
.WithSetting("MediaFileNameEditorSettings.ShowFileNameEditor", "True")
.AsAudio()
.WithPart("IdentityPart")
.WithIdentity()
);
ContentDefinitionManager.AlterTypeDefinition("Document", td => td
.DisplayedAs("Document")
.WithSetting("MediaFileNameEditorSettings.ShowFileNameEditor", "True")
.AsDocument()
.WithPart("IdentityPart")
.WithIdentity()
);
ContentDefinitionManager.AlterTypeDefinition("OEmbed", td => td
.DisplayedAs("External Media")
.WithSetting("Stereotype", "Media")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("CommonPart")
.WithPart("MediaPart")
.WithPart("OEmbedPart")
@ -105,23 +105,23 @@ namespace Orchard.MediaLibrary {
public int UpdateFrom2() {
ContentDefinitionManager.AlterTypeDefinition("Image", td => td
.WithPart("IdentityPart")
.WithIdentity()
);
ContentDefinitionManager.AlterTypeDefinition("Video", td => td
.WithPart("IdentityPart")
.WithIdentity()
);
ContentDefinitionManager.AlterTypeDefinition("Audio", td => td
.WithPart("IdentityPart")
.WithIdentity()
);
ContentDefinitionManager.AlterTypeDefinition("Document", td => td
.WithPart("IdentityPart")
.WithIdentity()
);
ContentDefinitionManager.AlterTypeDefinition("OEmbed", td => td
.WithPart("IdentityPart")
.WithIdentity()
);
return 3;
@ -200,7 +200,7 @@ namespace Orchard.MediaLibrary {
.DisplayedAs("Vector Image")
.WithSetting("Stereotype", "Media")
.WithSetting("MediaFileNameEditorSettings.ShowFileNameEditor", "True")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("CommonPart")
.WithPart("MediaPart")
.WithPart("VectorImagePart")

2
src/Orchard.Web/Modules/Orchard.MediaProcessing/Migrations.cs
View File

@ -14,7 +14,7 @@ namespace Orchard.MediaProcessing {
cfg => cfg
.WithPart("ImageProfilePart")
.WithPart("CommonPart", p => p.WithSetting("OwnerEditorSettings.ShowOwnerEditor", "false"))
.WithPart("IdentityPart")
.WithIdentity()
);
SchemaBuilder.CreateTable("FilterRecord",

6
src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs
View File

@ -64,7 +64,7 @@ namespace Orchard.Projections {
cfg => cfg
.WithPart("QueryPart")
.WithPart("TitlePart")
.WithPart("IdentityPart")
.WithIdentity()
);
SchemaBuilder.CreateTable("QueryPartRecord",
@ -179,7 +179,7 @@ namespace Orchard.Projections {
cfg => cfg
.WithPart("WidgetPart")
.WithPart("CommonPart")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("ProjectionPart")
.WithSetting("Stereotype", "Widget")
);
@ -277,7 +277,7 @@ namespace Orchard.Projections {
public int UpdateFrom3() {
ContentDefinitionManager.AlterTypeDefinition("NavigationQueryMenuItem",
cfg => cfg
.WithPart("IdentityPart")
.WithIdentity()
);
return 4;

4
src/Orchard.Web/Modules/Orchard.Resources/Assets.json
View File

@ -262,10 +262,10 @@
"Assets/Js/Bootstrap/collapse.js",
"Assets/Js/Bootstrap/dropdown.js",
"Assets/Js/Bootstrap/modal.js",
"Assets/Js/Bootstrap/tooltip.js",
"Assets/Js/Bootstrap/popover.js",
"Assets/Js/Bootstrap/scrollspy.js",
"Assets/Js/Bootstrap/tab.js",
"Assets/Js/Bootstrap/tooltip.js",
"Assets/Js/Bootstrap/tab.js",
"Assets/Js/Bootstrap/transition.js"
],
"output": "Scripts/bootstrap.js"

2
src/Orchard.Web/Modules/Orchard.Search/Migrations.cs
View File

@ -27,7 +27,7 @@ namespace Orchard.Search {
public int UpdateFrom2() {
ContentDefinitionManager.AlterTypeDefinition("SearchForm",
cfg => cfg.WithPart("IdentityPart"));
cfg => cfg.WithIdentity());
return 3;
}

4
src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
View File

@ -126,6 +126,10 @@
<Name>Orchard.Framework</Name>
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="..\..\Core\Orchard.Core.csproj">
<Project>{9916839c-39fc-4ceb-a5af-89ca7e87119f}</Project>
<Name>Orchard.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.MediaLibrary\Orchard.MediaLibrary.csproj">
<Project>{73a7688a-5bd3-4f7e-adfa-ce36c5a10e3b}</Project>
<Name>Orchard.MediaLibrary</Name>

2
src/Orchard.Web/Modules/Orchard.Templates/Migrations/Migrations.cs
View File

@ -12,7 +12,7 @@ namespace Orchard.Templates {
ContentDefinitionManager.AlterTypeDefinition("Template", type => type
.WithPart("CommonPart")
.WithPart("IdentityPart")
.WithIdentity()
.WithPart("TitlePart")
.WithPart("ShapePart")
.Draftable());

4
src/Orchard.Web/Modules/Orchard.Widgets/Extensions/WidgetsMetaDataExtensions.cs
View File

@ -25,8 +25,8 @@ namespace Orchard.ContentManagement.MetaData {
return builder
.WithPart("CommonPart")
.WithPart("WidgetPart")
.WithPart("IdentityPart")
.WithSetting("Stereotype", "Widget");
.WithSetting("Stereotype", "Widget")
.WithIdentity();
}
}
}

2
src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
View File

@ -44,7 +44,7 @@ namespace Orchard.Widgets {
}
public int UpdateFrom1() {
ContentDefinitionManager.AlterTypeDefinition("HtmlWidget", cfg => cfg.WithPart("IdentityPart"));
ContentDefinitionManager.AlterTypeDefinition("HtmlWidget", cfg => cfg.WithIdentity());
return 2;
}

2
src/Orchard.Web/Modules/Orchard.Workflows/Scripts/orchard-workflows.js
View File

@ -97,7 +97,7 @@
} else {
var lowerCaseText = text.toLowerCase();
$(".activity-toolbox-item").each(function () {
var recordText = $(this).data("activity-text").toLowerCase();
var recordText = $(this).data("activity-name").toLowerCase();
$(this).toggle(recordText.indexOf(lowerCaseText) >= 0);
});
}