lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-23 12:53:33 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Michael Dorian Bach
2010-10-19 19:44:05 -07:00
parent 9796467508 aa756f46d0
commit d9f1696868
5 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.SummaryAdmin.cshtml
View File

@@ -14,8 +14,8 @@
</div> </div>
<div class="related">@Display(Model.Related) <div class="related">@Display(Model.Related)
@Html.Link(T("Edit").Text, Url.BlogPostEdit((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart)))) @T(" | ") @Html.Link(T("Edit").Text, Url.BlogPostEdit((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart)))) @T(" | ")
@Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" }) @Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })@T(" | ")
<br />@Display(Model.Secondary) @Display(Model.Secondary)
</div> </div>
<div class="primary">@Display(Model.Content)</div> <div class="primary">@Display(Model.Content)</div>
</div> </div>

2
src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Count.SummaryAdmin.cshtml
View File

@@ -1,4 +1,4 @@
@using Orchard.Comments.Models; @using Orchard.Comments.Models;
@using Orchard.Comments.ViewModels; @using Orchard.Comments.ViewModels;
@using Orchard.ContentManagement; @using Orchard.ContentManagement;
<span class="commentcount">@Display.CommentSummaryLinks(item: Model.ContentPart.ContentItem, count: Model.CommentCount, pendingCount: Model.PendingCount)</span> <span class="commentcount">@Display.CommentSummaryLinks(item: Model.ContentPart.ContentItem, count: Model.CommentCount, pendingCount: Model.PendingCount)@T(" | ")</span>

2
src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
View File

@@ -89,7 +89,7 @@
<Compile Include="ViewModels\WidgetsIndexViewModel.cs" /> <Compile Include="ViewModels\WidgetsIndexViewModel.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Content\Admin\images\edit.gif" /> <Content Include="Content\Admin\images\edit.png" />
<Content Include="Content\Admin\images\moveup.gif" /> <Content Include="Content\Admin\images\moveup.gif" />
<Content Include="Content\Admin\images\movedown.gif" /> <Content Include="Content\Admin\images\movedown.gif" />
<Content Include="Module.txt" /> <Content Include="Module.txt" />

6
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -756,7 +756,7 @@ table .button {
#main .contentItems li:hover .ibutton.blog { background-position:-120px 0; } #main .contentItems li:hover .ibutton.blog { background-position:-120px 0; }
.contentItems .summary { .contentItems .summary {
overflow:auto; clear:both;
padding:1.2em .4em .5em; padding:1.2em .4em .5em;
} }
.contentItems .properties { .contentItems .properties {
@@ -786,9 +786,9 @@ table .button {
margin:0 .2em -.2em; margin:0 .2em -.2em;
} }
.contentItems .related { .contentItems .related {
float:right;
font-size:1.4em;
text-align:right; text-align:right;
font-size:1.4em;
} }
.contentItems .commentcount { .contentItems .commentcount {
line-height:2em; line-height:2em;

5
src/Orchard.Web/Themes/Themes.csproj
View File

@@ -89,13 +89,10 @@
<Content Include="TheAdmin\Theme.png" /> <Content Include="TheAdmin\Theme.png" />
<Content Include="TheAdmin\Views\User.cshtml" /> <Content Include="TheAdmin\Views\User.cshtml" />
<Content Include="TheAdmin\Views\Header.cshtml" /> <Content Include="TheAdmin\Views\Header.cshtml" />
<Content Include="TheThemeMachine\Views\Items\BlogPost.Summary.cshtml" />
<Content Include="TheThemeMachine\Views\Items\BlogPost.cshtml">
<SubType>Designer</SubType>
</Content>
<Content Include="TheThemeMachine\Views\Layout.cshtml" /> <Content Include="TheThemeMachine\Views\Layout.cshtml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="TheThemeMachine\Views\Items\" />
<Folder Include="TheThemeMachine\Views\Parts\" /> <Folder Include="TheThemeMachine\Views\Parts\" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />