diff --git a/lib/aspnetmvc/Microsoft.Data.dll b/lib/aspnetmvc/Microsoft.Data.dll deleted file mode 100644 index fd4d04f34..000000000 Binary files a/lib/aspnetmvc/Microsoft.Data.dll and /dev/null differ diff --git a/lib/aspnetmvc/Microsoft.Web.Infrastructure.dll b/lib/aspnetmvc/Microsoft.Web.Infrastructure.dll index f9ef14129..6f4fdf498 100644 Binary files a/lib/aspnetmvc/Microsoft.Web.Infrastructure.dll and b/lib/aspnetmvc/Microsoft.Web.Infrastructure.dll differ diff --git a/lib/aspnetmvc/Microsoft.Web.Mvc.dll b/lib/aspnetmvc/Microsoft.Web.Mvc.dll deleted file mode 100644 index 5a5870c2c..000000000 Binary files a/lib/aspnetmvc/Microsoft.Web.Mvc.dll and /dev/null differ diff --git a/lib/aspnetmvc/Microsoft.WebPages.dll b/lib/aspnetmvc/Microsoft.WebPages.dll deleted file mode 100644 index 34553e6d3..000000000 Binary files a/lib/aspnetmvc/Microsoft.WebPages.dll and /dev/null differ diff --git a/lib/aspnetmvc/System.Razor.Web.dll b/lib/aspnetmvc/System.Razor.Web.dll deleted file mode 100644 index dade0391c..000000000 Binary files a/lib/aspnetmvc/System.Razor.Web.dll and /dev/null differ diff --git a/lib/aspnetmvc/System.Razor.dll b/lib/aspnetmvc/System.Razor.dll deleted file mode 100644 index bd1479d6b..000000000 Binary files a/lib/aspnetmvc/System.Razor.dll and /dev/null differ diff --git a/lib/aspnetmvc/System.Web.Helpers.dll b/lib/aspnetmvc/System.Web.Helpers.dll new file mode 100644 index 000000000..be49eb6eb Binary files /dev/null and b/lib/aspnetmvc/System.Web.Helpers.dll differ diff --git a/lib/aspnetmvc/System.Web.Mvc.dll b/lib/aspnetmvc/System.Web.Mvc.dll index a4193003a..2a5c3405d 100644 Binary files a/lib/aspnetmvc/System.Web.Mvc.dll and b/lib/aspnetmvc/System.Web.Mvc.dll differ diff --git a/lib/aspnetmvc/System.Web.Razor.dll b/lib/aspnetmvc/System.Web.Razor.dll new file mode 100644 index 000000000..4c8a126e2 Binary files /dev/null and b/lib/aspnetmvc/System.Web.Razor.dll differ diff --git a/lib/aspnetmvc/System.Web.WebPages.Razor.dll b/lib/aspnetmvc/System.Web.WebPages.Razor.dll new file mode 100644 index 000000000..b9a45ba7e Binary files /dev/null and b/lib/aspnetmvc/System.Web.WebPages.Razor.dll differ diff --git a/lib/aspnetmvc/System.Web.WebPages.dll b/lib/aspnetmvc/System.Web.WebPages.dll new file mode 100644 index 000000000..e0ed8b603 Binary files /dev/null and b/lib/aspnetmvc/System.Web.WebPages.dll differ diff --git a/lib/aspnetmvc/WebMatrix.Data.dll b/lib/aspnetmvc/WebMatrix.Data.dll new file mode 100644 index 000000000..1b5cb783a Binary files /dev/null and b/lib/aspnetmvc/WebMatrix.Data.dll differ diff --git a/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs b/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs index 77b9b5e3e..3de07ac2c 100644 --- a/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs +++ b/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs @@ -26,6 +26,7 @@ using Orchard.Mvc.Routes; using Orchard.Tests.Environment.TestDependencies; using Orchard.Tests.Stubs; using Orchard.Tests.Utility; +using IModelBinderProvider = Orchard.Mvc.ModelBinders.IModelBinderProvider; namespace Orchard.Tests.Environment { [TestFixture] diff --git a/src/Orchard.Tests/Environment/DefaultOrchardShellTests.cs b/src/Orchard.Tests/Environment/DefaultOrchardShellTests.cs index 51be38c77..15574fc4e 100644 --- a/src/Orchard.Tests/Environment/DefaultOrchardShellTests.cs +++ b/src/Orchard.Tests/Environment/DefaultOrchardShellTests.cs @@ -8,6 +8,7 @@ using NUnit.Framework; using Orchard.Environment; using Orchard.Mvc.ModelBinders; using Orchard.Mvc.Routes; +using IModelBinderProvider = Orchard.Mvc.ModelBinders.IModelBinderProvider; namespace Orchard.Tests.Environment { [TestFixture] diff --git a/src/Orchard.Tests/UI/ShapeTests.cs b/src/Orchard.Tests/UI/ShapeTests.cs index 28b705fc9..f5d8fb4c0 100644 --- a/src/Orchard.Tests/UI/ShapeTests.cs +++ b/src/Orchard.Tests/UI/ShapeTests.cs @@ -22,7 +22,7 @@ namespace Orchard.Tests.UI { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); - builder.RegisterType().As(); + builder.RegisterType().As(); //builder.RegisterType().As(); builder.RegisterType().As(); @@ -35,74 +35,74 @@ namespace Orchard.Tests.UI { [Test, Ignore("implementation pending")] public void WorkContextPageIsLayoutShape() { - var page = _workContext.Page; - ShapeMetadata pageMetadata = page.Metadata; + var layout = _workContext.Layout; + ShapeMetadata pageMetadata = layout.Metadata; Assert.That(pageMetadata.Type, Is.EqualTo("Layout")); - Assert.That(page.Metadata.Type, Is.EqualTo("Layout")); + Assert.That(layout.Metadata.Type, Is.EqualTo("Layout")); } [Test, Ignore("implementation pending")] public void PagePropertiesAreNil() { - var page = _workContext.Page; - var pageFoo = page.Foo; + var layout = _workContext.Layout; + var pageFoo = layout.Foo; Assert.That(pageFoo == null); } [Test, Ignore("implementation pending")] public void PageZonesPropertyIsNotNil() { - var page = _workContext.Page; - var pageZones = page.Zones; + var layout = _workContext.Layout; + var pageZones = layout.Zones; Assert.That(pageZones != null); Assert.That(pageZones.Foo == null); } [Test, Ignore("implementation pending")] public void AddingToZonePropertyMakesItExist() { - var page = _workContext.Page; - Assert.That(page.Zones.Foo == null); + var layout = _workContext.Layout; + Assert.That(layout.Zones.Foo == null); - var pageZonesFoo = page.Zones.Foo; + var pageZonesFoo = layout.Zones.Foo; pageZonesFoo.Add("hello"); - Assert.That(page.Zones.Foo != null); - Assert.That(page.Foo != null); - Assert.That(page.Foo.Metadata.Type, Is.EqualTo("Zone")); + Assert.That(layout.Zones.Foo != null); + Assert.That(layout.Foo != null); + Assert.That(layout.Foo.Metadata.Type, Is.EqualTo("Zone")); } [Test, Ignore("implementation pending")] public void AddingToZoneIndexedMakesItExist() { - var page = _workContext.Page; - Assert.That(page.Zones["Foo"] == null); + var layout = _workContext.Layout; + Assert.That(layout.Zones["Foo"] == null); - var pageZonesFoo = page.Zones["Foo"]; + var pageZonesFoo = layout.Zones["Foo"]; pageZonesFoo.Add("hello"); - Assert.That(page.Zones["Foo"] != null); - Assert.That(page["Foo"] != null); - Assert.That(page["Foo"].Metadata.Type, Is.EqualTo("Zone")); + Assert.That(layout.Zones["Foo"] != null); + Assert.That(layout["Foo"] != null); + Assert.That(layout["Foo"].Metadata.Type, Is.EqualTo("Zone")); } [Test, Ignore("implementation pending")] public void CallingAddOnNilPropertyMakesItBecomeZone() { - var page = _workContext.Page; - Assert.That(page.Foo == null); + var layout = _workContext.Layout; + Assert.That(layout.Foo == null); - page.Foo.Add("hello"); + layout.Foo.Add("hello"); - Assert.That(page.Foo != null); - Assert.That(page.Foo.Metadata.Type, Is.EqualTo("Zone")); + Assert.That(layout.Foo != null); + Assert.That(layout.Foo.Metadata.Type, Is.EqualTo("Zone")); } [Test, Ignore("implementation pending")] public void ZoneContentsAreEnumerable() { - var page = _workContext.Page; - Assert.That(page.Foo == null); + var layout = _workContext.Layout; + Assert.That(layout.Foo == null); - page.Foo.Add("hello"); - page.Foo.Add("world"); + layout.Foo.Add("hello"); + layout.Foo.Add("world"); var list = new List(); - foreach (var item in page.Foo) { + foreach (var item in layout.Foo) { list.Add(item); } @@ -126,11 +126,11 @@ namespace Orchard.Tests.UI { [Test, Ignore("implementation pending")] public void NumberIsFortyTwo() { - var page = _workContext.Page; - Assert.That(page.Number, Is.EqualTo(42)); - Assert.That(page.Foo.Number == null); - page.Foo.Add("yarg"); - Assert.That(page.Foo.Number, Is.EqualTo(42)); + var layout = _workContext.Layout; + Assert.That(layout.Number, Is.EqualTo(42)); + Assert.That(layout.Foo.Number == null); + layout.Foo.Add("yarg"); + Assert.That(layout.Foo.Number, Is.EqualTo(42)); } } diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Fields/Common.TextField.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Fields/Common.TextField.cshtml index 652feef47..cf10b0d50 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Fields/Common.TextField.cshtml +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Fields/Common.TextField.cshtml @@ -1,3 +1,3 @@ @model Orchard.Core.Common.Fields.TextField -@using Orchard.Utility.Extensions +@using Orchard.Utility.Extensions;

@Model.Name.CamelFriendly(): @Model.Value

\ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.cshtml index 45bdd3478..7340291dc 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.cshtml +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.cshtml @@ -1,5 +1,5 @@ @model BodyDisplayViewModel -@using Orchard.Core.Common.ViewModels +@using Orchard.Core.Common.ViewModels;
@Html.ItemEditLinkWithReturnUrl(T("Edit").ToString(), Model.BodyPart.ContentItem)
\ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.cshtml index 9a9ee2c1d..a24a87b20 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.cshtml +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.cshtml @@ -1,7 +1,7 @@ @model BodyDisplayViewModel -@using Orchard.Core.Common.ViewModels -@/* begin: knowingly broken HTML (hence the ManageWrapperPre and ManageWrapperPost templates) +@using Orchard.Core.Common.ViewModels; +@* begin: knowingly broken HTML (hence the ManageWrapperPre and ManageWrapperPost templates) we need "wrapper templates" (among other functionality) in the future of UI composition -please do not delete or the front end will be broken when the user is authenticated. */ +please do not delete or the front end will be broken when the user is authenticated. *@ -@/* begin: knowingly broken HTML */ \ No newline at end of file +@* begin: knowingly broken HTML *@ \ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPre.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPre.cshtml index c9182ef28..930523ad4 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPre.cshtml +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPre.cshtml @@ -1,3 +1,3 @@ @model BodyDisplayViewModel -@using Orchard.Core.Common.ViewModels +@using Orchard.Core.Common.ViewModels;
\ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.cshtml index 64c03cd9b..c01416962 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.cshtml +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.cshtml @@ -1,8 +1,8 @@ @model BodyDisplayViewModel -@using Orchard.Core.Common.ViewModels -@/*//doing excerpt generation on the way out for now so we don't stick ourselves with needing to regen excerpts for existing data - //also, doing this here, inline, until we have a pluggable processing model (both in and out) - //also, ...this is ugly*/ +@using Orchard.Core.Common.ViewModels; +@*doing excerpt generation on the way out for now so we don't stick ourselves with needing to regen excerpts for existing data + also, doing this here, inline, until we have a pluggable processing model (both in and out) + also, ...this is ugly *@ @{ var body = new HtmlString(Html.Excerpt(Model.Html.ToString(), 200).ToString().Replace(Environment.NewLine, "

" + Environment.NewLine + "

")); } diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.cshtml index b3b4584d8..0592419bf 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.cshtml +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.cshtml @@ -1,3 +1,3 @@ @model BodyDisplayViewModel -@using Orchard.Core.Common.ViewModels +@using Orchard.Core.Common.ViewModels; @Model.Html \ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.cshtml index d5cbe0eee..fa8036d7e 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.cshtml +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.cshtml @@ -1,5 +1,5 @@ @model Orchard.Core.Common.ViewModels.CommonMetadataViewModel -@using Orchard.Core.Common.Extensions +@using Orchard.Core.Common.Extensions; @if (Model.Creator != null) {

@T("Published by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T))
diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Body.cshtml b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Body.cshtml index dc7e33c1a..580c02232 100644 --- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Body.cshtml +++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Body.cshtml @@ -1,5 +1,5 @@ @model BodyEditorViewModel -@using Orchard.Core.Common.ViewModels +@using Orchard.Core.Common.ViewModels;
@Html.Partial("EditorTemplates/" + Model.TextEditorTemplate, Model) diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Container.cshtml b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Container.cshtml index 1548db8f3..6afd59c02 100644 --- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Container.cshtml +++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Container.cshtml @@ -1,5 +1,5 @@ @model ContainerEditorViewModel -@using Orchard.Core.Common.ViewModels +@using Orchard.Core.Common.ViewModels;
@Html.HiddenFor(m=>m.ContainerId)
\ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml index 15e469413..87035578a 100644 --- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml +++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml @@ -1,5 +1,5 @@ @model OwnerEditorViewModel -@using Orchard.Core.Common.ViewModels +@using Orchard.Core.Common.ViewModels;
@Html.LabelFor(m=>m.Owner) @Html.EditorFor(m=>m.Owner) diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/PlainTextEditor.cshtml b/src/Orchard.Web/Core/Common/Views/EditorTemplates/PlainTextEditor.cshtml index a85559433..b4aab5ad4 100644 --- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/PlainTextEditor.cshtml +++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/PlainTextEditor.cshtml @@ -1,3 +1,3 @@ @model BodyEditorViewModel -@using Orchard.Core.Common.ViewModels +@using Orchard.Core.Common.ViewModels; @Html.TextArea("Text", Model.Text, 25, 80, new { @class = Model.Format }) \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml b/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml index 48443cf55..7b357f372 100644 --- a/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml @@ -1,4 +1,4 @@ -@using Orchard.Core.Contents.ViewModels +@using Orchard.Core.Contents.ViewModels; @{ var typeDisplayName = Model.TypeDisplayName; var pageTitle = T("Manage Content"); diff --git a/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Parts/Contents.Publish.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Parts/Contents.Publish.SummaryAdmin.cshtml index e2d93ff18..cdd1c59f8 100644 --- a/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Parts/Contents.Publish.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Parts/Contents.Publish.SummaryAdmin.cshtml @@ -1,5 +1,5 @@ -@using Orchard.ContentManagement -@using Orchard.Utility.Extensions +@using Orchard.ContentManagement; +@using Orchard.Utility.Extensions; @{ Script.Require("ShapesBase"); } diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml index f6850e19e..a082c49f0 100644 --- a/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml @@ -1,5 +1,5 @@ -@using Orchard.ContentManagement -@using Orchard.Utility.Extensions +@using Orchard.ContentManagement; +@using Orchard.Utility.Extensions; @{ ContentItem contentItem = Model.ContentItem; var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); diff --git a/src/Orchard.Web/Core/Feeds/Services/FeedFilter.cs b/src/Orchard.Web/Core/Feeds/Services/FeedFilter.cs index cd3b26f34..10000f8c4 100644 --- a/src/Orchard.Web/Core/Feeds/Services/FeedFilter.cs +++ b/src/Orchard.Web/Core/Feeds/Services/FeedFilter.cs @@ -18,10 +18,10 @@ namespace Orchard.Core.Feeds.Services { dynamic Shape { get; set; } public void OnResultExecuting(ResultExecutingContext filterContext) { - var page =_workContextAccessor.GetContext(filterContext).Page; + var layout = _workContextAccessor.GetContext(filterContext).Layout; var feed = Shape.Feed() .FeedManager(_feedManager); - page.Zones.Head.Add(feed, ":after"); + layout.Zones.Head.Add(feed, ":after"); } public void OnResultExecuted(ResultExecutedContext filterContext) {} diff --git a/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml b/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml index 6dd93bcb7..64214837e 100644 --- a/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml +++ b/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml @@ -1,5 +1,5 @@ @model AddLocalizationViewModel -@using Orchard.Core.Localization.ViewModels +@using Orchard.Core.Localization.ViewModels; @{ dynamic content = Model.Content; content.Zones.primary.Add(New.Partial(TemplateName: "CultureSelection", Model: Model), "0"); diff --git a/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml b/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml index d68535ac5..0bde72b23 100644 --- a/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml +++ b/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml @@ -1,6 +1,6 @@ @model MessageSettingsPartViewModel -@using Orchard.Core.Messaging.Models -@using Orchard.Core.Messaging.ViewModels +@using Orchard.Core.Messaging.Models; +@using Orchard.Core.Messaging.ViewModels;
@T("Messaging")
diff --git a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml index 9efc403b4..eb9698417 100644 --- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml @@ -1,7 +1,7 @@ @model NavigationManagementViewModel -@using Orchard.ContentManagement -@using Orchard.Core.Navigation.Models -@using Orchard.Core.Navigation.ViewModels +@using Orchard.ContentManagement; +@using Orchard.Core.Navigation.Models; +@using Orchard.Core.Navigation.ViewModels;

@Html.TitleForPage(T("Manage Main Menu").ToString())

@using (Html.BeginFormAntiForgeryPost()) { diff --git a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.cshtml b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.cshtml index 1e1a048f9..5d7b94c8a 100644 --- a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.cshtml +++ b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.cshtml @@ -1,6 +1,6 @@ @model MenuPart -@using Orchard.Core.Navigation.Models -@using Orchard.Core.Navigation.ViewModels +@using Orchard.Core.Navigation.Models; +@using Orchard.Core.Navigation.ViewModels; @{ Script.Require("ShapesBase"); } diff --git a/src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.SummaryAdmin.cshtml b/src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.SummaryAdmin.cshtml index 3239d6593..f0eb83310 100644 --- a/src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.SummaryAdmin.cshtml @@ -1,6 +1,6 @@ @model Orchard.Core.PublishLater.ViewModels.PublishLaterViewModel
    -
  • @// Published or not +
  • @* Published or not *@ @if (Model.HasPublished) { @T( @T("Published") |  } @@ -9,7 +9,7 @@ }
  • - @// Does the page have a draft + @* Does the page have a draft *@ @if (Model.HasDraft) { @T( @T("Draft") |  } diff --git a/src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml b/src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml index add65c39f..cf5aaba5d 100644 --- a/src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml +++ b/src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml @@ -28,7 +28,7 @@
diff --git a/src/Orchard.Web/Core/Shapes/Views/Layout.cshtml b/src/Orchard.Web/Core/Shapes/Views/Layout.cshtml index c9459aa29..357d26321 100644 --- a/src/Orchard.Web/Core/Shapes/Views/Layout.cshtml +++ b/src/Orchard.Web/Core/Shapes/Views/Layout.cshtml @@ -1,4 +1,4 @@ -@// Html.RegisterStyle("site.css"); +@* Html.RegisterStyle("site.css"); *@ @{ Model.Header.Add(Display.Header(), "5"); Model.Header.Add(Display.User(), "10"); diff --git a/src/Orchard.Web/Core/Shapes/Views/User.cshtml b/src/Orchard.Web/Core/Shapes/Views/User.cshtml index f9bc647c5..f11a5ca62 100644 --- a/src/Orchard.Web/Core/Shapes/Views/User.cshtml +++ b/src/Orchard.Web/Core/Shapes/Views/User.cshtml @@ -1,4 +1,4 @@ -@using System.Web.Mvc +@using System.Web.Mvc;
@if (Request.IsAuthenticated) { @T("Welcome, {0}!", WorkContext.CurrentUser.UserName) diff --git a/src/Orchard.Web/Core/XmlRpc/Models/ModelBinderProvider.cs b/src/Orchard.Web/Core/XmlRpc/Models/ModelBinderProvider.cs index 968ac9dc1..3e95febac 100644 --- a/src/Orchard.Web/Core/XmlRpc/Models/ModelBinderProvider.cs +++ b/src/Orchard.Web/Core/XmlRpc/Models/ModelBinderProvider.cs @@ -3,6 +3,7 @@ using System.Web.Mvc; using System.Xml; using System.Xml.Linq; using Orchard.Mvc.ModelBinders; +using IModelBinderProvider = Orchard.Mvc.ModelBinders.IModelBinderProvider; namespace Orchard.Core.XmlRpc.Models { public class ModelBinderProvider : IModelBinderProvider, IModelBinder { diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.cshtml index 34be7b760..181ea0445 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.cshtml @@ -1,5 +1,5 @@ @model Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel -@using Orchard.Mvc.Html +@using Orchard.Mvc.Html; @if ((Model.IsPublished && Model.ScheduledArchiveUtc.HasValue && Model.ScheduledArchiveUtc.Value > DateTime.UtcNow)) {
    diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml index 538e603eb..1d2c1b6a5 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml @@ -1,5 +1,5 @@ @model Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel -@using System.Web.Mvc.Html +@using System.Web.Mvc.Html; @{ Style.Require("jQueryUtils_TimePicker"); Style.Require("jQueryUI_DatePicker"); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Filters/ArchivesFilter.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Filters/ArchivesFilter.cs index 16d88abec..e6620f55f 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Filters/ArchivesFilter.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Filters/ArchivesFilter.cs @@ -35,7 +35,7 @@ namespace Orchard.Blogs.Filters { BlogPart blog = model.ContentItem.Get(typeof (BlogPart)); var blogArchives = shape.BlogArchives() .Archives(new BlogPostArchiveViewModel { BlogPart = blog, Archives = _blogPostService.GetArchives(blog) }); - workContext.Page.Sidebar.Add(blogArchives); + workContext.Layout.Sidebar.Add(blogArchives); return; } @@ -43,7 +43,7 @@ namespace Orchard.Blogs.Filters { BlogPart blog = model.Blog.ContentItem.Get(typeof (BlogPart)); var blogArchives = shape.BlogArchives() .Archives(new BlogPostArchiveViewModel { BlogPart = blog, Archives = _blogPostService.GetArchives(blog) }); - workContext.Page.Sidebar.Add(blogArchives); + workContext.Layout.Sidebar.Add(blogArchives); return; } } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml index 591eb2680..f67493b8d 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml @@ -1,4 +1,4 @@ -@using Orchard.Blogs.Extensions +@using Orchard.Blogs.Extensions;

    @Html.TitleForPage(T("Manage Blogs").ToString())

    @if (Model.ContentItems.Items.Count > 0) {
    @T("New Blog")
    diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogArchives.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogArchives.cshtml index 34b3fa14c..b8e34dcfc 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogArchives.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogArchives.cshtml @@ -1,5 +1,5 @@ -@using Orchard.Blogs.Extensions -@using Orchard.Blogs.ViewModels +@using Orchard.Blogs.Extensions; +@using Orchard.Blogs.ViewModels; @{ BlogPostArchiveViewModel model = Model.Archives; Style.Require("BlogsArchives"); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/ListByArchive.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/ListByArchive.cshtml index 99291fe1b..3f1d1f716 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/ListByArchive.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/ListByArchive.cshtml @@ -1,4 +1,4 @@ -@using Orchard.Blogs.Extensions +@using Orchard.Blogs.Extensions;

    @Html.TitleForPage(T("Archives").Text, (string)Model.ArchiveData.Year.ToString(), (string)(Model.ArchiveData.Month > 0 ? new DateTime(Model.ArchiveData.Year, Model.ArchiveData.Month, 1).ToString("MMMM") : null), (string)(Model.ArchiveData.Day > 0 ? Model.ArchiveData.Day.ToString() : null))

    @T("Archives") / diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.cshtml index e707e3f2b..ec9924e89 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.cshtml @@ -1,4 +1,4 @@ -@using Orchard.Blogs.Extensions +@using Orchard.Blogs.Extensions; @{ Style.Require("BlogsAdmin"); } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.Admin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.Admin.cshtml index c567e668a..e71d4bc6b 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.Admin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.Admin.cshtml @@ -1,5 +1,5 @@ -@using Orchard.Core.Contents.ViewModels -@using Orchard.Utility.Extensions +@using Orchard.Core.Contents.ViewModels; +@using Orchard.Utility.Extensions; @if (Model.Items.Count > 0) { using (Html.BeginFormAntiForgeryPost(Url.Action("List", "Admin", new { area = "Contents", id = "" }))) {
    diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml index a70e25b6e..3847f90ce 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml @@ -1,5 +1,5 @@ -@using Orchard.Blogs.Extensions -@using Orchard.Blogs.Models +@using Orchard.Blogs.Extensions; +@using Orchard.Blogs.Models;

    @Html.TitleForPage((string)Model.Title)

    @Display(Model.manage)
    @T("New Post")
    diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml index 9706d8c52..e99cc1c67 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml @@ -1,5 +1,5 @@ -@using Orchard.Blogs.Extensions -@using Orchard.UI.Resources +@using Orchard.Blogs.Extensions; +@using Orchard.UI.Resources; @{ RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest((string)Model.Slug) }); RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd((string)Model.Slug) }); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml index 42697f22e..0e65b0dce 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml @@ -1,4 +1,4 @@ -@using Orchard.Blogs.Models +@using Orchard.Blogs.Models; @{ Html.AddTitleParts((string)Model.Title); BlogPostPart blogPost = Model.ContentItem.Get(typeof(BlogPostPart)); @@ -11,7 +11,7 @@ @Display(Model.secondary)
    - @//TODO: (erikpo) In the future, remove the HasPublished check so the user can delete the content item from here if the choose to + @* TODO: (erikpo) In the future, remove the HasPublished check so the user can delete the content item from here if the choose to *@ @if (blogPost.HasDraft && blogPost.HasPublished) { @Html.AntiForgeryTokenValueOrchardLink(T("Discard Draft").ToString(), Url.Action("DiscardDraft", new {Area = "Orchard.Blogs", Controller = "BlogPostAdmin", id = Model.Item.Id}), new {@class = "button"}) } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.Blog.cshtml index 87722010e..abb445ea0 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.Blog.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.Blog.cshtml @@ -1,5 +1,5 @@ -@using Orchard.Blogs.Extensions -@using Orchard.Blogs.Models +@using Orchard.Blogs.Extensions; +@using Orchard.Blogs.Models;

    @Html.Link((string)Model.Title, Url.Blog((string)Model.Slug))

    @if (!string.IsNullOrEmpty((string)Model.Description)) {

    @Model.Description

    diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml index be565384a..f788fb89e 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml @@ -1,8 +1,8 @@ -@using Orchard.Blogs.Extensions -@using Orchard.Blogs.Models -@using Orchard.Core.Common.Extensions -@using Orchard.Core.Common.Models -@using Orchard.Core.Common.ViewModels +@using Orchard.Blogs.Extensions; +@using Orchard.Blogs.Models; +@using Orchard.Core.Common.Extensions; +@using Orchard.Core.Common.Models; +@using Orchard.Core.Common.ViewModels;

    @Html.Link((string)Model.Title, Url.BlogPost((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart))))

    @Html.PublishedState(new CommonMetadataViewModel((CommonPart)Model.ContentItem.Get(typeof(CommonPart))), T) | @Display(Model.meta)
    @Display(Model.primary)
    \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml index 4aedc8254..d1a0549f8 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml @@ -1,12 +1,12 @@ -@using Orchard.Blogs.Extensions -@using Orchard.Blogs.Models +@using Orchard.Blogs.Extensions; +@using Orchard.Blogs.Models;
    @T("View")@T(" | ") @T("List Posts")@T(" | ") @T("New Post")@T(" | ") @T("Edit")@T(" | ") - @//todo: (heskew) this is a bit too verbose. need template helpers for all ibuttons + @* todo: (heskew) this is a bit too verbose. need template helpers for all ibuttons *@ @using (Html.BeginFormAntiForgeryPost(Url.BlogRemove((string)Model.Slug), FormMethod.Post, new { @class = "inline link" })) { } @@ -14,7 +14,7 @@

    @Html.Link((string)Model.Title, Url.BlogForAdmin((string)Model.Slug))

    @Display(Model.meta)

    - @//

    [list of authors] [modify blog access]

    + @*

    [list of authors] [modify blog access]

    *@

    @Model.Description

    diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml index 6678a2e21..e3a8ac0ba 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml @@ -1,7 +1,7 @@ -@using Orchard.Blogs.Extensions -@using Orchard.Blogs.Models -@using Orchard.ContentManagement -@using Orchard.Utility.Extensions +@using Orchard.Blogs.Extensions; +@using Orchard.Blogs.Models; +@using Orchard.ContentManagement; +@using Orchard.Utility.Extensions; @{ ContentItem contentItem = Model.ContentItem; var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml index 89449f6f4..824e11983 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml @@ -1,6 +1,6 @@ @model Orchard.Comments.ViewModels.CommentsDetailsViewModel -@using Orchard.Comments.Models -@using Orchard.Comments.ViewModels +@using Orchard.Comments.Models; +@using Orchard.Comments.ViewModels;

    @Html.TitleForPage(T("Comments for {0}", Model.DisplayNameForCommentedItem).ToString())

    diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml index 497c76545..62a826b00 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml @@ -1,5 +1,5 @@ @model Orchard.Comments.ViewModels.CommentsEditViewModel -@using Orchard.Comments.Models +@using Orchard.Comments.Models;

    @Html.TitleForPage(T("Edit Comment").ToString())

    @using(Html.BeginFormAntiForgeryPost()) { diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml index fb9dc2d53..d028b4fac 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml @@ -1,6 +1,6 @@ @model Orchard.Comments.ViewModels.CommentsIndexViewModel -@using Orchard.Comments.Models -@using Orchard.Comments.ViewModels +@using Orchard.Comments.Models; +@using Orchard.Comments.ViewModels;

    @Html.TitleForPage(T("Manage Comments").ToString())

    @using(Html.BeginFormAntiForgeryPost()) { diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Comments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Comments.cshtml index 3675fb42c..f52ac112d 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Comments.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Comments.cshtml @@ -1,8 +1,8 @@ @model Orchard.Comments.Models.CommentsPart -@using Orchard.Comments.Models -@using Orchard.Comments -@using Orchard.Security -@using Orchard.Utility.Extensions +@using Orchard.Comments.Models; +@using Orchard.Comments; +@using Orchard.Security; +@using Orchard.Utility.Extensions; @if (Model.Comments.Count > 0) {

    @T.Plural("1 Comment", "{0} Comments", Model.Comments.Count)

    diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.cshtml index e74dec37c..e6eafe670 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.cshtml @@ -1,4 +1,4 @@ @model Orchard.Comments.ViewModels.CommentCountViewModel -@using Orchard.Comments.ViewModels +@using Orchard.Comments.ViewModels; @T.Plural("1 Comment", "{0} Comments", Model.CommentCount) diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.CountAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.CountAdmin.cshtml index 3361f9d54..26bc8188d 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.CountAdmin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.CountAdmin.cshtml @@ -1,5 +1,5 @@ @model Orchard.Comments.ViewModels.CommentCountViewModel -@using Orchard.Comments.ViewModels -@using Orchard.Comments.Extensions +@using Orchard.Comments.ViewModels; +@using Orchard.Comments.Extensions; @Html.CommentSummaryLinks(T, Model.Item, Model.CommentCount, Model.PendingCount) diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.Comments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.Comments.cshtml index 5f19c245f..083a213b9 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.Comments.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.Comments.cshtml @@ -1,7 +1,7 @@ @model Orchard.Comments.Models.CommentsPart -@using Orchard.Comments.Models -@using Orchard.Comments.Extensions -@using Orchard.Localization +@using Orchard.Comments.Models; +@using Orchard.Comments.Extensions; +@using Orchard.Localization;
    @T("Comments") diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.cshtml index e1821785d..1a418d81f 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.cshtml @@ -1,5 +1,5 @@ @model Orchard.Comments.Models.CommentSettingsPartRecord -@using Orchard.Comments.Models +@using Orchard.Comments.Models;
    @T("Comments") diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml index 25de5545d..9de2d99ae 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml @@ -1,5 +1,5 @@ @model IEnumerable -@using Orchard.Comments.Models +@using Orchard.Comments.Models;
      @foreach (var comment in Model) { diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml index f9f3bf024..abe6ab523 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml @@ -9,9 +9,9 @@
      @Html.TextBoxFor(m => m.DisplayName, new { @class = "textMedium" }) - @// todo: if we continue to go down the midrodata route, some helpers would be nice + @* todo: if we continue to go down the midrodata route, some helpers would be nice *@ - @// has unintended consequences (renamging the type) - changing the name creates a new type of that name + @* has unintended consequences (renamging the type) - changing the name creates a new type of that name *@ @Html.HiddenFor(m => m.Name)
      diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml index efe8f56e9..5cf769f41 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml @@ -6,7 +6,7 @@ @Html.ValidationSummary()
      - @// has unintended consequences (renamging the part) - changing the name creates a new part of that name + @* has unintended consequences (renamging the part) - changing the name creates a new part of that name *@ @Html.TextBoxFor(m => m.Name, new {@class = "textMedium", disabled = "disabled"}) @Html.HiddenFor(m => m.Name)
      diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml index 78621a9a5..19d636de7 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml @@ -1,5 +1,5 @@ @model Orchard.ContentTypes.ViewModels.EditTypeViewModel -@using Orchard.Core.Contents.Settings +@using Orchard.Core.Contents.Settings;

      @Model.DisplayName

      @{ var creatable = Model.Settings.GetModel().Creatable; } diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.cshtml index e0facc518..5ac6f7510 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.cshtml @@ -1,7 +1,7 @@ @model SettingsDictionary -@using Orchard.ContentManagement.MetaData.Models +@using Orchard.ContentManagement.MetaData.Models; @if (Model.Any()) { - @/*

      @T("Global Settings")

      */ + @*

      @T("Global Settings")

      *@
      @foreach (var setting in Model) {
      @setting.Key
      @setting.Value
      } diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml index 22bf232d6..f157dcd11 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml @@ -2,7 +2,7 @@

      @Model.Name (@Model.FieldDefinition.Name)

      - @Html.ActionLink(T("Remove").Text, "RemoveFieldFrom", new { area = "Orchard.ContentTypes", id = Model.Part.Name, Model.Name }, new { itemprop = "RemoveUrl UnsafeUrl" }) @// <- some experimentation + @Html.ActionLink(T("Remove").Text, "RemoveFieldFrom", new { area = "Orchard.ContentTypes", id = Model.Part.Name, Model.Name }, new { itemprop = "RemoveUrl UnsafeUrl" }) @* <- some experimentation *@
      @{Html.RenderTemplates(Model.Templates);} diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.cshtml index 763428577..9d0cfe71d 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.cshtml @@ -1,5 +1,5 @@ @model SettingsDictionary -@using Orchard.ContentManagement.MetaData.Models +@using Orchard.ContentManagement.MetaData.Models; @if (Model.Any()) {
      @{ diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml index 2a05be99f..8f83675ce 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml @@ -2,7 +2,7 @@

      @Model.PartDefinition.DisplayName

      - @Html.ActionLink(T("Remove").Text, "RemovePartFrom", new { area = "Orchard.ContentTypes", id = Model.Type.Name, Model.PartDefinition.Name }, new { itemprop = "RemoveUrl UnsafeUrl" }) @// <- some experimentation + @Html.ActionLink(T("Remove").Text, "RemovePartFrom", new { area = "Orchard.ContentTypes", id = Model.Type.Name, Model.PartDefinition.Name }, new { itemprop = "RemoveUrl UnsafeUrl" }) @* <- some experimentation *@
      @Html.EditorFor(m => m.PartDefinition.Fields, "TypePartFields", "PartDefinition") @if (Model.Templates.Any()) { @@ -13,7 +13,7 @@ }
      } - @//don't show global part settings for now - @Html.DisplayFor(m => m.PartDefinition.Settings, "Settings", "PartDefinition") + @* don't show global part settings for now - @Html.DisplayFor(m => m.PartDefinition.Settings, "Settings", "PartDefinition") *@ @Html.HiddenFor(m => m.PartDefinition.Name) @Html.HiddenFor(m => m.Index)
      diff --git a/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml index 160afff9e..a996198eb 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml @@ -1,5 +1,5 @@ @model Orchard.Email.Models.SmtpSettingsPart -@using System.Net.Mail +@using System.Net.Mail;
      @T("SMTP") diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml index 16d13e884..f559dff71 100644 --- a/src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml @@ -1,5 +1,5 @@ -@using Orchard -@using Orchard.DisplayManagement.Descriptors +@using Orchard; +@using Orchard.DisplayManagement.Descriptors; @{ var workContext = ViewContext.GetWorkContext(); var shapeTable = workContext.Resolve().GetShapeTable(workContext.CurrentTheme.ThemeName); diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml index 917a1c009..e05941f9b 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml @@ -1,6 +1,6 @@ @model Orchard.Media.ViewModels.MediaItemAddViewModel -@using Orchard.Media.Helpers -@using Orchard.Media.Models +@using Orchard.Media.Helpers; +@using Orchard.Media.Models; @{ Style.Require("MediaAdmin"); }

      @Html.TitleForPage(T("Add Media").ToString())

      diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml index 10fe65007..4783387d6 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml @@ -1,6 +1,6 @@ @model Orchard.Media.ViewModels.MediaFolderCreateViewModel -@using Orchard.Media.Helpers -@using Orchard.Media.Models +@using Orchard.Media.Helpers; +@using Orchard.Media.Models; @{ Style.Require("MediaAdmin"); }

      @Html.TitleForPage(T("Add a Folder").ToString())

      diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml index 370c3421f..374b177ca 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml @@ -1,6 +1,6 @@ @model Orchard.Media.ViewModels.MediaFolderEditViewModel -@using Orchard.Media.Helpers -@using Orchard.Media.Models +@using Orchard.Media.Helpers; +@using Orchard.Media.Models; @{ Style.Require("MediaAdmin"); }

      @Html.TitleForPage(T("Manage Folder").ToString())

      diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml index d0eb844d1..e3b0d0a56 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml @@ -1,6 +1,6 @@ @model Orchard.Media.ViewModels.MediaItemEditViewModel -@using Orchard.Media.Helpers -@using Orchard.Media.Models +@using Orchard.Media.Helpers; +@using Orchard.Media.Models; @{ Style.Require("MediaAdmin"); }

      @Html.TitleForPage(T("Edit Media - {0}", Model.Name).ToString())

      diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml index 419e1005e..267c889f7 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml @@ -1,6 +1,6 @@ @model Orchard.Media.ViewModels.MediaFolderEditPropertiesViewModel -@using Orchard.Media.Helpers -@using Orchard.Media.Models +@using Orchard.Media.Helpers; +@using Orchard.Media.Models; @{ Style.Require("MediaAdmin"); }

      @Html.TitleForPage(T("Folder Properties").ToString())

      diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml index 608893131..e8e8b50c8 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml @@ -1,5 +1,5 @@ @model ModuleAddViewModel -@using Orchard.Modules.ViewModels +@using Orchard.Modules.ViewModels; @{ Style.Require("ModulesAdmin"); } diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml index c4c3347b4..06f6d07cb 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml @@ -1,9 +1,9 @@ @model FeaturesViewModel -@using Orchard.Localization -@using Orchard.Modules.Extensions -@using Orchard.Modules.ViewModels -@using Orchard.Utility.Extensions -@using Orchard.Modules.Models +@using Orchard.Localization; +@using Orchard.Modules.Extensions; +@using Orchard.Modules.ViewModels; +@using Orchard.Utility.Extensions; +@using Orchard.Modules.Models; @{ Style.Require("ModulesAdmin"); diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml index 494b041fb..42fb37faa 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml @@ -1,7 +1,7 @@ @model ModulesIndexViewModel -@using Orchard.Modules.Extensions -@using Orchard.Mvc.Html -@using Orchard.Modules.ViewModels +@using Orchard.Modules.Extensions; +@using Orchard.Mvc.Html; +@using Orchard.Modules.ViewModels; @{ Style.Require("ModulesAdmin"); diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.cshtml index 2a6d4efbc..4b37b0682 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.cshtml @@ -1,5 +1,5 @@ @model Orchard.Environment.Configuration.ShellSettings -@using Orchard.MultiTenancy.Extensions +@using Orchard.MultiTenancy.Extensions; @using(Html.BeginFormAntiForgeryPost(Url.Action("enable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) { @Html.HiddenFor(ss => ss.Name) diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForInvalid.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForInvalid.cshtml index f7b1b22ed..5c55803f9 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForInvalid.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForInvalid.cshtml @@ -1,4 +1,4 @@ @model Orchard.Environment.Configuration.ShellSettings -@using Orchard.MultiTenancy.Extensions +@using Orchard.MultiTenancy.Extensions; @Html.ActionLink(T("Make Valid*").ToString(), "_setup", new {tenantName = Model.Name, area = "Orchard.MultiTenancy"}) diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.cshtml index ef3ceaed0..2e328bcd1 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.cshtml @@ -1,5 +1,5 @@ @model Orchard.Environment.Configuration.ShellSettings -@using Orchard.MultiTenancy.Extensions +@using Orchard.MultiTenancy.Extensions; @using(Html.BeginFormAntiForgeryPost(Url.Action("disable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) { @Html.HiddenFor(ss => ss.Name) diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForUninitialized.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForUninitialized.cshtml index 1031123c8..bd0749dac 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForUninitialized.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForUninitialized.cshtml @@ -1,4 +1,4 @@ @model Orchard.Environment.Configuration.ShellSettings -@using Orchard.MultiTenancy.Extensions +@using Orchard.MultiTenancy.Extensions; @Html.Link(T("Set Up").ToString(), Url.Tenant(Model)) diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml index 72e186a12..0aecbcc75 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml @@ -1,5 +1,5 @@ @model Orchard.MultiTenancy.ViewModels.TenantEditViewModel -@using Orchard.Environment.Configuration +@using Orchard.Environment.Configuration;

      @Html.TitleForPage(T("Edit Tenant").ToString())

      @using (Html.BeginFormAntiForgeryPost()) { diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml index 65edce358..f54d4bedd 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml @@ -1,5 +1,5 @@ @model Orchard.MultiTenancy.ViewModels.TenantsIndexViewModel -@using Orchard.MultiTenancy.Extensions +@using Orchard.MultiTenancy.Extensions; @{ Style.Require("MultiTenancyAdmin"); } diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs index 045bdc775..989b48277 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs @@ -11,9 +11,11 @@ namespace Orchard.Packaging { public void GetNavigation(NavigationBuilder builder) { builder.Add(T("Gallery"), "5", menu => menu - .Add(T("Browse Gallery"), "1.0", item => item - .Action("Index", "Gallery", new { area = "Orchard.Packaging" })) - .Add(T("Gallery Feeds"), "2.0", item => item + .Add(T("Browse Modules"), "1.0", item => item + .Action("ModulesIndex", "Gallery", new { area = "Orchard.Packaging" })) + .Add(T("Browse Themes"), "2.0", item => item + .Action("ThemesIndex", "Gallery", new { area = "Orchard.Packaging" })) + .Add(T("Gallery Feeds"), "3.0", item => item .Action("Sources", "Gallery", new { area = "Orchard.Packaging" }))); } } diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Commands/GalleryCommands.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Commands/GalleryCommands.cs index 433522a16..845fae08f 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Commands/GalleryCommands.cs +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Commands/GalleryCommands.cs @@ -63,7 +63,10 @@ namespace Orchard.Packaging.Commands { Context.Output.WriteLine(T("Success")); } catch (WebException webException) { - var text = new StreamReader(webException.Response.GetResponseStream()).ReadToEnd(); + string text = ""; + if (webException.Response != null) { + text = new StreamReader(webException.Response.GetResponseStream()).ReadToEnd(); + } throw new ApplicationException(text); } } diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs index 930a279cc..a2e2e3560 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs @@ -34,10 +34,14 @@ namespace Orchard.Packaging.Controllers { Localizer T { get; set; } - public ActionResult Index() { + public ActionResult ModulesIndex() { return Modules(Guid.Empty); } + public ActionResult ThemesIndex() { + return Themes(Guid.Empty); + } + public ActionResult Sources() { return View("Sources", new PackagingSourcesViewModel { Sources = _packagingSourceManager.GetSources(), @@ -47,7 +51,7 @@ namespace Orchard.Packaging.Controllers { public ActionResult Remove(Guid id) { _packagingSourceManager.RemoveSource(id); _notifier.Information(T("The feed has been removed successfully.")); - Update(); + Update(null); return RedirectToAction("Sources"); } @@ -90,7 +94,7 @@ namespace Orchard.Packaging.Controllers { _packagingSourceManager.AddSource(new PackagingSource { Id = Guid.NewGuid(), FeedUrl = url, FeedTitle = title }); _notifier.Information(T("The feed has been added successfully.")); - Update(); + Update(null); return RedirectToAction("Sources"); } catch ( Exception exception ) { @@ -102,18 +106,28 @@ namespace Orchard.Packaging.Controllers { public ActionResult Modules(Guid? sourceId) { var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault(); - + return View("Modules", new PackagingModulesViewModel { - Modules = _packagingSourceManager.GetModuleList(selectedSource), + Modules = _packagingSourceManager.GetModuleList(selectedSource).Where(p => p.SyndicationItem.Categories.All(c => c.Name == "Orchard Module" || c.Name != "Orchard Theme")), Sources = _packagingSourceManager.GetSources().OrderBy(s => s.FeedTitle), SelectedSource = selectedSource }); } - public ActionResult Update() { + public ActionResult Themes(Guid? sourceId) { + var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault(); + + return View("Themes", new PackagingModulesViewModel { + Modules = _packagingSourceManager.GetModuleList(selectedSource).Where(p => p.SyndicationItem.Categories.Any(c => c.Name == "Orchard Theme")), + Sources = _packagingSourceManager.GetSources().OrderBy(s => s.FeedTitle), + SelectedSource = selectedSource + }); + } + + public ActionResult Update(string cameFrom) { _packagingSourceManager.UpdateLists(); _notifier.Information(T("List of available modules and themes is updated.")); - return RedirectToAction("Index"); + return RedirectToAction(cameFrom == "Themes" ? "ThemesIndex" : "ModulesIndex"); } public ActionResult Harvest(string extensionName, string feedUrl) { @@ -147,16 +161,16 @@ namespace Orchard.Packaging.Controllers { _packageManager.Push(packageData, model.FeedUrl, model.User, model.Password); _notifier.Information(T("Harvested {0} and published onto {1}", model.ExtensionName, model.FeedUrl)); - Update(); + Update(null); return RedirectToAction("Harvest", new { model.ExtensionName, model.FeedUrl }); } - public ActionResult Install(string syndicationId) { + public ActionResult Install(string syndicationId, string cameFrom) { var packageData = _packageManager.Download(syndicationId); _packageManager.Install(packageData.PackageStream); _notifier.Information(T("Installed module")); - return RedirectToAction("Modules"); + return RedirectToAction(cameFrom == "Themes" ? "ThemesIndex" : "ModulesIndex"); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj index 3ad1b7e84..ef1c9d653 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj @@ -121,6 +121,9 @@ + + + - \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Menu.cshtml_ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Menu.cshtml_ new file mode 100644 index 000000000..b483973cd --- /dev/null +++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Menu.cshtml_ @@ -0,0 +1,10 @@ +@{ + // Model is Model.Menu from the layout (Layout.Menu) + var tag = Tag(Model, "ul"); +} + \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/MenuItem.cshtml_ b/src/Orchard.Web/Themes/TheThemeMachine/Views/MenuItem.cshtml_ new file mode 100644 index 000000000..282250443 --- /dev/null +++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/MenuItem.cshtml_ @@ -0,0 +1,17 @@ +@{ + // odd formatting in this file is to cause more attractive results in the output. + var items = (IEnumerable)Enumerable.Cast(Model); +} +@{ +if (HasText(Model.Text)) { + @DisplayChildren(Model) +} else { +
    • @Model.Text + @if (items.Any()) { +
        + @DisplayChildren(Model) +
      + } +
      • + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/TempFeatured.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/TempFeatured.cshtml new file mode 100644 index 000000000..895311037 --- /dev/null +++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/TempFeatured.cshtml @@ -0,0 +1 @@ +

      I am temp featured!! Hello, @Model.Hello

      \ No newline at end of file diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index 1a3179ee2..98bf34c10 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -9,17 +9,17 @@ --> - -
      -
      + +
      +
      - - - + + + @@ -31,7 +31,7 @@ - +