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

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-07-15 15:00:10 -07:00
parent 3982bbdb87 3538ce33a9
commit fe35cc634a
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
AzurePackage.proj
View File

@@ -31,6 +31,7 @@
<Target Name="Package"> <Target Name="Package">
<CallTarget Targets="Package-ForCloud"/> <CallTarget Targets="Package-ForCloud"/>
<CallTarget Targets="Package-SqlCe" />
<CallTarget Targets="Package-Stage"/> <CallTarget Targets="Package-Stage"/>
<CallTarget Targets="Package-Zip"/> <CallTarget Targets="Package-Zip"/>
</Target> </Target>
@@ -39,7 +40,6 @@
<!-- Building --> <!-- Building -->
<Target Name="Clean"> <Target Name="Clean">
<MSBuild Projects="$(SrcFolder)\Orchard.sln" Targets="Clean" />
<MSBuild Projects="$(SrcFolder)\Orchard.Azure\Orchard.Azure.CloudService.sln" Targets="Clean" /> <MSBuild Projects="$(SrcFolder)\Orchard.Azure\Orchard.Azure.CloudService.sln" Targets="Clean" />
<RemoveDir Directories="$(BuildFolder)" /> <RemoveDir Directories="$(BuildFolder)" />
</Target> </Target>
@@ -70,13 +70,6 @@
</Target> </Target>
<Target Name ="Spec">
<CreateItem Include="$(CompileFolder)\*.Specs.dll">
<Output TaskParameter="Include" ItemName="SpecAssemblies" />
</CreateItem>
<NUnit Assemblies="@(SpecAssemblies)" ToolPath="$(LibFolder)\nunit" />
</Target>
<!-- Packaging --> <!-- Packaging -->
<Target Name="Package-ForCloud"> <Target Name="Package-ForCloud">
@@ -126,6 +119,15 @@
</Target> </Target>
<Target Name="Package-SqlCe">
<ItemGroup>
<SqlCeBinariesx86 Include="$(LibFolder)\sqlce\x86\*.*" />
<SqlCeBinariesx64 Include="$(LibFolder)\sqlce\amd64\*.*" />
</ItemGroup>
<Copy SourceFiles="@(SqlCeBinariesx86)" DestinationFolder="$(CloudRootFolder)\bin\x86" SkipUnchangedFiles="true" />
<Copy SourceFiles="@(SqlCeBinariesx64)" DestinationFolder="$(CloudRootFolder)\bin\amd64" SkipUnchangedFiles="true" />
</Target>
<Target Name="Package-Stage"> <Target Name="Package-Stage">
<Exec <Exec

7
src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs
View File

@@ -1,8 +1,15 @@
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.ContentManagement.Aspects;
using Orchard.ContentManagement.Drivers; using Orchard.ContentManagement.Drivers;
namespace Orchard.Core.Contents.Drivers { namespace Orchard.Core.Contents.Drivers {
public class ContentsDriver : ContentItemDriver<ContentPart> { public class ContentsDriver : ContentItemDriver<ContentPart> {
protected override string GetDisplayText(ContentPart item) {
return item.Is<IRoutableAspect>()
? item.As<IRoutableAspect>().Title
: base.GetDisplayText(item);
}
protected override DriverResult Display(ContentPart part, string displayType) { protected override DriverResult Display(ContentPart part, string displayType) {
return ContentItemTemplate("Items/Contents.Item").LongestMatch(displayType, "Summary", "SummaryAdmin"); return ContentItemTemplate("Items/Contents.Item").LongestMatch(displayType, "Summary", "SummaryAdmin");
} }

4
src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.SummaryAdmin.ascx
View File

@@ -1,10 +1,8 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels" %> <%@ Import Namespace="Orchard.Mvc.ViewModels" %>
<%@ Import Namespace="Orchard.ContentManagement.Aspects" %>
<%@ Import Namespace="Orchard.ContentManagement" %>
<div class="summary"> <div class="summary">
<div class="properties"> <div class="properties">
<h3><%:Html.ActionLink(Model.Item.Is<IRoutableAspect>() ? Model.Item.As<IRoutableAspect>().Title : string.Format("[title for this {0}]", Model.Item.TypeDefinition.DisplayName), "Edit", new { id = Model.Item.Id }) %></h3> <h3><%:Html.ItemEditLink(Model.Item) %></h3>
<div class="metadata"><% Html.Zone("metadata"); %></div> <div class="metadata"><% Html.Zone("metadata"); %></div>
</div> </div>
<div class="related"><% <div class="related"><%

3
src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/admin.css Normal file
View File

@@ -0,0 +1,3 @@
.tenantHost {
font-size: .8em;
}

3
src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx
View File

@@ -2,6 +2,7 @@
<%@ Import Namespace="Orchard.MultiTenancy.Extensions" %> <%@ Import Namespace="Orchard.MultiTenancy.Extensions" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.MultiTenancy.ViewModels"%> <%@ Import Namespace="Orchard.MultiTenancy.ViewModels"%>
<%Html.RegisterStyle("admin.css"); %>
<h1><%: Html.TitleForPage(T("List of Site's Tenants").ToString())%></h1> <h1><%: Html.TitleForPage(T("List of Site's Tenants").ToString())%></h1>
<div class="manage"><%: Html.ActionLink(T("Add a Tenant").ToString(), "Add", new {area = "Orchard.MultiTenancy"}, new { @class = "button primaryAction" })%></div> <div class="manage"><%: Html.ActionLink(T("Add a Tenant").ToString(), "Add", new {area = "Orchard.MultiTenancy"}, new { @class = "button primaryAction" })%></div>
<ul class="contentItems tenants"><% <ul class="contentItems tenants"><%
@@ -9,7 +10,7 @@
<li class="tenant <%=tenant.State.CurrentState %>"> <li class="tenant <%=tenant.State.CurrentState %>">
<div class="summary"> <div class="summary">
<div class="properties"> <div class="properties">
<h3><span class="tenantName"><%: tenant.Name %></span><% <h3><%: tenant.Name %><%
if (!string.IsNullOrEmpty(tenant.RequestUrlHost)) { if (!string.IsNullOrEmpty(tenant.RequestUrlHost)) {
%><span class="tenantHost"> - <%: Html.Link(Url.Tenant(tenant), Url.Tenant(tenant))%></span><% %><span class="tenantHost"> - <%: Html.Link(Url.Tenant(tenant), Url.Tenant(tenant))%></span><%
} %></h3> } %></h3>