Fix Razor views "using" syntax

"@using" directive now requires a semicolon at the end. --HG-- branch : dev
2026-02-09 09:16:41 +08:00 · 2010-10-07 10:48:51 -07:00
parent 0f4613cb18
commit 1e826830f2
86 changed files with 144 additions and 141 deletions
@@ -1,3 +1,3 @@
@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>
@@ -1,5 +1,5 @@
@model BodyDisplayViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 <div class="manage">
    @Html.ItemEditLinkWithReturnUrl(T("Edit").ToString(), Model.BodyPart.ContentItem)
 </div>
@@ -1,5 +1,5 @@
@model BodyDisplayViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
@/* begin: knowingly broken HTML (hence the ManageWrapperPre and ManageWrapperPost templates)
 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. */
@@ -1,3 +1,3 @@
@model BodyDisplayViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 <div class="managewrapper">
@@ -1,5 +1,5 @@
@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
    //also, doing this here, inline, until we have a pluggable processing model (both in and out)
    //also, ...this is ugly*/
@@ -1,3 +1,3 @@
@model BodyDisplayViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
@Model.Html
@@ -1,5 +1,5 @@
@model Orchard.Core.Common.ViewModels.CommonMetadataViewModel
-@using Orchard.Core.Common.Extensions
+@using Orchard.Core.Common.Extensions;
@if (Model.Creator != null) {
 <div class="metadata">
    <div class="posted">@T("Published by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T))</div>
@@ -1,5 +1,5 @@
@model BodyEditorViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 <fieldset>
    <label>@T("Body")</label>
    @Html.Partial("EditorTemplates/" + Model.TextEditorTemplate, Model)
@@ -1,5 +1,5 @@
@model ContainerEditorViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 <fieldset>
    @Html.HiddenFor(m=>m.ContainerId)
 </fieldset>
@@ -1,5 +1,5 @@
@model OwnerEditorViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 <fieldset>
    @Html.LabelFor(m=>m.Owner)
    @Html.EditorFor(m=>m.Owner)
@@ -1,3 +1,3 @@
@model BodyEditorViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
@Html.TextArea("Text", Model.Text, 25, 80, new { @class = Model.Format })
@@ -1,4 +1,4 @@
-@using Orchard.Core.Contents.ViewModels
+@using Orchard.Core.Contents.ViewModels;
@{
    var typeDisplayName = Model.TypeDisplayName;
    var pageTitle = T("Manage Content");
@@ -1,5 +1,5 @@
-@using Orchard.ContentManagement
-@using Orchard.Utility.Extensions
+@using Orchard.ContentManagement;
+@using Orchard.Utility.Extensions;
@{
    Script.Require("ShapesBase");
 }
@@ -1,5 +1,5 @@
-@using Orchard.ContentManagement
-@using Orchard.Utility.Extensions
+@using Orchard.ContentManagement;
+@using Orchard.Utility.Extensions;
@{
 	ContentItem contentItem = Model.ContentItem;
 	var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
@@ -1,5 +1,5 @@
@model AddLocalizationViewModel
-@using Orchard.Core.Localization.ViewModels
+@using Orchard.Core.Localization.ViewModels;
@{
    dynamic content = Model.Content;
    content.Zones.primary.Add(New.Partial(TemplateName: "CultureSelection", Model: Model), "0");
@@ -1,6 +1,6 @@
@model MessageSettingsPartViewModel
-@using Orchard.Core.Messaging.Models
-@using Orchard.Core.Messaging.ViewModels
+@using Orchard.Core.Messaging.Models;
+@using Orchard.Core.Messaging.ViewModels;
 <fieldset>
    <legend>@T("Messaging")</legend>
    <div>
@@ -1,7 +1,7 @@
@model NavigationManagementViewModel
-@using Orchard.ContentManagement
-@using Orchard.Core.Navigation.Models
-@using Orchard.Core.Navigation.ViewModels
+@using Orchard.ContentManagement;
+@using Orchard.Core.Navigation.Models;
+@using Orchard.Core.Navigation.ViewModels;

 <h1>@Html.TitleForPage(T("Manage Main Menu").ToString())</h1>
@using (Html.BeginFormAntiForgeryPost()) {
@@ -1,6 +1,6 @@
@model MenuPart
-@using Orchard.Core.Navigation.Models
-@using Orchard.Core.Navigation.ViewModels
+@using Orchard.Core.Navigation.Models;
+@using Orchard.Core.Navigation.ViewModels;
@{
    Script.Require("ShapesBase");
 }
@@ -1,5 +1,5 @@
@model DisplayReportViewModel
-@using Orchard.Core.Reports.ViewModels
+@using Orchard.Core.Reports.ViewModels;
 <h1>@Html.TitleForPage(T("Display Report").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) {
 	@Html.ValidationSummary()
@@ -1,5 +1,5 @@
@model ReportsAdminIndexViewModel
-@using Orchard.Core.Reports.ViewModels
+@using Orchard.Core.Reports.ViewModels;
 <h1>@Html.TitleForPage(T("Manage Reports").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) {
 	@Html.ValidationSummary()
@@ -1,5 +1,5 @@
@model Orchard.Core.Routable.ViewModels.RoutableEditorViewModel
-@using Orchard.Utility.Extensions
+@using Orchard.Utility.Extensions;
@{ Script.Require("Slugify"); }

 <fieldset>
@@ -1,5 +1,5 @@
@model SiteCulturesViewModel
-@using Orchard.Core.Settings.ViewModels
+@using Orchard.Core.Settings.ViewModels;
 <h1>@Html.TitleForPage(T("Cultures").ToString())</h1>
 <p class="breadcrumb">@Html.ActionLink(T("Manage Settings").Text, "index")@T(" &#62; ")@T("Supported Cultures")</p>
 <h3>@T("Available Cultures")</h3>
@@ -1,5 +1,5 @@
@model Orchard.Core.Settings.ViewModels.SiteSettingsPartViewModel
-@using Orchard.Settings
+@using Orchard.Settings;
@{
 	var resourceDebugMode = new SelectList(new object[] {
 		new { Id = (int)ResourceDebugMode.FromAppSetting, Text = "Use web.config setting" },
@@ -1,5 +1,5 @@
-@using Orchard.Mvc.Html
-@using Orchard.UI.Resources
+@using Orchard.Mvc.Html;
+@using Orchard.UI.Resources;
@{
 	RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")});
 }
@@ -1,4 +1,4 @@
-@using System.Web.Mvc
+@using System.Web.Mvc;
        <div class="user-display">
@if (Request.IsAuthenticated) {
        @T("Welcome, <strong>{0}</strong>!", WorkContext.CurrentUser.UserName)
@@ -1,5 +1,5 @@
@model Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel
-@using Orchard.Mvc.Html
+@using Orchard.Mvc.Html;

@if ((Model.IsPublished && Model.ScheduledArchiveUtc.HasValue && Model.ScheduledArchiveUtc.Value > DateTime.UtcNow)) { 
 <ul class="pageStatus">
@@ -1,5 +1,5 @@
@model Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel
-@using System.Web.Mvc.Html
+@using System.Web.Mvc.Html;
@{
    Style.Require("jQueryUtils_TimePicker");
    Style.Require("jQueryUI_DatePicker");
@@ -1,4 +1,4 @@
-@using Orchard.Blogs.Extensions
+@using Orchard.Blogs.Extensions;
 <h1>@Html.TitleForPage(T("Manage Blogs").ToString())</h1>
@if (Model.ContentItems.Items.Count > 0) { 
 <div class="actions"><a class="add button primaryAction" href="@Url.BlogCreate()">@T("New Blog")</a></div>
@@ -1,5 +1,5 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.Blogs.ViewModels
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.ViewModels;
@{
    BlogPostArchiveViewModel model = Model.Archives;
    Style.Require("BlogsArchives");
@@ -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>
 <div class="archive-trail">
@T("Archives") / 
@@ -1,4 +1,4 @@
-@using Orchard.Blogs.Extensions
+@using Orchard.Blogs.Extensions;
@{
    Style.Require("BlogsAdmin");
 }
@@ -1,5 +1,5 @@
-@using Orchard.Core.Contents.ViewModels
-@using Orchard.Utility.Extensions
+@using Orchard.Core.Contents.ViewModels;
+@using Orchard.Utility.Extensions;
@if (Model.Items.Count > 0) {
    using (Html.BeginFormAntiForgeryPost(Url.Action("List", "Admin", new { area = "Contents", id = "" }))) {
    <fieldset class="bulk-actions">
@@ -1,5 +1,5 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.Blogs.Models
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
 <h1><a href="@Url.BlogForAdmin((string)Model.Slug)">@Html.TitleForPage((string)Model.Title)</a></h1>
@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>
@@ -1,5 +1,5 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.UI.Resources
+@using Orchard.Blogs.Extensions;
+@using Orchard.UI.Resources;
@{
    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) });
@@ -1,4 +1,4 @@
-@using Orchard.Blogs.Models
+@using Orchard.Blogs.Models;
@{
    Html.AddTitleParts((string)Model.Title);
    BlogPostPart blogPost = Model.ContentItem.Get(typeof(BlogPostPart));
@@ -1,5 +1,5 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.Blogs.Models
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
 <h2>@Html.Link((string)Model.Title, Url.Blog((string)Model.Slug))</h2>
@if (!string.IsNullOrEmpty((string)Model.Description)) {
    <p>@Model.Description</p>
@@ -1,8 +1,8 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.Blogs.Models
-@using Orchard.Core.Common.Extensions
-@using Orchard.Core.Common.Models
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
+@using Orchard.Core.Common.Extensions;
+@using Orchard.Core.Common.Models;
+@using Orchard.Core.Common.ViewModels;
 <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="content">@Display(Model.primary)</div>
@@ -1,5 +1,5 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.Blogs.Models
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
 <div class="summary">
    <div class="related">
        <a href="@Url.Blog((string)Model.Slug)" title="@T("View")">@T("View")</a>@T(" | ")
@@ -1,7 +1,7 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.Blogs.Models
-@using Orchard.ContentManagement
-@using Orchard.Utility.Extensions
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
+@using Orchard.ContentManagement;
+@using Orchard.Utility.Extensions;
@{
 	ContentItem contentItem = Model.ContentItem;
 	var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
@@ -1,6 +1,6 @@
@model Orchard.Comments.ViewModels.CommentsDetailsViewModel
-@using Orchard.Comments.Models
-@using Orchard.Comments.ViewModels
+@using Orchard.Comments.Models;
+@using Orchard.Comments.ViewModels;

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

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

 <h1>@Html.TitleForPage(T("Manage Comments").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) { 
@@ -1,8 +1,8 @@
@model Orchard.Comments.Models.CommentsPart
-@using Orchard.Comments.Models
-@using Orchard.Comments
-@using Orchard.Security
-@using Orchard.Utility.Extensions
+@using Orchard.Comments.Models;
+@using Orchard.Comments;
+@using Orchard.Security;
+@using Orchard.Utility.Extensions;

@if (Model.Comments.Count > 0) { 
 <h2 id="comments">@T.Plural("1 Comment", "{0} Comments", Model.Comments.Count)</h2>
@@ -1,4 +1,4 @@
@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>
@@ -1,5 +1,5 @@
@model Orchard.Comments.ViewModels.CommentCountViewModel
-@using Orchard.Comments.ViewModels
-@using Orchard.Comments.Extensions
+@using Orchard.Comments.ViewModels;
+@using Orchard.Comments.Extensions;

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

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

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

 <ul class="comments">
@foreach (var comment in Model) { 
@@ -1,5 +1,5 @@
@model Orchard.ContentTypes.ViewModels.EditTypeViewModel
-@using Orchard.Core.Contents.Settings
+@using Orchard.Core.Contents.Settings;
 <div class="summary">
    <div class="properties">
        <h3>@Model.DisplayName</h3>@{ var creatable = Model.Settings.GetModel<ContentTypeSettings>().Creatable; }
@@ -1,5 +1,5 @@
@model SettingsDictionary
-@using Orchard.ContentManagement.MetaData.Models
+@using Orchard.ContentManagement.MetaData.Models;
@if (Model.Any()) {
    @/*<h4>@T("Global Settings")</h4>*/
    <dl class="settings">@foreach (var setting in Model) {
@@ -1,5 +1,5 @@
@model SettingsDictionary
-@using Orchard.ContentManagement.MetaData.Models
+@using Orchard.ContentManagement.MetaData.Models;
@if (Model.Any()) {
    <fieldset>
    @{ 
@@ -1,5 +1,5 @@
@model Orchard.Email.Models.SmtpSettingsPart
-@using System.Net.Mail
+@using System.Net.Mail;

 <fieldset>
    <legend>@T("SMTP")</legend>
@@ -1,5 +1,5 @@
-@using Orchard
-@using Orchard.DisplayManagement.Descriptors
+@using Orchard;
+@using Orchard.DisplayManagement.Descriptors;
@{
 	var workContext = ViewContext.GetWorkContext();
 	var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.ThemeName);
@@ -1,6 +1,6 @@
@model Orchard.Media.ViewModels.MediaItemAddViewModel
-@using Orchard.Media.Helpers
-@using Orchard.Media.Models
+@using Orchard.Media.Helpers;
+@using Orchard.Media.Models;
@{ Style.Require("MediaAdmin"); }

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

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

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

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

 <h1>@Html.TitleForPage(T("Folder Properties").ToString())</h1>
@@ -1,5 +1,5 @@
@model ModuleAddViewModel
-@using Orchard.Modules.ViewModels
+@using Orchard.Modules.ViewModels;
@{
    Style.Require("ModulesAdmin");
 }
@@ -1,9 +1,9 @@
@model FeaturesViewModel
-@using Orchard.Localization
-@using Orchard.Modules.Extensions
-@using Orchard.Modules.ViewModels
-@using Orchard.Utility.Extensions
-@using Orchard.Modules.Models
+@using Orchard.Localization;
+@using Orchard.Modules.Extensions;
+@using Orchard.Modules.ViewModels;
+@using Orchard.Utility.Extensions;
+@using Orchard.Modules.Models;

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

@{
    Style.Require("ModulesAdmin");
@@ -1,5 +1,5 @@
@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"})) { 
 	@Html.HiddenFor(ss => ss.Name) 
@@ -1,4 +1,4 @@
@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"})
@@ -1,5 +1,5 @@
@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"})) { 
 	@Html.HiddenFor(ss => ss.Name)
@@ -1,4 +1,4 @@
@model Orchard.Environment.Configuration.ShellSettings
-@using Orchard.MultiTenancy.Extensions
+@using Orchard.MultiTenancy.Extensions;

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

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

@{ Style.Require("MultiTenancyAdmin"); }

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

 <h1>@Html.TitleForPage(T("Manage Roles").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) {
@@ -1,5 +1,5 @@
@model UserRolesViewModel
-@using Orchard.Roles.ViewModels
+@using Orchard.Roles.ViewModels;
 <fieldset>
    <legend>@T("Roles")</legend>
    @if (Model.Roles.Count > 0) {
@@ -1,5 +1,5 @@
@model Orchard.Search.ViewModels.SearchSettingsViewModel
-@using Orchard.Search.ViewModels
+@using Orchard.Search.ViewModels;

 <fieldset>
    <legend>@T("Search")</legend>
@@ -1,5 +1,5 @@
@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" })) { 
    <fieldset>
@@ -1,5 +1,7 @@
@model Orchard.Setup.ViewModels.SetupViewModel

+@Html.Partial("~/Themes/Classic/Theme.txt2")
+
 <h1>@Html.TitleForPage(T("Get Started").ToString())</h1>

@using (Html.BeginFormAntiForgeryPost()) {
@@ -1,6 +1,6 @@
@model Orchard.Tags.ViewModels.TagsAdminIndexViewModel

-@using Orchard.Tags.ViewModels
+@using Orchard.Tags.ViewModels;

 <h1>@Html.TitleForPage(T("Manage Tags").ToString()) </h1>

@@ -1,5 +1,5 @@
@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>
 <table class="items">
@@ -1,5 +1,5 @@
@model Orchard.Users.ViewModels.UsersIndexViewModel
-@using Orchard.Users.Models
+@using Orchard.Users.Models;

 <h1>@Html.TitleForPage(T("Manage Users").ToString()) </h1>
@using (Html.BeginFormAntiForgeryPost()) { 
@@ -188,7 +188,7 @@
    <Content Include="Themes\Classic\Theme.png" />
    <Content Include="Themes\Classic\Theme.txt" />
    <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\comment-arrow.png" />
    <Content Include="Themes\Contoso\Content\Images\content-bkg.png" />
@@ -1,14 +1,15 @@
-@using Orchard.UI.Resources
+@using Orchard.UI.Resources;
+
@{
    Style.Include("site.css");
    Style.Include("blog.css");
 }
 <div id="wrapper">
-@// HTML.Include will render a div with a class="user-display"
-@// 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"
+@* HTML.Include will render a div with a class="user-display" *@
+@* 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" *@
@Display.User()
-@// Top Navigation and branding
+@* Top Navigation and branding *@
 <div id="headercontainer">
    <div id="header">
        <h1>@WorkContext.CurrentSite.SiteName</h1>
@@ -21,14 +22,14 @@

 <div id="main">
        <div id="content">
-        @// Main Content
+        @* Main Content *@
@Display(Model.Content)
        </div>
        <div id="sidebar">
@Display(Model.search)
@Display(Model.sidebar)
        </div>
-        @// End Content
+        @* End Content *@
@Display.Footer(Navigation:Model.Navigation)
    </div>
 </div>
@@ -1,4 +1,4 @@
-@using Orchard.UI.Resources
+@using Orchard.UI.Resources;
@{
 	Style.Include("site.css");
 	Style.Include("blog.css");
@@ -1,5 +1,5 @@
-@using Orchard.Mvc.Html
-@using Orchard.UI.Resources
+@using Orchard.Mvc.Html;
+@using Orchard.UI.Resources;
@{
 	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) 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);
-     @//Html.Zone("head", ":metas :styles :scripts"); %>
+     @*Model.Zones.AddRenderPartial("head:before", "HeadPreload", Model);*@
+     @*Html.Zone("head", ":metas :styles :scripts"); %>*@
 	 @Display(Model.Head)
    <script>(function(d){d.className="dyn "+d.className.substring(7,d.length);})(document.documentElement);</script> 
 </head> 
@@ -1,4 +1,4 @@
-@using Orchard.UI.Resources
+@using Orchard.UI.Resources;
@{
    Script.Require("jQuery");
    Script.Require("ShapesBase");
@@ -1,5 +1,5 @@
-@using Orchard
-@using Orchard.DisplayManagement.Descriptors
+@using Orchard;
+@using Orchard.DisplayManagement.Descriptors;
@{
 	var workContext = ViewContext.GetWorkContext();
 	var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.ThemeName);
@@ -1,9 +1,9 @@
@model dynamic
-@using Orchard.Security
-@using Orchard.DisplayManagement.Descriptors
-@using Orchard.UI.Resources
-@using Orchard
-@using Orchard.ContentManagement
+@using Orchard.Security;
+@using Orchard.DisplayManagement.Descriptors;
+@using Orchard.UI.Resources;
+@using Orchard;
+@using Orchard.ContentManagement;

@{
    Style.Include("site.css");
@@ -1,5 +1,5 @@
-@using Orchard.Mvc.Html
-@using Orchard.UI.Resources
+@using Orchard.Mvc.Html;
+@using Orchard.UI.Resources;
@{
 	RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")});
 }
@@ -1,5 +1,5 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.UI.Resources
+@using Orchard.Blogs.Extensions;
+@using Orchard.UI.Resources;
@{
    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) });