lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-22 21:02:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Updated green theme and added ascx overrides.

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045441
This commit is contained in:
jowall
2010-01-15 00:28:29 +00:00
parent 80989b7cf0
commit e5f10e98a0
12 changed files with 249 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{50B779EA-EC00-4699-84C0-03B395C365D2}</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -171,9 +171,15 @@
<Content Include="Themes\Green\Content\Images\tabLeftOn.gif" />
<Content Include="Themes\Green\Content\Images\tabRightOff.gif" />
<Content Include="Themes\Green\Content\Images\tabRightOn.gif" />
<Content Include="Themes\Green\Styles\blog.css" />
<Content Include="Themes\Green\Styles\site.css" />
<Content Include="Themes\Green\Styles\yui.css" />
<Content Include="Themes\Green\Theme.gif" />
<Content Include="Themes\Green\Theme.txt" />
<Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
<Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
<Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
<Content Include="Themes\Green\Views\DisplayTemplates\Parts\Comments.HasComments.ascx" />
<Content Include="Themes\Green\Views\footer.ascx" />
<Content Include="Themes\Green\Views\layout.ascx" />
<Content Include="Themes\Green\Views\menu.ascx" />
@@ -181,6 +187,27 @@
<Content Include="Themes\TheAdmin\Views\menu.ascx" />
<Content Include="Themes\TheAdmin\Views\user.ascx" />
<Content Include="Themes\TheAdmin\Views\header.ascx" />
<Content Include="Themes\Times\Content\Images\bodyBackground.gif" />
<Content Include="Themes\Times\Content\Images\bodyBackgroundgrey.gif" />
<Content Include="Themes\Times\Content\Images\footerBackground.gif" />
<Content Include="Themes\Times\Content\Images\mainBackground.gif" />
<Content Include="Themes\Times\Content\Images\mainBackground.png" />
<Content Include="Themes\Times\Content\Images\mainBackgroundgrey.gif" />
<Content Include="Themes\Times\Content\Images\mainBackgroundgrey.png" />
<Content Include="Themes\Times\Content\Images\navDivider.gif" />
<Content Include="Themes\Times\Content\Images\sidebarBackground.gif" />
<Content Include="Themes\Times\Styles\blog.css" />
<Content Include="Themes\Times\Styles\site.css" />
<Content Include="Themes\Times\Theme.gif" />
<Content Include="Themes\Times\Theme.txt" />
<Content Include="Themes\Times\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
<Content Include="Themes\Times\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
<Content Include="Themes\Times\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
<Content Include="Themes\Times\Views\DisplayTemplates\Items\Pages.Page.ascx" />
<Content Include="Themes\Times\Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" />
<Content Include="Themes\Times\Views\footer.ascx" />
<Content Include="Themes\Times\Views\layout.ascx" />
<Content Include="Themes\Times\Views\menu.ascx" />
<Content Include="Themes\Web.config" />
</ItemGroup>
<ItemGroup>
@@ -222,9 +249,6 @@
<IISUrl>
</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>

BIN
src/Orchard.Web/Themes/Green/Content/Images/bodyBackground.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 63 KiB

BIN
src/Orchard.Web/Themes/Green/Content/Images/bodyBackground.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 153 KiB

After

Width:  |  Height:  |  Size: 148 KiB

34
src/Orchard.Web/Themes/Green/Styles/blog.css Normal file
View File

@@ -0,0 +1,34 @@
/*Blog specific styles
----------------------------------------------------------*/
.posted, div.comment {
margin: 0 0 8px 0;
}
.meta, .manage {
float:right;
margin:6px 6px 0 0;
}
.manage {
margin:12px 6px 0 0;
}
.bloginfo h1 ,.blogPosts h3, .blogs h3 {
float:left;
}
.blogdescription, .postsummary {
clear:both;
}
.comments li {
margin:20px 20px 20px 10px;
padding:8px;
border-bottom:1px solid #eef2ed;
}
span.who {
font-weight:700;
}

140
src/Orchard.Web/Themes/Green/Styles/site.css
View File

