lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-03 12:03:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Migrating Settings

Browse Source 
--HG--
branch : theming
This commit is contained in:
Sebastien Ros
2010-09-10 15:47:52 -07:00
parent 541c6d1e65
commit adeda2e278
6 changed files with 59 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -319,8 +319,8 @@
<Content Include="Routable\Views\Item\Display.ascx" />
<Content Include="Settings\Module.txt" />
<Content Include="Settings\Styles\admin.css" />
<Content Include="Settings\Views\Admin\Index.ascx" />
<Content Include="Settings\Views\Admin\Culture.ascx" />
<None Include="Settings\Views\Admin\Index.cshtml" />
<None Include="Settings\Views\Admin\Culture.cshtml" />
<Content Include="Settings\Views\DisplayTemplates\CurrentCulture.ascx" />
<Content Include="Settings\Views\DisplayTemplates\RemovableCulture.ascx" />
<Content Include="Shapes\Module.txt" />

8
src/Orchard.Web/Core/Settings/Controllers/AdminController.cs
View File

@@ -37,10 +37,10 @@ namespace Orchard.Core.Settings.Controllers {
var site = _siteService.GetSiteSettings().As<SiteSettingsPart>();
var model = new SettingsIndexViewModel {
Site = Services.ContentManager.BuildEditorModel(site),
Site = site,
SiteCultures = _cultureManager.ListCultures()
};
return View(Shape.Model(model));
return View(model);
}
[HttpPost, ActionName("Index")]
@@ -53,7 +53,7 @@ namespace Orchard.Core.Settings.Controllers {
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();
return View(Shape.Model(model));
return View(model);
}
Services.Notifier.Information(T("Settings updated"));
@@ -73,7 +73,7 @@ namespace Orchard.Core.Settings.Controllers {
.Select(ci => ci.Name)
.Where(s => !model.SiteCultures.Contains(s));
return View(Shape.Model(model));
return View(model);
}
[HttpPost]

19
src/Orchard.Web/Core/Settings/Views/Admin/Culture.ascx
View File

@@ -1,19 +0,0 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SiteCulturesViewModel>" %>
<%@ Import Namespace="Orchard.Core.Settings.ViewModels" %><%
Html.RegisterStyle("admin.css"); %>
<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>
<% using (Html.BeginFormAntiForgeryPost("AddCulture")) { %>
<%:Html.ValidationSummary() %>
<fieldset class="addCulture">
<label for="CultureName"><%:T("Add a culture...") %></label>
<%:Html.DropDownList("CultureName", new SelectList(Model.AvailableSystemCultures.OrderBy(s => s), Model.CurrentCulture))%>
<button class="primaryAction" type="submit"><%:T("Add") %></button>
</fieldset>
<% } %>
<h3><%:T("Cultures this site supports") %></h3>
<%: Html.UnorderedList(
Model.SiteCultures.OrderBy(s => s),
(s, i) => Html.DisplayFor(scvm => s, s == Model.CurrentCulture ? "CurrentCulture" : "RemovableCulture", ""),
"site-cultures", "culture", "odd")%>

18
src/Orchard.Web/Core/Settings/Views/Admin/Culture.cshtml Normal file
View File

@@ -0,0 +1,18 @@
@model SiteCulturesViewModel
@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>
@using (Html.BeginFormAntiForgeryPost("AddCulture")) {
@Html.ValidationSummary()
<fieldset class="addCulture">
<label for="CultureName">@T("Add a culture...")</label>
@Html.DropDownList("CultureName", new SelectList(Model.AvailableSystemCultures.OrderBy(s => s), Model.CurrentCulture))
<button class="primaryAction" type="submit">@T("Add")</button>
</fieldset>
}
<h3>@T("Cultures this site supports")</h3>
@Html.UnorderedList(
Model.SiteCultures.OrderBy(s => s),
(s, i) => Html.DisplayFor(scvm => s, s == Model.CurrentCulture ? "CurrentCulture" : "RemovableCulture", ""),
"site-cultures", "culture", "odd")

35
src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx
View File

@@ -1,35 +0,0 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SettingsIndexViewModel>" %>
<%@ Import Namespace="Orchard.Core.Settings.ViewModels" %>
<h1><%:Html.TitleForPage(T("Manage Settings").ToString()) %></h1>
<% using (Html.BeginFormAntiForgeryPost()) { %>
<%:Html.ValidationSummary() %>
<fieldset>
<legend><%:T("Global Settings") %></legend>
<div>
<label for="SiteName"><%:T("Site name") %></label>
<%:Html.EditorFor(m => m.SiteName) %>
<%:Html.ValidationMessage("SiteName", "*") %>
</div>
<div>
<label for="SiteCulture"><%:T("Default Site Culture") %></label>
<%:Html.DropDownList("SiteCulture", new SelectList(Model.SiteCultures, Model.SiteCulture)) %>
<%:Html.ValidationMessage("SiteCulture", "*") %>
<p><%:Html.ActionLink(T("Add or remove supported cultures for the site.").ToString(), "Culture") %></p>
</div>
<div>
<label for="PageTitleSeparator"><%:T("Page title separator") %></label>
<%:Html.EditorFor(x => x.PageTitleSeparator) %>
<%:Html.ValidationMessage("PageTitleSeparator", "*") %>
</div>
<div>
<label for="SuperUser"><%:T("Super user") %></label>
<%:Html.EditorFor(x=>x.SuperUser) %>
<%:Html.ValidationMessage("SuperUser", "*") %>
</div>
</fieldset>
<%:Html.EditorForItem(Model.ViewModel) %>
<fieldset>
<%:Html.EditorFor(s => s.Id) %>
<input class="button primaryAction" type="submit" value="<%:T("Save") %>" />
</fieldset>
<% } %>

35
src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml Normal file
View File

@@ -0,0 +1,35 @@
@model SettingsIndexViewModel
@using Orchard.Core.Settings.ViewModels
<h1>@Html.TitleForPage(T("Manage Settings").ToString())</h1>
@using (Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary()
<fieldset>
<legend>@T("Global Settings")</legend>
<div>
<label for="SiteName">@T("Site name")</label>
@Html.EditorFor(m => m.SiteName)
@Html.ValidationMessage("SiteName", "*")
</div>
<div>
<label for="SiteCulture">@T("Default Site Culture")</label>
@Html.DropDownList("SiteCulture", new SelectList(Model.SiteCultures, Model.SiteCulture))
@Html.ValidationMessage("SiteCulture", "*")
<p>@Html.ActionLink(T("Add or remove supported cultures for the site.").ToString(), "Culture")</p>
</div>
<div>
<label for="PageTitleSeparator">@T("Page title separator")</label>
@Html.EditorFor(x => x.PageTitleSeparator)
@Html.ValidationMessage("PageTitleSeparator", "*")
</div>
<div>
<label for="SuperUser">@T("Super user")</label>
@Html.EditorFor(x=>x.SuperUser)
@Html.ValidationMessage("SuperUser", "*")
</div>
</fieldset>
<fieldset>
@Html.EditorFor(s => s.Id)
<input class="button primaryAction" type="submit" value="@T("Save")" />
</fieldset>
}