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

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Michael Dorian Bach
2010-03-09 21:10:37 -08:00
parent 274b96449b 7798083a8d
commit b5bf9cf6f4
14 changed files with 103 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.Summary.ascx Normal file
View File

@@ -0,0 +1,6 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BlogPost>" %>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%><%
if (Model.Creator != null) {
%><span class="posted"><%=_Encoded("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model)) %> | </span><%
} %>

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

@@ -161,6 +161,22 @@
</ItemGroup>
<ItemGroup>
<None Include="Themes\TheAdmin\Styles\images\icons.psd" />
<Content Include="Themes\ClassicDark\Content\Images\bodyBackgroundgrey.gif" />
<Content Include="Themes\ClassicDark\Content\Images\sidebarBackground.gif" />
<Content Include="Themes\ClassicDark\Styles\blog.css" />
<Content Include="Themes\ClassicDark\Styles\site.css" />
<Content Include="Themes\ClassicDark\Theme.png" />
<Content Include="Themes\ClassicDark\Theme.txt" />
<Content Include="Themes\ClassicDark\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
<Content Include="Themes\ClassicDark\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
<Content Include="Themes\ClassicDark\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
<Content Include="Themes\ClassicDark\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
<Content Include="Themes\ClassicDark\Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" />
<Content Include="Themes\ClassicDark\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
<Content Include="Themes\ClassicDark\Views\DisplayTemplates\Parts\Pages.Page.Metadata.ascx" />
<Content Include="Themes\ClassicDark\Views\Footer.ascx" />
<Content Include="Themes\ClassicDark\Views\Layout.ascx" />
<Content Include="Themes\ClassicDark\Views\ZoneTest.ascx" />
<Content Include="Themes\Classic\Content\Images\bodyBackground.gif" />
<Content Include="Themes\Classic\Content\Images\bodyBackgroundgrey.gif" />
<Content Include="Themes\Classic\Content\Images\footerBackground.gif" />
@@ -170,6 +186,7 @@
<Content Include="Themes\Classic\Content\Images\mainBackgroundgrey.png" />
<Content Include="Themes\Classic\Content\Images\navDivider.gif" />
<Content Include="Themes\Classic\Content\Images\sidebarBackground.gif" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
<Content Include="Themes\Classic\Zones\Sidebar.html" />
<Content Include="Themes\Classic\Styles\blog.css" />
<Content Include="Themes\Classic\Styles\site.css" />
@@ -238,6 +255,8 @@
<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\Views\Archives.ascx" />
<Content Include="Themes\Green\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
<Content Include="Themes\Green\Zones\Sidebar.html" />
<Content Include="Themes\Green\Zones\User2.html" />
<Content Include="Themes\Green\Zones\User3.html" />
@@ -277,6 +296,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="Themes\ClassicDark\DesignerNotes\" />
<Folder Include="Themes\SafeMode\Content\Images\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

7
src/Orchard.Web/Themes/Classic/Styles/blog.css
View File

@@ -34,3 +34,10 @@ ul.blogs p {
padding:20px 10px 0 0;
}
.archives {
margin: 0 0 24px 0;
}
ul.archiveMonthList li {
padding:8px;
}

4
src/Orchard.Web/Themes/ClassicDark/Styles/blog.css
View File

@@ -33,3 +33,7 @@ ul.blogs p {
float:left;
padding:20px 10px 0 0;
}
.archives {
margin: 0 0 24px 0;
}

11
src/Orchard.Web/Themes/Green/Styles/blog.css
View File

@@ -54,4 +54,13 @@
float:left;
padding:20px 10px 0 0;
}
.archives {
margin: 0 0 18px 0;
}
#subcolumn ul.archiveMonthList li {
background:0;
border:0;
padding:8px;
}

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

