More layout updates to the new theme.

--HG--
branch : dev
This commit is contained in:
Jonathan Wall
2010-10-12 15:53:42 -07:00
parent b222794a39
commit 7540e437b8
10 changed files with 63 additions and 238 deletions

View File

@@ -140,11 +140,10 @@
<Content Include="Themes\TheThemeMachine\Theme.png" />
<Content Include="Themes\TheThemeMachine\Theme.txt" />
<None Include="Themes\Classic\App_Data\Localization\fr-FR\orchard.theme.po" />
<None Include="Themes\TheThemeMachine\Views\Layout-homePage.cshtml" />
<None Include="Themes\TheThemeMachine\Views\AsideThird.cshtml" />
<None Include="Themes\TheThemeMachine\Views\Recent.cshtml">
<SubType>Designer</SubType>
</None>
<None Include="Themes\TheThemeMachine\Views\Layout-Blog.cshtml" />
<None Include="Themes\TheThemeMachine\Views\Featured.cshtml">
<SubType>Designer</SubType>
</None>

View File

@@ -90,7 +90,7 @@ a:visited{}
h1,h2,h3,h4,h5,h6 { font-weight: normal; }
h1 { font-size: 3em; }
h1 { font-size: 2em; }
h2 { font-size: 1.3em; }
h3 { font-size: 1.2em; }
h4 { font-size: 1.1em; }
@@ -102,9 +102,10 @@ h4 img, h5 img, h6 img {
margin: 0;
}
article header h1 { font-size: 2em; }
p, aside, footer, .meta {
/* TODO: We wrap all widgets with consistent html so we get predictable font sizing */
p, footer, .meta {
font-size:1.3em;
line-height:2em;
}
@@ -176,8 +177,7 @@ nav ul a {
/* Main
***************************************************************/
/* Sidebar off - Content Zone 960 */
#content, .sidebar {
#content, .aside, .about {
padding:6px;
}
@@ -187,7 +187,7 @@ nav ul a {
float:left;
}
.has-sidebar .sidebar {
.has-sidebar .aside.first {
width: 348px;
float:right;
}
@@ -198,7 +198,7 @@ nav ul a {
float:right;
}
.has-sidebar-left .secondary {
.has-sidebar-left .aside.second {
width: 348px;
float:left;
}
@@ -208,11 +208,11 @@ nav ul a {
width: 588px;
}
.has-sidebars .sidebar {
.has-sidebars .aside.first, .has-sidebars .aside.second {
width: 168px;
}
.has-sidebars .primary, .has-sidebars .secondary, .has-sidebars #content {
.has-sidebars .aside.first, .has-sidebars .aside.second, .has-sidebars #content {
float:left;
}
@@ -275,6 +275,16 @@ form.inline p { margin-bottom:0; }
display:inline;
}
.aside.third {
border-top:1px solid #999999;
clear:both;
}
.aside.third div > div {
float:left;
width:304px;
padding:12px 6px 0 6px;
}
/* Featured Zone - switch to an image */

View File

@@ -4,4 +4,4 @@ Description: It's a *really* good theme, yo.
Version: 0.1
Tags: Awesome
Website: http://orchardproject.net
Zones: Header, Navigation, Messages, Featured, Recent, Sidebar, Content, Sidebar2, Footer
Zones: Header, Navigation, Messages, AsideFirst, AsideSecond, AsideThird, Content, Footer

View File

@@ -0,0 +1,14 @@
<div>
<h1>First Leader Aside</h1>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur a nibh ut tortor dapibus vestibulum. Aliquam vel sem nibh. Suspendisse vel condimentum tellus.</p>
</div>
<div>
<h1>Second Leader Aside</h1>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur a nibh ut tortor dapibus vestibulum. Aliquam vel sem nibh. Suspendisse vel condimentum tellus.</p>
</div>
<div>
<h1>Third Leader Aside</h1>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur a nibh ut tortor dapibus vestibulum. Aliquam vel sem nibh. Suspendisse vel condimentum tellus.</p>
</div>

View File

@@ -1,15 +0,0 @@
<!-- zone: featured -->
<div class="featuredimage">Image</div>
<article class="featured-blogpost">
<header>
<!-- // example // -->
@if(HasText(Model.Title)) {
<h1>@Model.Title</h1>
}
else {
<h1>@Model.insertMessage</h1>
}
</header>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ultrices vehicula nibh quis varius. Donec tincidunt, purus at tincidunt elementum, justo nisi rhoncus metus, quis bibendum lorem nunc at dolor. Sed scelerisque aliquet leo sed semper. Donec accumsan, nibh at consectetur rhoncus, odio justo imperdiet risus, quis pretium tortor dolor vel dolor.</p>
</article>
<!-- /zone: featured -->

View File

@@ -1,79 +0,0 @@
@{
Style.Include("site.css");
// cool stuff goes up here
var homeUrl = Href("~/");
// Zone is an alias for Display
Func<dynamic, dynamic> Zone = x => Display(x);
if (Model.Sidebar != null) {
Html.AddPageClassNames(new[]{"icanhassidebar"});
}
}
<div id="layout-wrapper">
<header id="layout-header">
@* needs to be the page title, not page (head) title... *@
<h1><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1>
@if(Model.Header != null) {
<div id="header">
@Zone(Model.Header)
</div>
}
@if(Model.Navigation != null) {
<div id="navigation">
@Zone(Model.Navigation)
</div>
}
</header>
@if(Model.Messages != null) {
<div id="messages">
@Zone(Model.Messages)
</div>
}
@* This code would inject text into the Featured zone.
@{WorkContext.Layout.Featured.Add("just some text in featured");}
*@
@{
WorkContext.Layout.Featured.Add(New.Featured(insertMessage:"This is a featured blog post."));
}
@if(Model.Featured != null) {
<div id="featured" class="group">
@Zone(Model.Featured)
</div>
}
@* the model content for the page is in the Content zone @ the default position (nothing, zero, zilch) *@
@if(Model.Content == null) {
<div id="content">
@Zone(Model.Content)
</div>
}
else {
<div id="content">
Let's take over the home page
</div>
}
@if(Model.Sidebar != null) {
<aside class="sidebar">
@Zone(Model.Sidebar)
</aside>
}
@if(Model.Footer != null) {
<footer>
@Zone(Model.Footer)
</footer>
}
else {
<footer id="sitemap">
Powered by Orchard @Display.User()
</footer>
}
</div>

View File

@@ -1,87 +0,0 @@
@{
Style.Include("site.css");
// cool stuff goes up here
var homeUrl = Href("~/");
// Zone is an alias for Display
Func<dynamic, dynamic> Zone = x => Display(x);
if (Model.Sidebar != null) {
Html.AddPageClassNames(new[]{"has-sidebar"});
}
}
<div id="layout-wrapper">
<header id="layout-header">
@* needs to be the page title, not page (head) title... *@
<h1><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1>
@if(Model.Header != null) {
<div id="header">
@Zone(Model.Header)
</div>
}
@if(Model.Navigation != null) {
<div id="navigation">
@Zone(Model.Navigation)
</div>
}
</header>
@if(Model.Messages != null) {
<div id="messages">
@Zone(Model.Messages)
</div>
}
@* This code would inject text into the Featured zone.
@{WorkContext.Layout.Featured.Add("just some text in featured");}
*@
@{
WorkContext.Layout.Featured.Add(New.Featured(insertMessage:"This is a featured blog post."));
}
@if(Model.Featured != null) {
<div class="group">
@Zone(Model.Featured)
</div>
}
@{
WorkContext.Layout.Recent.Add(New.Recent());
}
@if(Model.Featured != null) {
<div class="zone-featured zone group">
@Zone(Model.Recent)
</div>
}
@* the model content for the page is in the Content zone @ the default position (nothing, zero, zilch) *@
@if(Model.Content != null) {
<div id="content" class="group">
@Zone(Model.Content)
</div>
}
else {
<div id="content" class="group">
Let's take over the home page
</div>
}
@if(Model.Sidebar != null) {
<aside class="sidebar">
@Zone(Model.Sidebar)
</aside>
}
@if(Model.Footer != null) {
<footer>
@Zone(Model.Footer)
</footer>
}
else {
<footer id="sitemap">
Powered by Orchard @Display.User()
</footer>
}
</div>

View File

@@ -8,20 +8,25 @@
// Zone is an alias for Display
Func<dynamic, dynamic> Zone = x => Display(x);
//Add classes to the wrapper div to toggle zones on and off
if (Model.Sidebar != null && Model.Sidebar2 == null) {
//Use the two lines below to test the sidebar zones.
//WorkContext.Layout.AsideFirst.Add("This test text will render in Sidebar1.");
//WorkContext.Layout.AsideSecond.Add("This test text will render in Sidebar2.");
//Add classes to the wrapper div to toggle zones on and off
if (Model.AsideFirst != null && Model.AsideSecond == null) {
Model.Classes.Add("has-sidebar");
}
else if (Model.Sidebar == null && Model.Sidebar2 != null) {
else if (Model.AsideFirst == null && Model.AsideSecond != null) {
Model.Classes.Add("has-sidebar-left");
}
else if (Model.Sidebar != null && Model.Sidebar2 != null) {
else if (Model.AsideFirst != null && Model.AsideSecond != null) {
Model.Classes.Add("has-sidebars");
}
else {
}
//Model.Attributes.Add("onclick", "javscript:alert('woot')");
Model.Id = "layout-wrapper";
@@ -61,19 +66,10 @@
@Zone(Model.Messages)
</div>
}
@if(Model.Featured != null) {
<div class="zone-featured">
@Zone(Model.Featured)
</div>
}
@if(Model.Recent != null) {
<div class="zone-recent">
@Zone(Model.Recent)
</div>
}
@if(Model.Sidebar2 != null) {
<aside class="sidebar secondary">
@Zone(Model.Sidebar2)
@if(Model.AsideSecond != null) {
<aside class="aside second">
@Zone(Model.AsideSecond)
</aside>
}
@@ -83,17 +79,27 @@
@Zone(Model.Content)
</div>
}
@if(Model.Sidebar != null) {
<aside class="sidebar primary">
@Zone(Model.Sidebar)
@if(Model.AsideFirst != null) {
<aside class="aside first">
@Zone(Model.AsideFirst)
</aside>
}
@* Create a zone and only show it on the home page. *@
@if (Request.Path == "/OrchardLocal") {
WorkContext.Layout.AsideThird.Add(New.AsideThird());
}
@if(Model.AsideThird != null) {
<aside class="aside third group">
@Zone(Model.AsideThird)
</aside>
}
</div>
@if(Model.Footer != null) {
<footer id="layout-footer" class="group">
@Zone(Model.Footer)

View File

@@ -1,22 +0,0 @@
<!-- zone: recent -->
<section class="posts-recent">
<ul>
<li class="first">
<article>
<header>
<h1>Another recent post title</h1>
</header>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent magna ante, accumsan at blandit et, posuere imperdiet sapien. Praesent condimentum laoreet justo non semper. Cras molestie fermentum turpis, in ornare eros mollis non. Sed a ligula sit amet mauris ultrices hendrerit ac vitae quam. Integer sit amet lorem vitae velit accumsan suscipit. Nulla mi nulla, congue eget euismod eget, ultrices in mauris. Mauris leo turpis, malesuada mattis feugiat ut, convallis in neque. Maecenas iaculis consequat interdum. Sed fermentum dolor quis ante interdum in sollicitudin lorem sollicitudin. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
</article>
</li>
<li class="last">
<article>
<header>
<h1>Another recent post title</h1>
</header>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent magna ante, accumsan at blandit et, posuere imperdiet sapien. Praesent condimentum laoreet justo non semper. Cras molestie fermentum turpis, in ornare eros mollis non. Sed a ligula sit amet mauris ultrices hendrerit ac vitae quam. Integer sit amet lorem vitae velit accumsan suscipit. Nulla mi nulla, congue eget euismod eget, ultrices in mauris. Mauris leo turpis, malesuada mattis feugiat ut, convallis in neque. Maecenas iaculis consequat interdum. Sed fermentum dolor quis ante interdum in sollicitudin lorem sollicitudin. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
</article>
</li>
</ul>
</section>
<!-- /zone: recent -->