Incremental work on Dashboards.

This commit is contained in:
Sipke Schoorstra
2015-05-07 00:08:06 +02:00
parent 2dc5448ee0
commit 74a71321de
9 changed files with 1073 additions and 4 deletions

View File

@@ -68,7 +68,11 @@
</ItemGroup>
<ItemGroup>
<None Include="Placement.info" />
<Content Include="Styles\Dashboard.css" />
<Content Include="Styles\bootstrap.css" />
<Content Include="Styles\bootstrap.min.css">
<DependentUpon>bootstrap.css</DependentUpon>
</Content>
<Content Include="Styles\dashboard.css" />
<Content Include="Web.config" />
<Content Include="Scripts\Web.config" />
<Content Include="Styles\Web.config" />
@@ -77,6 +81,9 @@
<Content Include="Views\EditorTemplates\Parts.DashboardSettings.cshtml" />
<Content Include="Views\StaticDashboard.cshtml" />
<Content Include="Views\Content.Dashboard.cshtml" />
<Content Include="Views\Elements\Grid.Dashboard.cshtml" />
<Content Include="Views\Elements\Column.Dashboard.cshtml" />
<Content Include="Views\Parts\Layout.cshtml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
@@ -89,6 +96,11 @@
<Name>Orchard.Core</Name>
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="..\Orchard.Layouts\Orchard.Layouts.csproj">
<Project>{6bd8b2fa-f2e3-4ac8-a4c3-2925a653889a}</Project>
<Name>Orchard.Layouts</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="Controllers\AdminController.cs" />

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,7 @@
@using Orchard.ContentManagement
@{
Style.Include("Dashboard.css");
Style.Include("bootstrap.css", "bootstrap.min.css");
Style.Include("dashboard.css");
}
@{
var contentItem = (ContentItem)Model.ContentItem;

View File

@@ -0,0 +1,19 @@
@using Orchard.Core.Shapes
@using Orchard.DisplayManagement.Shapes
@using Orchard.Layouts.Helpers
@{
var columnSpan = (int?)Model.Width;
var columnOffset = (int?)Model.Offset;
var columnOffsetCss = columnOffset > 0 ? "offset-lg-" + columnOffset : default(string);
var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
tagBuilder.AddCssClass(String.Concat("col-lg-", columnSpan));
tagBuilder.AddCssClass(columnOffsetCss);
}
@if (!Model.Collapsed) {
@tagBuilder.StartElement
foreach (var item in CoreShapes.Order(Model)) {
@Display(item)
}
@tagBuilder.EndElement
}

View File

@@ -0,0 +1,8 @@
@using Orchard.Layouts.Helpers
@{
var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
tagBuilder.AddCssClass("container-fluid");
}
@tagBuilder.StartElement
@DisplayChildren(Model)
@tagBuilder.EndElement

View File

@@ -0,0 +1,3 @@
<div class="orchard-layouts-root">
@Display(Model.LayoutRoot)
</div>

View File

@@ -34,8 +34,9 @@
<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add assembly="Orchard.Framework, Culture=neutral, PublicKeyToken=null"/>
<add assembly="Orchard.Core, Culture=neutral, PublicKeyToken=null"/>
<add assembly="Orchard.Framework"/>
<add assembly="Orchard.Core"/>
<add assembly="Orchard.Layouts"/>
</assemblies>
</compilation>
</system.web>

View File

@@ -404,6 +404,7 @@
<ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
<Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
<Name>Orchard.Forms</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\Orchard.MediaLibrary\Orchard.MediaLibrary.csproj">
<Project>{73a7688a-5bd3-4f7e-adfa-ce36c5a10e3b}</Project>