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

Convert Core.Setttings to new shape API.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-10-18 14:40:57 -07:00
parent 7567c2034f
commit 346192d638
10 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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" />
<Content Include="Settings\Views\DisplayTemplates\RemovableCulture.ascx" />
<None Include="Settings\Placement.info">
<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" />

9
src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs
View File

@@ -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));
}
}
}

3
src/Orchard.Web/Core/Settings/Placement.info Normal file
View File

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

2
src/Orchard.Web/Core/Settings/Views/Admin/Culture.cshtml
View File

@@ -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>
}

2
src/Orchard.Web/Core/Settings/Views/DisplayTemplates/CurrentCulture.ascx
View File

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

1
src/Orchard.Web/Core/Settings/Views/DisplayTemplates/CurrentCulture.cshtml Normal file
View File

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

6
src/Orchard.Web/Core/Settings/Views/DisplayTemplates/RemovableCulture.ascx
View File

@@ -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>
<% } %>

7
src/Orchard.Web/Core/Settings/Views/DisplayTemplates/RemovableCulture.cshtml Normal file
View File

@@ -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>

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

@@ -1,11 +1,11 @@
@model Orchard.Core.Settings.ViewModels.SiteSettingsPartViewModel
@using Orchard.Settings;
@{
var resourceDebugMode = new SelectList(new object[] {
new { Id = (int)ResourceDebugMode.FromAppSetting, Text = "Use web.config setting" },
new { Id = (int)ResourceDebugMode.Enabled, Text = "Enabled" },
new { Id = (int)ResourceDebugMode.Disabled, Text = "Disabled" },
}, "Id", "Text", (int)Model.ResourceDebugMode);
var resourceDebugMode = new SelectList(new object[] {
new { Id = (int)ResourceDebugMode.FromAppSetting, Text = "Use web.config setting" },
new { Id = (int)ResourceDebugMode.Enabled, Text = "Enabled" },
new { Id = (int)ResourceDebugMode.Disabled, Text = "Disabled" },
}, "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>
<label for="SiteDebugMode">@T("Resource Debug Mode")</label>
@Html.DropDownList("ResourceDebugMode", resourceDebugMode)
<p>@T("Determines whether scripts and stylesheets load in their debuggable or minified form.")</p>
</div>
</fieldset>
<div>
<label for="SiteDebugMode">@T("Resource Debug Mode")</label>
@Html.DropDownList("ResourceDebugMode", resourceDebugMode)
<p>@T("Determines whether scripts and stylesheets load in their debuggable or minified form.")</p>
</div>
</fieldset>

4
src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
View File

@@ -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">