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

More progress on defining new UI capabilities..

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-10-06 14:02:37 -07:00
parent 37695de420
commit 7503606d74
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Core/Shapes/CoreShapes.cs
View File

@@ -64,7 +64,6 @@ namespace Orchard.Core.Shapes {
var zone = context.New.Zone(); var zone = context.New.Zone();
zone.Id = "zone-" + name; zone.Id = "zone-" + name;
zone.Classes.Add(zone.Id);
zone.Classes.Add("zone"); zone.Classes.Add("zone");
return zone; return zone;
} }

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

@@ -111,6 +111,7 @@
<Content Include="Themes\TheAdmin\Styles\images\menuOpen.gif" /> <Content Include="Themes\TheAdmin\Styles\images\menuOpen.gif" />
<Content Include="Themes\TheAdmin\Styles\images\menuOpenHover.gif" /> <Content Include="Themes\TheAdmin\Styles\images\menuOpenHover.gif" />
<Content Include="Themes\TheThemeMachine\draft.html" /> <Content Include="Themes\TheThemeMachine\draft.html" />
<Content Include="Themes\TheThemeMachine\Styles\site.css" />
<Content Include="Themes\TheThemeMachine\Theme.png" /> <Content Include="Themes\TheThemeMachine\Theme.png" />
<Content Include="Themes\TheThemeMachine\Theme.txt" /> <Content Include="Themes\TheThemeMachine\Theme.txt" />
<None Include="Themes\TheThemeMachine\Views\Document.cshtml" /> <None Include="Themes\TheThemeMachine\Views\Document.cshtml" />
@@ -286,6 +287,7 @@
<Content Include="Themes\TheAdmin\Views\User.cshtml" /> <Content Include="Themes\TheAdmin\Views\User.cshtml" />
<Content Include="Themes\TheAdmin\Views\Header.cshtml" /> <Content Include="Themes\TheAdmin\Views\Header.cshtml" />
<Content Include="Themes\Web.config" /> <Content Include="Themes\Web.config" />
<Content Include="Themes\TheThemeMachine\Views\Items\Content.Blog.cshtml" />
<None Include="Themes\TheThemeMachine\Views\Layout.cshtml" /> <None Include="Themes\TheThemeMachine\Views\Layout.cshtml" />
<None Include="Themes\TheThemeMachine\Views\Menu.cshtml"> <None Include="Themes\TheThemeMachine\Views\Menu.cshtml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
@@ -295,7 +297,6 @@
<Folder Include="App_Data\" /> <Folder Include="App_Data\" />
<Folder Include="Themes\ClassicDark\DesignerNotes\" /> <Folder Include="Themes\ClassicDark\DesignerNotes\" />
<Folder Include="Themes\SafeMode\Content\Images\" /> <Folder Include="Themes\SafeMode\Content\Images\" />
<Folder Include="Themes\TheThemeMachine\Styles\" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

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

@@ -0,0 +1,10 @@
@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)

8
src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
View File

@@ -1,14 +1,20 @@
@{ @{
Style.Include("site.css");
// cool stuff goes up here // cool stuff goes up here
var homeUrl = Href("~/"); var homeUrl = Href("~/");
// Zone is an alias for Display // Zone is an alias for Display
Func<dynamic, dynamic> Zone = x => Display(x); Func<dynamic, dynamic> Zone = x => Display(x);
if (Model.Sidebar != null) {
Html.AddPageClassNames(new[]{"icanhassidebar"});
}
} }
<div id="layout-wrapper"> <div id="layout-wrapper">
<header id="layout-header"> <header id="layout-header">
@// needs to be the page title, not page (head) title... @// needs to be the page title, not page (head) title...
<h1><a href="@homeUrl">@Model.Title</a></h1> <h1><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1>
@if(Model.Header != null) { @if(Model.Header != null) {
<div id="header"> <div id="header">
@Zone(Model.Header) @Zone(Model.Header)