mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Starting to dream up the new theme...up
--HG-- branch : dev
This commit is contained in:
@@ -162,7 +162,6 @@ namespace Orchard.Tests.DisplayManagement {
|
|||||||
Assert.That(result.ToString(), Is.EqualTo("Hi there!"));
|
Assert.That(result.ToString(), Is.EqualTo("Hi there!"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void RenderAlternateShape() {
|
public void RenderAlternateShape() {
|
||||||
var displayManager = _container.Resolve<IDisplayManager>();
|
var displayManager = _container.Resolve<IDisplayManager>();
|
||||||
|
|||||||
@@ -111,6 +111,9 @@
|
|||||||
<Content Include="Themes\TheAdmin\Styles\images\menuClosedHover.gif" />
|
<Content Include="Themes\TheAdmin\Styles\images\menuClosedHover.gif" />
|
||||||
<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\Theme.png" />
|
||||||
|
<Content Include="Themes\TheThemeMachine\Theme.txt" />
|
||||||
<Content Include="Web.config">
|
<Content Include="Web.config">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Content>
|
</Content>
|
||||||
@@ -290,11 +293,13 @@
|
|||||||
<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\Layout.cshtml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<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" />
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 116 KiB |
@@ -0,0 +1,6 @@
|
|||||||
|
Name: The Theme Machine
|
||||||
|
Author: jowall, mibach, loudej, heskew
|
||||||
|
Description: It's a *really* good theme, yo.
|
||||||
|
Version: 0.1
|
||||||
|
Tags: Awesome
|
||||||
|
Website: http://orchardproject.net
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
@using Orchard.UI.Resources
|
||||||
|
@{
|
||||||
|
Style.Require("Classic");
|
||||||
|
Style.Require("Classic_Blog");
|
||||||
|
}
|
||||||
|
<div id="wrapper">
|
||||||
|
@// HTML.Include will render a div with a class="user-display"
|
||||||
|
@// Can use this -> {Html.Include("User");}
|
||||||
|
@// or the following. At least they appear to do the same thing currently. The first is a standard Html.Include, the second "displays the (New) User shape"
|
||||||
|
@Display.User()
|
||||||
|
@// Top Navigation and branding
|
||||||
|
<div id="headercontainer">
|
||||||
|
<div id="header">
|
||||||
|
<h1>@WorkContext.CurrentSite.SiteName</h1>
|
||||||
|
<div class="menucontainer">
|
||||||
|
@Display(Model.Navigation)
|
||||||
|
</div>
|
||||||
|
<div class="clearBoth"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="main">
|
||||||
|
<div id="content">
|
||||||
|
@// Main Content
|
||||||
|
@Display(Model.Content)
|
||||||
|
</div>
|
||||||
|
<div id="sidebar">
|
||||||
|
@Display(Model.search)
|
||||||
|
@Display(Model.sidebar)
|
||||||
|
</div>
|
||||||
|
@// End Content
|
||||||
|
@Display.Footer(Navigation:Model.Navigation)
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en" class="static @Html.ClassForPage()">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<title>@Html.Title(WorkContext.CurrentSite.SiteName)</title>
|
||||||
|
<script>(function(d){d.className="dyn "+d.className.substring(7,d.length);})(document.documentElement);</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="layout-wrapper">
|
||||||
|
<header id="layout-header">
|
||||||
|
<h1><a href="#">The Theme Machine</a></h1>
|
||||||
|
<!--zone: navigation -->
|
||||||
|
<nav>
|
||||||
|
<ul>
|
||||||
|
<li class="first current"><a href="#">Home</a></li>
|
||||||
|
<li><a href="#">Blog</a></li>
|
||||||
|
<li><a href="#">About</a></li>
|
||||||
|
<li><a href="#">Full Page</a></li>
|
||||||
|
<li><a href="#">Image Page</a></li>
|
||||||
|
<li><a href="#">Gallery Page</a></li>
|
||||||
|
<li><a href="#">Nested Page</a></li>
|
||||||
|
<li class="last"><a href="#">Contact</a></li>
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
|
<!--/zone: navigation -->
|
||||||
|
</header>
|
||||||
|
<section>
|
||||||
|
<article>
|
||||||
|
<header>
|
||||||
|
<h1><a href="#">Title</a></h1>
|
||||||
|
</header>
|
||||||
|
<section>
|
||||||
|
<p>Lorem ipsum...</p>
|
||||||
|
</section>
|
||||||
|
</article>
|
||||||
|
<article>
|
||||||
|
<header>
|
||||||
|
<h1><a href="#">Title</a></h1>
|
||||||
|
</header>
|
||||||
|
<section>
|
||||||
|
<p>Lorem ipsum...</p>
|
||||||
|
</section>
|
||||||
|
</article>
|
||||||
|
<article>
|
||||||
|
<header>
|
||||||
|
<h1><a href="#">Title</a></h1>
|
||||||
|
</header>
|
||||||
|
<section>
|
||||||
|
<p>Lorem ipsum...</p>
|
||||||
|
</section>
|
||||||
|
</article>
|
||||||
|
</section>
|
||||||
|
<footer>
|
||||||
|
<p>Copyright © 2008 All Rights</p>
|
||||||
|
</footer>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
Reference in New Issue
Block a user