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

Polishing Core.Contents

Browse Source 
--HG--
branch : theming
This commit is contained in:
Sebastien Ros
2010-09-13 12:50:16 -07:00
parent a37b464a14
commit 508b0d88f7
12 changed files with 9 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Orchard.Web/Core/Contents/Views/Admin/List.ascx_
View File

@@ -1,40 +0,0 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Contents.ViewModels.ListContentsViewModel>" %>
<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
<h1><%:Html.TitleForPage((string.IsNullOrEmpty(Model.TypeDisplayName) ? T("Manage Content") : T("Manage {0} Content", Model.TypeDisplayName)).ToString()) %></h1>
<div class="manage">
<%:Html.ActionLink(!string.IsNullOrEmpty(Model.TypeDisplayName) ? T("Create New {0}", Model.TypeDisplayName).Text : T("Create New Content").Text, "Create", new { }, new { @class = "button primaryAction" }) %>
</div><%
using (Html.BeginFormAntiForgeryPost()) { %>
<fieldset class="bulk-actions">
<label for="publishActions"><%:T("Actions:") %></label>
<select id="publishActions" name="<%:Html.NameOf(m => m.Options.BulkAction) %>">
<%:Html.SelectOption(Model.Options.BulkAction, ContentsBulkAction.None, T("Choose action...").ToString()) %>
<%:Html.SelectOption(Model.Options.BulkAction, ContentsBulkAction.PublishNow, T("Publish Now").ToString()) %>
<%:Html.SelectOption(Model.Options.BulkAction, ContentsBulkAction.Unpublish, T("Unpublish").ToString()) %>
<%:Html.SelectOption(Model.Options.BulkAction, ContentsBulkAction.Remove, T("Remove").ToString()) %>
</select>
<button type="submit" name="submit.BulkEdit" value="yes"><%:T("Apply") %></button>
</fieldset>
<fieldset class="bulk-actions">
<label for="filterResults" class="bulk-filter"><%:T("Show")%></label>
<select id="filterResults" name="<%:Html.NameOf(m => m.Options.SelectedFilter) %>">
<%:Html.SelectOption(Model.Options.SelectedFilter, "", T("any (show all)").ToString()) %>
<% foreach(var filterOption in Model.Options.FilterOptions) { %>
<%:Html.SelectOption(Model.Options.SelectedFilter, filterOption.Key, filterOption.Value) %><%
} %>
</select>
<label for="orderResults" class="bulk-order"><%:T("Ordered by")%></label>
<select id="orderResults" name="<%:Html.NameOf(m => m.Options.OrderBy) %>">
<%:Html.SelectOption(Model.Options.OrderBy, ContentsOrder.Created, T("recently created").ToString())%>
<%:Html.SelectOption(Model.Options.OrderBy, ContentsOrder.Modified, T("recently modified").ToString())%>
<%--<%:Html.SelectOption(Model.Options.OrderBy, ContentsOrder.Published, T("Date Published").ToString())%>--%>
</select>
<button type="submit" name="submit.Filter" value="yes please"><%:T("Apply") %></button>
</fieldset>
<fieldset class="contentItems bulk-items">
<%:Html.UnorderedList(
Model.Entries,
(entry, i) => Html.DisplayForItem(entry.ViewModel),
"") %>
</fieldset><%
} %>

5
src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.Summary.ascx
View File

@@ -1,5 +0,0 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Mvc.ViewModels.ContentItemViewModel>" %>
<h3><%:Html.ItemDisplayLink(Model.Item) %></h3>
<div class="content">
<% Html.Zone("primary", ":manage :metadata"); %>
</div>

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

@@ -1,17 +0,0 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels" %>
<%@ Import Namespace="Orchard.Utility.Extensions" %>
<div class="summary" itemscope="itemscope" itemid="<%:Model.Item.Id %>" itemtype="http://orchardproject.net/data/ContentItem">
<div class="properties">
<input type="checkbox" value="<%:Model.Item.Id %>" name="itemIds"/>
<h3><%:Html.ItemEditLink(Model.Item) %></h3>
<div class="metadata"><% Html.Zone("metadata"); %></div>
</div>
<div class="related"><%
Html.Zone("secondary"); %>
<%:Html.ItemEditLink(T("Edit").Text, Model.Item) %><%:T(" | ") %>
<%:Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = Model.Item.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString() }), new { itemprop = "RemoveUrl UnsafeUrl" }) %>
<br /><% Html.Zone("meta"); %>
</div>
<div class="primary"><% Html.ZonesAny(); %></div>
</div>

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

@@ -1,6 +0,0 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels" %>
<h1><%:Html.ItemDisplayText(Model.Item)%></h1>
<% Html.Zone("metadata");
Html.Zone("primary", ":manage :metadata");
Html.ZonesAny(); %>

13
src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Parts/Contents.Publish.SummaryAdmin.ascx
View File

@@ -1,13 +0,0 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Contents.ViewModels.PublishContentViewModel>" %>
<%@ Import Namespace="Orchard.Utility.Extensions" %>
<% // todo: make this all work
if (Model.HasPublished) { %>
<%:Html.ItemDisplayLink(T("View").Text, Model.ContentItem) %><%:T(" | ") %><%
if (Model.HasDraft) { %>
<%:Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = Model.ContentItem.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString() }), new { itemprop = "PublishUrl UnsafeUrl" })%><%:T(" | ") %><%
} %>
<%:Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new { area = "Contents", id = Model.ContentItem.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString() }), new { itemprop = "UnpublishUrl UnsafeUrl" })%><%:T(" | ") %><%
}
else { %>
<%:Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = Model.ContentItem.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString() }), new { itemprop = "PublishUrl UnsafeUrl" })%><%:T(" | ") %><%
} %>

1
src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Parts/Contents.Publish.ascx
View File

@@ -1 +0,0 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Contents.ViewModels.PublishContentViewModel>" %>

14
src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx
View File

@@ -1,14 +0,0 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<div class="sections">
<div class="primary"><%
Html.Zone("primary");
Html.ZonesExcept("secondary"); %>
</div>
<div class="secondary">
<% Html.Zone("secondary");%>
<fieldset>
<input class="button primaryAction" type="submit" name="submit.Save" value="<%: T("Save") %>"/>
</fieldset>
</div>
</div>

4
src/Orchard.Web/Core/Contents/Views/Item/Display.cshtml
View File

@@ -1,3 +1 @@
@model dynamic
<h1>Oh hai!</h1>
@Display(Model)
@Display(Model)

3
src/Orchard.Web/Core/Contents/Views/Item/Preview.aspx
View File

@@ -1,3 +0,0 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<Orchard.Core.Contents.ViewModels.DisplayItemViewModel>" %>
<%: Html.DisplayForItem(m=>m.Content) %>

1
src/Orchard.Web/Core/Contents/Views/Item/Preview.cshtml Normal file
View File

@@ -0,0 +1 @@
@Display(Model)

19
src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/LocationSettings.ascx
View File

@@ -1,18 +1,11 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.ContentsLocation.ViewModels.LocationSettingsViewModel>" %>
<%
Html.RegisterStyle("admin.css"); %>
@model Orchard.Core.ContentsLocation.ViewModels.LocationSettingsViewModel
@Html.RegisterStyle("admin.css");
<fieldset class="location-setting">
<legend><%:T("{0}", Model.Definition.DisplayName) %></legend>
<legend>@T("{0}", Model.Definition.DisplayName)</legend>
<fieldset>
<label for="<%:Html.FieldIdFor(m => m.Location.Zone) %>"><%:T("Zone name (e.g. body, primary)") %></label><%
if (!string.IsNullOrWhiteSpace(Model.DefaultLocation.Zone)) {
%><span class="default"><%:T(" - default: {0}", Model.DefaultLocation.Zone) %></span><%
} %><%:Html.EditorFor(m => m.Location.Zone) %><%:Html.ValidationMessageFor(m => m.Location.Zone)%>
<label for="@Html.FieldIdFor(m => m.Location.Zone)">@T("Zone name (e.g. body, primary)")</label>@if (!string.IsNullOrWhiteSpace(Model.DefaultLocation.Zone)) {<span class="default">@T(" - default: {0}", Model.DefaultLocation.Zone)</span>}@Html.EditorFor(m => m.Location.Zone)@Html.ValidationMessageFor(m => m.Location.Zone)
</fieldset>
<fieldset>
<label for="<%:Html.FieldIdFor(m => m.Location.Position) %>"><%:T("Position in zone (e.g. 1, 1.0, 2.5.1)") %></label><%
if (!string.IsNullOrWhiteSpace(Model.DefaultLocation.Zone)) {
%><span class="default"><%:T(" - default: {0}", Model.DefaultLocation.Position) %></span><%
} %><%:Html.EditorFor(m => m.Location.Position) %>
</fieldset><%:Html.ValidationMessageFor(m => m.Location.Position)%>
<label for="@Html.FieldIdFor(m => m.Location.Position)">@T("Position in zone (e.g. 1, 1.0, 2.5.1)")</label>@if (!string.IsNullOrWhiteSpace(Model.DefaultLocation.Zone)) {<span class="default">@T(" - default: {0}", Model.DefaultLocation.Position)</span>}@Html.EditorFor(m => m.Location.Position)
</fieldset>@Html.ValidationMessageFor(m => m.Location.Position)
</fieldset>

9
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -251,8 +251,6 @@
<Content Include="ContentsLocation\Styles\admin.css" />
<Content Include="ContentsLocation\Views\DefinitionTemplates\LocationSettings.ascx" />
<None Include="Contents\Views\Admin\List.cshtml" />
<Content Include="Contents\Views\DisplayTemplates\Parts\Contents.Publish.SummaryAdmin.ascx" />
<Content Include="Contents\Views\DisplayTemplates\Parts\Contents.Publish.ascx" />
<Content Include="Localization\Views\EditorTemplates\Parts\Localization.Translation.ascx" />
<Content Include="Messaging\Module.txt" />
<Content Include="Messaging\Views\EditorTemplates\Parts\Messaging.MessageSettings.ascx" />
@@ -270,12 +268,7 @@
<None Include="Contents\Views\Admin\Edit.cshtml" />
<Content Include="Contents\Views\Admin\CreatableTypeList.ascx" />
<None Include="Contents\Views\Admin\Create.cshtml" />
<None Include="Contents\Views\Admin\List.ascx_" />
<Content Include="Contents\Views\DisplayTemplates\Items\Contents.Item.ascx" />
<Content Include="Contents\Views\DisplayTemplates\Items\Contents.Item.SummaryAdmin.ascx" />
<Content Include="Contents\Views\DisplayTemplates\Items\Contents.Item.Summary.ascx" />
<Content Include="Contents\Views\EditorTemplates\Items\Contents.Item.ascx" />
<Content Include="Contents\Views\Item\Preview.aspx" />
<None Include="Contents\Views\Item\Preview.cshtml" />
<Content Include="Localization\Styles\admin.css" />
<Content Include="Localization\Styles\base.css" />
<Content Include="Localization\Views\DisplayTemplates\Parts\Localization.ContentTranslations.Summary.ascx" />