From ed0ee41035773fc8334c993d18f0b937837afaf0 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Fri, 3 Dec 2010 00:51:41 -0800 Subject: [PATCH 1/2] Setting a max width and height on the preview image in Orchard.Media's media manager --HG-- branch : dev --- .../Modules/Orchard.Media/Styles/orchard-media-admin.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css b/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css index 353fa9a3b..5afaf4635 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css +++ b/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css @@ -5,4 +5,8 @@ .folderProperties { float:right; margin:-5em 0 0; +} +.previewImage { + max-height:640px; + max-width:640px; } \ No newline at end of file From 946257f5138bb3e5aff606ecb660d5554754e101 Mon Sep 17 00:00:00 2001 From: Suha Can Date: Fri, 3 Dec 2010 12:19:02 -0800 Subject: [PATCH 2/2] Fixing unit test failures introduced by ShapeTable caching changes. --HG-- branch : perf --- .../Common/Providers/CommonPartProviderTests.cs | 2 ++ .../Descriptors/DefaultShapeTableManagerTests.cs | 6 ++++-- src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs | 8 +++----- src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs | 9 +++------ src/Orchard.Tests/DisplayManagement/SubsystemTests.cs | 3 +++ 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs b/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs index 8f1222e2b..4986cb536 100644 --- a/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs +++ b/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs @@ -6,6 +6,7 @@ using Autofac; using JetBrains.Annotations; using Moq; using NUnit.Framework; +using Orchard.Caching; using Orchard.ContentManagement.Aspects; using Orchard.ContentManagement.Drivers; using Orchard.ContentManagement.Drivers.Coordinators; @@ -53,6 +54,7 @@ namespace Orchard.Core.Tests.Common.Providers { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); + builder.RegisterType().As(); builder.RegisterInstance(new Mock().Object); builder.RegisterInstance(new Mock().Object); builder.RegisterInstance(new Mock().Object); diff --git a/src/Orchard.Tests/DisplayManagement/Descriptors/DefaultShapeTableManagerTests.cs b/src/Orchard.Tests/DisplayManagement/Descriptors/DefaultShapeTableManagerTests.cs index 5cdf6e35d..6c7bdc513 100644 --- a/src/Orchard.Tests/DisplayManagement/Descriptors/DefaultShapeTableManagerTests.cs +++ b/src/Orchard.Tests/DisplayManagement/Descriptors/DefaultShapeTableManagerTests.cs @@ -3,18 +3,20 @@ using System.Collections.Generic; using System.Linq; using Autofac; using NUnit.Framework; +using Orchard.Caching; using Orchard.ContentManagement; using Orchard.DisplayManagement.Descriptors; using Orchard.DisplayManagement.Implementation; -using Orchard.Environment.Descriptor.Models; using Orchard.Environment.Extensions; using Orchard.Environment.Extensions.Models; +using Orchard.Tests.Stubs; namespace Orchard.Tests.DisplayManagement.Descriptors { [TestFixture] public class DefaultShapeTableManagerTests : ContainerTestBase { - protected override void Register(Autofac.ContainerBuilder builder) { + protected override void Register(ContainerBuilder builder) { builder.RegisterType().As(); + builder.RegisterType().As(); var features = new [] { new FeatureDescriptor { diff --git a/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs b/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs index d217198b8..bda26c966 100644 --- a/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs +++ b/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Autofac; +using Autofac; using NUnit.Framework; +using Orchard.Caching; using Orchard.DisplayManagement; using Orchard.DisplayManagement.Descriptors; using Orchard.DisplayManagement.Implementation; @@ -22,6 +19,7 @@ namespace Orchard.Tests.DisplayManagement { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); + builder.RegisterType().As(); _container = builder.Build(); } diff --git a/src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs b/src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs index ce6b42307..953efdadf 100644 --- a/src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs +++ b/src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Autofac; +using Autofac; using NUnit.Framework; +using Orchard.Caching; using Orchard.DisplayManagement; using Orchard.DisplayManagement.Descriptors; using Orchard.DisplayManagement.Implementation; -using Orchard.DisplayManagement.Shapes; using Orchard.Environment.Extensions; using Orchard.Tests.Stubs; @@ -22,6 +18,7 @@ namespace Orchard.Tests.DisplayManagement { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); + builder.RegisterType().As(); _container = builder.Build(); } diff --git a/src/Orchard.Tests/DisplayManagement/SubsystemTests.cs b/src/Orchard.Tests/DisplayManagement/SubsystemTests.cs index 34e4b7a1b..e2e7eb30f 100644 --- a/src/Orchard.Tests/DisplayManagement/SubsystemTests.cs +++ b/src/Orchard.Tests/DisplayManagement/SubsystemTests.cs @@ -4,6 +4,7 @@ using System.Web.Routing; using Autofac; using Moq; using NUnit.Framework; +using Orchard.Caching; using Orchard.DisplayManagement; using Orchard.DisplayManagement.Descriptors; using Orchard.DisplayManagement.Descriptors.ShapeAttributeStrategy; @@ -11,6 +12,7 @@ using Orchard.DisplayManagement.Implementation; using Orchard.DisplayManagement.Shapes; using Orchard.Environment; using Orchard.Environment.Extensions.Models; +using Orchard.Tests.Stubs; using Orchard.Tests.Utility; namespace Orchard.Tests.DisplayManagement { @@ -45,6 +47,7 @@ namespace Orchard.Tests.DisplayManagement { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); + builder.RegisterType().As(); builder.RegisterInstance(new DefaultDisplayManagerTests.TestWorkContextAccessor(workContext)).As(); builder.RegisterInstance(new SimpleShapes()).WithMetadata("Feature", testFeature); builder.RegisterInstance(new RouteCollection());