Fix Razor views "using" syntax

"@using" directive now requires a semicolon at the end.

--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-10-07 10:48:51 -07:00
parent 0f4613cb18
commit 1e826830f2
86 changed files with 144 additions and 141 deletions

View File

@@ -1,3 +1,3 @@
@model Orchard.Core.Common.Fields.TextField @model Orchard.Core.Common.Fields.TextField
@using Orchard.Utility.Extensions @using Orchard.Utility.Extensions;
<p class="text-field"><span class="name">@Model.Name.CamelFriendly():</span> @Model.Value</p> <p class="text-field"><span class="name">@Model.Name.CamelFriendly():</span> @Model.Value</p>

View File

@@ -1,5 +1,5 @@
@model BodyDisplayViewModel @model BodyDisplayViewModel
@using Orchard.Core.Common.ViewModels @using Orchard.Core.Common.ViewModels;
<div class="manage"> <div class="manage">
@Html.ItemEditLinkWithReturnUrl(T("Edit").ToString(), Model.BodyPart.ContentItem) @Html.ItemEditLinkWithReturnUrl(T("Edit").ToString(), Model.BodyPart.ContentItem)
</div> </div>

View File

@@ -1,5 +1,5 @@
@model BodyDisplayViewModel @model BodyDisplayViewModel
@using Orchard.Core.Common.ViewModels @using Orchard.Core.Common.ViewModels;
@/* begin: knowingly broken HTML (hence the ManageWrapperPre and ManageWrapperPost templates) @/* begin: knowingly broken HTML (hence the ManageWrapperPre and ManageWrapperPost templates)
we need "wrapper templates" (among other functionality) in the future of UI composition we need "wrapper templates" (among other functionality) in the future of UI composition
please do not delete or the front end will be broken when the user is authenticated. */ please do not delete or the front end will be broken when the user is authenticated. */

View File

@@ -1,3 +1,3 @@
@model BodyDisplayViewModel @model BodyDisplayViewModel
@using Orchard.Core.Common.ViewModels @using Orchard.Core.Common.ViewModels;
<div class="managewrapper"> <div class="managewrapper">

View File

@@ -1,5 +1,5 @@
@model BodyDisplayViewModel @model BodyDisplayViewModel
@using Orchard.Core.Common.ViewModels @using Orchard.Core.Common.ViewModels;
@/*//doing excerpt generation on the way out for now so we don't stick ourselves with needing to regen excerpts for existing data @/*//doing excerpt generation on the way out for now so we don't stick ourselves with needing to regen excerpts for existing data
//also, doing this here, inline, until we have a pluggable processing model (both in and out) //also, doing this here, inline, until we have a pluggable processing model (both in and out)
//also, ...this is ugly*/ //also, ...this is ugly*/

View File

@@ -1,3 +1,3 @@
@model BodyDisplayViewModel @model BodyDisplayViewModel
@using Orchard.Core.Common.ViewModels @using Orchard.Core.Common.ViewModels;
@Model.Html @Model.Html

View File