@@ -2,39 +2,13 @@
/* Site CSS
----------------------------------------------------------*/
/* Common */
.floatLeft {float: left;} /*Use this class to float anything to the left*/
.floatRight {float: right;} /*Use this class to float anything to the right*/
.floatNone {float: none;}
.centered {margin:0 auto;} /*Center*/
.textRight {text-align:right;}
.textCentered {text-align:center;}
.textJustified {text-align:justify;}
.displayText {display:none;}
.clearLayout {clear:both;} /*Use this class clear layout*/
.disabled {color:#CCC;}
.alert {color:#FF0000;}
/* Headings and defaults
/*Defaults
----------------------------------------------------------*/
html {height: 100%; background-color: #eaf0e8;}
body {
font-family: "Tahoma", "Helvetica Neue", "Lucida Grande", "Segoe UI", Arial, Helvetica, Verdana, sans-serif;
font-family: "Segoe UI", Candara, "Bitstream Vera Sans", "DejaVu Sans", "Bitstream Vera Sans", "Trebuchet MS", Verdana, "Verdana Ref", sans-serif;
font-style:normal;
background:url(../Content/Images/bodyBackground.png) top center no-repeat #eaf0e8;
text-align:left;
@@ -43,7 +17,9 @@ body {
}
/* Headings */
/* ---------- Headings and defaults ---------- */
h1,h2,h3,h4,h5,h6,legend {font-weight:normal; font-style: normal; color:#37440a;}
h1 {font-size: 197%;} /*26px*/
h2 {font-size: 182%;} /*24px*/
@@ -52,18 +28,16 @@ h4 {font-size: 153.9%;} /*20px*/
h5 {font-size: 138.5%;} /*18px*/
h6 {font-size: 123.1%;} /*16px*/
.productWidget h5 {border-bottom:1px solid #d3d4d7; padding:0 0 10px 0;}
/* Paragraphs and lists */
p {line-height:20px; padding:2px 8px;}
.small {font-size: 85%; line-height:16px;}
p {line-height:20px; padding:12px 0px;}
.small {font-size: 96%;}
strong {font-weight:700;}
ul {line-height:22px;}
ul.bullet li {list-style:square inside;}
ul.square li {list-style:square; list-style-position:inside; line-height:24px; margin:0 0 0 12px;}
ol.decimal li {list-style:decimal; list-style-position:inside; line-height:24px; margin:0 0 0 12px;}
/* Links */
@@ -80,10 +54,11 @@ a:active {color:#006699; text-decoration:none;}
#innerft a:hover {text-decoration: underline;}
#innerft a:active {color:#525e50; text-decoration: none;}
/* Forms
----------------------------------------------------------*/
fieldset, input[type="text"], #CommentText, #password {
input[type="text"], textarea, #password {
border:1px solid #DDDEDF;
display: block;
-moz-border-radius:6px;
@@ -92,23 +67,34 @@ fieldset, input[type="text"], #CommentText, #password {
fieldset {
margin: 20px 20px 20px 10px;
border:1px solid #eef2ed;
-moz-border-radius:6px;
-webkit-border-radius:6px;
}
fieldset div {margin:12px 0 0 0}
legend {
font-size:123.1%;
margin:-10px 0 0 10px;
padding:0 6px;
}
label {
display: block;
margin:20px 0 2px 10px;
font-weight:600;
margin:8px 0 2px 16px;
font-size:105%;
}
input[type="text"], #CommentText, #password {
input[type="text"], textarea, #password {
border-color:#cacec6;
padding:2px;
margin:2px 0 20px 10px;
width:80%;
margin:2px 0 4px 16px;
width:90%;
}
input[type="checkbox"] {
margin:2px 0 20px 10px;
margin:2px 0 4px 10px;
}
input[type="submit"], input[type="button"] {
@@ -123,6 +109,7 @@ input[type="submit"], input[type="button"] {
display:inline;
}
/* Tables
----------------------------------------------------------*/
@@ -187,12 +174,17 @@ colgroup
#bd {
min-height:500px;
background:#fff;
padding: 20px 16px;
-webkit-border-top-left-radius: 6px; /* for Safari */
-webkit-border-top-right-radius: 6px;
-moz-border-radius-topleft: 6px; /* for Firefox */
-moz-border-radius-topright: 6px;
}
#hd h1 {
margin: 0px;
}
#hd h1 a {
background:url(../Content/Images/logo.png) no-repeat top left;
display: block;
@@ -215,17 +207,30 @@ colgroup
float:right;
}
#maincolumn {margin:10px 0 0 20px;}
#maincolumn {
padding:0 18px 0 0;
}
#subcolumn1 {
margin:43px 10px 10px 10px;
#subcolumn {
padding:4px 0 12px 0;
border:1px solid #e1e7df;
background:#fff;
}
#subcolumn h4 {
margin:6px 0 0 6px;
}
#subcolumn p {
padding:6px;
}
#subcolumn ul {
border:1px solid #eef2ed;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
padding:8px;
}
/* contentItems is the generic class for all content items - e.g. blogs uses this for the unordered lists to display posts */
.contentItems li {
@@ -242,6 +247,7 @@ colgroup
#innerft {
padding:20px 8px 8px 8px;
padding:10px 20px 20px 20px;
}
@@ -250,7 +256,7 @@ colgroup
#menucontainer {
margin:0;
padding:0;
padding:0 0 0 20px;
list-style:none;
float:left;
font-size:104%;
@@ -264,8 +270,44 @@ colgroup
#menucontainer ul li a {
display:block;
padding:.4em 1.4em .6em 1.4em;
padding: 8px 18px;
background:url(../Content/Images/tabLeftOff.gif) no-repeat top left;
text-decoration:none;
float:left;
font-size:115%;
color:#35550b;
}
#menucontainer ul li.tabon {
background:url(../Content/Images/tabRightOn.gif) no-repeat top right;
}
#menucontainer ul li.tabon a {
background:url(../Content/Images/tabLeftOn.gif) no-repeat top left;
font-weight:600;
}
/* Common */
.floatLeft {float: left;}
.floatRight {float: right;}
.floatNone {float: none;}
.centered {margin:0 auto;}
.textRight {text-align:right;}
.textCentered {text-align:center;}
.textJustified {text-align:justify;}
.displayText {display:none;}
.clearLayout {clear:both;}
.disabled {color:#CCC;}
.alert {color:#FF0000;}

7
src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx Normal file
View File

@@ -0,0 +1,7 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Blog>>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>
<h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3>
<div class="blog meta"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%></a></div>
<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div>

21
src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx Normal file
View File

@@ -0,0 +1,21 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Blog>>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>
<div class="bloginfo">
<h1><%=Html.TitleForPage(Model.Item.Name) %></h1>
<div class="manage">
<a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit"><%=_Encoded("Edit") %></a>
</div>
<div class="blogdescription">
<p><%=Html.Encode(Model.Item.Description) %></p>
</div>
</div>
<% Html.Zone("primary");
Html.ZonesAny(); %>

13
src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx Normal file
View File

@@ -0,0 +1,13 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<BlogPost>>" %>
<%@ Import Namespace="Orchard.ContentManagement"%>
<%@ Import Namespace="Orchard.Core.Common.Models"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>
<h3><%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug)) %></h3>
<div class="meta"><%=Html.PublishedState(Model.Item) %> | <%=Html.Link(_Encoded("?? comments").ToString(), "") %>
</div>
<div class="postsummary"><%=Model.Item.As<BodyAspect>().Text ?? string.Format("<p><em>{0}</em></p>", _Encoded("there's no content for this blog post"))%></div>

