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

Incremental work on Dashboards.

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-05-06 12:35:26 +02:00
parent 5479fe9bcb
commit 2dc5448ee0
14 changed files with 98 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Orchard.Web/Modules/Orchard.Dashboards/Controllers/AdminController.cs
View File

@@ -1,10 +1,17 @@
using System.Web.Mvc;
using Orchard.Dashboards.Services;
using Orchard.Mvc;
namespace Orchard.Dashboards.Controllers {
public class AdminController : Controller {
private readonly IDashboardService _dashboardService;
public AdminController(IDashboardService dashboardService) {
_dashboardService = dashboardService;
}
public ActionResult Index() {
return View();
var shape = _dashboardService.GetDashboardShape();
return new ShapeResult(this, shape);
}
}
}

4
src/Orchard.Web/Modules/Orchard.Dashboards/Elements/DashboardSiteSettingsPartDriver.cs → src/Orchard.Web/Modules/Orchard.Dashboards/Drivers/DashboardSiteSettingsPartDriver.cs
View File

@@ -5,7 +5,7 @@ using Orchard.ContentManagement.Drivers;
using Orchard.Dashboards.Models;
using Orchard.Dashboards.ViewModels;
namespace Orchard.Dashboards.Elements {
namespace Orchard.Dashboards.Drivers {
public class DashboardSiteSettingsPartDriver : ContentPartDriver<DashboardSiteSettingsPart> {
private readonly IContentManager _contentManager;
@@ -20,7 +20,7 @@ namespace Orchard.Dashboards.Elements {
protected override DriverResult Editor(DashboardSiteSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
return ContentShape("Parts_DashboardSettings", () => {
var viewModel = new DashboardSiteSettingsViewModel {
SelectedDashboardId = part.DefaultDashboardId.ToString(),
SelectedDashboardId = part.DefaultDashboardId.ToString()
};
if (updater != null) {

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

File diff suppressed because one or more lines are too long

13
src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj
View File

@@ -68,12 +68,15 @@
</ItemGroup>
<ItemGroup>
<None Include="Placement.info" />
<Content Include="Styles\Dashboard.css" />
<Content Include="Web.config" />
<Content Include="Scripts\Web.config" />
<Content Include="Styles\Web.config" />
<Content Include="Properties\AssemblyInfo.cs" />
<Content Include="Module.txt" />
<Content Include="Views\EditorTemplates\Parts.DashboardSettings.cshtml" />
<Content Include="Views\StaticDashboard.cshtml" />
<Content Include="Views\Content.Dashboard.cshtml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
@@ -89,21 +92,19 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="Elements\DashboardSiteSettingsPartDriver.cs" />
<Compile Include="Drivers\DashboardSiteSettingsPartDriver.cs" />
<Compile Include="Handlers\DashboardSiteSettingsPartHandler.cs" />
<Compile Include="Migrations.cs" />
<Compile Include="Services\IDashboardService.cs" />
<Compile Include="ViewModels\DashboardSiteSettingsViewModel.cs" />
<Compile Include="Models\DashboardSiteSettingsPart.cs" />
<Compile Include="Routes.cs" />
<Compile Include="Services\DashboardSelectorResult.cs" />
<Compile Include="Services\DashboardDescriptor.cs" />
<Compile Include="Services\DefaultDashboardSelector.cs" />
<Compile Include="Services\IDashboardSelector.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="Drivers\" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Admin\Index.cshtml" />
<Folder Include="Elements\" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

6
src/Orchard.Web/Modules/Orchard.Dashboards/Placement.info
View File

@@ -1,3 +1,9 @@
<Placement>
<Place Parts_DashboardSettings="Content:0" />
<Match DisplayType="Dashboard">
<Place
Parts_Common_Body="Content:0"
Parts_Common_Body_Summary="-"
Parts_Layout="Content:1" />
</Match>
</Placement>

8
src/Orchard.Web/Modules/Orchard.Dashboards/Services/DashboardDescriptor.cs Normal file
View File

@@ -0,0 +1,8 @@
using System;
namespace Orchard.Dashboards.Services {
public class DashboardDescriptor {
public int Priority { get; set; }
public Func<dynamic, dynamic> DashboardFactory { get; set; }
}
}

8
src/Orchard.Web/Modules/Orchard.Dashboards/Services/DashboardSelectorResult.cs
View File

@@ -1,8 +0,0 @@
using Orchard.ContentManagement;
namespace Orchard.Dashboards.Services {
public class DashboardSelectorResult {
public int Priority { get; set; }
public IContent Dashboard { get; set; }
}
}

13
src/Orchard.Web/Modules/Orchard.Dashboards/Services/DefaultDashboardSelector.cs
View File

@@ -1,5 +1,4 @@
using System;
using Orchard.ContentManagement;
using Orchard.ContentManagement;
using Orchard.Dashboards.Models;
namespace Orchard.Dashboards.Services {
@@ -9,10 +8,18 @@ namespace Orchard.Dashboards.Services {
_services = services;
}
public DashboardSelectorResult GetDashboard() {
public DashboardDescriptor GetDashboardDescriptor() {
var settings = _services.WorkContext.CurrentSite.As<DashboardSiteSettingsPart>();
var dashboardId = settings.DefaultDashboardId;
var dashboard = dashboardId != null ? _services.ContentManager.Get(dashboardId.Value) : default(ContentItem);
var descriptor = new DashboardDescriptor { Priority = -10 };
if (dashboard == null)
descriptor.DashboardFactory = shapeFactory => shapeFactory.StaticDashboard();
else
descriptor.DashboardFactory = shapeFactory => _services.ContentManager.BuildDisplay(dashboard, displayType: "Dashboard");
return descriptor;
}
}
}

2
src/Orchard.Web/Modules/Orchard.Dashboards/Services/IDashboardSelector.cs
View File

@@ -1,5 +1,5 @@
namespace Orchard.Dashboards.Services {
public interface IDashboardSelector : IDependency {
DashboardSelectorResult GetDashboard();
DashboardDescriptor GetDashboardDescriptor();
}
}

34
src/Orchard.Web/Modules/Orchard.Dashboards/Services/IDashboardService.cs Normal file
View File

@@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Orchard.DisplayManagement;
namespace Orchard.Dashboards.Services {
public interface IDashboardService : IDependency {
dynamic GetDashboardShape();
}
public class DashboardService : IDashboardService {
private readonly Lazy<IEnumerable<IDashboardSelector>> _selectors;
private readonly IShapeFactory _shapeFactory;
public DashboardService(Lazy<IEnumerable<IDashboardSelector>> selectors, IShapeFactory shapeFactory) {
_selectors = selectors;
_shapeFactory = shapeFactory;
}
public dynamic GetDashboardShape() {
var selectorQuery =
from selector in _selectors.Value
let descriptor = selector.GetDashboardDescriptor()
orderby descriptor.Priority descending
select descriptor;
var result = selectorQuery.First();
var factory = result.DashboardFactory ?? (shapeFactory => shapeFactory.StaticDashboard());
var shape = factory(_shapeFactory);
return shape;
}
}
}

6
src/Orchard.Web/Modules/Orchard.Dashboards/Styles/Dashboard.css Normal file
View File

@@ -0,0 +1,6 @@
.dashboard h2 {
font-size: 16px;
background: #f1f1f2;
line-height: 2em;
padding: 0 20px;
}

13
src/Orchard.Web/Modules/Orchard.Dashboards/Views/Content.Dashboard.cshtml Normal file
View File

@@ -0,0 +1,13 @@
@using Orchard.ContentManagement
@{
Style.Include("Dashboard.css");
}
@{
var contentItem = (ContentItem)Model.ContentItem;
var title = Html.ItemDisplayText(contentItem);
Layout.Title = title;
}
<article class="content-item dashboard">
@Display(Model.Content)
</article>

2
src/Orchard.Web/Modules/Orchard.Dashboards/Views/EditorTemplates/Parts.DashboardSettings.cshtml
View File

@@ -8,7 +8,7 @@
@Display.ContentPicker_Edit(
DisplayName: T("Default Dashboard").Text,
SelectedItemsFieldName: Html.FieldNameFor(m => m.SelectedDashboardId),
ContentItems: Model.SelectedDashboard != null ? new[] { Model.SelectedDashboard } : Enumerable.Empty<ContentItem>(),
ContentItems: Model.SelectedDashboard != null ? new[] {Model.SelectedDashboard} : Enumerable.Empty<ContentItem>(),
Hint: T("Select the content item to use as the dashboard.").Text)
</div>
</section>

3
src/Orchard.Web/Modules/Orchard.Dashboards/Views/Admin/Index.cshtml → src/Orchard.Web/Modules/Orchard.Dashboards/Views/StaticDashboard.cshtml
View File

@@ -1,5 +1,4 @@
@model dynamic
@{ Layout.Title = T("Welcome to my Custom Dashboard").ToString(); }
@{ Layout.Title = T("Welcome to Orchard").ToString(); }
<section class="dashboard group">
<div class="help-item">
<h2 class="start">@T("Get up and running")</h2>