@@ -211,12 +211,12 @@ colgroup
padding:4px 20px 12px 0;
}
#subcolumn h4, .homeWidget h4 {
#subcolumn h4, .subZone h4 {
padding:6px 0 8px 6px;
background:#CED5CE;
}
#subcolumn h4:hover, .homeWidget h4:hover {
#subcolumn h4:hover, .subZone h4:hover {
padding:6px 0 8px 6px;
background:#CED5CE;
cursor:pointer;
@@ -226,7 +226,7 @@ colgroup
padding:8px;
}
#subcolumn ul li, .homeWidget {
#subcolumn ul li, .subZone, .archives {
border:1px solid #CACEC6;
background:#EAF0E8;
-webkit-border-radius: 6px;
@@ -234,7 +234,7 @@ colgroup
margin: 0 0 18px 0;
}
div.homeWidget {
div.subZone {
margin:24px 0;
}

38
src/Orchard.Web/Themes/Green/Views/Archives.ascx Normal file
View File

@@ -0,0 +1,38 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="Orchard.Mvc.ViewUserControl<BlogArchivesViewModel>" %>
<%@ Import Namespace="Orchard.Blogs.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>
<% Html.RegisterStyle("archives.css"); %>
<% Html.RegisterFootScript("archives.js"); %>
<div class="archives">
<h4 class="collapsible"><%=_Encoded("Archives") %></h4><%
if (Model.Archives.Count() > 0) {
if (Model.Archives.Count() > 20) { %>
<ul class="years"><%
int lastYear = Model.Archives.First().Key.Year;
int firstYear = Model.Archives.Last().Key.Year;
for (int year = lastYear; year >= firstYear; year--) {
var yearMonths = Model.Archives.Where(m => m.Key.Year == year);
if (year == lastYear) { %>
<li>
<h4><%=year %></h4><%
}
else { %>
<li class="previous">
<h4><%=year %> <span>(<%=yearMonths.Sum(ym => ym.Value) %>)</span></h4><%
} %>
<%=Html.UnorderedList(yearMonths, (t, i) => Html.Link(string.Format("{0:MMMM} ({1})", t.Key.ToDateTime(), t.Value), Url.BlogArchiveMonth(Model.Blog.Slug, t.Key.Year, t.Key.Month)), "archiveMonthList") %>
</li><%
} %>
</ul><%
}
else { %>
<%=Html.UnorderedList(Model.Archives, (t, i) => Html.Link(string.Format("{0:MMMM yyyy} ({1})", t.Key.ToDateTime(), t.Value), Url.BlogArchiveMonth(Model.Blog.Slug, t.Key.Year, t.Key.Month)), "archiveMonthList") %><%
}
}
else { %>
<div class="message info"><%=_Encoded("None found")%></div><%
} %>
</div>

3
src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx
View File

@@ -9,5 +9,4 @@
<div class="bloginfo">
<h1><%=Html.TitleForPage(Model.Item.Name) %></h1>
</div>
<% Html.Zone("primary", ":manage :metadata");
Html.ZonesAny(); %>
<% Html.Zone("primary"); %>

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

@@ -10,5 +10,5 @@
<div class="meta"><%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%></div>
<div class="postsummary">
<% Html.Zone("primary", ":manage :metadata"); %>
<% Html.Zone("primary"); %>
</div>

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

@@ -0,0 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<BlogPost>>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>
<h1><%=Html.TitleForPage(Model.Item.Title)%></h1>
<% Html.Zone("primary"); %>

8
src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
View File

@@ -47,11 +47,11 @@ return false;
<div class="yui-g">
<%--Main Content--%>
<%Html.ZoneBody("content");%>
<div class="yui-u first homeWidget">
<%Html.Zone("Widget"); %>
<div class="yui-u first subZone">
<%Html.Zone("sideBarZone1"); %>
</div>
<div class="yui-u homeWidget">
<%Html.Zone("Widget1"); %>
<div class="yui-u subZone">
<%Html.Zone("sideBarZone2"); %>
</div>
</div>

5
src/Orchard.Web/Themes/Green/Views/Layout.ascx
View File

@@ -51,12 +51,13 @@ return false;
<div id="subcolumn" class="yui-b">
<div>
<%Html.Zone("sidebar");%>
<ul>
<li>
<%Html.Zone("Widget"); %>
<%Html.Zone("sideBarZone1"); %>
</li>
<li>
<%Html.Zone("Widget1"); %>
<%Html.Zone("sideBarZone2"); %>
</li>
</ul>
</div>

0
src/Orchard.Web/Themes/Green/Zones/Widget.html → src/Orchard.Web/Themes/Green/Zones/sideBarZone1.html
View File

0
src/Orchard.Web/Themes/Green/Zones/Widget1.html → src/Orchard.Web/Themes/Green/Zones/sideBarZone2.html
View File