40
src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Comments.HasComments.ascx Normal file
View File

@@ -0,0 +1,40 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<HasComments>" %>
<%@ Import Namespace="Orchard.Comments.Models"%>
<h2 id="comments"><%=_Encoded("{0} Comment{1}", Model.CommentCount, Model.CommentCount == 1 ? "" : "s") %></h2><%
if (Model.CommentCount > 0) { Html.RenderPartial("ListOfComments", Model.Comments); }
if (Model.CommentsActive == false) { %>
<p><%=_Encoded("Comments have been disabled for this content.") %></p><%
} else { %>
<%-- todo: (heskew) need a comment form for the authenticated user... --%>
<% using(Html.BeginForm("Create", "Admin", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment" })) { %>
<%=Html.ValidationSummary() %>
<fieldset class="who">
<legend>Leave your comment</legend>
<%=Html.Hidden("CommentedOn", Model.ContentItem.Id) %>
<%=Html.Hidden("ReturnUrl", Context.Request.Url) %>
<div>
<label for="Name"><%=_Encoded("Name") %></label>
<input id="Name" class="text" name="Name" type="text" />
</div>
<div>
<label for="Email"><%=_Encoded("Email") %></label>
<input id="Email" class="text" name="Email" type="text" />
</div>
<div>
<label for="SiteName"><%=_Encoded("Url") %></label>
<input id="SiteName" class="text" name="SiteName" type="text" />
</div>
<div>
<label for="CommentText"><%=_Encoded("Comment") %></label>
<textarea id="CommentText" rows="10" cols="30" name="CommentText"></textarea>
</div>
<div>
<input type="submit" class="button" value="<%=_Encoded("Submit Comment") %>" />
<%=Html.AntiForgeryTokenOrchard() %>
</div>
</fieldset><%
}
} %>

4
src/Orchard.Web/Themes/Green/Views/footer.ascx
View File

@@ -14,7 +14,7 @@
<div class="yui-g">
<div class="yui-u first">
<h5>Need Help?</h5>
<ul class="bullet">
<ul class="square">
<li><a href="#">Lorem ipsum</a></li>
<li><a href="#">Lorem ipsum</a></li>
<li><a href="#">Lorem ipsum</a></li>
@@ -24,7 +24,7 @@
</div>
<div class="yui-u">
<h5>Company Info</h5>
<ul class="bullet">
<ul class="square">
<li><a href="#">Lorem ipsum</a></li>
<li><a href="#">Lorem ipsum</a></li>
<li><a href="#">Lorem ipsum</a></li>

16
src/Orchard.Web/Themes/Green/Views/layout.ascx
View File

@@ -5,6 +5,7 @@
<%
Html.RegisterStyle("yui.css");
Html.RegisterStyle("site.css");
Html.RegisterStyle("blog.css");
%>
<div id="doc4" class="yui-t6">
@@ -32,15 +33,22 @@
<div id="bd" role="main">
<div id="yui-main">
<div id="maincolumn" class="yui-b">
<div class="yui-g coreWidget">
<div class="yui-g">
<%--Main Content--%>
<%Html.ZoneBody("content");%>
</div>
</div>
</div>
<div id="subcolumn1" class="yui-b">
<%--Start widgets--%>
This was our old widget zone
<div id="subcolumn" class="yui-b">
<h3>Sidebar</h3>
<ul>
<li><h4>Item 1</h4></li>
<li><p class="small">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas adipiscing dolor vel nunc molestie laoreet. Curabitur vitae elit et massa consequat interdum. Curabitur blandit leo nec magna dictum vitae mollis tellus gravida. Morbi non condimentum neque. Suspendisse commodo condimentum feugiat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</p></li>
<li><h4>Item 2</h4></li>
<li><p class="small">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas adipiscing dolor vel nunc molestie laoreet. Curabitur vitae elit et massa consequat interdum. Curabitur blandit leo nec magna dictum vitae mollis tellus gravida. Morbi non condimentum neque. Suspendisse commodo condimentum feugiat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</p></li>
</ul>
</div>
</div>
<%-- End Content --%>

2
src/Orchard.Web/Themes/Green/Views/menu.ascx
View File

@@ -1,7 +1,7 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<div id="menucontainer" role="navigation" class="yui-g">
<ul id="menu">
<li><%= Html.ActionLink("Home", "Index", "Home", new {Area = ""}, new {})%></li>
<li class="tabon"><%= Html.ActionLink("Home", "Index", "Home", new {Area = ""}, new {})%></li>
<li><%= Html.ActionLink("Blogs", "List", "Blog", new {Area = "Orchard.Blogs"}, new {})%></li>
<li><%= Html.ActionLink("Admin", "List", new {Area = "Orchard.Blogs", Controller = "BlogAdmin"})%></li>
</ul>