@@ -1,5 +1,5 @@
@model Orchard.Core.Common.ViewModels.CommonMetadataViewModel @model Orchard.Core.Common.ViewModels.CommonMetadataViewModel
@using Orchard.Core.Common.Extensions @using Orchard.Core.Common.Extensions;
@if (Model.Creator != null) { @if (Model.Creator != null) {
<div class="metadata"> <div class="metadata">
<div class="posted">@T("Published by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T))</div> <div class="posted">@T("Published by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T))</div>

View File

@@ -1,5 +1,5 @@
@model BodyEditorViewModel @model BodyEditorViewModel
@using Orchard.Core.Common.ViewModels @using Orchard.Core.Common.ViewModels;
<fieldset> <fieldset>
<label>@T("Body")</label> <label>@T("Body")</label>
@Html.Partial("EditorTemplates/" + Model.TextEditorTemplate, Model) @Html.Partial("EditorTemplates/" + Model.TextEditorTemplate, Model)

View File

@@ -1,5 +1,5 @@
@model ContainerEditorViewModel @model ContainerEditorViewModel
@using Orchard.Core.Common.ViewModels @using Orchard.Core.Common.ViewModels;
<fieldset> <fieldset>
@Html.HiddenFor(m=>m.ContainerId) @Html.HiddenFor(m=>m.ContainerId)
</fieldset> </fieldset>

View File

@@ -1,5 +1,5 @@
@model OwnerEditorViewModel @model OwnerEditorViewModel
@using Orchard.Core.Common.ViewModels @using Orchard.Core.Common.ViewModels;
<fieldset> <fieldset>
@Html.LabelFor(m=>m.Owner) @Html.LabelFor(m=>m.Owner)
@Html.EditorFor(m=>m.Owner) @Html.EditorFor(m=>m.Owner)

View File

@@ -1,3 +1,3 @@
@model BodyEditorViewModel @model BodyEditorViewModel
@using Orchard.Core.Common.ViewModels @using Orchard.Core.Common.ViewModels;
@Html.TextArea("Text", Model.Text, 25, 80, new { @class = Model.Format }) @Html.TextArea("Text", Model.Text, 25, 80, new { @class = Model.Format })

View File

@@ -1,4 +1,4 @@
@using Orchard.Core.Contents.ViewModels @using Orchard.Core.Contents.ViewModels;
@{ @{
var typeDisplayName = Model.TypeDisplayName; var typeDisplayName = Model.TypeDisplayName;
var pageTitle = T("Manage Content"); var pageTitle = T("Manage Content");

View File

@@ -1,5 +1,5 @@
@using Orchard.ContentManagement @using Orchard.ContentManagement;
@using Orchard.Utility.Extensions @using Orchard.Utility.Extensions;
@{ @{
Script.Require("ShapesBase"); Script.Require("ShapesBase");
} }

View File

@@ -1,5 +1,5 @@
@using Orchard.ContentManagement @using Orchard.ContentManagement;
@using Orchard.Utility.Extensions @using Orchard.Utility.Extensions;
@{ @{
ContentItem contentItem = Model.ContentItem; ContentItem contentItem = Model.ContentItem;
var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();

View File

@@ -1,5 +1,5 @@
@model AddLocalizationViewModel @model AddLocalizationViewModel
@using Orchard.Core.Localization.ViewModels @using Orchard.Core.Localization.ViewModels;
@{ @{
dynamic content = Model.Content; dynamic content = Model.Content;
content.Zones.primary.Add(New.Partial(TemplateName: "CultureSelection", Model: Model), "0"); content.Zones.primary.Add(New.Partial(TemplateName: "CultureSelection", Model: Model), "0");

View File

@@ -1,6 +1,6 @@
@model MessageSettingsPartViewModel @model MessageSettingsPartViewModel
@using Orchard.Core.Messaging.Models @using Orchard.Core.Messaging.Models;
@using Orchard.Core.Messaging.ViewModels @using Orchard.Core.Messaging.ViewModels;
<fieldset> <fieldset>
<legend>@T("Messaging")</legend> <legend>@T("Messaging")</legend>
<div> <div>

View File

@@ -1,7 +1,7 @@
@model NavigationManagementViewModel @model NavigationManagementViewModel
@using Orchard.ContentManagement @using Orchard.ContentManagement;
@using Orchard.Core.Navigation.Models @using Orchard.Core.Navigation.Models;
@using Orchard.Core.Navigation.ViewModels @using Orchard.Core.Navigation.ViewModels;
<h1>@Html.TitleForPage(T("Manage Main Menu").ToString())</h1> <h1>@Html.TitleForPage(T("Manage Main Menu").ToString())</h1>
@using (Html.BeginFormAntiForgeryPost()) { @using (Html.BeginFormAntiForgeryPost()) {

View File

@@ -1,6 +1,6 @@
@model MenuPart @model MenuPart
@using Orchard.Core.Navigation.Models @using Orchard.Core.Navigation.Models;
@using Orchard.Core.Navigation.ViewModels @using Orchard.Core.Navigation.ViewModels;
@{ @{
Script.Require("ShapesBase"); Script.Require("ShapesBase");
} }

View File

@@ -1,5 +1,5 @@
@model DisplayReportViewModel @model DisplayReportViewModel
@using Orchard.Core.Reports.ViewModels @using Orchard.Core.Reports.ViewModels;
<h1>@Html.TitleForPage(T("Display Report").ToString())</h1> <h1>@Html.TitleForPage(T("Display Report").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) { @using(Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary() @Html.ValidationSummary()

View File

@@ -1,5 +1,5 @@
@model ReportsAdminIndexViewModel @model ReportsAdminIndexViewModel
@using Orchard.Core.Reports.ViewModels @using Orchard.Core.Reports.ViewModels;
<h1>@Html.TitleForPage(T("Manage Reports").ToString())</h1> <h1>@Html.TitleForPage(T("Manage Reports").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) { @using(Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary() @Html.ValidationSummary()

View File

@@ -1,5 +1,5 @@
@model Orchard.Core.Routable.ViewModels.RoutableEditorViewModel @model Orchard.Core.Routable.ViewModels.RoutableEditorViewModel
@using Orchard.Utility.Extensions @using Orchard.Utility.Extensions;
@{ Script.Require("Slugify"); } @{ Script.Require("Slugify"); }
<fieldset> <fieldset>

View File

@@ -1,5 +1,5 @@
@model SiteCulturesViewModel @model SiteCulturesViewModel
@using Orchard.Core.Settings.ViewModels @using Orchard.Core.Settings.ViewModels;
<h1>@Html.TitleForPage(T("Cultures").ToString())</h1> <h1>@Html.TitleForPage(T("Cultures").ToString())</h1>
<p class="breadcrumb">@Html.ActionLink(T("Manage Settings").Text, "index")@T(" &#62; ")@T("Supported Cultures")</p> <p class="breadcrumb">@Html.ActionLink(T("Manage Settings").Text, "index")@T(" &#62; ")@T("Supported Cultures")</p>
<h3>@T("Available Cultures")</h3> <h3>@T("Available Cultures")</h3>

View File

@@ -1,5 +1,5 @@
@model Orchard.Core.Settings.ViewModels.SiteSettingsPartViewModel @model Orchard.Core.Settings.ViewModels.SiteSettingsPartViewModel
@using Orchard.Settings @using Orchard.Settings;
@{ @{
var resourceDebugMode = new SelectList(new object[] { var resourceDebugMode = new SelectList(new object[] {
new { Id = (int)ResourceDebugMode.FromAppSetting, Text = "Use web.config setting" }, new { Id = (int)ResourceDebugMode.FromAppSetting, Text = "Use web.config setting" },

View File

@@ -1,5 +1,5 @@
@using Orchard.Mvc.Html @using Orchard.Mvc.Html;
@using Orchard.UI.Resources @using Orchard.UI.Resources;
@{ @{
RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")}); RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")});
} }

View File

@@ -1,4 +1,4 @@
@using System.Web.Mvc @using System.Web.Mvc;
<div class="user-display"> <div class="user-display">
@if (Request.IsAuthenticated) { @if (Request.IsAuthenticated) {
@T("Welcome, <strong>{0}</strong>!", WorkContext.CurrentUser.UserName) @T("Welcome, <strong>{0}</strong>!", WorkContext.CurrentUser.UserName)

View File

@@ -1,5 +1,5 @@
@model Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel @model Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel
@using Orchard.Mvc.Html @using Orchard.Mvc.Html;
@if ((Model.IsPublished && Model.ScheduledArchiveUtc.HasValue && Model.ScheduledArchiveUtc.Value > DateTime.UtcNow)) { @if ((Model.IsPublished && Model.ScheduledArchiveUtc.HasValue && Model.ScheduledArchiveUtc.Value > DateTime.UtcNow)) {
<ul class="pageStatus"> <ul class="pageStatus">

View File

@@ -1,5 +1,5 @@
@model Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel @model Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel
@using System.Web.Mvc.Html @using System.Web.Mvc.Html;
@{ @{
Style.Require("jQueryUtils_TimePicker"); Style.Require("jQueryUtils_TimePicker");
Style.Require("jQueryUI_DatePicker"); Style.Require("jQueryUI_DatePicker");

View File

@@ -1,4 +1,4 @@
@using Orchard.Blogs.Extensions @using Orchard.Blogs.Extensions;
<h1>@Html.TitleForPage(T("Manage Blogs").ToString())</h1> <h1>@Html.TitleForPage(T("Manage Blogs").ToString())</h1>
@if (Model.ContentItems.Items.Count > 0) { @if (Model.ContentItems.Items.Count > 0) {
<div class="actions"><a class="add button primaryAction" href="@Url.BlogCreate()">@T("New Blog")</a></div> <div class="actions"><a class="add button primaryAction" href="@Url.BlogCreate()">@T("New Blog")</a></div>

View File

@@ -1,5 +1,5 @@
@using Orchard.Blogs.Extensions @using Orchard.Blogs.Extensions;
@using Orchard.Blogs.ViewModels @using Orchard.Blogs.ViewModels;
@{ @{
BlogPostArchiveViewModel model = Model.Archives; BlogPostArchiveViewModel model = Model.Archives;
Style.Require("BlogsArchives"); Style.Require("BlogsArchives");

View File

@@ -1,4 +1,4 @@
@using Orchard.Blogs.Extensions @using Orchard.Blogs.Extensions;
<h1 class="page-title">@Html.TitleForPage(T("Archives").Text, (string)Model.ArchiveData.Year.ToString(), (string)(Model.ArchiveData.Month > 0 ? new DateTime(Model.ArchiveData.Year, Model.ArchiveData.Month, 1).ToString("MMMM") : null), (string)(Model.ArchiveData.Day > 0 ? Model.ArchiveData.Day.ToString() : null))</h1> <h1 class="page-title">@Html.TitleForPage(T("Archives").Text, (string)Model.ArchiveData.Year.ToString(), (string)(Model.ArchiveData.Month > 0 ? new DateTime(Model.ArchiveData.Year, Model.ArchiveData.Month, 1).ToString("MMMM") : null), (string)(Model.ArchiveData.Day > 0 ? Model.ArchiveData.Day.ToString() : null))</h1>
<div class="archive-trail"> <div class="archive-trail">
@T("Archives") / @T("Archives") /

View File

@@ -1,4 +1,4 @@
@using Orchard.Blogs.Extensions @using Orchard.Blogs.Extensions;
@{ @{
Style.Require("BlogsAdmin"); Style.Require("BlogsAdmin");
} }

View File

@@ -1,5 +1,5 @@
@using Orchard.Core.Contents.ViewModels @using Orchard.Core.Contents.ViewModels;
@using Orchard.Utility.Extensions @using Orchard.Utility.Extensions;
@if (Model.Items.Count > 0) { @if (Model.Items.Count > 0) {
using (Html.BeginFormAntiForgeryPost(Url.Action("List", "Admin", new { area = "Contents", id = "" }))) { using (Html.BeginFormAntiForgeryPost(Url.Action("List", "Admin", new { area = "Contents", id = "" }))) {
<fieldset class="bulk-actions"> <fieldset class="bulk-actions">

View File

@@ -1,5 +1,5 @@
@using Orchard.Blogs.Extensions @using Orchard.Blogs.Extensions;
@using Orchard.Blogs.Models @using Orchard.Blogs.Models;
<h1><a href="@Url.BlogForAdmin((string)Model.Slug)">@Html.TitleForPage((string)Model.Title)</a></h1> <h1><a href="@Url.BlogForAdmin((string)Model.Slug)">@Html.TitleForPage((string)Model.Title)</a></h1>
@Display(Model.manage) @Display(Model.manage)
<div class="manage"><a href="@Url.BlogPostCreate((BlogPart)Model.ContentItem.Get(typeof(BlogPart)))" class="add button primaryAction">@T("New Post")</a></div> <div class="manage"><a href="@Url.BlogPostCreate((BlogPart)Model.ContentItem.Get(typeof(BlogPart)))" class="add button primaryAction">@T("New Post")</a></div>

View File

@@ -1,5 +1,5 @@
@using Orchard.Blogs.Extensions @using Orchard.Blogs.Extensions;
@using Orchard.UI.Resources @using Orchard.UI.Resources;
@{ @{
RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest((string)Model.Slug) }); RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest((string)Model.Slug) });
RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd((string)Model.Slug) }); RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd((string)Model.Slug) });

View File

@@ -1,4 +1,4 @@
@using Orchard.Blogs.Models @using Orchard.Blogs.Models;
@{ @{
Html.AddTitleParts((string)Model.Title); Html.AddTitleParts((string)Model.Title);
BlogPostPart blogPost = Model.ContentItem.Get(typeof(BlogPostPart)); BlogPostPart blogPost = Model.ContentItem.Get(typeof(BlogPostPart));

View File

@@ -1,5 +1,5 @@
@using Orchard.Blogs.Extensions @using Orchard.Blogs.Extensions;
@using Orchard.Blogs.Models @using Orchard.Blogs.Models;
<h2>@Html.Link((string)Model.Title, Url.Blog((string)Model.Slug))</h2> <h2>@Html.Link((string)Model.Title, Url.Blog((string)Model.Slug))</h2>
@if (!string.IsNullOrEmpty((string)Model.Description)) { @if (!string.IsNullOrEmpty((string)Model.Description)) {
<p>@Model.Description</p> <p>@Model.Description</p>

View File

@@ -1,8 +1,8 @@
@using Orchard.Blogs.Extensions @using Orchard.Blogs.Extensions;
@using Orchard.Blogs.Models @using Orchard.Blogs.Models;
@using Orchard.Core.Common.Extensions @using Orchard.Core.Common.Extensions;
@using Orchard.Core.Common.Models @using Orchard.Core.Common.Models;
@using Orchard.Core.Common.ViewModels @using Orchard.Core.Common.ViewModels;
<h2>@Html.Link((string)Model.Title, Url.BlogPost((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart))))</h2> <h2>@Html.Link((string)Model.Title, Url.BlogPost((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart))))</h2>
<div class="meta">@Html.PublishedState(new CommonMetadataViewModel((CommonPart)Model.ContentItem.Get(typeof(CommonPart))), T) | @Display(Model.meta)</div> <div class="meta">@Html.PublishedState(new CommonMetadataViewModel((CommonPart)Model.ContentItem.Get(typeof(CommonPart))), T) | @Display(Model.meta)</div>
<div class="content">@Display(Model.primary)</div> <div class="content">@Display(Model.primary)</div>

View File

@@ -1,5 +1,5 @@
@using Orchard.Blogs.Extensions @using Orchard.Blogs.Extensions;
@using Orchard.Blogs.Models @using Orchard.Blogs.Models;
<div class="summary"> <div class="summary">
<div class="related"> <div class="related">
<a href="@Url.Blog((string)Model.Slug)" title="@T("View")">@T("View")</a>@T(" | ") <a href="@Url.Blog((string)Model.Slug)" title="@T("View")">@T("View")</a>@T(" | ")

View File

@@ -1,7 +1,7 @@
@using Orchard.Blogs.Extensions @using Orchard.Blogs.Extensions;
@using Orchard.Blogs.Models @using Orchard.Blogs.Models;
@using Orchard.ContentManagement @using Orchard.ContentManagement;
@using Orchard.Utility.Extensions @using Orchard.Utility.Extensions;
@{ @{
ContentItem contentItem = Model.ContentItem; ContentItem contentItem = Model.ContentItem;
var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();

View File

@@ -1,6 +1,6 @@
@model Orchard.Comments.ViewModels.CommentsDetailsViewModel @model Orchard.Comments.ViewModels.CommentsDetailsViewModel
@using Orchard.Comments.Models @using Orchard.Comments.Models;
@using Orchard.Comments.ViewModels @using Orchard.Comments.ViewModels;
<h1>@Html.TitleForPage(T("Comments for {0}", Model.DisplayNameForCommentedItem).ToString())</h1> <h1>@Html.TitleForPage(T("Comments for {0}", Model.DisplayNameForCommentedItem).ToString())</h1>
<div class="manage"> <div class="manage">

View File

@@ -1,5 +1,5 @@
@model Orchard.Comments.ViewModels.CommentsEditViewModel @model Orchard.Comments.ViewModels.CommentsEditViewModel
@using Orchard.Comments.Models @using Orchard.Comments.Models;
<h1>@Html.TitleForPage(T("Edit Comment").ToString())</h1> <h1>@Html.TitleForPage(T("Edit Comment").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) { @using(Html.BeginFormAntiForgeryPost()) {

View File

@@ -1,6 +1,6 @@
@model Orchard.Comments.ViewModels.CommentsIndexViewModel @model Orchard.Comments.ViewModels.CommentsIndexViewModel
@using Orchard.Comments.Models @using Orchard.Comments.Models;
@using Orchard.Comments.ViewModels @using Orchard.Comments.ViewModels;
<h1>@Html.TitleForPage(T("Manage Comments").ToString())</h1> <h1>@Html.TitleForPage(T("Manage Comments").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) { @using(Html.BeginFormAntiForgeryPost()) {

View File

@@ -1,8 +1,8 @@
@model Orchard.Comments.Models.CommentsPart @model Orchard.Comments.Models.CommentsPart
@using Orchard.Comments.Models @using Orchard.Comments.Models;
@using Orchard.Comments @using Orchard.Comments;
@using Orchard.Security @using Orchard.Security;
@using Orchard.Utility.Extensions @using Orchard.Utility.Extensions;
@if (Model.Comments.Count > 0) { @if (Model.Comments.Count > 0) {
<h2 id="comments">@T.Plural("1 Comment", "{0} Comments", Model.Comments.Count)</h2> <h2 id="comments">@T.Plural("1 Comment", "{0} Comments", Model.Comments.Count)</h2>

View File

@@ -1,4 +1,4 @@
@model Orchard.Comments.ViewModels.CommentCountViewModel @model Orchard.Comments.ViewModels.CommentCountViewModel
@using Orchard.Comments.ViewModels @using Orchard.Comments.ViewModels;
<span class="commentcount">@T.Plural("1 Comment", "{0} Comments", Model.CommentCount)</span> <span class="commentcount">@T.Plural("1 Comment", "{0} Comments", Model.CommentCount)</span>

View File

@@ -1,5 +1,5 @@
@model Orchard.Comments.ViewModels.CommentCountViewModel @model Orchard.Comments.ViewModels.CommentCountViewModel
@using Orchard.Comments.ViewModels @using Orchard.Comments.ViewModels;
@using Orchard.Comments.Extensions @using Orchard.Comments.Extensions;
<span class="commentcount">@Html.CommentSummaryLinks(T, Model.Item, Model.CommentCount, Model.PendingCount)</span> <span class="commentcount">@Html.CommentSummaryLinks(T, Model.Item, Model.CommentCount, Model.PendingCount)</span>

View File

@@ -1,7 +1,7 @@
@model Orchard.Comments.Models.CommentsPart @model Orchard.Comments.Models.CommentsPart
@using Orchard.Comments.Models @using Orchard.Comments.Models;
@using Orchard.Comments.Extensions @using Orchard.Comments.Extensions;
@using Orchard.Localization @using Orchard.Localization;
<fieldset> <fieldset>
<legend>@T("Comments") <legend>@T("Comments")

View File

@@ -1,5 +1,5 @@
@model Orchard.Comments.Models.CommentSettingsPartRecord @model Orchard.Comments.Models.CommentSettingsPartRecord
@using Orchard.Comments.Models @using Orchard.Comments.Models;
<fieldset> <fieldset>
<legend>@T("Comments")</legend> <legend>@T("Comments")</legend>

View File

@@ -1,5 +1,5 @@
@model IEnumerable<Orchard.Comments.Models.CommentPart> @model IEnumerable<Orchard.Comments.Models.CommentPart>
@using Orchard.Comments.Models @using Orchard.Comments.Models;
<ul class="comments"> <ul class="comments">
@foreach (var comment in Model) { @foreach (var comment in Model) {

View File

@@ -1,5 +1,5 @@
@model Orchard.ContentTypes.ViewModels.EditTypeViewModel @model Orchard.ContentTypes.ViewModels.EditTypeViewModel
@using Orchard.Core.Contents.Settings @using Orchard.Core.Contents.Settings;
<div class="summary"> <div class="summary">
<div class="properties"> <div class="properties">
<h3>@Model.DisplayName</h3>@{ var creatable = Model.Settings.GetModel<ContentTypeSettings>().Creatable; } <h3>@Model.DisplayName</h3>@{ var creatable = Model.Settings.GetModel<ContentTypeSettings>().Creatable; }

View File

@@ -1,5 +1,5 @@
@model SettingsDictionary @model SettingsDictionary
@using Orchard.ContentManagement.MetaData.Models @using Orchard.ContentManagement.MetaData.Models;
@if (Model.Any()) { @if (Model.Any()) {
@/*<h4>@T("Global Settings")</h4>*/ @/*<h4>@T("Global Settings")</h4>*/
<dl class="settings">@foreach (var setting in Model) { <dl class="settings">@foreach (var setting in Model) {

View File

@@ -1,5 +1,5 @@
@model SettingsDictionary @model SettingsDictionary
@using Orchard.ContentManagement.MetaData.Models @using Orchard.ContentManagement.MetaData.Models;
@if (Model.Any()) { @if (Model.Any()) {
<fieldset> <fieldset>
@{ @{

View File

@@ -1,5 +1,5 @@
@model Orchard.Email.Models.SmtpSettingsPart @model Orchard.Email.Models.SmtpSettingsPart
@using System.Net.Mail @using System.Net.Mail;
<fieldset> <fieldset>
<legend>@T("SMTP")</legend> <legend>@T("SMTP")</legend>

View File

@@ -1,5 +1,5 @@
@using Orchard @using Orchard;
@using Orchard.DisplayManagement.Descriptors @using Orchard.DisplayManagement.Descriptors;
@{ @{
var workContext = ViewContext.GetWorkContext(); var workContext = ViewContext.GetWorkContext();
var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.ThemeName); var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.ThemeName);

View File

@@ -1,6 +1,6 @@
@model Orchard.Media.ViewModels.MediaItemAddViewModel @model Orchard.Media.ViewModels.MediaItemAddViewModel
@using Orchard.Media.Helpers @using Orchard.Media.Helpers;
@using Orchard.Media.Models @using Orchard.Media.Models;
@{ Style.Require("MediaAdmin"); } @{ Style.Require("MediaAdmin"); }
<h1>@Html.TitleForPage(T("Add Media").ToString())</h1> <h1>@Html.TitleForPage(T("Add Media").ToString())</h1>

View File

@@ -1,6 +1,6 @@
@model Orchard.Media.ViewModels.MediaFolderCreateViewModel @model Orchard.Media.ViewModels.MediaFolderCreateViewModel
@using Orchard.Media.Helpers @using Orchard.Media.Helpers;
@using Orchard.Media.Models @using Orchard.Media.Models;
@{ Style.Require("MediaAdmin"); } @{ Style.Require("MediaAdmin"); }
<h1>@Html.TitleForPage(T("Add a Folder").ToString())</h1> <h1>@Html.TitleForPage(T("Add a Folder").ToString())</h1>

View File

@@ -1,6 +1,6 @@
@model Orchard.Media.ViewModels.MediaFolderEditViewModel @model Orchard.Media.ViewModels.MediaFolderEditViewModel
@using Orchard.Media.Helpers @using Orchard.Media.Helpers;
@using Orchard.Media.Models @using Orchard.Media.Models;
@{ Style.Require("MediaAdmin"); } @{ Style.Require("MediaAdmin"); }
<h1>@Html.TitleForPage(T("Manage Folder").ToString())</h1> <h1>@Html.TitleForPage(T("Manage Folder").ToString())</h1>

View File

@@ -1,6 +1,6 @@
@model Orchard.Media.ViewModels.MediaItemEditViewModel @model Orchard.Media.ViewModels.MediaItemEditViewModel
@using Orchard.Media.Helpers @using Orchard.Media.Helpers;
@using Orchard.Media.Models @using Orchard.Media.Models;
@{ Style.Require("MediaAdmin"); } @{ Style.Require("MediaAdmin"); }
<h1>@Html.TitleForPage(T("Edit Media - {0}", Model.Name).ToString())</h1> <h1>@Html.TitleForPage(T("Edit Media - {0}", Model.Name).ToString())</h1>

View File

@@ -1,6 +1,6 @@
@model Orchard.Media.ViewModels.MediaFolderEditPropertiesViewModel @model Orchard.Media.ViewModels.MediaFolderEditPropertiesViewModel
@using Orchard.Media.Helpers @using Orchard.Media.Helpers;
@using Orchard.Media.Models @using Orchard.Media.Models;
@{ Style.Require("MediaAdmin"); } @{ Style.Require("MediaAdmin"); }
<h1>@Html.TitleForPage(T("Folder Properties").ToString())</h1> <h1>@Html.TitleForPage(T("Folder Properties").ToString())</h1>

View File

@@ -1,5 +1,5 @@
@model ModuleAddViewModel @model ModuleAddViewModel
@using Orchard.Modules.ViewModels @using Orchard.Modules.ViewModels;
@{ @{
Style.Require("ModulesAdmin"); Style.Require("ModulesAdmin");
} }

View File

@@ -1,9 +1,9 @@
@model FeaturesViewModel @model FeaturesViewModel
@using Orchard.Localization @using Orchard.Localization;
@using Orchard.Modules.Extensions @using Orchard.Modules.Extensions;
@using Orchard.Modules.ViewModels @using Orchard.Modules.ViewModels;
@using Orchard.Utility.Extensions @using Orchard.Utility.Extensions;
@using Orchard.Modules.Models @using Orchard.Modules.Models;
@{ @{
Style.Require("ModulesAdmin"); Style.Require("ModulesAdmin");

View File

@@ -1,7 +1,7 @@
@model ModulesIndexViewModel @model ModulesIndexViewModel
@using Orchard.Modules.Extensions @using Orchard.Modules.Extensions;
@using Orchard.Mvc.Html @using Orchard.Mvc.Html;
@using Orchard.Modules.ViewModels @using Orchard.Modules.ViewModels;
@{ @{
Style.Require("ModulesAdmin"); Style.Require("ModulesAdmin");

View File

@@ -1,5 +1,5 @@
@model Orchard.Environment.Configuration.ShellSettings @model Orchard.Environment.Configuration.ShellSettings
@using Orchard.MultiTenancy.Extensions @using Orchard.MultiTenancy.Extensions;
@using(Html.BeginFormAntiForgeryPost(Url.Action("enable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) { @using(Html.BeginFormAntiForgeryPost(Url.Action("enable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) {
@Html.HiddenFor(ss => ss.Name) @Html.HiddenFor(ss => ss.Name)

View File

@@ -1,4 +1,4 @@
@model Orchard.Environment.Configuration.ShellSettings @model Orchard.Environment.Configuration.ShellSettings
@using Orchard.MultiTenancy.Extensions @using Orchard.MultiTenancy.Extensions;
@Html.ActionLink(T("Make Valid*").ToString(), "_setup", new {tenantName = Model.Name, area = "Orchard.MultiTenancy"}) @Html.ActionLink(T("Make Valid*").ToString(), "_setup", new {tenantName = Model.Name, area = "Orchard.MultiTenancy"})

View File

@@ -1,5 +1,5 @@
@model Orchard.Environment.Configuration.ShellSettings @model Orchard.Environment.Configuration.ShellSettings
@using Orchard.MultiTenancy.Extensions @using Orchard.MultiTenancy.Extensions;
@using(Html.BeginFormAntiForgeryPost(Url.Action("disable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) { @using(Html.BeginFormAntiForgeryPost(Url.Action("disable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) {
@Html.HiddenFor(ss => ss.Name) @Html.HiddenFor(ss => ss.Name)

View File

@@ -1,4 +1,4 @@
@model Orchard.Environment.Configuration.ShellSettings @model Orchard.Environment.Configuration.ShellSettings
@using Orchard.MultiTenancy.Extensions @using Orchard.MultiTenancy.Extensions;
@Html.Link(T("Set Up").ToString(), Url.Tenant(Model)) @Html.Link(T("Set Up").ToString(), Url.Tenant(Model))

View File

@@ -1,5 +1,5 @@
@model Orchard.MultiTenancy.ViewModels.TenantEditViewModel @model Orchard.MultiTenancy.ViewModels.TenantEditViewModel
@using Orchard.Environment.Configuration @using Orchard.Environment.Configuration;
<h1>@Html.TitleForPage(T("Edit Tenant").ToString())</h1> <h1>@Html.TitleForPage(T("Edit Tenant").ToString())</h1>
@using (Html.BeginFormAntiForgeryPost()) { @using (Html.BeginFormAntiForgeryPost()) {

View File

@@ -1,5 +1,5 @@
@model Orchard.MultiTenancy.ViewModels.TenantsIndexViewModel @model Orchard.MultiTenancy.ViewModels.TenantsIndexViewModel
@using Orchard.MultiTenancy.Extensions @using Orchard.MultiTenancy.Extensions;
@{ Style.Require("MultiTenancyAdmin"); } @{ Style.Require("MultiTenancyAdmin"); }

View File

@@ -1,5 +1,5 @@
@model RoleCreateViewModel @model RoleCreateViewModel
@using Orchard.Roles.ViewModels @using Orchard.Roles.ViewModels;
<h1>@Html.TitleForPage(T("Add Role").ToString())</h1> <h1>@Html.TitleForPage(T("Add Role").ToString())</h1>
@using (Html.BeginFormAntiForgeryPost()) { @using (Html.BeginFormAntiForgeryPost()) {
Html.ValidationSummary(); Html.ValidationSummary();

View File

@@ -1,5 +1,5 @@
@model RoleEditViewModel @model RoleEditViewModel
@using Orchard.Roles.ViewModels @using Orchard.Roles.ViewModels;
<h1>@Html.TitleForPage(T("Edit Role").ToString())</h1> <h1>@Html.TitleForPage(T("Edit Role").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) { @using(Html.BeginFormAntiForgeryPost()) {
Html.ValidationSummary(); Html.ValidationSummary();

View File

@@ -1,5 +1,5 @@
@model RolesIndexViewModel @model RolesIndexViewModel
@using Orchard.Roles.ViewModels @using Orchard.Roles.ViewModels;
<h1>@Html.TitleForPage(T("Manage Roles").ToString())</h1> <h1>@Html.TitleForPage(T("Manage Roles").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) { @using(Html.BeginFormAntiForgeryPost()) {

View File

@@ -1,5 +1,5 @@
@model UserRolesViewModel @model UserRolesViewModel
@using Orchard.Roles.ViewModels @using Orchard.Roles.ViewModels;
<fieldset> <fieldset>
<legend>@T("Roles")</legend> <legend>@T("Roles")</legend>
@if (Model.Roles.Count > 0) { @if (Model.Roles.Count > 0) {

View File

@@ -1,5 +1,5 @@
@model Orchard.Search.ViewModels.SearchSettingsViewModel @model Orchard.Search.ViewModels.SearchSettingsViewModel
@using Orchard.Search.ViewModels @using Orchard.Search.ViewModels;
<fieldset> <fieldset>
<legend>@T("Search")</legend> <legend>@T("Search")</legend>

View File

@@ -1,5 +1,5 @@
@model Orchard.Search.ViewModels.SearchViewModel @model Orchard.Search.ViewModels.SearchViewModel
@using Orchard.Search.ViewModels @using Orchard.Search.ViewModels;
@using(Html.BeginForm("index", "search", new { area = "Orchard.Search" }, FormMethod.Get, new { @class = "search" })) { @using(Html.BeginForm("index", "search", new { area = "Orchard.Search" }, FormMethod.Get, new { @class = "search" })) {
<fieldset> <fieldset>

View File

@@ -1,5 +1,7 @@
@model Orchard.Setup.ViewModels.SetupViewModel @model Orchard.Setup.ViewModels.SetupViewModel
@Html.Partial("~/Themes/Classic/Theme.txt2")
<h1>@Html.TitleForPage(T("Get Started").ToString())</h1> <h1>@Html.TitleForPage(T("Get Started").ToString())</h1>
@using (Html.BeginFormAntiForgeryPost()) { @using (Html.BeginFormAntiForgeryPost()) {

View File

@@ -1,6 +1,6 @@
@model Orchard.Tags.ViewModels.TagsAdminIndexViewModel @model Orchard.Tags.ViewModels.TagsAdminIndexViewModel
@using Orchard.Tags.ViewModels @using Orchard.Tags.ViewModels;
<h1>@Html.TitleForPage(T("Manage Tags").ToString()) </h1> <h1>@Html.TitleForPage(T("Manage Tags").ToString()) </h1>

View File

@@ -1,5 +1,5 @@
@model Orchard.Tags.ViewModels.TagsAdminSearchViewModel @model Orchard.Tags.ViewModels.TagsAdminSearchViewModel
@using Orchard.ContentManagement @using Orchard.ContentManagement;
<h1>@Html.TitleForPage(T("List of contents tagged with {0}", Model.TagName).ToString())</h1> <h1>@Html.TitleForPage(T("List of contents tagged with {0}", Model.TagName).ToString())</h1>
<table class="items"> <table class="items">

View File

@@ -1,5 +1,5 @@
@model Orchard.Users.ViewModels.UsersIndexViewModel @model Orchard.Users.ViewModels.UsersIndexViewModel
@using Orchard.Users.Models @using Orchard.Users.Models;
<h1>@Html.TitleForPage(T("Manage Users").ToString()) </h1> <h1>@Html.TitleForPage(T("Manage Users").ToString()) </h1>
@using (Html.BeginFormAntiForgeryPost()) { @using (Html.BeginFormAntiForgeryPost()) {

View File

@@ -188,7 +188,7 @@
<Content Include="Themes\Classic\Theme.png" /> <Content Include="Themes\Classic\Theme.png" />
<Content Include="Themes\Classic\Theme.txt" /> <Content Include="Themes\Classic\Theme.txt" />
<Content Include="Themes\Classic\Views\Footer.cshtml" /> <Content Include="Themes\Classic\Views\Footer.cshtml" />
<Content Include="Themes\Classic\Views\Layout.ascx" /> <None Include="Themes\Classic\Views\Layout.cshtml" />
<Content Include="Themes\Contoso\Content\Images\bkg.jpg" /> <Content Include="Themes\Contoso\Content\Images\bkg.jpg" />
<Content Include="Themes\Contoso\Content\Images\comment-arrow.png" /> <Content Include="Themes\Contoso\Content\Images\comment-arrow.png" />
<Content Include="Themes\Contoso\Content\Images\content-bkg.png" /> <Content Include="Themes\Contoso\Content\Images\content-bkg.png" />

View File

@@ -1,14 +1,15 @@
@using Orchard.UI.Resources @using Orchard.UI.Resources;
@{ @{
Style.Include("site.css"); Style.Include("site.css");
Style.Include("blog.css"); Style.Include("blog.css");
} }
<div id="wrapper"> <div id="wrapper">
@// HTML.Include will render a div with a class="user-display" @* HTML.Include will render a div with a class="user-display" *@
@// Can use this -> {Html.Include("User");} @* Can use this -> {Html.Include("User");} *@
@// or the following. At least they appear to do the same thing currently. The first is a standard Html.Include, the second "displays the (New) User shape" @* or the following. At least they appear to do the same thing currently. The first is a standard Html.Include, the second "displays the (New) User shape" *@
@Display.User() @Display.User()
@// Top Navigation and branding @* Top Navigation and branding *@
<div id="headercontainer"> <div id="headercontainer">
<div id="header"> <div id="header">
<h1>@WorkContext.CurrentSite.SiteName</h1> <h1>@WorkContext.CurrentSite.SiteName</h1>
@@ -21,14 +22,14 @@
<div id="main"> <div id="main">
<div id="content"> <div id="content">
@// Main Content @* Main Content *@
@Display(Model.Content) @Display(Model.Content)
</div> </div>
<div id="sidebar"> <div id="sidebar">
@Display(Model.search) @Display(Model.search)
@Display(Model.sidebar) @Display(Model.sidebar)
</div> </div>
@// End Content @* End Content *@
@Display.Footer(Navigation:Model.Navigation) @Display.Footer(Navigation:Model.Navigation)
</div> </div>
</div> </div>

View File

@@ -1,4 +1,4 @@
@using Orchard.UI.Resources @using Orchard.UI.Resources;
@{ @{
Style.Include("site.css"); Style.Include("site.css");
Style.Include("blog.css"); Style.Include("blog.css");

View File

@@ -1,5 +1,5 @@
@using Orchard.Mvc.Html @using Orchard.Mvc.Html;
@using Orchard.UI.Resources @using Orchard.UI.Resources;
@{ @{
RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")}); RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")});
} }
@@ -12,8 +12,8 @@
//todo: (heskew) have resource modules that can be leaned on (like a jQuery module that knows about various CDNs and jQuery's version and min naming schemes) //todo: (heskew) have resource modules that can be leaned on (like a jQuery module that knows about various CDNs and jQuery's version and min naming schemes)
//todo: (heskew) this is an interim solution to inlude jQuery in every page and still allow that to be overriden in some theme by it containing a headScripts partial //todo: (heskew) this is an interim solution to inlude jQuery in every page and still allow that to be overriden in some theme by it containing a headScripts partial
} }
@//Model.Zones.AddRenderPartial("head:before", "HeadPreload", Model); @*Model.Zones.AddRenderPartial("head:before", "HeadPreload", Model);*@
@//Html.Zone("head", ":metas :styles :scripts"); %> @*Html.Zone("head", ":metas :styles :scripts"); %>*@
@Display(Model.Head) @Display(Model.Head)
<script>(function(d){d.className="dyn "+d.className.substring(7,d.length);})(document.documentElement);</script> <script>(function(d){d.className="dyn "+d.className.substring(7,d.length);})(document.documentElement);</script>
</head> </head>

View File

@@ -1,4 +1,4 @@
@using Orchard.UI.Resources @using Orchard.UI.Resources;
@{ @{
Script.Require("jQuery"); Script.Require("jQuery");
Script.Require("ShapesBase"); Script.Require("ShapesBase");

View File

@@ -1,5 +1,5 @@
@using Orchard @using Orchard;
@using Orchard.DisplayManagement.Descriptors @using Orchard.DisplayManagement.Descriptors;
@{ @{
var workContext = ViewContext.GetWorkContext(); var workContext = ViewContext.GetWorkContext();
var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.ThemeName); var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.ThemeName);

View File

@@ -1,9 +1,9 @@
@model dynamic @model dynamic
@using Orchard.Security @using Orchard.Security;
@using Orchard.DisplayManagement.Descriptors @using Orchard.DisplayManagement.Descriptors;
@using Orchard.UI.Resources @using Orchard.UI.Resources;
@using Orchard @using Orchard;
@using Orchard.ContentManagement @using Orchard.ContentManagement;
@{ @{
Style.Include("site.css"); Style.Include("site.css");

View File

@@ -1,5 +1,5 @@
@using Orchard.Mvc.Html @using Orchard.Mvc.Html;
@using Orchard.UI.Resources @using Orchard.UI.Resources;
@{ @{
RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")}); RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")});
} }

View File

@@ -1,5 +1,5 @@
@using Orchard.Blogs.Extensions @using Orchard.Blogs.Extensions;
@using Orchard.UI.Resources @using Orchard.UI.Resources;
@{ @{
RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest((string)Model.Slug) }); RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest((string)Model.Slug) });
RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd((string)Model.Slug) }); RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd((string)Model.Slug) });