lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Making the widget wrapper an <article/>

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-10-15 16:28:45 -07:00
parent ac4c1c8f80
commit 0e59891b16
7 changed files with 19 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
View File

@@ -8,9 +8,9 @@ namespace Orchard.Widgets {
builder.Describe("Widget")
.Configure(descriptor => {
// todo: have "alternates" for chrome
//todo: (heskew) something...this still doesn't feel right
descriptor.Wrappers.Add("Widget_ControlWrapper");
// todo: (heskew) something...this still doesn't feel right
descriptor.Wrappers.Add("Widget_Wrapper");
descriptor.Wrappers.Add("Widget_ControlWrapper");
})
.OnCreated(created => {
var widget = created.Shape;

3
src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.cshtml
View File

@@ -1,2 +1 @@
@Display(Model.Header)
@Display(Model.Content)
@Display(Model.Content)

18
src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml
View File

@@ -1,3 +1,17 @@
<div class="widget">
@using Orchard.ContentManagement;
@using Orchard.Widgets.Models;
@{
var title = ((IContent)Model.ContentItem).As<WidgetPart>().Title;
}
<article class="widget">
<header>
<h1>@title</h1>
@Display(Model.Header)
</header>
@Display.PlaceChildContent(Source: Model)
</div>
@if(Model.Footer != null) {
<footer>
@Display(Model.Footer)
</footer>
}
</article>

3
src/Orchard.Web/Themes/Orchard.Themes.csproj
View File

@@ -64,7 +64,6 @@
<Content Include="TheThemeMachine\Styles\Site.css" />
<Content Include="TheThemeMachine\Theme.png" />
<Content Include="TheThemeMachine\Theme.txt" />
<Content Include="TheThemeMachine\Views\Items\Widget-HtmlWidget.cshtml" />
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
@@ -218,8 +217,6 @@
<Content Include="TheAdmin\Theme.png" />
<Content Include="TheAdmin\Views\User.cshtml" />
<Content Include="TheAdmin\Views\Header.cshtml" />
<Content Include="TheThemeMachine\Views\Items\Content.Blog.cshtml" />
<Content Include="TheThemeMachine\Views\Items\Widget-Content.cshtml" />
<None Include="TheThemeMachine\Views\Layout.cshtml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

10
src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml
View File

@@ -1,10 +0,0 @@
@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) });
}
<h1>@Html.TitleForPage((string)Model.Title)</h1>
@Display(Model.manage)
@Display(Model.metadata)
@Display(Model.Primary)

17
src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Widget-Content.cshtml
View File

@@ -1,17 +0,0 @@
@using Orchard.ContentManagement;
@using Orchard.Widgets.Models;
@{
var title = ((IContent)Model.ContentItem).As<WidgetPart>().Title;
}
<article>
<header>
<h1>@title</h1>
@Display(Model.Header)
</header>
@Display(Model.Content)
@if(Model.Footer != null) {
<footer>
@Display(Model.Footer)
</footer>
}
</article>

11
src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Widget-HtmlWidget.cshtml
View File

@@ -1,11 +0,0 @@
@using Orchard.ContentManagement;
@using Orchard.Widgets.Models;
@{
var title = ((IContent)Model.ContentItem).As<WidgetPart>().Title;
}
<div>
<h1>@title</h1>
@Display(Model.Header)
@Display(Model.Content)
@Display(Model.Footer)
</div>