Convert Core.Setttings to new shape API.

--HG--
branch : dev

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -293,8 +293,11 @@
     <Content Include="Settings\Styles\admin.css" />
     <Content Include="Settings\Views\Admin\Index.cshtml" />
     <Content Include="Settings\Views\Admin\Culture.cshtml" />
-    <Content Include="Settings\Views\DisplayTemplates\CurrentCulture.ascx" />
+    <None Include="Settings\Placement.info">
-    <Content Include="Settings\Views\DisplayTemplates\RemovableCulture.ascx" />
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Settings\Views\DisplayTemplates\CurrentCulture.cshtml" />
+    <None Include="Settings\Views\DisplayTemplates\RemovableCulture.cshtml" />
     <Content Include="Shapes\Module.txt" />
     <Content Include="Shapes\Scripts\base.js" />
     <Content Include="Shapes\Scripts\html5.js" />

src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs

@@ -27,17 +27,18 @@ namespace Orchard.Core.Settings.Drivers {
                 SiteCultures = _cultureManager.ListCultures()
             };
 
-            return ContentPartTemplate(model, "Parts/Settings.SiteSettingsPart");
+            return ContentShape("Parts_Settings_SiteSettingsPart",
+                () => shapeHelper.EditorTemplate(TemplateName: "Parts/Settings.SiteSettingsPart", Model: model));
         }
 
         protected override DriverResult Editor(SiteSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
             var site = _siteService.GetSiteSettings().As<SiteSettingsPart>();
             var model = new SiteSettingsPartViewModel { Site = site };
 
-            if (updater.TryUpdateModel(model, Prefix, null, null)) {
+            updater.TryUpdateModel(model, Prefix, null, null);
-            }
 
-            return ContentPartTemplate(model, "Parts/Settings.SiteSettingsPart");
+            return ContentShape("Parts_Settings_SiteSettingsPart",
+                () => shapeHelper.EditorTemplate(TemplateName: "Parts/Settings.SiteSettingsPart", Model: model));
         }
     }
 }

src/Orchard.Web/Core/Settings/Placement.info

@@ -0,0 +1,3 @@
+<Placement>
+    <Place Parts_Settings_SiteSettingsPart="Primary:1"/>
+</Placement>

src/Orchard.Web/Core/Settings/Views/Admin/Culture.cshtml

@@ -8,7 +8,7 @@
 <fieldset class="addCulture">
     <label for="CultureName">@T("Add a culture...")</label>
     @Html.DropDownList("SystemCultureName", new SelectList(Model.AvailableSystemCultures.OrderBy(s => s), Model.CurrentCulture))
-	@T("Other"): @Html.TextBox("CultureName")
+    @T("Other"): @Html.TextBox("CultureName")
     <button class="primaryAction" type="submit">@T("Add")</button>
 </fieldset>
 }

src/Orchard.Web/Core/Settings/Views/DisplayTemplates/CurrentCulture.ascx

@@ -1,2 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<string>" %>
-<strong><%:Model %></strong>

src/Orchard.Web/Core/Settings/Views/DisplayTemplates/CurrentCulture.cshtml

@@ -0,0 +1 @@
+<strong>@Model</strong>

src/Orchard.Web/Core/Settings/Views/DisplayTemplates/RemovableCulture.ascx

@@ -1,6 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<string>" %>
-<div><%:Model %></div>
-<% using (Html.BeginFormAntiForgeryPost(Url.Action("DeleteCulture", "Admin", new { area = "Settings" }), FormMethod.Post, new {@class = "inline link"})) { %>
-    <%: Html.Hidden("cultureName", Model, new { id = "" }) %>
-    <button type="submit" class="remove" title="<%:T("Delete") %>">x</button>
-<% } %>

src/Orchard.Web/Core/Settings/Views/DisplayTemplates/RemovableCulture.cshtml

@@ -0,0 +1,7 @@
+<div>
+    @Model 
+    @using (Html.BeginFormAntiForgeryPost(Url.Action("DeleteCulture", "Admin", new { area = "Settings" }), FormMethod.Post, new {@class = "inline link"})) {
+        @Html.Hidden("cultureName", (string)Model, new { id = "" }) 
+        <button type="submit" class="remove" title="@T("Delete")">x</button>
+    }
+</div>

src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts/Settings.SiteSettingsPart.cshtml

@@ -1,11 +1,11 @@
 @model Orchard.Core.Settings.ViewModels.SiteSettingsPartViewModel
 @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" },
-		new { Id = (int)ResourceDebugMode.Enabled, Text = "Enabled" },
+        new { Id = (int)ResourceDebugMode.Enabled, Text = "Enabled" },
-		new { Id = (int)ResourceDebugMode.Disabled, Text = "Disabled" },
+        new { Id = (int)ResourceDebugMode.Disabled, Text = "Disabled" },
-	}, "Id", "Text", (int)Model.ResourceDebugMode);
+    }, "Id", "Text", (int)Model.ResourceDebugMode);
 }
 <fieldset>
     <legend>@T("Global Settings")</legend>
@@ -30,9 +30,9 @@
         @Html.EditorFor(x=>x.SuperUser)
         @Html.ValidationMessage("SuperUser", "*")
     </div>
-	<div>
+    <div>
-		<label for="SiteDebugMode">@T("Resource Debug Mode")</label>
+        <label for="SiteDebugMode">@T("Resource Debug Mode")</label>
-		@Html.DropDownList("ResourceDebugMode", resourceDebugMode)
+        @Html.DropDownList("ResourceDebugMode", resourceDebugMode)
-		<p>@T("Determines whether scripts and stylesheets load in their debuggable or minified form.")</p>
+        <p>@T("Determines whether scripts and stylesheets load in their debuggable or minified form.")</p>
-	</div>
+    </div>
-</fieldset>
+</fieldset>

src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj

@@ -98,7 +98,9 @@
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Placement.info" />
+    <None Include="Placement.info">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Core\Orchard.Core.csproj">