diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx index db6ea5e47..d3e88fd97 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx @@ -1,37 +1,25 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.CmsPages.ViewModels"%> <%@ Import Namespace="Orchard.Utility"%> <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("Head"); %> -
-

Delete pages

-

- Are you sure you want to delete the pages?

-
- -
- <%using (Html.BeginForm()) { %> +

Delete pages

+

Are you sure you want to delete the pages?

+ <% using (Html.BeginForm()) { %> <%= Html.ValidationSummary() %> - -
-
    -
  1. - - - -
  2. -
-
- +
+ + + <% - int pageIndex = 0; - foreach (var pageEntry in Model.PageEntries.Where(e => e.IsChecked)) { - %> - - - <% pageIndex++; - }%> - <%}/*EndForm*/%> -
+ int pageIndex = 0; + foreach (var pageEntry in Model.PageEntries.Where(e => e.IsChecked)) { + var pi = pageIndex; + %> + <% + pageIndex++; + } %> + + <% } %> <% Html.Include("Foot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx index caff2098e..223a944d2 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx @@ -1,36 +1,25 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.CmsPages.ViewModels"%> <%@ Import Namespace="Orchard.Utility"%> <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("Head"); %> - <%using (Html.BeginForm()) { %> -
+ <% using (Html.BeginForm()) { %>

Publish later

-

Enter the scheduled publication date:

- <%=Html.EditorFor(m => m.Options.BulkPublishLaterDate)%> -
- -
- <%= Html.ValidationSummary() %> - -
-
    -
  1. - - -
  2. -
-
- +

Enter the scheduled publication date:

+ <%=Html.ValidationSummary() %> +
+ <%=Html.EditorFor(m => m.Options.BulkPublishLaterDate)%> + + <% - int pageIndex = 0; - foreach (var pageEntry in Model.PageEntries.Where(e => e.IsChecked)) { - %> - - - <% pageIndex++; - }%> -
- <%}/*EndForm*/%> + int pageIndex = 0; + foreach (var pageEntry in Model.PageEntries.Where(e => e.IsChecked)) { + var pi = pageIndex; + %> + <% + pageIndex++; + } %> + + <% } %> <% Html.Include("Foot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx index 2c9a2b962..7bb5c28ee 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx @@ -7,13 +7,13 @@ <% using (Html.BeginForm()) { %><%= Html.ValidationSummary() %>
-
    - <% foreach (var template in Model.Templates) { - var t = template; %> -
  1. - <%=Html.EditorFor(m => t) %> -
  2. - <% } %> +
      <% + foreach (var template in Model.Templates) { + var t = template; %> +
    1. <%= + Html.EditorFor(m => t) %> +
    2. <% + } %>
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx index e5d12ac2d..8a7f08078 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx @@ -31,18 +31,18 @@

<%=_Encoded("Publish Settings") %>

-
    -
  1. -
  2. + +
+
<%=Html.EditorFor(m => m.PublishLaterDate) %> - -
  • -
  • - - /> -
  • - +
    +
    + +
    +
    + + />
    <%}/*EndForm*/%> diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx index 61df9d4c5..0e2a766ec 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx @@ -8,8 +8,8 @@ var t = template; %>
  • <%=Html.EditorFor(m => t) %> -
  • - <% } %> + <% + } %>
    \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/TemplateDescriptor.ascx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/TemplateDescriptor.ascx index d95b26d47..120a89909 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/TemplateDescriptor.ascx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/TemplateDescriptor.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.CmsPages.Services.Templates"%> +<%@ Import Namespace="Orchard.CmsPages.Services.Templates" %>
    • <%=Html.Encode(Model.DisplayName)%>

      @@ -7,7 +7,7 @@